zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

🧑‍💻 Fix MAP macro use

Browse source 
Followup to #24191
This commit is contained in:
Scott Lahteine 2022-07-29 04:00:39 -05:00
parent 6523b92014
commit fa50d2c757
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Marlin/src/feature/spindle_laser.h
View file

@ -40,7 +40,6 @@
#define PCT_TO_PWM(X) ((X) * 255 / 100) #define PCT_TO_PWM(X) ((X) * 255 / 100)
#define PCT_TO_SERVO(X) ((X) * 180 / 100) #define PCT_TO_SERVO(X) ((X) * 180 / 100)
// Laser/Cutter operation mode // Laser/Cutter operation mode
enum CutterMode : int8_t { enum CutterMode : int8_t {
CUTTER_MODE_ERROR = -1, CUTTER_MODE_ERROR = -1,

2
Marlin/src/module/stepper/trinamic.cpp
View file

@ -980,7 +980,7 @@ void reset_trinamic_drivers() {
#define TMC_SWSERIAL_CONFLICT_MSG(A) STRINGIFY(A) "_SLAVE_ADDRESS conflicts with another driver using the same " STRINGIFY(A) "_SERIAL_RX_PIN or " STRINGIFY(A) "_SERIAL_TX_PIN" #define TMC_SWSERIAL_CONFLICT_MSG(A) STRINGIFY(A) "_SLAVE_ADDRESS conflicts with another driver using the same " STRINGIFY(A) "_SERIAL_RX_PIN or " STRINGIFY(A) "_SERIAL_TX_PIN"
#define SA_NO_TMC_SW_C(A) static_assert(1 >= count_tmc_sw_serial_matches(TMC_SW_DETAIL_ARGS(A), 0, COUNT(sanity_tmc_sw_details)), TMC_SWSERIAL_CONFLICT_MSG(A)); #define SA_NO_TMC_SW_C(A) static_assert(1 >= count_tmc_sw_serial_matches(TMC_SW_DETAIL_ARGS(A), 0, COUNT(sanity_tmc_sw_details)), TMC_SWSERIAL_CONFLICT_MSG(A));
MAPLIST(SA_NO_TMC_SW_C, ALL_AXIS_NAMES) MAP(SA_NO_TMC_SW_C, ALL_AXIS_NAMES)
#endif #endif
#endif // HAS_TRINAMIC_CONFIG #endif // HAS_TRINAMIC_CONFIG