fix M207 Zxxx

Update config extruder config syntax

diff --git a/ConfigSamples/AzteegX5Mini/Version3/config b/ConfigSamples/AzteegX5Mini/Version3/config
index 979fbc0..5ea6265 100644 (file)
--- a/ConfigSamples/AzteegX5Mini/Version3/config
+++ b/ConfigSamples/AzteegX5Mini/Version3/config
@@ -52,16 +52,18 @@ second_usb_serial_enable                     false            # This enables a s
 #dfu_enable                                  false            # for linux developers, set to true to enable DFU\r
 #watchdog_timeout                            10               # watchdog timeout in seconds, default is 10, set to 0 to disable the watchdog\r
 \r
-# Extruder module configuration\r
-extruder_module_enable                       true             # Whether to activate the extruder module at all. All configuration is ignored if false\r
-extruder_steps_per_mm                        140              # Steps per mm for extruder stepper\r
-extruder_default_feed_rate                   600              # Default rate ( mm/minute ) for moves where only the extruder moves\r
-extruder_acceleration                        500              # Acceleration in mm/sec^2, only used for retracts\r
-extruder_max_speed                           1000             # mm/sec NOTE only used for retracts\r
-\r
-extruder_step_pin                            2.0              # Pin for extruder step signal\r
-extruder_dir_pin                             0.5              # Pin for extruder dir signal\r
-extruder_en_pin                              0.4             # Pin for extruder enable signal\r
+\r
+## Extruder module configuration\r
+extruder.hotend.enable                          true             # Whether to activate the extruder module at all. All configuration is ignored if false\r
+extruder.hotend.steps_per_mm                    140              # Steps per mm for extruder stepper\r
+extruder.hotend.default_feed_rate               600              # Default rate ( mm/minute ) for moves where only the extruder moves\r
+extruder.hotend.acceleration                    500              # Acceleration for the stepper motor mm/sec²\r
+extruder.hotend.max_speed                       50               # mm/s\r
+\r
+extruder.hotend.step_pin                        2.0              # Pin for extruder step signal\r
+extruder.hotend.dir_pin                         0.5              # Pin for extruder dir signal\r
+extruder.hotend.en_pin                          0.4              # Pin for extruder enable signal\r
+\r
 delta_current                                1.0              # Extruder stepper motor current\r
 \r
 # Laser module configuration\r

diff --git a/src/modules/tools/extruder/Extruder.cpp b/src/modules/tools/extruder/Extruder.cpp
index 079b90d..640a5a6 100644 (file)
--- a/src/modules/tools/extruder/Extruder.cpp
+++ b/src/modules/tools/extruder/Extruder.cpp
@@ -309,7 +309,7 @@ void Extruder::on_gcode_received(void *argument)
             // M207 - set retract length S[positive mm] F[feedrate mm/min] Z[additional zlift/hop] Q[zlift feedrate mm/min]
             if(gcode->has_letter('S')) retract_length = gcode->get_value('S');
             if(gcode->has_letter('F')) retract_feedrate = gcode->get_value('F') / 60.0F; // specified in mm/min converted to mm/sec
-            if(gcode->has_letter('Z')) retract_zlift_length = gcode->get_value('Z') / 60.0F; // specified in mm/min converted to mm/sec
+            if(gcode->has_letter('Z')) retract_zlift_length = gcode->get_value('Z'); // specified in mm
             if(gcode->has_letter('Q')) retract_zlift_feedrate = gcode->get_value('Q') / 60.0F; // specified in mm/min converted to mm/sec
 
         } else if (gcode->m == 208 && ( (this->selected && !gcode->has_letter('P')) || (gcode->has_letter('P') && gcode->get_value('P') == this->identifier)) ) {