瀏覽代碼

Fix up XYZ_CONSTS_FROM_CONFIG macro

Scott Lahteine 8 年之前
父節點
當前提交
fd535e111a
共有 1 個文件被更改,包括 11 次插入10 次删除
  1. 11
    10
      Marlin/Marlin_main.cpp

+ 11
- 10
Marlin/Marlin_main.cpp 查看文件

@@ -676,14 +676,15 @@ static inline signed char pgm_read_any(const signed char *p) { return pgm_read_b
676 676
 
677 677
 #define XYZ_CONSTS_FROM_CONFIG(type, array, CONFIG) \
678 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,13 +715,13 @@ static void report_current_position();
714 715
 #if ENABLED(DEBUG_LEVELING_FEATURE)
715 716
   void print_xyz(const char* prefix, const char* suffix, const float x, const float y, const float z) {
716 717
     serialprintPGM(prefix);
717
-    SERIAL_ECHOPAIR("(", x);
718
+    SERIAL_CHAR('(');
719
+    SERIAL_ECHO(x);
718 720
     SERIAL_ECHOPAIR(", ", y);
719 721
     SERIAL_ECHOPAIR(", ", z);
720 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 727
   void print_xyz(const char* prefix, const char* suffix, const float xyz[]) {

Loading…
取消
儲存