diff --git a/radio/src/bitmaps/horus/CMakeLists.txt b/radio/src/bitmaps/horus/CMakeLists.txt index 0a6c29a9e..5f7f1f5b0 100644 --- a/radio/src/bitmaps/horus/CMakeLists.txt +++ b/radio/src/bitmaps/horus/CMakeLists.txt @@ -8,7 +8,7 @@ add_custom_target(ttf_horus_fonts DEPENDS ttf_horus_tinsize ttf_horus_smlsize tt add_bitmaps_target(horus_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/bmp_*.png" 480 5/6/5) add_bitmaps_target(horus_calibration_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/calibration/bmp_*.png" 480 5/6/5) -add_bitmaps_target(horus_button_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/button/bmp_*.png" 480 5/6/5) +add_bitmaps_target(horus_button_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/button/alpha_*.png" 480 5/6/5/8) add_bitmaps_target(horus_alpha_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/alpha_*.png" 480 5/6/5/8) add_bitmaps_target(horus_alpha_calibration_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/calibration/alpha_*.png" 480 5/6/5/8) add_bitmaps_target(horus_masks ${RADIO_SRC_DIRECTORY}/bitmaps/horus/mask_*.png 480 8bits) diff --git a/radio/src/bitmaps/horus/button/alpha_button_off.png b/radio/src/bitmaps/horus/button/alpha_button_off.png new file mode 100644 index 000000000..056368e30 Binary files /dev/null and b/radio/src/bitmaps/horus/button/alpha_button_off.png differ diff --git a/radio/src/bitmaps/horus/button/alpha_button_on.png b/radio/src/bitmaps/horus/button/alpha_button_on.png new file mode 100644 index 000000000..cbb0f0a35 Binary files /dev/null and b/radio/src/bitmaps/horus/button/alpha_button_on.png differ diff --git a/radio/src/bitmaps/horus/button/bmp_left.png b/radio/src/bitmaps/horus/button/bmp_left.png deleted file mode 100644 index 62e4969e6..000000000 Binary files a/radio/src/bitmaps/horus/button/bmp_left.png and /dev/null differ diff --git a/radio/src/bitmaps/horus/button/bmp_mid.png b/radio/src/bitmaps/horus/button/bmp_mid.png deleted file mode 100644 index 36bd4a760..000000000 Binary files a/radio/src/bitmaps/horus/button/bmp_mid.png and /dev/null differ diff --git a/radio/src/bitmaps/horus/button/bmp_right.png b/radio/src/bitmaps/horus/button/bmp_right.png deleted file mode 100644 index 85e216187..000000000 Binary files a/radio/src/bitmaps/horus/button/bmp_right.png and /dev/null differ diff --git a/radio/src/bitmaps/horus/button/button_hover_dot_backround.png b/radio/src/bitmaps/horus/button/button_hover_dot_backround.png deleted file mode 100644 index c6b2a7e4f..000000000 Binary files a/radio/src/bitmaps/horus/button/button_hover_dot_backround.png and /dev/null differ diff --git a/radio/src/bitmaps/horus/button/button_hover_dot_center.png b/radio/src/bitmaps/horus/button/button_hover_dot_center.png deleted file mode 100644 index 8e067a538..000000000 Binary files a/radio/src/bitmaps/horus/button/button_hover_dot_center.png and /dev/null differ diff --git a/radio/src/bitmaps/horus/button/button_left.png b/radio/src/bitmaps/horus/button/button_left.png deleted file mode 100644 index 62e4969e6..000000000 Binary files a/radio/src/bitmaps/horus/button/button_left.png and /dev/null differ diff --git a/radio/src/bitmaps/horus/button/button_mid.png b/radio/src/bitmaps/horus/button/button_mid.png deleted file mode 100644 index 36bd4a760..000000000 Binary files a/radio/src/bitmaps/horus/button/button_mid.png and /dev/null differ diff --git a/radio/src/bitmaps/horus/button/button_right.png b/radio/src/bitmaps/horus/button/button_right.png deleted file mode 100644 index 85e216187..000000000 Binary files a/radio/src/bitmaps/horus/button/button_right.png and /dev/null differ diff --git a/radio/src/bitmaps/horus/mask_carroussel_left.png b/radio/src/bitmaps/horus/mask_carroussel_left.png new file mode 100644 index 000000000..ab30a9036 Binary files /dev/null and b/radio/src/bitmaps/horus/mask_carroussel_left.png differ diff --git a/radio/src/bitmaps/horus/mask_carroussel_right.png b/radio/src/bitmaps/horus/mask_carroussel_right.png new file mode 100644 index 000000000..ffe3db5f0 Binary files /dev/null and b/radio/src/bitmaps/horus/mask_carroussel_right.png differ diff --git a/radio/src/gui/horus/bitmaps.cpp b/radio/src/gui/horus/bitmaps.cpp index 65ffc7295..cf0304680 100644 --- a/radio/src/gui/horus/bitmaps.cpp +++ b/radio/src/gui/horus/bitmaps.cpp @@ -316,3 +316,12 @@ const uint8_t LBM_CARROUSSEL_RIGHT[] __DMA = { #include "mask_carroussel_right.lbm" }; +const uint8_t LBM_BUTTON_ON[] __DMA = { +#include "alpha_button_on.lbm" +}; + +const uint8_t LBM_BUTTON_OFF[] __DMA = { +#include "alpha_button_off.lbm" +}; + + diff --git a/radio/src/gui/horus/bitmaps.h b/radio/src/gui/horus/bitmaps.h index e78fe7ff3..4cc2943ba 100644 --- a/radio/src/gui/horus/bitmaps.h +++ b/radio/src/gui/horus/bitmaps.h @@ -89,4 +89,8 @@ extern const uint8_t LBM_SLIDER_POINT_IN[]; extern const uint8_t LBM_CARROUSSEL_LEFT[]; extern const uint8_t LBM_CARROUSSEL_RIGHT[]; +// Button bitmaps +extern const uint8_t LBM_BUTTON_ON[]; +extern const uint8_t LBM_BUTTON_OFF[]; + #endif // _BITMAPS_H_ diff --git a/radio/src/gui/horus/lcd.h b/radio/src/gui/horus/lcd.h index f02dc6288..8ab125103 100644 --- a/radio/src/gui/horus/lcd.h +++ b/radio/src/gui/horus/lcd.h @@ -42,14 +42,12 @@ /* lcd common flags */ #define BLINK 0x01 -/* lcd text flags */ +/* lcdDrawText flags */ #define INVERS 0x02 #define LEFT 0x08 /* align left */ - -/* lcd puts flags */ #define ZCHAR 0x04 -/* lcd outdez flags */ +/* lcdDrawNumber flags */ #define LEADING0 0x10 #define PREC1 0x20 #define PREC2 0x30 diff --git a/radio/src/gui/horus/menu_model_setup.cpp b/radio/src/gui/horus/menu_model_setup.cpp index 4e9c28f44..b37426ed0 100644 --- a/radio/src/gui/horus/menu_model_setup.cpp +++ b/radio/src/gui/horus/menu_model_setup.cpp @@ -80,8 +80,8 @@ enum menuModelSetupItems { #define FIELD_PROTOCOL_MAX 1 #define MODEL_SETUP_2ND_COLUMN 200 -#define MODEL_SETUP_BIND_OFS 30 -#define MODEL_SETUP_RANGE_OFS 60 +#define MODEL_SETUP_BIND_OFS 40 +#define MODEL_SETUP_RANGE_OFS 80 #define MODEL_SETUP_SET_FAILSAFE_OFS 100 void onModelSetupBitmapMenu(const char *result) @@ -648,8 +648,8 @@ bool menuModelSetup(evt_t event) if (attr && l_posHorz==0 && s_editMode>0) { CHECK_INCDEC_MODELVAR_ZERO(event, g_model.header.modelId[moduleIdx], IS_MODULE_DSM2(moduleIdx) ? 20 : 63); } - drawButton(MODEL_SETUP_2ND_COLUMN+xOffsetBind, y, STR_MODULE_BIND, l_posHorz==1 ? attr : 0); - drawButton(MODEL_SETUP_2ND_COLUMN+MODEL_SETUP_RANGE_OFS+xOffsetBind, y, STR_MODULE_RANGE, l_posHorz==2 ? attr : 0); + drawButton(MODEL_SETUP_2ND_COLUMN+xOffsetBind, y, STR_MODULE_BIND, (moduleFlag[moduleIdx] == MODULE_BIND ? BUTTON_ON : BUTTON_OFF) | (l_posHorz==1 ? attr : 0)); + drawButton(MODEL_SETUP_2ND_COLUMN+MODEL_SETUP_RANGE_OFS+xOffsetBind, y, STR_MODULE_RANGE, (moduleFlag[moduleIdx] == MODULE_RANGECHECK ? BUTTON_ON : BUTTON_OFF) | (l_posHorz==2 ? attr : 0)); uint8_t newFlag = 0; if (attr && l_posHorz>0 && s_editMode>0) { if (l_posHorz == 1) diff --git a/radio/src/gui/horus/screens_setup.cpp b/radio/src/gui/horus/screens_setup.cpp index 8be8a7938..b42d7dd2b 100644 --- a/radio/src/gui/horus/screens_setup.cpp +++ b/radio/src/gui/horus/screens_setup.cpp @@ -181,7 +181,7 @@ bool menuSetupScreensView(evt_t event) linesCount++; } - SUBMENU_WITH_OPTIONS("Main views setup", LBM_MAINVIEWS_ICON, linesCount, OPTION_MENU_TITLE_BAR, { countRegisteredLayouts-1, ORPHAN_ROW, 0, 0, 0, 0 }); + SUBMENU_WITH_OPTIONS("Main views setup", LBM_MAINVIEWS_ICON, linesCount, OPTION_MENU_TITLE_BAR, { uint8_t(countRegisteredLayouts-1), ORPHAN_ROW, 0, 0, 0, 0 }); for (int i=0; i