From 40c533bafcf7cc5549e1d10e75d4f32f6381c32e Mon Sep 17 00:00:00 2001 From: Wouter van Gulik Date: Thu, 28 Dec 2023 20:54:12 +1300 Subject: [PATCH] menu: use const char* const (cherry picked from commit fbdaf6631d681fadf0caa22baa565cb3292515cd) (cherry picked from commit 989fa9fa78b05b0e43e77f6f9d84530a871d26f9) --- ui/menu.c | 8 ++++---- ui/menu.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ui/menu.c b/ui/menu.c index f03d456..582c6d8 100644 --- a/ui/menu.c +++ b/ui/menu.c @@ -196,7 +196,7 @@ const char gSubMenu_TOT[][7] = "15 min" }; -const char* gSubMenu_RXMode[] = +const char* const gSubMenu_RXMode[] = { "MAIN\nONLY", // TX and RX on main only "DUAL RX\nRESPOND", // Watch both and respond @@ -220,7 +220,7 @@ const char gSubMenu_SC_REV[][8] = "STOP" }; -const char* gSubMenu_MDF[] = +const char* const gSubMenu_MDF[] = { "FREQ", "CHANNEL\nNUMBER", @@ -246,7 +246,7 @@ const char gSubMenu_D_RSP[][11] = }; #endif -const char* gSubMenu_PTT_ID[] = +const char* const gSubMenu_PTT_ID[] = { "OFF", "UP CODE", @@ -276,7 +276,7 @@ const char gSubMenu_RESET[][4] = "ALL" }; -const char * gSubMenu_F_LOCK[] = +const char * const gSubMenu_F_LOCK[] = { "DEFAULT+\n137-174\n400-470", "FCC HAM\n144-148\n420-450", diff --git a/ui/menu.h b/ui/menu.h index c6e89af..be3dccd 100644 --- a/ui/menu.h +++ b/ui/menu.h @@ -137,24 +137,24 @@ extern const char gSubMenu_W_N[2][7]; extern const char gSubMenu_OFF_ON[2][4]; extern const char gSubMenu_SAVE[5][4]; extern const char gSubMenu_TOT[11][7]; -extern const char* gSubMenu_RXMode[4]; +extern const char* const gSubMenu_RXMode[4]; #ifdef ENABLE_VOICE extern const char gSubMenu_VOICE[3][4]; #endif extern const char gSubMenu_SC_REV[3][8]; -extern const char* gSubMenu_MDF[4]; +extern const char* const gSubMenu_MDF[4]; #ifdef ENABLE_ALARM extern const char gSubMenu_AL_MOD[2][5]; #endif #ifdef ENABLE_DTMF_CALLING extern const char gSubMenu_D_RSP[4][11]; #endif -extern const char* gSubMenu_PTT_ID[5]; +extern const char* const gSubMenu_PTT_ID[5]; extern const char gSubMenu_PONMSG[4][8]; extern const char gSubMenu_ROGER[3][6]; extern const char gSubMenu_RESET[2][4]; -extern const char* gSubMenu_F_LOCK[F_LOCK_LEN]; +extern const char* const gSubMenu_F_LOCK[F_LOCK_LEN]; extern const char gSubMenu_BACKLIGHT[8][7]; extern const char gSubMenu_RX_TX[4][6]; extern const char gSubMenu_BAT_TXT[3][8];