diff options
Diffstat (limited to 'ArcWelder/arc_welder.h')
| -rw-r--r-- | ArcWelder/arc_welder.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ArcWelder/arc_welder.h b/ArcWelder/arc_welder.h index 7e75038..d1ab85c 100644 --- a/ArcWelder/arc_welder.h +++ b/ArcWelder/arc_welder.h @@ -109,7 +109,8 @@ private: progress_callback progress_callback_; int process_gcode(parsed_command cmd, bool is_end); int write_gcode_to_file(std::string gcode); - std::string get_arc_gcode(double f, const std::string comment); + std::string get_arc_gcode_relative(double f, const std::string comment); + std::string get_arc_gcode_absolute(double e, double f, const std::string comment); std::string get_comment_for_arc(); int write_unwritten_gcodes_to_file(); std::string create_g92_e(double absolute_e); @@ -127,7 +128,6 @@ private: long get_file_size(const std::string& file_path); double get_time_elapsed(double start_clock, double end_clock); double get_next_update_time() const; - bool waiting_for_line_; bool waiting_for_arc_; array_list<unwritten_command> unwritten_commands_; segmented_arc current_arc_; @@ -135,7 +135,8 @@ private: // We don't care about the printer settings, except for g91 influences extruder. gcode_position * p_source_position_; - double previous_feedrate_ = -1; + double previous_feedrate_; + bool previous_is_extruder_relative_; gcode_parser parser_; bool verbose_output_; int logger_type_; |