Skip to content

Commit 432c879

Browse files
committed
πŸ§‘β€πŸ’» Fix STATIC_ITEM_N arg order
1 parent 6cbd7a4 commit 432c879

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

β€ŽMarlin/src/lcd/menu/menu.h

+1
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ void menu_move();
214214
//////// Menu Item Helper Functions ////////
215215
////////////////////////////////////////////
216216

217+
void lcd_move_axis(const AxisEnum);
217218
void lcd_move_z();
218219
void _lcd_draw_homing();
219220

β€ŽMarlin/src/lcd/menu/menu_item.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ class MenuItem_bool : public MenuEditItemBase {
357357
NEXT_ITEM(); \
358358
} while(0)
359359

360-
#define STATIC_ITEM_N_F(FLABEL, N, V...) do{ \
360+
#define STATIC_ITEM_N_F(N, FLABEL, V...) do{ \
361361
if (_menuLineNr == _thisItemNr) { \
362362
MenuItemBase::init(N); \
363363
STATIC_ITEM_INNER_F(FLABEL, ##V); \
@@ -380,7 +380,7 @@ class MenuItem_bool : public MenuEditItemBase {
380380
#define PSTRING_ITEM(LABEL, V...) PSTRING_ITEM_F(GET_TEXT_F(LABEL), ##V)
381381

382382
#define STATIC_ITEM(LABEL, V...) STATIC_ITEM_F(GET_TEXT_F(LABEL), ##V)
383-
#define STATIC_ITEM_N(LABEL, N, V...) STATIC_ITEM_N_F(GET_TEXT_F(LABEL), N, ##V)
383+
#define STATIC_ITEM_N(N, LABEL, V...) STATIC_ITEM_N_F(N, GET_TEXT_F(LABEL), ##V)
384384

385385
// Menu item with index and composed C-string substitution
386386
#define MENU_ITEM_N_S_F(TYPE, N, S, FLABEL, V...) _MENU_ITEM_N_S_F(TYPE, N, S, false, FLABEL, ##V)

β€ŽMarlin/src/lcd/menu/menu_led.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
START_MENU();
8484
BACK_ITEM(MSG_LED_CONTROL);
8585
#if ENABLED(NEOPIXEL2_SEPARATE)
86-
STATIC_ITEM_N(MSG_LED_CHANNEL_N, 1, SS_DEFAULT|SS_INVERT);
86+
STATIC_ITEM_N(1, MSG_LED_CHANNEL_N, SS_DEFAULT|SS_INVERT);
8787
#endif
8888
EDIT_ITEM(uint8, MSG_INTENSITY_R, &leds.color.r, 0, 255, leds.update, true);
8989
EDIT_ITEM(uint8, MSG_INTENSITY_G, &leds.color.g, 0, 255, leds.update, true);
@@ -95,7 +95,7 @@
9595
EDIT_ITEM(uint8, MSG_LED_BRIGHTNESS, &leds.color.i, 0, 255, leds.update, true);
9696
#endif
9797
#if ENABLED(NEOPIXEL2_SEPARATE)
98-
STATIC_ITEM_N(MSG_LED_CHANNEL_N, 2, SS_DEFAULT|SS_INVERT);
98+
STATIC_ITEM_N(2, MSG_LED_CHANNEL_N, SS_DEFAULT|SS_INVERT);
9999
EDIT_ITEM(uint8, MSG_INTENSITY_R, &leds2.color.r, 0, 255, leds2.update, true);
100100
EDIT_ITEM(uint8, MSG_INTENSITY_G, &leds2.color.g, 0, 255, leds2.update, true);
101101
EDIT_ITEM(uint8, MSG_INTENSITY_B, &leds2.color.b, 0, 255, leds2.update, true);

β€ŽMarlin/src/lcd/menu/menu_motion.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
173173
START_MENU();
174174
if (LCD_HEIGHT >= 4) {
175175
switch (axis) {
176-
#define _CASE_MOVE(N) case N##_AXIS: STATIC_ITEM(MSG_MOVE_##N, SS_DEFAULT|SS_INVERT); break;
176+
#define _CASE_MOVE(N) case N##_AXIS: STATIC_ITEM_N(N##_AXIS, MSG_MOVE_N, SS_DEFAULT|SS_INVERT); break;
177177
MAIN_AXIS_MAP(_CASE_MOVE)
178178
default:
179179
TERN_(MANUAL_E_MOVES_RELATIVE, manual_move_e_origin = current_position.e);

0 commit comments

Comments
Β (0)