diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 1069186821..b4b413c371 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -676,14 +676,15 @@ static inline signed char pgm_read_any(const signed char *p) { return pgm_read_b #define XYZ_CONSTS_FROM_CONFIG(type, array, CONFIG) \ static const PROGMEM type array##_P[XYZ] = { X_##CONFIG, Y_##CONFIG, Z_##CONFIG }; \ - static inline type array(AxisEnum axis) { return pgm_read_any(&array##_P[axis]); } + static inline type array(AxisEnum axis) { return pgm_read_any(&array##_P[axis]); } \ + typedef void __void_##CONFIG##__ -XYZ_CONSTS_FROM_CONFIG(float, base_min_pos, MIN_POS) -XYZ_CONSTS_FROM_CONFIG(float, base_max_pos, MAX_POS) -XYZ_CONSTS_FROM_CONFIG(float, base_home_pos, HOME_POS) -XYZ_CONSTS_FROM_CONFIG(float, max_length, MAX_LENGTH) -XYZ_CONSTS_FROM_CONFIG(float, home_bump_mm, HOME_BUMP_MM) -XYZ_CONSTS_FROM_CONFIG(signed char, home_dir, HOME_DIR) +XYZ_CONSTS_FROM_CONFIG(float, base_min_pos, MIN_POS); +XYZ_CONSTS_FROM_CONFIG(float, base_max_pos, MAX_POS); +XYZ_CONSTS_FROM_CONFIG(float, base_home_pos, HOME_POS); +XYZ_CONSTS_FROM_CONFIG(float, max_length, MAX_LENGTH); +XYZ_CONSTS_FROM_CONFIG(float, home_bump_mm, HOME_BUMP_MM); +XYZ_CONSTS_FROM_CONFIG(signed char, home_dir, HOME_DIR); /** * *************************************************************************** @@ -714,13 +715,13 @@ static void report_current_position(); #if ENABLED(DEBUG_LEVELING_FEATURE) void print_xyz(const char* prefix, const char* suffix, const float x, const float y, const float z) { serialprintPGM(prefix); - SERIAL_ECHOPAIR("(", x); + SERIAL_CHAR('('); + SERIAL_ECHO(x); SERIAL_ECHOPAIR(", ", y); SERIAL_ECHOPAIR(", ", z); SERIAL_CHAR(')'); - if (suffix) serialprintPGM(suffix); - else SERIAL_EOL; + suffix ? serialprintPGM(suffix) : SERIAL_EOL; } void print_xyz(const char* prefix, const char* suffix, const float xyz[]) {