Ver código fonte

Add HAS_HOTEND_OFFSET_Z conditional

Scott Lahteine 6 anos atrás
pai
commit
83d42f33e1

+ 2
- 2
Marlin/src/gcode/config/M218.cpp Ver arquivo

@@ -52,7 +52,7 @@ void GcodeSuite::M218() {
52 52
     report = false;
53 53
   }
54 54
 
55
-  #if ENABLED(DUAL_X_CARRIAGE) || ENABLED(SWITCHING_NOZZLE) || ENABLED(PARKING_EXTRUDER)
55
+  #if HAS_HOTEND_OFFSET_Z
56 56
     if (parser.seenval('Z')) {
57 57
       hotend_offset[Z_AXIS][target_extruder] = parser.value_linear_units();
58 58
       report = false;
@@ -67,7 +67,7 @@ void GcodeSuite::M218() {
67 67
       SERIAL_ECHO(hotend_offset[X_AXIS][e]);
68 68
       SERIAL_CHAR(',');
69 69
       SERIAL_ECHO(hotend_offset[Y_AXIS][e]);
70
-      #if ENABLED(DUAL_X_CARRIAGE) || ENABLED(SWITCHING_NOZZLE) || ENABLED(PARKING_EXTRUDER)
70
+      #if HAS_HOTEND_OFFSET_Z
71 71
         SERIAL_CHAR(',');
72 72
         SERIAL_ECHO(hotend_offset[Z_AXIS][e]);
73 73
       #endif

+ 0
- 3
Marlin/src/inc/Conditionals_LCD.h Ver arquivo

@@ -413,9 +413,6 @@
413 413
   #undef HOTEND_OFFSET_Y
414 414
 #else                                                         // Two hotends
415 415
   #define HOTENDS       EXTRUDERS
416
-  #if ENABLED(SWITCHING_NOZZLE) && !defined(HOTEND_OFFSET_Z)
417
-    #define HOTEND_OFFSET_Z { 0 }
418
-  #endif
419 416
 #endif
420 417
 
421 418
 #define HOTEND_LOOP() for (int8_t e = 0; e < HOTENDS; e++)

+ 2
- 1
Marlin/src/inc/Conditionals_post.h Ver arquivo

@@ -434,6 +434,7 @@
434 434
 /**
435 435
  * Default hotend offsets, if not defined
436 436
  */
437
+#define HAS_HOTEND_OFFSET_Z (HOTENDS > 1 && (ENABLED(DUAL_X_CARRIAGE) || ENABLED(SWITCHING_NOZZLE) || ENABLED(PARKING_EXTRUDER)))
437 438
 #if HOTENDS > 1
438 439
   #ifndef HOTEND_OFFSET_X
439 440
     #define HOTEND_OFFSET_X { 0 } // X offsets for each extruder
@@ -441,7 +442,7 @@
441 442
   #ifndef HOTEND_OFFSET_Y
442 443
     #define HOTEND_OFFSET_Y { 0 } // Y offsets for each extruder
443 444
   #endif
444
-  #if !defined(HOTEND_OFFSET_Z) && (ENABLED(DUAL_X_CARRIAGE) || ENABLED(SWITCHING_NOZZLE))
445
+  #if HAS_HOTEND_OFFSET_Z && !defined(HOTEND_OFFSET_Z)
445 446
     #define HOTEND_OFFSET_Z { 0 }
446 447
   #endif
447 448
 #endif

+ 1
- 1
Marlin/src/module/configuration_store.cpp Ver arquivo

@@ -2126,7 +2126,7 @@ void MarlinSettings::reset(PORTARG_SOLO) {
2126 2126
         SERIAL_ECHOPAIR_P(port, "  M218 T", (int)e);
2127 2127
         SERIAL_ECHOPAIR_P(port, " X", LINEAR_UNIT(hotend_offset[X_AXIS][e]));
2128 2128
         SERIAL_ECHOPAIR_P(port, " Y", LINEAR_UNIT(hotend_offset[Y_AXIS][e]));
2129
-        #if ENABLED(DUAL_X_CARRIAGE) || ENABLED(SWITCHING_NOZZLE) || ENABLED(PARKING_EXTRUDER)
2129
+        #if HAS_HOTEND_OFFSET_Z
2130 2130
           SERIAL_ECHOPAIR_P(port, " Z", LINEAR_UNIT(hotend_offset[Z_AXIS][e]));
2131 2131
         #endif
2132 2132
         SERIAL_EOL_P(port);

Carregando…
Cancelar
Salvar