From a254354e687a781d5cb27094374cc5c436cf98ee Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 24 Feb 2020 06:11:31 -0600 Subject: [PATCH] BS_TOTAL_AXIS => BS_TOTAL_IND --- Marlin/src/feature/babystep.cpp | 4 ++-- Marlin/src/feature/babystep.h | 8 ++++---- Marlin/src/lcd/menu/menu_tune.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Marlin/src/feature/babystep.cpp b/Marlin/src/feature/babystep.cpp index 25552a701cb5..bf9e9a78b551 100644 --- a/Marlin/src/feature/babystep.cpp +++ b/Marlin/src/feature/babystep.cpp @@ -37,7 +37,7 @@ Babystep babystep; volatile int16_t Babystep::steps[BS_AXIS_IND(Z_AXIS) + 1]; #if ENABLED(BABYSTEP_DISPLAY_TOTAL) - int16_t Babystep::axis_total[BS_TOTAL_AXIS(Z_AXIS) + 1]; + int16_t Babystep::axis_total[BS_TOTAL_IND(Z_AXIS) + 1]; #endif int16_t Babystep::accum; @@ -66,7 +66,7 @@ void Babystep::add_steps(const AxisEnum axis, const int16_t distance) { accum += distance; // Count up babysteps for the UI #if ENABLED(BABYSTEP_DISPLAY_TOTAL) - axis_total[BS_TOTAL_AXIS(axis)] += distance; + axis_total[BS_TOTAL_IND(axis)] += distance; #endif #if ENABLED(BABYSTEP_ALWAYS_AVAILABLE) diff --git a/Marlin/src/feature/babystep.h b/Marlin/src/feature/babystep.h index 8ce48e397deb..287664502cdb 100644 --- a/Marlin/src/feature/babystep.h +++ b/Marlin/src/feature/babystep.h @@ -41,9 +41,9 @@ #if ENABLED(BABYSTEP_DISPLAY_TOTAL) #if ENABLED(BABYSTEP_XY) - #define BS_TOTAL_AXIS(A) A + #define BS_TOTAL_IND(A) A #else - #define BS_TOTAL_AXIS(A) 0 + #define BS_TOTAL_IND(A) 0 #endif #endif @@ -53,13 +53,13 @@ class Babystep { static int16_t accum; // Total babysteps in current edit #if ENABLED(BABYSTEP_DISPLAY_TOTAL) - static int16_t axis_total[BS_TOTAL_AXIS(Z_AXIS) + 1]; // Total babysteps since G28 + static int16_t axis_total[BS_TOTAL_IND(Z_AXIS) + 1]; // Total babysteps since G28 static inline void reset_total(const AxisEnum axis) { if (true #if ENABLED(BABYSTEP_XY) && axis == Z_AXIS #endif - ) axis_total[BS_TOTAL_AXIS(axis)] = 0; + ) axis_total[BS_TOTAL_IND(axis)] = 0; } #endif diff --git a/Marlin/src/lcd/menu/menu_tune.cpp b/Marlin/src/lcd/menu/menu_tune.cpp index 549e41c9c63c..9221d7700541 100644 --- a/Marlin/src/lcd/menu/menu_tune.cpp +++ b/Marlin/src/lcd/menu/menu_tune.cpp @@ -81,7 +81,7 @@ #endif lcd_put_u8str_P(GET_TEXT(MSG_BABYSTEP_TOTAL)); lcd_put_wchar(':'); - lcd_put_u8str(LCD_Z_OFFSET_FUNC(spm * babystep.axis_total[BS_TOTAL_AXIS(axis)])); + lcd_put_u8str(LCD_Z_OFFSET_FUNC(spm * babystep.axis_total[BS_TOTAL_IND(axis)])); } #endif }