backport patches done on main

Frix-x · Feb 29, 2024 · 7f148d2 · 7f148d2
2 parents 20f41e8 + 9cf27c3
commit 7f148d2
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/config/machine.cfg b/config/machine.cfg
@@ -7,7 +7,7 @@ on_error_gcode:
    {% if printer["gcode_macro _USER_VARIABLES"].probe_type_enabled == "dockable" %}
        _PROBE_ON_ERROR_ACTION
    {% endif %}
-    CANCEL_PRINT
+   PARK
 
 [idle_timeout]
 timeout: 1800

diff --git a/config/mcu_definitions/toolhead/LDO_Nitehawk-SB_v1.0.cfg b/config/mcu_definitions/toolhead/LDO_Nitehawk-SB_v1.0.cfg
@@ -13,7 +13,7 @@ aliases:
 
     MCU_HEAT=gpio9 , MCU_HEAT_CHAMBER=gpio28 , MCU_NH_TEMP=gpio26 ,
 
-    MCU_RGB=gpio17 , MCU_ACTIVITY_LED=gpio8 ,
+    MCU_RGB=gpio7 , MCU_ACTIVITY_LED=gpio8 ,
 
     MCU_ADXL_CS=gpio21 , MCU_ADXL_SCK=gpio18 , MCU_ADXL_MOSI=gpio20 , MCU_ADXL_MISO=gpio19 ,
 

diff --git a/macros/base/park.cfg b/macros/base/park.cfg
@@ -43,8 +43,6 @@ gcode:
             G92 E0
             G1 E-{E} F2100
         {% endif %}
-    {% else %}
-        RESPOND MSG="no extruder retraction because extruder temperature ({printer.extruder.temperature}) is lower than min_extrude_temp ({printer.configfile.config.extruder.min_extrude_temp})"
     {% endif %}
 
     G90

diff --git a/macros/base/start_print.cfg b/macros/base/start_print.cfg
@@ -14,6 +14,7 @@ variable_material: "XXX"
 variable_fl_size: "0_0_0_0"
 variable_bed_mesh_profile: ""
 variable_total_layer: 0
+variable_adaptive_primeline: 1
 gcode:
     # Get all the parameters passed from the slicer
     {% set BED_TEMP = params.BED_TEMP|default(printer["gcode_macro _USER_VARIABLES"].print_default_bed_temp)|float %} # Bed temperature