From f5c5413e88fc33dc55c096600dcb7eed1f2cc6ac Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Wed, 15 May 2019 11:23:16 +0200
Subject: [PATCH] HORUS fixes

---
 radio/src/gui/128x64/menus.h         |  2 +-
 radio/src/gui/212x64/menu_radio.cpp  |  2 +-
 radio/src/gui/480x272/menu_radio.cpp |  2 +-
 radio/src/gui/480x272/menus.h        | 28 ++++++++++++++--------------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/radio/src/gui/128x64/menus.h b/radio/src/gui/128x64/menus.h
index ccd3d472e..d56867b0c 100644
--- a/radio/src/gui/128x64/menus.h
+++ b/radio/src/gui/128x64/menus.h
@@ -106,7 +106,7 @@ void menuRadioSpectrumAnalyser(event_t event);
 void menuRadioPowerMeter(event_t event);
 void menuRadioCalibration(event_t event);
 
-static const MenuHandlerFunc menuTabGeneral[]  = {
+static const MenuHandlerFunc menuTabGeneral[MENU_RADIO_PAGES_COUNT]  = {
   menuRadioSetup,
   CASE_SDCARD(menuRadioSdManager)
 #if defined(PXX2)
diff --git a/radio/src/gui/212x64/menu_radio.cpp b/radio/src/gui/212x64/menu_radio.cpp
index 2b8ce874f..89efdb94d 100644
--- a/radio/src/gui/212x64/menu_radio.cpp
+++ b/radio/src/gui/212x64/menu_radio.cpp
@@ -20,7 +20,7 @@
 
 #include "opentx.h"
 
-const MenuHandlerFunc menuTabGeneral[] = {
+const MenuHandlerFunc menuTabGeneral[MENU_RADIO_PAGES_COUNT] = {
   menuRadioSetup,
   menuRadioSdManager,
 #if defined(PXX2)
diff --git a/radio/src/gui/480x272/menu_radio.cpp b/radio/src/gui/480x272/menu_radio.cpp
index b793c0fe7..dfb473bfe 100644
--- a/radio/src/gui/480x272/menu_radio.cpp
+++ b/radio/src/gui/480x272/menu_radio.cpp
@@ -20,7 +20,7 @@
 
 #include "opentx.h"
 
-const MenuHandlerFunc menuTabGeneral[] = {
+const MenuHandlerFunc menuTabGeneral[MENU_RADIO_PAGES_COUNT] = {
   menuRadioSetup,
   menuRadioSdManager,
 #if defined(PXX2)
diff --git a/radio/src/gui/480x272/menus.h b/radio/src/gui/480x272/menus.h
index 0cc20ae8a..bdc63e92f 100644
--- a/radio/src/gui/480x272/menus.h
+++ b/radio/src/gui/480x272/menus.h
@@ -126,20 +126,7 @@ enum EnumTabModel {
   MENU_MODEL_PAGES_COUNT
 };
 
-const uint8_t RADIO_ICONS[] = {
-  ICON_RADIO,
-  ICON_RADIO_SETUP,
-  ICON_RADIO_SD_BROWSER,
-#if defined(PXX2)
-  ICON_RADIO_SETUP,
-#endif
-  ICON_RADIO_GLOBAL_FUNCTIONS,
-  ICON_RADIO_TRAINER,
-  ICON_RADIO_HARDWARE,
-  ICON_RADIO_VERSION
-};
-
-const uint8_t MODEL_ICONS[] = {
+const uint8_t MODEL_ICONS[MENU_MODEL_PAGES_COUNT + 1] = {
   ICON_MODEL,
   ICON_MODEL_SETUP,
   CASE_HELI(ICON_MODEL_HELI)
@@ -210,6 +197,19 @@ enum EnumTabRadio {
   MENU_RADIO_PAGES_COUNT
 };
 
+const uint8_t RADIO_ICONS[MENU_RADIO_PAGES_COUNT + 1] = {
+  ICON_RADIO,
+  ICON_RADIO_SETUP,
+  ICON_RADIO_SD_BROWSER,
+#if defined(PXX2)
+  ICON_RADIO_SETUP,
+#endif
+  ICON_RADIO_GLOBAL_FUNCTIONS,
+  ICON_RADIO_TRAINER,
+  ICON_RADIO_HARDWARE,
+  ICON_RADIO_VERSION
+};
+
 bool menuRadioSetup(event_t event);
 bool menuRadioSdManager(event_t event);
 bool menuRadioTools(event_t event);