From 7982c9d5c779662eb41f78ba7fae550653486198 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sun, 11 Oct 2015 11:30:58 +0200 Subject: [PATCH] [Horus] Radio icons now displayed --- radio/src/gui/Horus/bitmaps.cpp | 42 +++++++++++++++++++++++++++++++++ radio/src/gui/Horus/widgets.cpp | 6 +++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/Horus/bitmaps.cpp b/radio/src/gui/Horus/bitmaps.cpp index f01425ea8..358d292ac 100644 --- a/radio/src/gui/Horus/bitmaps.cpp +++ b/radio/src/gui/Horus/bitmaps.cpp @@ -60,6 +60,48 @@ const uint8_t LBM_CURRENT_DOT[] = { #include "../../bitmaps/Horus/mask_current_dot.lbm" }; +/* + * Radio menu bitmaps + */ + +const uint8_t LBM_MENU_RADIO[] = { +#include "../../bitmaps/Horus/mask_menu_radio.lbm" +}; + +const uint8_t LBM_RADIO_SETUP_ICON[] = { +#include "../../bitmaps/Horus/mask_radio_setup.lbm" +}; + +const uint8_t LBM_SD_BROWSER_ICON[] = { +#include "../../bitmaps/Horus/mask_sd_browser.lbm" +}; + +const uint8_t LBM_GLOBAL_FUNCTIONS_ICON[] = { +#include "../../bitmaps/Horus/mask_global_functions.lbm" +}; + +const uint8_t LBM_TRAINER_ICON[] = { +#include "../../bitmaps/Horus/mask_trainer.lbm" +}; + +const uint8_t LBM_CALIBRATION_ICON[] = { +#include "../../bitmaps/Horus/mask_calibration.lbm" +}; + +const uint8_t LBM_VERSION_ICON[] = { +#include "../../bitmaps/Horus/mask_version.lbm" +}; + +const uint8_t * const LBM_RADIO_ICONS[] = { + LBM_MENU_RADIO, + LBM_RADIO_SETUP_ICON, + LBM_SD_BROWSER_ICON, + LBM_GLOBAL_FUNCTIONS_ICON, + LBM_TRAINER_ICON, + LBM_CALIBRATION_ICON, + LBM_VERSION_ICON +}; + /* * Model menu bitmaps */ diff --git a/radio/src/gui/Horus/widgets.cpp b/radio/src/gui/Horus/widgets.cpp index 587699a48..b0db92533 100644 --- a/radio/src/gui/Horus/widgets.cpp +++ b/radio/src/gui/Horus/widgets.cpp @@ -139,10 +139,12 @@ void drawMenuTemplate(const char *name, evt_t event, int pageIndex, int pageCoun lcdDrawBitmapPattern(58+pageIndex*MENU_ICONS_SPACING, MENU_TITLE_TOP-9, LBM_DOT, MENU_TITLE_COLOR); } - lcdDrawBitmapPattern(5, 7, LBM_MODEL_ICONS[0], MENU_TITLE_COLOR); + const uint8_t * const * icons = (g_menuPos[0] == 0 ? LBM_MODEL_ICONS : LBM_RADIO_ICONS); + + lcdDrawBitmapPattern(5, 7, icons[0], MENU_TITLE_COLOR); for (int i=0; i