Explorar el Código

Fix garbled M119 output. Honor NUM_RUNOUT_SENSORS (#11948)

InsanityAutomation hace 6 años
padre
commit
23114aeb81
Se han modificado 1 ficheros con 14 adiciones y 30 borrados
  1. 14
    30
      Marlin/src/module/endstops.cpp

+ 14
- 30
Marlin/src/module/endstops.cpp Ver fichero

422
     print_es_state(READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING, PSTR(MSG_Z_PROBE));
422
     print_es_state(READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING, PSTR(MSG_Z_PROBE));
423
   #endif
423
   #endif
424
   #if ENABLED(FILAMENT_RUNOUT_SENSOR)
424
   #if ENABLED(FILAMENT_RUNOUT_SENSOR)
425
-    #define FRS_COUNT (1 + PIN_EXISTS(FIL_RUNOUT2) + PIN_EXISTS(FIL_RUNOUT3) + PIN_EXISTS(FIL_RUNOUT4) + PIN_EXISTS(FIL_RUNOUT5) + PIN_EXISTS(FIL_RUNOUT6))
426
-    #if FRS_COUNT == 1
427
-      print_es_state(READ(FIL_RUNOUT_PIN) != FIL_RUNOUT_INVERTING, MSG_FILAMENT_RUNOUT_SENSOR);
425
+    #if NUM_RUNOUT_SENSORS == 1
426
+      print_es_state(READ(FIL_RUNOUT_PIN) != FIL_RUNOUT_INVERTING, PSTR(MSG_FILAMENT_RUNOUT_SENSOR));
428
     #else
427
     #else
429
-      for (uint8_t i = 1; i <=
430
-        #if   FRS_COUNT == 6
431
-          6
432
-        #elif FRS_COUNT == 5
433
-          5
434
-        #elif FRS_COUNT == 4
435
-          4
436
-        #elif FRS_COUNT == 3
437
-          3
438
-        #elif FRS_COUNT == 2
439
-          2
440
-        #endif
441
-        ; i++
442
-      ) {
428
+      for (uint8_t i = 1; i <= NUM_RUNOUT_SENSORS; i++) {
443
         pin_t pin;
429
         pin_t pin;
444
         switch (i) {
430
         switch (i) {
445
           default: continue;
431
           default: continue;
446
           case 1: pin = FIL_RUNOUT_PIN; break;
432
           case 1: pin = FIL_RUNOUT_PIN; break;
447
-          #if PIN_EXISTS(FIL_RUNOUT2)
448
-            case 2: pin = FIL_RUNOUT2_PIN; break;
449
-          #endif
450
-          #if PIN_EXISTS(FIL_RUNOUT3)
433
+          case 2: pin = FIL_RUNOUT2_PIN; break;
434
+          #if NUM_RUNOUT_SENSORS > 2
451
             case 3: pin = FIL_RUNOUT3_PIN; break;
435
             case 3: pin = FIL_RUNOUT3_PIN; break;
452
-          #endif
453
-          #if PIN_EXISTS(FIL_RUNOUT4)
454
-            case 4: pin = FIL_RUNOUT4_PIN; break;
455
-          #endif
456
-          #if PIN_EXISTS(FIL_RUNOUT5)
457
-            case 5: pin = FIL_RUNOUT5_PIN; break;
458
-          #endif
459
-          #if PIN_EXISTS(FIL_RUNOUT6)
460
-            case 6: pin = FIL_RUNOUT6_PIN; break;
436
+            #if NUM_RUNOUT_SENSORS > 3
437
+              case 4: pin = FIL_RUNOUT4_PIN; break;
438
+              #if NUM_RUNOUT_SENSORS > 4
439
+                case 5: pin = FIL_RUNOUT5_PIN; break;
440
+                #if NUM_RUNOUT_SENSORS > 5
441
+                  case 6: pin = FIL_RUNOUT6_PIN; break;
442
+                #endif
443
+              #endif
444
+            #endif
461
           #endif
445
           #endif
462
         }
446
         }
463
         SERIAL_PROTOCOLPGM(MSG_FILAMENT_RUNOUT_SENSOR);
447
         SERIAL_PROTOCOLPGM(MSG_FILAMENT_RUNOUT_SENSOR);

Loading…
Cancelar
Guardar