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

tweak code, style

Browse source
This commit is contained in:
Scott Lahteine 2020-11-08 23:14:57 -06:00 • committed by GitHub
parent 3cb9ba8103
commit 8154866f55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

84
Marlin/src/feature/runout.h
View file

@ -220,7 +220,7 @@ class FilamentSensorBase {
#define INIT_RUNOUT8_PIN(P) SET_INPUT(P) #define INIT_RUNOUT8_PIN(P) SET_INPUT(P)
#endif #endif
#endif #endif
#else // !ENABLED(DISTINCT_FIL_RUNOUT_STATES) #else // !DISTINCT_FIL_RUNOUT_STATES
#if ENABLED(FIL_RUNOUT_PULLUP) #if ENABLED(FIL_RUNOUT_PULLUP)
#define INIT_RUNOUT_PIN(P) SET_INPUT_PULLUP(P) #define INIT_RUNOUT_PIN(P) SET_INPUT_PULLUP(P)
#elif ENABLED(FIL_RUNOUT_PULLDOWN) #elif ENABLED(FIL_RUNOUT_PULLDOWN)
@ -228,7 +228,7 @@ class FilamentSensorBase {
#else #else
#define INIT_RUNOUT_PIN(P) SET_INPUT(P) #define INIT_RUNOUT_PIN(P) SET_INPUT(P)
#endif #endif
#endif // ENABLED(DISTINCT_FIL_RUNOUT_STATES) #endif // !DISTINCT_FIL_RUNOUT_STATES
#if ENABLED(DISTINCT_FIL_RUNOUT_STATES) #if ENABLED(DISTINCT_FIL_RUNOUT_STATES)
#define _INIT_RUNOUT(N) INIT_RUNOUT##N##_PIN(FIL_RUNOUT##N##_PIN); #define _INIT_RUNOUT(N) INIT_RUNOUT##N##_PIN(FIL_RUNOUT##N##_PIN);
@ -237,18 +237,16 @@ class FilamentSensorBase {
#endif #endif
REPEAT_S(1, INCREMENT(NUM_RUNOUT_SENSORS), _INIT_RUNOUT) REPEAT_S(1, INCREMENT(NUM_RUNOUT_SENSORS), _INIT_RUNOUT)
#undef _INIT_RUNOUT #undef _INIT_RUNOUT
#if ENABLED(DISTINCT_FIL_RUNOUT_STATES)
#undef INIT_RUNOUT1_PIN #undef INIT_RUNOUT1_PIN
#undef INIT_RUNOUT2_PIN #undef INIT_RUNOUT2_PIN
#undef INIT_RUNOUT3_PIN #undef INIT_RUNOUT3_PIN
#undef INIT_RUNOUT4_PIN #undef INIT_RUNOUT4_PIN
#undef INIT_RUNOUT5_PIN #undef INIT_RUNOUT5_PIN
#undef INIT_RUNOUT6_PIN #undef INIT_RUNOUT6_PIN
#undef INIT_RUNOUT7_PIN #undef INIT_RUNOUT7_PIN
#undef INIT_RUNOUT8_PIN #undef INIT_RUNOUT8_PIN
#else #undef INIT_RUNOUT_PIN
#undef INIT_RUNOUT_PIN
#endif
} }
// Return a bitmask of runout pin states // Return a bitmask of runout pin states
@ -260,52 +258,36 @@ class FilamentSensorBase {
// Return a bitmask of runout flag states (1 bits always indicates runout) // Return a bitmask of runout flag states (1 bits always indicates runout)
static inline uint8_t poll_runout_states() { static inline uint8_t poll_runout_states() {
return poll_runout_pins() return poll_runout_pins() ^ uint8_t(0
#if ENABLED(DISTINCT_FIL_RUNOUT_STATES) #if ENABLED(DISTINCT_FIL_RUNOUT_STATES)
#if FIL_RUNOUT1_STATE == LOW #if NUM_RUNOUT_SENSORS >= 1
^ uint8_t(_BV(1 - 1)) | (FIL_RUNOUT1_STATE ? 0 : _BV(1 - 1))
#endif #endif
#if NUM_RUNOUT_SENSORS > 1 #if NUM_RUNOUT_SENSORS >= 2
#if FIL_RUNOUT2_STATE == LOW | (FIL_RUNOUT2_STATE ? 0 : _BV(2 - 1))
^ uint8_t(_BV(2 - 1))
#endif
#endif #endif
#if NUM_RUNOUT_SENSORS > 2 #if NUM_RUNOUT_SENSORS >= 3
#if FIL_RUNOUT3_STATE == LOW | (FIL_RUNOUT3_STATE ? 0 : _BV(3 - 1))
^ uint8_t(_BV(3 - 1))
#endif
#endif #endif
#if NUM_RUNOUT_SENSORS > 3 #if NUM_RUNOUT_SENSORS >= 4
#if FIL_RUNOUT4_STATE == LOW | (FIL_RUNOUT4_STATE ? 0 : _BV(4 - 1))
^ uint8_t(_BV(4 - 1))
#endif
#endif #endif
#if NUM_RUNOUT_SENSORS > 4 #if NUM_RUNOUT_SENSORS >= 5
#if FIL_RUNOUT5_STATE == LOW | (FIL_RUNOUT5_STATE ? 0 : _BV(5 - 1))
^ uint8_t(_BV(5 - 1))
#endif
#endif #endif
#if NUM_RUNOUT_SENSORS > 5 #if NUM_RUNOUT_SENSORS >= 6
#if FIL_RUNOUT6_STATE == LOW | (FIL_RUNOUT6_STATE ? 0 : _BV(6 - 1))
^ uint8_t(_BV(6 - 1))
#endif
#endif #endif
#if NUM_RUNOUT_SENSORS > 6 #if NUM_RUNOUT_SENSORS >= 7
#if FIL_RUNOUT7_STATE == LOW | (FIL_RUNOUT7_STATE ? 0 : _BV(7 - 1))
^ uint8_t(_BV(7 - 1))
#endif
#endif #endif
#if NUM_RUNOUT_SENSORS > 7 #if NUM_RUNOUT_SENSORS >= 8
#if FIL_RUNOUT8_STATE == LOW | (FIL_RUNOUT8_STATE ? 0 : _BV(8 - 1))
^ uint8_t(_BV(8 - 1))
#endif
#endif #endif
#else // !ENABLED(DISTINCT_FIL_RUNOUT_STATES) #else // !DISTINCT_FIL_RUNOUT_STATES
#if FIL_RUNOUT_STATE == LOW | (FIL_RUNOUT_STATE ? 0 : _BV(NUM_RUNOUT_SENSORS) - 1)
^ uint8_t(_BV(NUM_RUNOUT_SENSORS) - 1) #endif
#endif );
#endif // ENABLED(DISTINCT_FIL_RUNOUT_STATES)
;
} }
}; };