Browse Source

BS_TOTAL_AXIS => BS_TOTAL_IND

Scott Lahteine 4 years ago
parent
commit
a254354e68

+ 2
- 2
Marlin/src/feature/babystep.cpp View File

37
 
37
 
38
 volatile int16_t Babystep::steps[BS_AXIS_IND(Z_AXIS) + 1];
38
 volatile int16_t Babystep::steps[BS_AXIS_IND(Z_AXIS) + 1];
39
 #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
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
 #endif
41
 #endif
42
 int16_t Babystep::accum;
42
 int16_t Babystep::accum;
43
 
43
 
66
 
66
 
67
   accum += distance; // Count up babysteps for the UI
67
   accum += distance; // Count up babysteps for the UI
68
   #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
68
   #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
69
-    axis_total[BS_TOTAL_AXIS(axis)] += distance;
69
+    axis_total[BS_TOTAL_IND(axis)] += distance;
70
   #endif
70
   #endif
71
 
71
 
72
   #if ENABLED(BABYSTEP_ALWAYS_AVAILABLE)
72
   #if ENABLED(BABYSTEP_ALWAYS_AVAILABLE)

+ 4
- 4
Marlin/src/feature/babystep.h View File

41
 
41
 
42
 #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
42
 #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
43
   #if ENABLED(BABYSTEP_XY)
43
   #if ENABLED(BABYSTEP_XY)
44
-    #define BS_TOTAL_AXIS(A) A
44
+    #define BS_TOTAL_IND(A) A
45
   #else
45
   #else
46
-    #define BS_TOTAL_AXIS(A) 0
46
+    #define BS_TOTAL_IND(A) 0
47
   #endif
47
   #endif
48
 #endif
48
 #endif
49
 
49
 
53
   static int16_t accum;                                     // Total babysteps in current edit
53
   static int16_t accum;                                     // Total babysteps in current edit
54
 
54
 
55
   #if ENABLED(BABYSTEP_DISPLAY_TOTAL)
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
     static inline void reset_total(const AxisEnum axis) {
57
     static inline void reset_total(const AxisEnum axis) {
58
       if (true
58
       if (true
59
         #if ENABLED(BABYSTEP_XY)
59
         #if ENABLED(BABYSTEP_XY)
60
           && axis == Z_AXIS
60
           && axis == Z_AXIS
61
         #endif
61
         #endif
62
-      ) axis_total[BS_TOTAL_AXIS(axis)] = 0;
62
+      ) axis_total[BS_TOTAL_IND(axis)] = 0;
63
     }
63
     }
64
   #endif
64
   #endif
65
 
65
 

+ 1
- 1
Marlin/src/lcd/menu/menu_tune.cpp View File

81
           #endif
81
           #endif
82
           lcd_put_u8str_P(GET_TEXT(MSG_BABYSTEP_TOTAL));
82
           lcd_put_u8str_P(GET_TEXT(MSG_BABYSTEP_TOTAL));
83
           lcd_put_wchar(':');
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
       #endif
86
       #endif
87
     }
87
     }

Loading…
Cancel
Save