Преглед изворни кода

Fix end stop and Z-probe reporting logic

Roxy-3D пре 6 година
родитељ
комит
4163c1a514
1 измењених фајлова са 4 додато и 4 уклоњено
  1. 4
    4
      Marlin/src/module/endstops.cpp

+ 4
- 4
Marlin/src/module/endstops.cpp Прегледај датотеку

367
 
367
 
368
 void _O2 Endstops::M119() {
368
 void _O2 Endstops::M119() {
369
   SERIAL_PROTOCOLLNPGM(MSG_M119_REPORT);
369
   SERIAL_PROTOCOLLNPGM(MSG_M119_REPORT);
370
-  #define ES_REPORT(S) print_es_state(READ(S##_PIN) == S##_ENDSTOP_INVERTING, PSTR(MSG_##S))
370
+  #define ES_REPORT(S) print_es_state(READ(S##_PIN) != S##_ENDSTOP_INVERTING, PSTR(MSG_##S))
371
   #if HAS_X_MIN
371
   #if HAS_X_MIN
372
     ES_REPORT(X_MIN);
372
     ES_REPORT(X_MIN);
373
   #endif
373
   #endif
411
     ES_REPORT(Z3_MAX);
411
     ES_REPORT(Z3_MAX);
412
   #endif
412
   #endif
413
   #if ENABLED(Z_MIN_PROBE_ENDSTOP)
413
   #if ENABLED(Z_MIN_PROBE_ENDSTOP)
414
-    print_es_state(READ(Z_MIN_PROBE_PIN) == Z_MIN_PROBE_ENDSTOP_INVERTING, PSTR(MSG_Z_PROBE));
414
+    print_es_state(READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING, PSTR(MSG_Z_PROBE));
415
   #endif
415
   #endif
416
   #if ENABLED(FILAMENT_RUNOUT_SENSOR)
416
   #if ENABLED(FILAMENT_RUNOUT_SENSOR)
417
     #define FRS_COUNT (1 + PIN_EXISTS(FIL_RUNOUT2) + PIN_EXISTS(FIL_RUNOUT3) + PIN_EXISTS(FIL_RUNOUT4) + PIN_EXISTS(FIL_RUNOUT5) + PIN_EXISTS(FIL_RUNOUT6))
417
     #define FRS_COUNT (1 + PIN_EXISTS(FIL_RUNOUT2) + PIN_EXISTS(FIL_RUNOUT3) + PIN_EXISTS(FIL_RUNOUT4) + PIN_EXISTS(FIL_RUNOUT5) + PIN_EXISTS(FIL_RUNOUT6))
418
     #if FRS_COUNT == 1
418
     #if FRS_COUNT == 1
419
-      print_es_state(READ(FIL_RUNOUT_PIN) == FIL_RUNOUT_INVERTING, MSG_FILAMENT_RUNOUT_SENSOR);
419
+      print_es_state(READ(FIL_RUNOUT_PIN) != FIL_RUNOUT_INVERTING, MSG_FILAMENT_RUNOUT_SENSOR);
420
     #else
420
     #else
421
       for (uint8_t i = 1; i <=
421
       for (uint8_t i = 1; i <=
422
         #if   FRS_COUNT == 6
422
         #if   FRS_COUNT == 6
454
         }
454
         }
455
         SERIAL_PROTOCOLPGM(MSG_FILAMENT_RUNOUT_SENSOR);
455
         SERIAL_PROTOCOLPGM(MSG_FILAMENT_RUNOUT_SENSOR);
456
         if (i > 1) { SERIAL_CHAR(' '); SERIAL_CHAR('0' + i); }
456
         if (i > 1) { SERIAL_CHAR(' '); SERIAL_CHAR('0' + i); }
457
-        print_es_state(digitalRead(pin) == FIL_RUNOUT_INVERTING);
457
+        print_es_state(digitalRead(pin) != FIL_RUNOUT_INVERTING);
458
       }
458
       }
459
     #endif
459
     #endif
460
   #endif
460
   #endif

Loading…
Откажи
Сачувај