chore(color): conversion helper tool and file cleanup (#6781)

This commit is contained in:
Robert
2026-01-21 13:09:14 +10:00
committed by GitHub
parent b0ecde2842
commit a7f0bac004
791 changed files with 2704 additions and 10854 deletions
+323 -310
View File
@@ -69,316 +69,329 @@ MaskBitmap* _decompressed_mask(const uint8_t* lz4_compressed)
return raw;
}
// gfx for quick menu
static const uint8_t mask_menu_favs[] __FLASH = {
#include "mask_menu_favs.lbm"
#include "mask_icon_menu_favs.lbm"
};
static const uint8_t mask_menu_model[] __FLASH = {
#include "mask_menu_model.lbm"
static const uint8_t mask_menu_manage_models[] __FLASH = {
#include "mask_icon_menu_manage_models.lbm" //TODO: someone may want to make proper icon
};
static const uint8_t mask_menu_notes[] __FLASH = {
#include "mask_menu_notes.lbm"
static const uint8_t mask_menu_model_setup[] __FLASH = {
#include "mask_icon_menu_model_setup.lbm"
};
static const uint8_t mask_menu_radio[] __FLASH = {
#include "mask_menu_radio.lbm"
static const uint8_t mask_menu_radio_setup[] __FLASH = {
#include "mask_icon_menu_radio_setup.lbm"
};
static const uint8_t mask_menu_stats[] __FLASH = {
#include "mask_menu_stats.lbm"
static const uint8_t mask_menu_ui_setup[] __FLASH = {
#include "mask_icon_menu_ui_setup.lbm"
};
static const uint8_t mask_menu_theme[] __FLASH = {
#include "mask_menu_theme.lbm"
static const uint8_t mask_menu_tools[] __FLASH = {
#include "mask_icon_menu_tools.lbm"
};
static const uint8_t mask_menu_logo[] __FLASH = {
#include "mask_menu_edgetx.lbm"
};
// gfx for settings screens
static const uint8_t mask_edgetx[] __FLASH = {
#include "mask_icon_edgetx.lbm"
};
// gfx model setup from model group
static const uint8_t mask_model_curves[] __FLASH = {
#include "mask_model_curves.lbm"
#include "mask_icon_model_curves.lbm"
};
static const uint8_t mask_model_flight_modes[] __FLASH = {
#include "mask_model_flight_modes.lbm"
#include "mask_icon_model_flight_modes.lbm"
};
static const uint8_t mask_model_general[] __FLASH = {
#include "mask_icon_model_general.lbm"
};
static const uint8_t mask_model_gvars[] __FLASH = {
#include "mask_model_gvars.lbm"
#include "mask_icon_model_gvars.lbm"
};
static const uint8_t mask_model_heli[] __FLASH = {
#include "mask_model_heli.lbm"
#include "mask_icon_model_heli.lbm"
};
static const uint8_t mask_model_inputs[] __FLASH = {
#include "mask_model_inputs.lbm"
#include "mask_icon_model_inputs.lbm"
};
static const uint8_t mask_model_logical_switches[] __FLASH = {
#include "mask_model_logical_switches.lbm"
};
static const uint8_t mask_model_lua_scripts[] __FLASH = {
#include "mask_model_lua_scripts.lbm"
#include "mask_icon_model_logical_switches.lbm"
};
static const uint8_t mask_model_mixer[] __FLASH = {
#include "mask_model_mixer.lbm"
#include "mask_icon_model_mixer.lbm"
};
static const uint8_t mask_model_mixer_scripts[] __FLASH = {
#include "mask_icon_model_mixer_scripts.lbm"
};
static const uint8_t mask_model_notes[] __FLASH = {
#include "mask_icon_model_notes.lbm"
};
static const uint8_t mask_model_outputs[] __FLASH = {
#include "mask_model_outputs.lbm"
};
static const uint8_t mask_model_setup[] __FLASH = {
#include "mask_model_setup.lbm"
#include "mask_icon_model_outputs.lbm"
};
static const uint8_t mask_model_special_functions[] __FLASH = {
#include "mask_model_special_functions.lbm"
#include "mask_icon_model_special_functions.lbm"
};
static const uint8_t mask_model_telemetry[] __FLASH = {
#include "mask_model_telemetry.lbm"
#include "mask_icon_model_telemetry.lbm"
};
static const uint8_t mask_model_timers[] __FLASH = {
#include "mask_icon_model_timers.lbm"
};
static const uint8_t mask_model_usb[] __FLASH = {
#include "mask_model_usb.lbm"
#include "mask_icon_model_usb.lbm"
};
static const uint8_t mask_menu_model_select[] __FLASH = {
#include "mask_menu_model_select.lbm" //TODO: someone may want to make proper icon
// gfx for radio setup group
static const uint8_t mask_radio_about[] __FLASH = {
#include "mask_icon_radio_about.lbm"
};
static const uint8_t mask_monitor[] __FLASH = {
#include "mask_monitor.lbm"
};
static const uint8_t mask_monitor_logsw[] __FLASH = {
#include "mask_monitor_logsw.lbm"
};
static const uint8_t mask_edgetx[] __FLASH = {
#include "mask_edgetx.lbm"
static const uint8_t mask_radio_analogs[] __FLASH = {
#include "mask_icon_radio_analogs.lbm"
};
static const uint8_t mask_radio_calibration[] __FLASH = {
#include "mask_radio_calibration.lbm"
#include "mask_icon_radio_calibration.lbm"
};
static const uint8_t mask_radio_general[] __FLASH = {
#include "mask_icon_radio_general.lbm"
};
static const uint8_t mask_radio_global_functions[] __FLASH = {
#include "mask_radio_global_functions.lbm"
#include "mask_icon_radio_global_functions.lbm"
};
static const uint8_t mask_radio_hardware[] __FLASH = {
#include "mask_radio_hardware.lbm"
};
static const uint8_t mask_radio_sd_browser[] __FLASH = {
#include "mask_radio_sd_browser.lbm"
};
static const uint8_t mask_radio_setup[] __FLASH = {
#include "mask_radio_setup.lbm"
};
static const uint8_t mask_radio_tools[] __FLASH = {
#include "mask_radio_tools.lbm"
};
static const uint8_t mask_radio_edit_theme[] __FLASH = {
#include "mask_radio_edit_theme.lbm"
#include "mask_icon_radio_hardware.lbm"
};
static const uint8_t mask_radio_trainer[] __FLASH = {
#include "mask_radio_trainer.lbm"
};
static const uint8_t mask_radio_version[] __FLASH = {
#include "mask_radio_version.lbm"
};
static const uint8_t mask_stats_analogs[] __FLASH = {
#include "mask_stats_analogs.lbm"
};
static const uint8_t mask_stats_debug[] __FLASH = {
#include "mask_stats_debug.lbm"
};
static const uint8_t mask_stats_timers[] __FLASH = {
#include "mask_stats_timers.lbm"
};
static const uint8_t mask_theme_add_view[] __FLASH = {
#include "mask_theme_add_view.lbm"
};
static const uint8_t mask_theme_setup[] __FLASH = {
#include "mask_theme_setup.lbm"
};
static const uint8_t mask_theme_view1[] __FLASH = {
#include "mask_theme_view1.lbm"
};
static const uint8_t mask_theme_view2[] __FLASH = {
#include "mask_theme_view2.lbm"
};
static const uint8_t mask_theme_view3[] __FLASH = {
#include "mask_theme_view3.lbm"
};
static const uint8_t mask_theme_view4[] __FLASH = {
#include "mask_theme_view4.lbm"
};
static const uint8_t mask_theme_view5[] __FLASH = {
#include "mask_theme_view5.lbm"
};
static const uint8_t mask_theme_view6[] __FLASH = {
#include "mask_theme_view6.lbm"
};
static const uint8_t mask_theme_view7[] __FLASH = {
#include "mask_theme_view7.lbm"
};
static const uint8_t mask_theme_view8[] __FLASH = {
#include "mask_theme_view8.lbm"
};
static const uint8_t mask_theme_view9[] __FLASH = {
#include "mask_theme_view9.lbm"
};
static const uint8_t mask_theme_view10[] __FLASH = {
#include "mask_theme_view10.lbm"
#include "mask_icon_radio_trainer.lbm"
};
static const uint8_t mask_chan_locked[] __FLASH = {
#include "mask_monitor_lockch.lbm"
// gfx for tools group
static const uint8_t mask_tools_apps[] __FLASH = {
#include "mask_icon_tools_apps.lbm"
};
static const uint8_t mask_chan_inverted[] __FLASH = {
#include "mask_monitor_inver.lbm"
static const uint8_t mask_tools_debug[] __FLASH = {
#include "mask_icon_tools_debug.lbm"
};
static const uint8_t mask_tools_monitor_ch[] __FLASH = {
#include "mask_icon_tools_monitor_ch.lbm"
};
static const uint8_t mask_tools_monitor_ls[] __FLASH = {
#include "mask_icon_tools_monitor_ls.lbm"
};
static const uint8_t mask_tools_reset[] __FLASH = {
#include "mask_icon_tools_reset.lbm"
};
static const uint8_t mask_tools_stats[] __FLASH = {
#include "mask_icon_tools_stats.lbm"
};
static const uint8_t mask_tools_storage[] __FLASH = {
#include "mask_icon_tools_storage.lbm"
};
static const uint8_t mask_shutdown_circle0[] __FLASH = {
#include "mask_shutdown_circle0.lbm"
// gfx for ui setup group
static const uint8_t mask_ui_view_add[] __FLASH = {
#include "mask_icon_ui_view_add.lbm"
};
static const uint8_t mask_shutdown_circle1[] __FLASH = {
#include "mask_shutdown_circle1.lbm"
static const uint8_t mask_ui_view1[] __FLASH = {
#include "mask_icon_ui_view1.lbm"
};
static const uint8_t mask_shutdown_circle2[] __FLASH = {
#include "mask_shutdown_circle2.lbm"
static const uint8_t mask_ui_view2[] __FLASH = {
#include "mask_icon_ui_view2.lbm"
};
static const uint8_t mask_shutdown_circle3[] __FLASH = {
#include "mask_shutdown_circle3.lbm"
static const uint8_t mask_ui_view3[] __FLASH = {
#include "mask_icon_ui_view3.lbm"
};
static const uint8_t mask_ui_view4[] __FLASH = {
#include "mask_icon_ui_view4.lbm"
};
static const uint8_t mask_ui_view5[] __FLASH = {
#include "mask_icon_ui_view5.lbm"
};
static const uint8_t mask_ui_view6[] __FLASH = {
#include "mask_icon_ui_view6.lbm"
};
static const uint8_t mask_ui_view7[] __FLASH = {
#include "mask_icon_ui_view7.lbm"
};
static const uint8_t mask_ui_view8[] __FLASH = {
#include "mask_icon_ui_view8.lbm"
};
static const uint8_t mask_ui_view9[] __FLASH = {
#include "mask_icon_ui_view9.lbm"
};
static const uint8_t mask_ui_view10[] __FLASH = {
#include "mask_icon_ui_view10.lbm"
};
static const uint8_t mask_ui_themes[] __FLASH = {
#include "mask_icon_ui_themes.lbm"
};
static const uint8_t mask_ui_topbar_setup[] __FLASH = {
#include "mask_icon_ui_topbar_setup.lbm"
};
static const uint8_t mask_shutdown[] __FLASH = {
#include "mask_shutdown.lbm"
// gfx used in lines
static const uint8_t mask_inline_add[] __FLASH = {
#include "mask_inline_add.lbm"
};
static const uint8_t mask_inline_curve[] __FLASH = {
#include "mask_inline_curve.lbm"
};
static const uint8_t mask_inline_dot[] __FLASH = {
#include "mask_inline_dot.lbm"
};
static const uint8_t mask_inline_fm[] __FLASH = {
#include "mask_inline_fm.lbm"
};
static const uint8_t mask_inline_inverted[] __FLASH = {
#include "mask_inline_inverted.lbm"
};
static const uint8_t mask_inline_locked[] __FLASH = {
#include "mask_inline_locked.lbm"
};
static const uint8_t mask_inline_multiply[] __FLASH = {
#include "mask_inline_multiply.lbm"
};
static const uint8_t mask_inline_replace[] __FLASH = {
#include "mask_inline_replace.lbm"
};
// gfx for info screens
static const uint8_t mask_info_busy[] __FLASH = {
#include "mask_info_busy.lbm"
};
static const uint8_t mask_info_error[] __FLASH = {
#include "mask_info_error.lbm"
};
static const uint8_t mask_info_shutdown[] __FLASH = {
#include "mask_info_shutdown.lbm"
};
static const uint8_t mask_info_shutdown_circle0[] __FLASH = {
#include "mask_info_shutdown_circle0.lbm"
};
static const uint8_t mask_info_shutdown_circle1[] __FLASH = {
#include "mask_info_shutdown_circle1.lbm"
};
static const uint8_t mask_info_shutdown_circle2[] __FLASH = {
#include "mask_info_shutdown_circle2.lbm"
};
static const uint8_t mask_info_shutdown_circle3[] __FLASH = {
#include "mask_info_shutdown_circle3.lbm"
};
static const uint8_t mask_info_usb_plugged[] __FLASH = {
#include "mask_info_usb_plugged.lbm"
};
// gfx for ui elements
const uint8_t mask_round_title_left[]{
#include "mask_ui_bg_tile_top_left.lbm"
};
const uint8_t mask_round_title_right[]{
#include "mask_ui_bg_tile_top_right.lbm"
};
const uint8_t mask_topleft_bg[] __FLASH = {
#include "mask_topleft.lbm"
#include "mask_ui_bg_topbar_left.lbm"
};
const uint8_t mask_topright_bg[] __FLASH = {
#include "mask_topright.lbm"
#include "mask_ui_bg_topbar_right.lbm"
};
static const uint8_t mask_btn_close[] __FLASH = {
#include "mask_ui_btn_close.lbm"
};
static const uint8_t mask_btn_next[] __FLASH = {
#include "mask_ui_btn_next.lbm"
};
static const uint8_t mask_btn_prev[] __FLASH = {
#include "mask_ui_btn_prev.lbm"
};
static const uint8_t mask_btn_grid_large[] __FLASH = {
#include "mask_ui_btn_grid_large.lbm"
};
static const uint8_t mask_btn_grid_small[] __FLASH = {
#include "mask_ui_btn_grid_small.lbm"
};
static const uint8_t mask_btn_list_one[] __FLASH = {
#include "mask_ui_btn_list_one.lbm"
};
static const uint8_t mask_btn_list_two[] __FLASH = {
#include "mask_ui_btn_list_two.lbm"
};
const uint8_t mask_currentmenu_bg[] __FLASH = {
#include "mask_currentmenu_bg.lbm"
};
const uint8_t mask_currentmenu_shadow[] __FLASH = {
#include "mask_currentmenu_shadow.lbm"
};
const uint8_t mask_currentmenu_dot[] __FLASH = {
#include "mask_currentmenu_dot.lbm"
};
// gfx for widgets
static const uint8_t mask_dot[] __FLASH = {
#include "mask_dot.lbm"
};
static const uint8_t mask_topmenu_usb[] __FLASH = {
#include "mask_topmenu_usb.lbm"
};
static const uint8_t mask_topmenu_vol0[] __FLASH = {
#include "mask_volume_0.lbm"
};
static const uint8_t mask_topmenu_vol1[] __FLASH = {
#include "mask_volume_1.lbm"
};
static const uint8_t mask_topmenu_vol2[] __FLASH = {
#include "mask_volume_2.lbm"
};
static const uint8_t mask_topmenu_vol3[] __FLASH = {
#include "mask_volume_3.lbm"
};
static const uint8_t mask_topmenu_vol4[] __FLASH = {
#include "mask_volume_4.lbm"
};
static const uint8_t mask_topmenu_vol_scale[] __FLASH = {
#include "mask_volume_scale.lbm"
};
static const uint8_t mask_topmenu_txbatt[] __FLASH = {
#include "mask_txbat.lbm"
};
#if defined(USB_CHARGER)
static const uint8_t mask_topmenu_txbatt_charging[] __FLASH = {
#include "mask_txbat_charging.lbm"
};
#endif
#if defined(INTERNAL_MODULE_PXX1) && defined(EXTERNAL_ANTENNA)
static const uint8_t mask_topmenu_antenna[] __FLASH = {
#include "mask_antenna.lbm"
#include "mask_widget_antenna.lbm"
};
#endif
#if defined(INTERNAL_GPS)
static const uint8_t mask_topmenu_gps[] __FLASH = {
#include "mask_topmenu_gps_18.lbm"
#include "mask_widget_gps.lbm"
};
#endif
static const uint8_t mask_error[] __FLASH = {
#include "mask_error.lbm"
static const uint8_t mask_widget_timer[] __FLASH = {
#include "mask_widget_timer.lbm"
};
static const uint8_t mask_busy[] __FLASH = {
#include "mask_busy.lbm"
static const uint8_t mask_widget_timer_bg[] __FLASH = {
#include "mask_widget_timer_bg.lbm"
};
static const uint8_t mask_widget_trim[] __FLASH = {
#include "mask_widget_trim.lbm"
};
static const uint8_t mask_widget_trim_shadow[] __FLASH = {
#include "mask_widget_trim_shadow.lbm"
};
static const uint8_t mask_widget_txbatt[] __FLASH = {
#include "mask_widget_txbat.lbm"
};
#if defined(USB_CHARGER)
static const uint8_t mask_widget_txbatt_charging[] __FLASH = {
#include "mask_widget_txbat_charging.lbm"
};
#endif
static const uint8_t mask_widget_usb[] __FLASH = {
#include "mask_widget_usb.lbm"
};
static const uint8_t mask_widget_volume0[] __FLASH = {
#include "mask_widget_volume0.lbm"
};
static const uint8_t mask_widget_volume1[] __FLASH = {
#include "mask_widget_volume1.lbm"
};
static const uint8_t mask_widget_volume2[] __FLASH = {
#include "mask_widget_volume2.lbm"
};
static const uint8_t mask_widget_volume3[] __FLASH = {
#include "mask_widget_volume3.lbm"
};
static const uint8_t mask_widget_volume4[] __FLASH = {
#include "mask_widget_volume4.lbm"
};
static const uint8_t mask_widget_volume_scale[] __FLASH = {
#include "mask_widget_volume_scale.lbm"
};
static const uint8_t mask_usb_plugged[] __FLASH = {
#include "mask_usb_symbol.lbm"
};
static const uint8_t mask_timer[] __FLASH = {
#include "mask_timer.lbm"
};
static const uint8_t mask_timer_bg[] __FLASH = {
#include "mask_timer_bg.lbm"
};
static const uint8_t mask_textline_curve[] __FLASH = {
#include "mask_textline_curve.lbm"
};
static const uint8_t mask_textline_fm[] __FLASH = {
#include "mask_textline_fm.lbm"
};
static const uint8_t mask_mplex_add[] __FLASH = {
#include "mask_mplex_add.lbm"
};
static const uint8_t mask_mplex_multi[] __FLASH = {
#include "mask_mplex_multi.lbm"
};
static const uint8_t mask_mplex_replace[] __FLASH = {
#include "mask_mplex_replace.lbm"
};
const uint8_t mask_round_title_left[] __FLASH = {
#include "mask_round_title_left.lbm"
};
const uint8_t mask_round_title_right[] __FLASH = {
#include "mask_round_title_right.lbm"
};
static const uint8_t mask_model_grid_large[] __FLASH = {
#include "mask_model_grid_large.lbm"
};
static const uint8_t mask_model_grid_small[] __FLASH = {
#include "mask_model_grid_small.lbm"
};
static const uint8_t mask_model_list_one[] __FLASH = {
#include "mask_model_list_one.lbm"
};
static const uint8_t mask_model_list_two[] __FLASH = {
#include "mask_model_list_two.lbm"
};
static const uint8_t mask_trim[] __FLASH = {
#include "mask_trim.lbm"
};
static const uint8_t mask_trim_shadow[] __FLASH = {
#include "mask_trim_shadow.lbm"
};
static const uint8_t mask_tools_apps[] __FLASH = {
#include "mask_tools_apps.lbm"
};
static const uint8_t mask_tools_reset[] __FLASH = {
#include "mask_tools_reset.lbm"
};
static const uint8_t mask_btn_close[] __FLASH = {
#include "mask_btn_close.lbm"
};
static const uint8_t mask_btn_next[] __FLASH = {
#include "mask_btn_next.lbm"
};
static const uint8_t mask_btn_prev[] __FLASH = {
#include "mask_btn_prev.lbm"
};
static const uint8_t mask_top_logo[] __FLASH = {
#include "mask_top_logo.lbm"
};
// const uint8_t mask_currentmenu_bg[] __FLASH = {
// #include "mask_currentmenu_bg.lbm"
// };
// const uint8_t mask_currentmenu_shadow[] __FLASH = {
// #include "mask_currentmenu_shadow.lbm"
// };
// const uint8_t mask_currentmenu_dot[] __FLASH = {
// #include "mask_currentmenu_dot.lbm"
// };
struct _BuiltinIcon {
const uint8_t* lz4_compressed_bitmap;
@@ -390,82 +403,82 @@ struct _BuiltinIcon {
}
// Note: Order must match EdgeTxIcon enum
static const _BuiltinIcon _builtinIcons[EDGETX_ICONS_COUNT] __FLASH = {
static const _BuiltinIcon _builtinIcons[EDGETX_ICONS_COUNT] = {
BI(ICON_EDGETX, mask_edgetx),
BI(ICON_QM_FAVORITES, mask_menu_favs),
BI(ICON_RADIO, mask_menu_radio),
BI(ICON_RADIO_SETUP, mask_radio_setup),
BI(ICON_RADIO_SD_MANAGER, mask_radio_sd_browser),
BI(ICON_RADIO_TOOLS, mask_radio_tools),
BI(ICON_RADIO, mask_menu_radio_setup),
BI(ICON_RADIO_SETUP, mask_radio_general),
BI(ICON_RADIO_SD_MANAGER, mask_tools_storage),
BI(ICON_RADIO_TOOLS, mask_menu_tools),
BI(ICON_RADIO_GLOBAL_FUNCTIONS, mask_radio_global_functions),
BI(ICON_RADIO_TRAINER, mask_radio_trainer),
BI(ICON_RADIO_HARDWARE, mask_radio_hardware),
BI(ICON_RADIO_CALIBRATION, mask_radio_calibration),
BI(ICON_RADIO_EDIT_THEME, mask_radio_edit_theme),
BI(ICON_RADIO_VERSION, mask_radio_version),
BI(ICON_MODEL, mask_menu_model),
BI(ICON_MODEL_SETUP, mask_model_setup),
BI(ICON_RADIO_EDIT_THEME, mask_ui_themes),
BI(ICON_RADIO_VERSION, mask_radio_about),
BI(ICON_MODEL, mask_menu_model_setup),
BI(ICON_MODEL_SETUP, mask_model_general),
BI(ICON_MODEL_HELI, mask_model_heli),
BI(ICON_MODEL_FLIGHT_MODES, mask_model_flight_modes),
BI(ICON_MODEL_INPUTS, mask_model_inputs),
BI(ICON_MODEL_MIXER, mask_model_mixer),
BI(ICON_MODEL_NOTES, mask_menu_notes),
BI(ICON_MODEL_NOTES, mask_model_notes),
BI(ICON_MODEL_OUTPUTS, mask_model_outputs),
BI(ICON_MODEL_CURVES, mask_model_curves),
BI(ICON_MODEL_GVARS, mask_model_gvars),
BI(ICON_MODEL_LOGICAL_SWITCHES, mask_model_logical_switches),
BI(ICON_MODEL_SPECIAL_FUNCTIONS, mask_model_special_functions),
BI(ICON_MODEL_LUA_SCRIPTS, mask_model_lua_scripts),
BI(ICON_MODEL_LUA_SCRIPTS, mask_model_mixer_scripts),
BI(ICON_MODEL_TELEMETRY, mask_model_telemetry),
BI(ICON_MODEL_USB, mask_model_usb),
BI(ICON_MODEL_SELECT, mask_menu_model_select),
BI(ICON_THEME, mask_menu_theme),
BI(ICON_THEME_SETUP, mask_theme_setup),
BI(ICON_THEME_VIEW1, mask_theme_view1),
BI(ICON_THEME_VIEW2, mask_theme_view2),
BI(ICON_THEME_VIEW3, mask_theme_view3),
BI(ICON_THEME_VIEW4, mask_theme_view4),
BI(ICON_THEME_VIEW5, mask_theme_view5),
BI(ICON_THEME_VIEW6, mask_theme_view6),
BI(ICON_THEME_VIEW7, mask_theme_view7),
BI(ICON_THEME_VIEW8, mask_theme_view8),
BI(ICON_THEME_VIEW9, mask_theme_view9),
BI(ICON_THEME_VIEW10, mask_theme_view10),
BI(ICON_THEME_ADD_VIEW, mask_theme_add_view),
BI(ICON_STATS, mask_menu_stats),
BI(ICON_STATS_TIMERS, mask_stats_timers),
BI(ICON_STATS_ANALOGS, mask_stats_analogs),
BI(ICON_STATS_DEBUG, mask_stats_debug),
BI(ICON_MONITOR, mask_monitor),
BI(ICON_MONITOR_LOGICAL_SWITCHES, mask_monitor_logsw),
BI(ICON_MODEL_SELECT, mask_menu_manage_models),
BI(ICON_THEME, mask_menu_ui_setup),
BI(ICON_THEME_SETUP, mask_ui_topbar_setup),
BI(ICON_THEME_VIEW1, mask_ui_view1),
BI(ICON_THEME_VIEW2, mask_ui_view2),
BI(ICON_THEME_VIEW3, mask_ui_view3),
BI(ICON_THEME_VIEW4, mask_ui_view4),
BI(ICON_THEME_VIEW5, mask_ui_view5),
BI(ICON_THEME_VIEW6, mask_ui_view6),
BI(ICON_THEME_VIEW7, mask_ui_view7),
BI(ICON_THEME_VIEW8, mask_ui_view8),
BI(ICON_THEME_VIEW9, mask_ui_view9),
BI(ICON_THEME_VIEW10, mask_ui_view10),
BI(ICON_THEME_ADD_VIEW, mask_ui_view_add),
BI(ICON_STATS, mask_tools_stats),
BI(ICON_STATS_TIMERS, mask_model_timers),
BI(ICON_STATS_ANALOGS, mask_radio_analogs),
BI(ICON_STATS_DEBUG, mask_tools_debug),
BI(ICON_MONITOR, mask_tools_monitor_ch),
BI(ICON_MONITOR_LOGICAL_SWITCHES, mask_tools_monitor_ls),
BI(ICON_CHAN_MONITOR_LOCKED, mask_chan_locked),
BI(ICON_CHAN_MONITOR_INVERTED, mask_chan_inverted),
BI(ICON_CHAN_MONITOR_LOCKED, mask_inline_locked),
BI(ICON_CHAN_MONITOR_INVERTED, mask_inline_inverted),
BI(ICON_SHUTDOWN_CIRCLE0, mask_shutdown_circle0),
BI(ICON_SHUTDOWN_CIRCLE1, mask_shutdown_circle1),
BI(ICON_SHUTDOWN_CIRCLE2, mask_shutdown_circle2),
BI(ICON_SHUTDOWN_CIRCLE3, mask_shutdown_circle3),
BI(ICON_SHUTDOWN, mask_shutdown),
BI(ICON_SHUTDOWN_CIRCLE0, mask_info_shutdown_circle0),
BI(ICON_SHUTDOWN_CIRCLE1, mask_info_shutdown_circle1),
BI(ICON_SHUTDOWN_CIRCLE2, mask_info_shutdown_circle2),
BI(ICON_SHUTDOWN_CIRCLE3, mask_info_shutdown_circle3),
BI(ICON_SHUTDOWN, mask_info_shutdown),
BI(ICON_TOPLEFT_BG, mask_topleft_bg),
BI(ICON_TOPRIGHT_BG, mask_topright_bg),
BI(ICON_CURRENTMENU_BG, mask_currentmenu_bg),
BI(ICON_CURRENTMENU_SHADOW, mask_currentmenu_shadow),
BI(ICON_CURRENTMENU_DOT, mask_currentmenu_dot),
// BI(ICON_CURRENTMENU_BG, mask_currentmenu_bg),
// BI(ICON_CURRENTMENU_SHADOW, mask_currentmenu_shadow),
// BI(ICON_CURRENTMENU_DOT, mask_currentmenu_dot),
BI(ICON_DOT, mask_dot),
BI(ICON_DOT, mask_inline_dot),
BI(ICON_TOPMENU_USB, mask_topmenu_usb),
BI(ICON_TOPMENU_VOLUME_0, mask_topmenu_vol0),
BI(ICON_TOPMENU_VOLUME_1, mask_topmenu_vol1),
BI(ICON_TOPMENU_VOLUME_2, mask_topmenu_vol2),
BI(ICON_TOPMENU_VOLUME_3, mask_topmenu_vol3),
BI(ICON_TOPMENU_VOLUME_4, mask_topmenu_vol4),
BI(ICON_TOPMENU_VOLUME_SCALE, mask_topmenu_vol_scale),
BI(ICON_TOPMENU_TXBATT, mask_topmenu_txbatt),
BI(ICON_TOPMENU_USB, mask_widget_usb),
BI(ICON_TOPMENU_VOLUME_0, mask_widget_volume0),
BI(ICON_TOPMENU_VOLUME_1, mask_widget_volume1),
BI(ICON_TOPMENU_VOLUME_2, mask_widget_volume2),
BI(ICON_TOPMENU_VOLUME_3, mask_widget_volume3),
BI(ICON_TOPMENU_VOLUME_4, mask_widget_volume4),
BI(ICON_TOPMENU_VOLUME_SCALE, mask_widget_volume_scale),
BI(ICON_TOPMENU_TXBATT, mask_widget_txbatt),
#if defined(USB_CHARGER)
BI(ICON_TOPMENU_TXBATT_CHARGE, mask_topmenu_txbatt_charging),
BI(ICON_TOPMENU_TXBATT_CHARGE, mask_widget_txbatt_charging),
#endif
#if defined(INTERNAL_MODULE_PXX1) && defined(EXTERNAL_ANTENNA)
BI(ICON_TOPMENU_ANTENNA, mask_topmenu_antenna),
@@ -474,30 +487,30 @@ static const _BuiltinIcon _builtinIcons[EDGETX_ICONS_COUNT] __FLASH = {
BI(ICON_TOPMENU_GPS, mask_topmenu_gps),
#endif
BI(ICON_ERROR, mask_error),
BI(ICON_BUSY, mask_busy),
BI(ICON_ERROR, mask_info_error),
BI(ICON_BUSY, mask_info_busy),
BI(ICON_USB_PLUGGED, mask_usb_plugged),
BI(ICON_USB_PLUGGED, mask_info_usb_plugged),
BI(ICON_TIMER_BG, mask_timer_bg),
BI(ICON_TIMER, mask_timer),
BI(ICON_TIMER_BG, mask_widget_timer_bg),
BI(ICON_TIMER, mask_widget_timer),
BI(ICON_TEXTLINE_CURVE, mask_textline_curve),
BI(ICON_TEXTLINE_FM, mask_textline_fm),
BI(ICON_TEXTLINE_CURVE, mask_inline_curve),
BI(ICON_TEXTLINE_FM, mask_inline_fm),
BI(ICON_MPLEX_ADD, mask_mplex_add),
BI(ICON_MPLEX_MULTIPLY, mask_mplex_multi),
BI(ICON_MPLEX_REPLACE, mask_mplex_replace),
BI(ICON_MPLEX_ADD, mask_inline_add),
BI(ICON_MPLEX_MULTIPLY, mask_inline_multiply),
BI(ICON_MPLEX_REPLACE, mask_inline_replace),
BI(ICON_ROUND_TITLE_LEFT, mask_round_title_left),
BI(ICON_ROUND_TITLE_RIGHT, mask_round_title_right),
BI(ICON_MODEL_GRID_LARGE, mask_model_grid_large),
BI(ICON_MODEL_GRID_SMALL, mask_model_grid_small),
BI(ICON_MODEL_LIST_TWO, mask_model_list_two),
BI(ICON_MODEL_LIST_ONE, mask_model_list_one),
BI(ICON_MODEL_GRID_LARGE, mask_btn_grid_large),
BI(ICON_MODEL_GRID_SMALL, mask_btn_grid_small),
BI(ICON_MODEL_LIST_TWO, mask_btn_list_two),
BI(ICON_MODEL_LIST_ONE, mask_btn_list_one),
BI(ICON_TRIM, mask_trim),
BI(ICON_TRIM_SHADOW, mask_trim_shadow),
BI(ICON_TRIM, mask_widget_trim),
BI(ICON_TRIM_SHADOW, mask_widget_trim_shadow),
BI(ICON_TOOLS_APPS, mask_tools_apps),
BI(ICON_TOOLS_RESET, mask_tools_reset),
@@ -505,7 +518,7 @@ static const _BuiltinIcon _builtinIcons[EDGETX_ICONS_COUNT] __FLASH = {
BI(ICON_BTN_CLOSE, mask_btn_close),
BI(ICON_BTN_NEXT, mask_btn_next),
BI(ICON_BTN_PREV, mask_btn_prev),
BI(ICON_TOP_LOGO, mask_top_logo),
BI(ICON_TOP_LOGO, mask_menu_logo),
};
static MaskBitmap* _builtinIconsDecompressed[EDGETX_ICONS_COUNT] = {0};
+3 -3
View File
@@ -83,9 +83,9 @@ enum EdgeTxIcon {
ICON_TOPLEFT_BG,
ICON_TOPRIGHT_BG,
ICON_CURRENTMENU_BG,
ICON_CURRENTMENU_SHADOW,
ICON_CURRENTMENU_DOT,
// ICON_CURRENTMENU_BG,
// ICON_CURRENTMENU_SHADOW,
// ICON_CURRENTMENU_DOT,
ICON_DOT,
+2 -2
View File
@@ -227,12 +227,12 @@ LAYOUT_ORIENTATION_SCALED(VERCHK_Y, 138, 240)
LAYOUT_ORIENTATION_SCALED(VERCHK_ICN_X, 78, 22)
const uint8_t __bmp_plug_usb[] {
#include "bmp_plug_usb.lbm"
#include "bmp_bootloader_plug_usb.lbm"
};
LZ4BitmapBuffer BMP_PLUG_USB(BMP_ARGB4444);
const uint8_t __bmp_usb_plugged[] {
#include "bmp_usb_plugged.lbm"
#include "bmp_bootloader_usb_plugged.lbm"
};
LZ4BitmapBuffer BMP_USB_PLUGGED(BMP_ARGB4444);
@@ -32,10 +32,10 @@
uint8_t menuCalibrationState;
static const uint8_t stick_pointer[] __FLASH = {
#include "alpha_stick_pointer.lbm"
#include "bmp_radio_stick_pointer.lbm"
};
static const uint8_t stick_background[] __FLASH = {
#include "alpha_stick_background.lbm"
#include "bmp_radio_stick_background.lbm"
};
class StickCalibrationWindow : public Window
+1 -1
View File
@@ -45,7 +45,7 @@ const std::string git_str = "(" GIT_STR ")";
#endif
const uint8_t __bmp_splash_logo[] __FLASH = {
#include "splash_logo.lbm"
#include "bmp_logo_edgetx_splash.lbm"
};
static Window* splashScreen = nullptr;