Bladeren bron

Merge pull request #6978 from thinkyhead/fix_z_endstop_adj

Fix z_endstop_adj initializer
Scott Lahteine 8 jaren geleden
bovenliggende
commit
7f0945d2b1
4 gewijzigde bestanden met toevoegingen van 18 en 9 verwijderingen
  1. 6
    7
      Marlin/Marlin_main.cpp
  2. 1
    1
      Marlin/configuration_store.cpp
  3. 4
    1
      Marlin/ultralcd.cpp
  4. 7
    0
      buildroot/bin/build_marlin_fail

+ 6
- 7
Marlin/Marlin_main.cpp Bestand weergeven

7918
       #ifdef PAUSE_PARK_X_POS
7918
       #ifdef PAUSE_PARK_X_POS
7919
         + PAUSE_PARK_X_POS
7919
         + PAUSE_PARK_X_POS
7920
       #endif
7920
       #endif
7921
+      #if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE)
7922
+        + (active_extruder ? hotend_offset[X_AXIS][active_extruder] : 0)
7923
+      #endif
7921
     ;
7924
     ;
7922
     const float y_pos = parser.seen('Y') ? parser.value_linear_units() : 0
7925
     const float y_pos = parser.seen('Y') ? parser.value_linear_units() : 0
7923
       #ifdef PAUSE_PARK_Y_POS
7926
       #ifdef PAUSE_PARK_Y_POS
7924
         + PAUSE_PARK_Y_POS
7927
         + PAUSE_PARK_Y_POS
7925
       #endif
7928
       #endif
7929
+      #if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE)
7930
+        + (active_extruder ? hotend_offset[Y_AXIS][active_extruder] : 0)
7931
+      #endif
7926
     ;
7932
     ;
7927
 
7933
 
7928
-    #if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE)
7929
-      if (active_extruder > 0) {
7930
-        if (!parser.seen('X')) x_pos += hotend_offset[X_AXIS][active_extruder];
7931
-        if (!parser.seen('Y')) y_pos += hotend_offset[Y_AXIS][active_extruder];
7932
-      }
7933
-    #endif
7934
-
7935
     const bool job_running = print_job_timer.isRunning();
7934
     const bool job_running = print_job_timer.isRunning();
7936
 
7935
 
7937
     if (pause_print(retract, z_lift, x_pos, y_pos)) {
7936
     if (pause_print(retract, z_lift, x_pos, y_pos)) {

+ 1
- 1
Marlin/configuration_store.cpp Bestand weergeven

1192
 
1192
 
1193
   #elif ENABLED(Z_DUAL_ENDSTOPS)
1193
   #elif ENABLED(Z_DUAL_ENDSTOPS)
1194
 
1194
 
1195
-    float z_endstop_adj =
1195
+    z_endstop_adj =
1196
       #ifdef Z_DUAL_ENDSTOPS_ADJUSTMENT
1196
       #ifdef Z_DUAL_ENDSTOPS_ADJUSTMENT
1197
         Z_DUAL_ENDSTOPS_ADJUSTMENT
1197
         Z_DUAL_ENDSTOPS_ADJUSTMENT
1198
       #else
1198
       #else

+ 4
- 1
Marlin/ultralcd.cpp Bestand weergeven

1731
 
1731
 
1732
     static bool _level_state;
1732
     static bool _level_state;
1733
     void _lcd_toggle_bed_leveling() { set_bed_leveling_enabled(_level_state); }
1733
     void _lcd_toggle_bed_leveling() { set_bed_leveling_enabled(_level_state); }
1734
-    void _lcd_set_z_fade_height() { set_z_fade_height(planner.z_fade_height); }
1734
+
1735
+    #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
1736
+      void _lcd_set_z_fade_height() { set_z_fade_height(planner.z_fade_height); }
1737
+    #endif
1735
 
1738
 
1736
     /**
1739
     /**
1737
      * Step 1: Bed Level entry-point
1740
      * Step 1: Bed Level entry-point

+ 7
- 0
buildroot/bin/build_marlin_fail Bestand weergeven

1
+#!/usr/bin/env bash
2
+
3
+if arduino --verify --board arduino:avr:mega:cpu=atmega2560 Marlin/Marlin.ino ; then
4
+  return 1
5
+else
6
+  return 0
7
+fi

Laden…
Annuleren
Opslaan