From 6d2a66c1e8c4ef4088d7562a122a29b253388d4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Wed, 22 Feb 2023 18:45:21 +0000 Subject: [PATCH] match menu_goto's encoder type to lcd_encoder type Change in memory: Flash: -20 bytes SRAM: 0 bytes --- Firmware/menu.cpp | 2 +- Firmware/menu.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/menu.cpp b/Firmware/menu.cpp index 34e669f16..a5a6f6204 100755 --- a/Firmware/menu.cpp +++ b/Firmware/menu.cpp @@ -45,7 +45,7 @@ void menu_data_reset(void) memset(&menu_data, 0, sizeof(menu_data)); } -void menu_goto(menu_func_t menu, const uint32_t encoder, bool reset_menu_state, const bool feedback) +void menu_goto(menu_func_t menu, const int16_t encoder, const bool feedback, bool reset_menu_state) { CRITICAL_SECTION_START; if (menu_menu != menu) diff --git a/Firmware/menu.h b/Firmware/menu.h index 291b3845e..5a0528c1c 100755 --- a/Firmware/menu.h +++ b/Firmware/menu.h @@ -65,7 +65,7 @@ extern menu_func_t menu_menu; extern void menu_data_reset(void); -extern void menu_goto(menu_func_t menu, const uint32_t encoder, bool reset_menu_state, const bool feedback=false); +extern void menu_goto(menu_func_t menu, const int16_t encoder, const bool feedback, bool reset_menu_state); #define MENU_BEGIN() menu_start(); for(menu_row = 0; menu_row < LCD_HEIGHT; menu_row++, menu_line++) { menu_item = 0; void menu_start(void);