3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

No distinct needed

Browse source
This commit is contained in:
Scott Lahteine 2020-11-10 23:32:21 -06:00
parent 2235a6d89d
commit fd3625aa74
2 changed files with 3 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/inc/Conditionals_LCD.h
View file

@ -676,12 +676,6 @@
#endif #endif
#if ENABLED(FILAMENT_RUNOUT_SENSOR) #if ENABLED(FILAMENT_RUNOUT_SENSOR)
#if ANY(FIL_RUNOUT1_STATE, FIL_RUNOUT1_PULL, FIL_RUNOUT2_STATE, FIL_RUNOUT2_PULL, \
FIL_RUNOUT3_STATE, FIL_RUNOUT3_PULL, FIL_RUNOUT4_STATE, FIL_RUNOUT4_PULL, \
FIL_RUNOUT5_STATE, FIL_RUNOUT5_PULL, FIL_RUNOUT6_STATE, FIL_RUNOUT6_PULL, \
FIL_RUNOUT7_STATE, FIL_RUNOUT7_PULL, FIL_RUNOUT8_STATE, FIL_RUNOUT8_PULL )
#define DISTINCT_FIL_RUNOUT_STATES 1
#endif
#if NUM_RUNOUT_SENSORS >= 1 #if NUM_RUNOUT_SENSORS >= 1
#ifndef FIL_RUNOUT1_STATE #ifndef FIL_RUNOUT1_STATE
#define FIL_RUNOUT1_STATE FIL_RUNOUT_STATE #define FIL_RUNOUT1_STATE FIL_RUNOUT_STATE

16
Marlin/src/module/endstops.cpp
View file

@ -461,27 +461,17 @@ void _O2 Endstops::report_states() {
#if NUM_RUNOUT_SENSORS == 1 #if NUM_RUNOUT_SENSORS == 1
print_es_state(READ(FIL_RUNOUT_PIN) != FIL_RUNOUT_STATE, PSTR(STR_FILAMENT_RUNOUT_SENSOR)); print_es_state(READ(FIL_RUNOUT_PIN) != FIL_RUNOUT_STATE, PSTR(STR_FILAMENT_RUNOUT_SENSOR));
#else #else
#if ENABLED(DISTINCT_FIL_RUNOUT_STATES) #define _CASE_RUNOUT(N) case N: pin = FIL_RUNOUT##N##_PIN; state = FIL_RUNOUT##N##_STATE; break;
#define _CASE_RUNOUT(N) case N: pin = FIL_RUNOUT##N##_PIN; state = FIL_RUNOUT##N##_STATE; break;
#else
#define _CASE_RUNOUT(N) case N: pin = FIL_RUNOUT##N##_PIN; break;
#endif
LOOP_S_LE_N(i, 1, NUM_RUNOUT_SENSORS) { LOOP_S_LE_N(i, 1, NUM_RUNOUT_SENSORS) {
pin_t pin; pin_t pin;
#if ENABLED(DISTINCT_FIL_RUNOUT_STATES) uint8_t state;
uint8_t state;
#endif
switch (i) { switch (i) {
default: continue; default: continue;
REPEAT_S(1, INCREMENT(NUM_RUNOUT_SENSORS), _CASE_RUNOUT) REPEAT_S(1, INCREMENT(NUM_RUNOUT_SENSORS), _CASE_RUNOUT)
} }
SERIAL_ECHOPGM(STR_FILAMENT_RUNOUT_SENSOR); SERIAL_ECHOPGM(STR_FILAMENT_RUNOUT_SENSOR);
if (i > 1) SERIAL_CHAR(' ', '0' + i); if (i > 1) SERIAL_CHAR(' ', '0' + i);
#if ENABLED(DISTINCT_FIL_RUNOUT_STATES) print_es_state(extDigitalRead(pin) != state);
print_es_state(extDigitalRead(pin) != state);
#else
print_es_state(extDigitalRead(pin) != FIL_RUNOUT_STATE);
#endif
} }
#undef _CASE_RUNOUT #undef _CASE_RUNOUT
#endif #endif