chore(color): Remove unused bitmaps (#4312)

radio/src/gui/colorlcd/bitmaps.cpp

@@ -26,12 +26,6 @@ const uint8_t _LBM_POINT[] = {
 };
 IMPL_LZ4_BITMAP(LBM_POINT);
 
-static const uint8_t mask_next[] = {
-#include "mask_next.lbm"
-};
-static const uint8_t mask_back[] = {
-#include "mask_back.lbm"
-};
 static const uint8_t mask_menu_model[] = {
 #include "mask_menu_model.lbm"
 };
@@ -89,9 +83,6 @@ static const uint8_t mask_model_usb[] = {
 static const uint8_t mask_menu_model_select[] = {
 #include "mask_menu_model_select.lbm" //TODO: someone may want to make proper icon
 };
-static const uint8_t mask_model_select_category[] = {
-#include "mask_model_select_category.lbm" //TODO: someone should make proper icon
-};
 static const uint8_t mask_monitor[] = {
 #include "mask_monitor.lbm"
 };
@@ -146,12 +137,6 @@ static const uint8_t mask_radio_trainer[] = {
 static const uint8_t mask_radio_version[] = {
 #include "mask_radio_version.lbm"
 };
-static const uint8_t mask_sbar_mixer[] = {
-#include "mask_sbar_mixer.lbm"
-};
-static const uint8_t mask_sbar_output[] = {
-#include "mask_sbar_output.lbm"
-};
 static const uint8_t mask_stats_analogs[] = {
 #include "mask_stats_analogs.lbm"
 };
@@ -164,21 +149,6 @@ static const uint8_t mask_stats_throttle_graph[] = {
 static const uint8_t mask_stats_timers[] = {
 #include "mask_stats_timers.lbm"
 };
-static const uint8_t mask_textline_delay[] = {
-#include "mask_textline_delay.lbm"
-};
-static const uint8_t mask_textline_delayslow[] = {
-#include "mask_textline_delayslow.lbm"
-};
-static const uint8_t mask_textline_label[] = {
-#include "mask_textline_label.lbm"
-};
-static const uint8_t mask_textline_slow[] = {
-#include "mask_textline_slow.lbm"
-};
-static const uint8_t mask_textline_switch[] = {
-#include "mask_textline_switch.lbm"
-};
 static const uint8_t mask_theme_add_view[] = {
 #include "mask_theme_add_view.lbm"
 };
@@ -221,44 +191,11 @@ static const uint8_t stick_pointer[] = {
 static const uint8_t stick_background[] = {
 #include "alpha_stick_background.lbm"
 };
-static const uint8_t trackp_background[] = {
-#include "alpha_trackp_background.lbm"
-};
-static const uint8_t mask_sdfree[] = {
-#include "mask_sdfree.lbm"
-};
-static const uint8_t mask_modelqty[] = {
-#include "mask_modelqty.lbm"
-};
-static const uint8_t mask_modelname[] = {
-#include "mask_modelname.lbm"
-};
-static const uint8_t mask_moveback[] = {
-#include "mask_moveback.lbm"
-};
-static const uint8_t mask_moveico[] = {
-#include "mask_moveico.lbm"
-};
 
 BitmapBuffer * calibStick = nullptr;
 BitmapBuffer * calibStickBackground = nullptr;
-BitmapBuffer * calibTrackpBackground = nullptr;
-BitmapBuffer * modelselSdFreeBitmap = nullptr;
-BitmapBuffer * modelselModelQtyBitmap = nullptr;
-BitmapBuffer * modelselModelNameBitmap = nullptr;
-BitmapBuffer * modelselModelMoveBackground = nullptr;
-BitmapBuffer * modelselModelMoveIcon = nullptr;
 BitmapBuffer * chanMonLockedBitmap = nullptr;
 BitmapBuffer * chanMonInvertedBitmap = nullptr;
-BitmapBuffer * mixerSetupMixerBitmap = nullptr;
-BitmapBuffer * mixerSetupToBitmap = nullptr;
-BitmapBuffer * mixerSetupOutputBitmap = nullptr;
-// BitmapBuffer * mixerSetupCurveIcon = nullptr;
-BitmapBuffer * mixerSetupSwitchIcon = nullptr;
-BitmapBuffer * mixerSetupLabelIcon = nullptr;
-BitmapBuffer * mixerSetupDelayIcon = nullptr;
-BitmapBuffer * mixerSetupSlowIcon = nullptr;
-BitmapBuffer * mixerSetupDelaySlowIcon = nullptr;
 
 struct _BuiltinBitmap {
 
@@ -270,29 +207,9 @@ struct _BuiltinBitmap {
 static const _BuiltinBitmap _builtinBitmaps[] = {
     {BMP_ARGB4444, stick_pointer, &calibStick},
     {BMP_ARGB4444, stick_background, &calibStickBackground},
-    {BMP_ARGB4444, trackp_background, &calibTrackpBackground},
-
-    {BMP_8BIT, mask_sdfree, &modelselSdFreeBitmap},
-
-    {BMP_8BIT, mask_modelqty, &modelselModelQtyBitmap},
-    {BMP_8BIT, mask_modelname, &modelselModelNameBitmap},
-
-    {BMP_8BIT, mask_moveback, &modelselModelMoveBackground},
-    {BMP_8BIT, mask_moveico, &modelselModelMoveIcon},
-    {BMP_8BIT, mask_moveico, &modelselModelMoveIcon},
 
     {BMP_8BIT, mask_monitor_lockch, &chanMonLockedBitmap},
     {BMP_8BIT, mask_monitor_inver, &chanMonInvertedBitmap},
-
-    {BMP_8BIT, mask_sbar_mixer, &mixerSetupMixerBitmap},
-    {BMP_8BIT, mask_sbar_output, &mixerSetupOutputBitmap},
-
-    {BMP_8BIT, mask_textline_label, &mixerSetupLabelIcon},
-    // {BMP_8BIT, mask_textline_curve, &mixerSetupCurveIcon},
-    {BMP_8BIT, mask_textline_switch, &mixerSetupSwitchIcon},
-    {BMP_8BIT, mask_textline_slow, &mixerSetupSlowIcon},
-    {BMP_8BIT, mask_textline_delay, &mixerSetupDelayIcon},
-    {BMP_8BIT, mask_textline_delayslow, &mixerSetupDelaySlowIcon},
 };
 
 void loadBuiltinBitmaps()
@@ -318,10 +235,6 @@ struct _BuiltinIcon {
 
 static const _BuiltinIcon _builtinIcons[] = {
     {ICON_EDGETX, mask_edgetx},
-#if defined(HARDWARE_TOUCH)
-    {ICON_NEXT, mask_next},
-    {ICON_BACK, mask_back},
-#endif
     {ICON_RADIO, mask_menu_radio},
     {ICON_RADIO_SETUP, mask_radio_setup},
     {ICON_RADIO_SD_MANAGER, mask_radio_sd_browser},
@@ -348,7 +261,6 @@ static const _BuiltinIcon _builtinIcons[] = {
     {ICON_MODEL_TELEMETRY, mask_model_telemetry},
     {ICON_MODEL_USB, mask_model_usb},
     {ICON_MODEL_SELECT, mask_menu_model_select},
-    {ICON_MODEL_SELECT_CATEGORY, mask_model_select_category},
     {ICON_THEME, mask_menu_theme},
     {ICON_THEME_SETUP, mask_theme_setup},
     {ICON_THEME_VIEW1, mask_theme_view1},

radio/src/gui/colorlcd/bitmaps.h

@@ -26,37 +26,14 @@
 
 DEFINE_LZ4_BITMAP(LBM_POINT);
 
-// Model selection bitmaps
-extern BitmapBuffer * modelselSdFreeBitmap;
-extern BitmapBuffer * modelselModelQtyBitmap;
-extern BitmapBuffer * modelselModelNameBitmap;
-extern BitmapBuffer * modelselModelMoveBackground;
-extern BitmapBuffer * modelselModelMoveIcon;
-extern BitmapBuffer * modelselWizardBackground;
-
 // calibration bitmaps
 extern BitmapBuffer * calibStick;
 extern BitmapBuffer * calibStickBackground;
-extern BitmapBuffer * calibTrackpBackground;
 
 // Channels monitor bitmaps
 extern BitmapBuffer * chanMonLockedBitmap;
 extern BitmapBuffer * chanMonInvertedBitmap;
 
-// Mixer setup bitmaps
-extern BitmapBuffer * mixerSetupMixerBitmap;
-extern BitmapBuffer * mixerSetupToBitmap;
-extern BitmapBuffer * mixerSetupOutputBitmap;
-extern BitmapBuffer * mixerSetupAddBitmap;
-extern BitmapBuffer * mixerSetupMultiBitmap;
-extern BitmapBuffer * mixerSetupReplaceBitmap;
-extern BitmapBuffer * mixerSetupLabelIcon;
-extern BitmapBuffer * mixerSetupCurveIcon;
-extern BitmapBuffer * mixerSetupSwitchIcon;
-extern BitmapBuffer * mixerSetupDelayIcon;
-extern BitmapBuffer * mixerSetupSlowIcon;
-extern BitmapBuffer * mixerSetupDelaySlowIcon;
-
 void loadBuiltinBitmaps();
 const uint8_t* getBuiltinIcon(MenuIcons id);
 

radio/src/gui/colorlcd/menus.h

@@ -28,10 +28,6 @@ extern uint8_t menuCalibrationState;
 
 enum MenuIcons {
   ICON_EDGETX,
-#if defined(HARDWARE_TOUCH)
-  ICON_NEXT,
-  ICON_BACK,
-#endif
   ICON_RADIO,
   ICON_RADIO_SETUP,
   ICON_RADIO_SD_MANAGER,
@@ -58,7 +54,6 @@ enum MenuIcons {
   ICON_MODEL_TELEMETRY,
   ICON_MODEL_USB,
   ICON_MODEL_SELECT,
-  ICON_MODEL_SELECT_CATEGORY,
   ICON_THEME,
   ICON_THEME_SETUP,
   ICON_THEME_VIEW1,

radio/src/gui/colorlcd/model_mixes.cpp

@@ -174,21 +174,6 @@ void MixLineButton::refresh()
   lv_label_set_text_fmt(opts, "%.*s", (int)sizeof(tmp_str), tmp_str);
 
   setFlightModes(line.flightModes);
-
-  // TODO: should we add these? then it would be best to have them in the font...
-  //
-  // uint8_t delayslow = 0;
-  // if (line.speedDown || line.speedUp) delayslow = 1;
-  // if (line.delayUp || line.delayDown) delayslow += 2;
-
-  // if (delayslow) {
-  //   BitmapBuffer* delayslowbmp[] = {mixerSetupSlowIcon, mixerSetupDelayIcon,
-  //                                   mixerSetupDelaySlowIcon};
-  //   const BitmapBuffer* mask = delayslowbmp[delayslow - 1];
-  //   coord_t w = lv_obj_get_width(lvobj);
-  //   w -= mask->width();
-  //   dc->drawMask(w - border - pad_right, y, mask, textColor);
-  // }
 }
 
 ModelMixesPage::ModelMixesPage() :