Quellcode durchsuchen

Reduce redundancy in BLTOUCH conditionals

Scott Lahteine vor 7 Jahren
Ursprung
Commit
a9487c9443
1 geänderte Dateien mit 4 neuen und 4 gelöschten Zeilen
  1. 4
    4
      Marlin/Conditionals_LCD.h

+ 4
- 4
Marlin/Conditionals_LCD.h Datei anzeigen

357
     #define BLTOUCH_RESET    160
357
     #define BLTOUCH_RESET    160
358
     #define _TEST_BLTOUCH(P) (READ(P##_PIN) != P##_ENDSTOP_INVERTING)
358
     #define _TEST_BLTOUCH(P) (READ(P##_PIN) != P##_ENDSTOP_INVERTING)
359
 
359
 
360
+    // Always disable probe pin inverting for BLTouch
361
+    #undef Z_MIN_PROBE_ENDSTOP_INVERTING
362
+    #define Z_MIN_PROBE_ENDSTOP_INVERTING false
363
+
360
     #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
364
     #if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
361
       #undef Z_MIN_ENDSTOP_INVERTING
365
       #undef Z_MIN_ENDSTOP_INVERTING
362
       #define Z_MIN_ENDSTOP_INVERTING false
366
       #define Z_MIN_ENDSTOP_INVERTING false
363
-      #undef Z_MIN_PROBE_ENDSTOP_INVERTING
364
-      #define Z_MIN_PROBE_ENDSTOP_INVERTING false
365
       #define TEST_BLTOUCH() _TEST_BLTOUCH(Z_MIN)
367
       #define TEST_BLTOUCH() _TEST_BLTOUCH(Z_MIN)
366
     #else
368
     #else
367
-      #undef Z_MIN_PROBE_ENDSTOP_INVERTING
368
-      #define Z_MIN_PROBE_ENDSTOP_INVERTING false
369
       #define TEST_BLTOUCH() _TEST_BLTOUCH(Z_MIN_PROBE)
369
       #define TEST_BLTOUCH() _TEST_BLTOUCH(Z_MIN_PROBE)
370
     #endif
370
     #endif
371
   #endif
371
   #endif

Laden…
Abbrechen
Speichern