Browse Source

Fix up XYZ_CONSTS_FROM_CONFIG macro

Scott Lahteine 8 years ago
parent
commit
fd535e111a
1 changed files with 11 additions and 10 deletions
  1. 11
    10
      Marlin/Marlin_main.cpp

+ 11
- 10
Marlin/Marlin_main.cpp View File

676
 
676
 
677
 #define XYZ_CONSTS_FROM_CONFIG(type, array, CONFIG) \
677
 #define XYZ_CONSTS_FROM_CONFIG(type, array, CONFIG) \
678
   static const PROGMEM type array##_P[XYZ] = { X_##CONFIG, Y_##CONFIG, Z_##CONFIG }; \
678
   static const PROGMEM type array##_P[XYZ] = { X_##CONFIG, Y_##CONFIG, Z_##CONFIG }; \
679
-  static inline type array(AxisEnum axis) { return pgm_read_any(&array##_P[axis]); }
679
+  static inline type array(AxisEnum axis) { return pgm_read_any(&array##_P[axis]); } \
680
+  typedef void __void_##CONFIG##__
680
 
681
 
681
-XYZ_CONSTS_FROM_CONFIG(float, base_min_pos,   MIN_POS)
682
-XYZ_CONSTS_FROM_CONFIG(float, base_max_pos,   MAX_POS)
683
-XYZ_CONSTS_FROM_CONFIG(float, base_home_pos,  HOME_POS)
684
-XYZ_CONSTS_FROM_CONFIG(float, max_length,     MAX_LENGTH)
685
-XYZ_CONSTS_FROM_CONFIG(float, home_bump_mm,   HOME_BUMP_MM)
686
-XYZ_CONSTS_FROM_CONFIG(signed char, home_dir, HOME_DIR)
682
+XYZ_CONSTS_FROM_CONFIG(float, base_min_pos,   MIN_POS);
683
+XYZ_CONSTS_FROM_CONFIG(float, base_max_pos,   MAX_POS);
684
+XYZ_CONSTS_FROM_CONFIG(float, base_home_pos,  HOME_POS);
685
+XYZ_CONSTS_FROM_CONFIG(float, max_length,     MAX_LENGTH);
686
+XYZ_CONSTS_FROM_CONFIG(float, home_bump_mm,   HOME_BUMP_MM);
687
+XYZ_CONSTS_FROM_CONFIG(signed char, home_dir, HOME_DIR);
687
 
688
 
688
 /**
689
 /**
689
  * ***************************************************************************
690
  * ***************************************************************************
714
 #if ENABLED(DEBUG_LEVELING_FEATURE)
715
 #if ENABLED(DEBUG_LEVELING_FEATURE)
715
   void print_xyz(const char* prefix, const char* suffix, const float x, const float y, const float z) {
716
   void print_xyz(const char* prefix, const char* suffix, const float x, const float y, const float z) {
716
     serialprintPGM(prefix);
717
     serialprintPGM(prefix);
717
-    SERIAL_ECHOPAIR("(", x);
718
+    SERIAL_CHAR('(');
719
+    SERIAL_ECHO(x);
718
     SERIAL_ECHOPAIR(", ", y);
720
     SERIAL_ECHOPAIR(", ", y);
719
     SERIAL_ECHOPAIR(", ", z);
721
     SERIAL_ECHOPAIR(", ", z);
720
     SERIAL_CHAR(')');
722
     SERIAL_CHAR(')');
721
 
723
 
722
-    if (suffix) serialprintPGM(suffix);
723
-    else SERIAL_EOL;
724
+    suffix ? serialprintPGM(suffix) : SERIAL_EOL;
724
   }
725
   }
725
 
726
 
726
   void print_xyz(const char* prefix, const char* suffix, const float xyz[]) {
727
   void print_xyz(const char* prefix, const char* suffix, const float xyz[]) {

Loading…
Cancel
Save