diff options
author | FormerLurker <hochgebe@gmail.com> | 2021-11-21 22:40:04 +0300 |
---|---|---|
committer | FormerLurker <hochgebe@gmail.com> | 2021-11-21 22:40:04 +0300 |
commit | 33946985e505a5d72d47bcfbd573f0b4587c09f8 (patch) | |
tree | febb4f56214b8a1d64ed78966a6bd6750e88e185 /ArcWelder/segmented_arc.h | |
parent | fe18f18b4c005a2c4e4b69a5866d0d065bde82aa (diff) | |
parent | 3bd3d54894cd49fb564396fd043c4b0c80f4b116 (diff) |
Merge devel into master
Diffstat (limited to 'ArcWelder/segmented_arc.h')
-rw-r--r-- | ArcWelder/segmented_arc.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ArcWelder/segmented_arc.h b/ArcWelder/segmented_arc.h index c67c071..2c7b240 100644 --- a/ArcWelder/segmented_arc.h +++ b/ArcWelder/segmented_arc.h @@ -42,14 +42,14 @@ public: double mm_per_arc_segment = DEFAULT_MM_PER_ARC_SEGMENT, bool allow_3d_arcs = DEFAULT_ALLOW_3D_ARCS, unsigned char default_xyz_precision = DEFAULT_XYZ_PRECISION, - unsigned char default_e_precision = DEFAULT_E_PRECISION + unsigned char default_e_precision = DEFAULT_E_PRECISION, + int max_gcode_length = DEFAULT_MAX_GCODE_LENGTH ); virtual ~segmented_arc(); virtual bool try_add_point(printer_point p); virtual double get_shape_length(); - std::string get_shape_gcode_absolute(double e, double f); - std::string get_shape_gcode_relative(double f); - + std::string get_shape_gcode() const; + int get_shape_gcode_length(); virtual bool is_shape() const; printer_point pop_front(double e_relative); printer_point pop_back(double e_relative); @@ -57,15 +57,16 @@ public: int get_min_arc_segments() const; double get_mm_per_arc_segment() const; int get_num_firmware_compensations() const; - + int get_num_gcode_length_exceptions() const; private: bool try_add_point_internal_(printer_point p); - std::string get_shape_gcode_(bool has_e, double e, double f) const; arc current_arc_; double max_radius_mm_; int min_arc_segments_; double mm_per_arc_segment_; int num_firmware_compensations_; bool allow_3d_arcs_; + int max_gcode_length_; + int num_gcode_length_exceptions_; }; |