diff --git a/app/action.h b/app/action.h index f54fc92..3591ab4 100644 --- a/app/action.h +++ b/app/action.h @@ -25,9 +25,7 @@ void ACTION_Scan(bool bRestart); #ifdef ENABLE_VOX void ACTION_Vox(void); #endif -#ifdef ENABLE_ALARM - //static void ACTION_AlarmOr1750(bool b1750) -#endif + #ifdef ENABLE_FMRADIO void ACTION_FM(void); #endif diff --git a/ui/menu.c b/ui/menu.c index d8dbc59..2e5b835 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -334,7 +334,7 @@ const char gSubMenu_SCRAMBLER[][7] = "3500Hz" }; -const t_sidefunction SIDEFUNCTIONS[] = +const t_sidefunction gSubMenu_SIDEFUNCTIONS[] = { {"NONE", ACTION_OPT_NONE}, #ifdef ENABLE_FLASHLIGHT @@ -363,8 +363,8 @@ const t_sidefunction SIDEFUNCTIONS[] = {"BLMIN\nTMP OFF", ACTION_OPT_BLMIN_TMP_OFF}, //BackLight Minimum Temporay OFF #endif }; -const t_sidefunction* gSubMenu_SIDEFUNCTIONS = SIDEFUNCTIONS; -const uint8_t gSubMenu_SIDEFUNCTIONS_size = ARRAY_SIZE(SIDEFUNCTIONS); + +const uint8_t gSubMenu_SIDEFUNCTIONS_size = ARRAY_SIZE(gSubMenu_SIDEFUNCTIONS); bool gIsInSubMenu; uint8_t gMenuCursor; diff --git a/ui/menu.h b/ui/menu.h index 09eb585..ba43619 100644 --- a/ui/menu.h +++ b/ui/menu.h @@ -161,7 +161,7 @@ extern const char gSubMenu_SCRAMBLER[11][7]; typedef struct {char* name; uint8_t id;} t_sidefunction; extern const uint8_t gSubMenu_SIDEFUNCTIONS_size; -extern const t_sidefunction* gSubMenu_SIDEFUNCTIONS; +extern const t_sidefunction gSubMenu_SIDEFUNCTIONS[]; extern bool gIsInSubMenu;