瀏覽代碼

BS_TOTAL_AXIS => BS_TOTAL_IND

Scott Lahteine 4 年之前
父節點
當前提交
a254354e68
共有 3 個文件被更改,包括 7 次插入7 次删除
  1. 2
    2
      Marlin/src/feature/babystep.cpp
  2. 4
    4
      Marlin/src/feature/babystep.h
  3. 1
    1
      Marlin/src/lcd/menu/menu_tune.cpp

+ 2
- 2
Marlin/src/feature/babystep.cpp 查看文件

@@ -37,7 +37,7 @@ Babystep babystep;
37 37
 
38 38
 volatile int16_t Babystep::steps[BS_AXIS_IND(Z_AXIS) + 1];
39 39
 #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
40
-  int16_t Babystep::axis_total[BS_TOTAL_AXIS(Z_AXIS) + 1];
40
+  int16_t Babystep::axis_total[BS_TOTAL_IND(Z_AXIS) + 1];
41 41
 #endif
42 42
 int16_t Babystep::accum;
43 43
 
@@ -66,7 +66,7 @@ void Babystep::add_steps(const AxisEnum axis, const int16_t distance) {
66 66
 
67 67
   accum += distance; // Count up babysteps for the UI
68 68
   #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
69
-    axis_total[BS_TOTAL_AXIS(axis)] += distance;
69
+    axis_total[BS_TOTAL_IND(axis)] += distance;
70 70
   #endif
71 71
 
72 72
   #if ENABLED(BABYSTEP_ALWAYS_AVAILABLE)

+ 4
- 4
Marlin/src/feature/babystep.h 查看文件

@@ -41,9 +41,9 @@
41 41
 
42 42
 #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
43 43
   #if ENABLED(BABYSTEP_XY)
44
-    #define BS_TOTAL_AXIS(A) A
44
+    #define BS_TOTAL_IND(A) A
45 45
   #else
46
-    #define BS_TOTAL_AXIS(A) 0
46
+    #define BS_TOTAL_IND(A) 0
47 47
   #endif
48 48
 #endif
49 49
 
@@ -53,13 +53,13 @@ public:
53 53
   static int16_t accum;                                     // Total babysteps in current edit
54 54
 
55 55
   #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
56
-    static int16_t axis_total[BS_TOTAL_AXIS(Z_AXIS) + 1];   // Total babysteps since G28
56
+    static int16_t axis_total[BS_TOTAL_IND(Z_AXIS) + 1];   // Total babysteps since G28
57 57
     static inline void reset_total(const AxisEnum axis) {
58 58
       if (true
59 59
         #if ENABLED(BABYSTEP_XY)
60 60
           && axis == Z_AXIS
61 61
         #endif
62
-      ) axis_total[BS_TOTAL_AXIS(axis)] = 0;
62
+      ) axis_total[BS_TOTAL_IND(axis)] = 0;
63 63
     }
64 64
   #endif
65 65
 

+ 1
- 1
Marlin/src/lcd/menu/menu_tune.cpp 查看文件

@@ -81,7 +81,7 @@
81 81
           #endif
82 82
           lcd_put_u8str_P(GET_TEXT(MSG_BABYSTEP_TOTAL));
83 83
           lcd_put_wchar(':');
84
-          lcd_put_u8str(LCD_Z_OFFSET_FUNC(spm * babystep.axis_total[BS_TOTAL_AXIS(axis)]));
84
+          lcd_put_u8str(LCD_Z_OFFSET_FUNC(spm * babystep.axis_total[BS_TOTAL_IND(axis)]));
85 85
         }
86 86
       #endif
87 87
     }

Loading…
取消
儲存