Skip to content

Commit

Permalink
2.5 Themes and general cleanup (#27)
Browse files Browse the repository at this point in the history
* 2.5 THEMES folder adjustment

- ditched obsolete EdgeTX folder
- added files compatible with EdgeTX 2.5 theme switching

* Temporarily restore default background

* Remove auto-generated settings file

* Typos

Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
  • Loading branch information
JimB40 and pfeerick authored Oct 6, 2021
1 parent 01a7f22 commit f67e3ec
Show file tree
Hide file tree
Showing 111 changed files with 216 additions and 0 deletions.
Binary file removed sdcard/horus/THEMES/EdgeTX/X10.bmp
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/X10S.bmp
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/asterisk.bmp
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/busy.bmp
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/horus.bmp
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_currentmenu_bg.png
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_currentmenu_dot.png
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_currentmenu_shadow.png
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_edgetx.png
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_menu_model.png
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_menu_radio.png
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_menu_stats.png
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_menu_theme.png
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_model_curves.png
Binary file not shown.
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_model_gvars.png
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_model_heli.png
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_model_inputs.png
Binary file not shown.
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_model_lua_scripts.png
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_model_mixer.png
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_model_outputs.png
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_model_setup.png
Binary file not shown.
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_model_telemetry.png
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_monitor.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_monitor_gvars.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_monitor_inver.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_monitor_lockch.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_monitor_logsw.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_monitor_mixes1.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_monitor_mixes2.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_mplex_add.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_mplex_multi.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_mplex_replace.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_opentx.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_opentx_testmode.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_radio_calibration.png
Diff not rendered.
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_radio_hardware.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_radio_sd_browser.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_radio_setup.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_radio_tools.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_radio_trainer.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_radio_version.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_sbar_mixer.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_sbar_output.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_sbar_to.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_stats_analogs.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_stats_debug.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_stats_lua.png
Diff not rendered.
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_stats_timers.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_stats_value.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_switches.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_textline_curve.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_textline_delay.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_textline_delayslow.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_textline_fm.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_textline_label.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_textline_slow.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_textline_switch.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_theme_add_view.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_theme_setup.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_theme_view1.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_theme_view2.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_theme_view3.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_theme_view4.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_theme_view5.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_theme_view6.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_theme_view7.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/mask_theme_view8.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/modelsel/icon_boat1.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/modelsel/icon_boat2.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/modelsel/icon_default.png
Diff not rendered.
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/modelsel/icon_plane1.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/modelsel/icon_plane2.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/modelsel/icon_plane3.png
Diff not rendered.
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/modelsel/mask_modelname.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/modelsel/mask_modelqty.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/modelsel/mask_moveback.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/modelsel/mask_moveico.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/modelsel/mask_sdfree.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/question.bmp
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/shutdown.bmp
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/sleep.bmp
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/stick_background.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/stick_pointer.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/thumb.bmp
Binary file not shown.
Binary file removed sdcard/horus/THEMES/EdgeTX/topleft.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/trackp_background.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/wizard/background.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/wizard/itembg.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/wizard/pgdn.png
Diff not rendered.
Binary file removed sdcard/horus/THEMES/EdgeTX/wizard/pgup.png
Diff not rendered.
Binary file added sdcard/horus/THEMES/EgdeTX.png
Binary file added sdcard/horus/THEMES/FM2M_Concrete.png
17 changes: 17 additions & 0 deletions sdcard/horus/THEMES/FM2M_Concrete.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
summary:
name: FM2M Concrete
author: JimB40
info: Grays are sexi. Let's explore this bando.
colors:
PRIMARY1: 0xA0A0A0
PRIMARY2: 0x202020
PRIMARY3: 0x505050
SECONDARY1: 0x808080
SECONDARY2: 0x505050
SECONDARY3: 0x303030
FOCUS: 0xC0C0C0
EDIT: 0xEEEEEE
ACTIVE: 0xD0D0D0
WARNING: 0x404040
DISABLED: 0x808080
Binary file added sdcard/horus/THEMES/FM2M_Greenfields.png
17 changes: 17 additions & 0 deletions sdcard/horus/THEMES/FM2M_Greenfields.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
summary:
name: FM2M Greenfields
author: JimB40
info: Green grass, yellow sun and blue sky. This is summer time.
colors:
PRIMARY1: 0x000000
PRIMARY2: 0xFFFFC0
PRIMARY3: 0x003000
SECONDARY1: 0x005000
SECONDARY2: 0x009900
SECONDARY3: 0x00C800
FOCUS: 0xFF8C00
EDIT: 0x6074FF
ACTIVE: 0xF7E400
WARNING: 0xE00000
DISABLED: 0x808080
Binary file added sdcard/horus/THEMES/FM2M_HellYeah.png
17 changes: 17 additions & 0 deletions sdcard/horus/THEMES/FM2M_HellYeah.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
summary:
name: FM2M Hell Yeah!
author: JimB40
info: Little devil inside my plane.
colors:
PRIMARY1: 0x220000
PRIMARY2: 0xFF2222
PRIMARY3: 0x4F0000
SECONDARY1: 0x080000
SECONDARY2: 0xA00000
SECONDARY3: 0x770000
FOCUS: 0x080000
EDIT: 0x440000
ACTIVE: 0xFF8080
WARNING: 0xFFFFFF
DISABLED: 0x000000
Binary file added sdcard/horus/THEMES/FM2M_Vineyard.png
17 changes: 17 additions & 0 deletions sdcard/horus/THEMES/FM2M_Vineyard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
summary:
name: FM2M Vineyard
author: JimB40
info: For wine lovers. Remember. Don't drink and fly.
colors:
PRIMARY1: 0x00DD00
PRIMARY2: 0xFFFF90
PRIMARY3: 0xA000A0
SECONDARY1: 0x780078
SECONDARY2: 0x006000
SECONDARY3: 0x400040
FOCUS: 0x008000
EDIT: 0x6060F0
ACTIVE: 0x004000
WARNING: 0xFFFFFF
DISABLED: 0x808080
148 changes: 148 additions & 0 deletions sdcard/horus/THEMES/readme.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
!!! IMPORTANT
EdgeTX 2.5 Theme implementation is first approach and may be changed in next
releases. That means color variables and YAML file structure may change.


EdgeTX 2.5 Theme
----------------
There are 11 EdgeTX OS color variables that are used to define EdgeTX UI look &
feel. PRIMARY1, PRIMARY2, PRIMARY3, SECONDARY1, SECONDARY2, SECONDARY3, FOCUS,
ACTIVE, WARNING & DISABLED.
Color values format uses 24bit value (RGB color scheme) coded in hex format
RRGGBB where RR stands for Red component value, GG for Green and BB for Blue.
Each component can have 256 values (00-FF range in hex format)

RGB color scheme examples:
FF0000 (Light Red)
440000 (Dark Red)
00FF00 (Light Green)
002400 (Dark Green)
0000FF (Light Blue)
000064 (Dark Blue)
FFFFFF (White)
808080 (50% Gray)
202020 (Dark Gray)


EdgeTX 2.5 Theme definition
---------------------------
Themes colors definition is stored in YAML format text files placed in /THEMES
folder in radio's SD card. YAML (Yet Another Markup Language) is simple markup
language to define data structure. It can be edited using any text editor.
File name has to have .yml extension.
Example: custom_theme.yml

Additionally you can include graphic file (in PNG format) to display in EdgeTX
User Interface Tab theme preview. To display preview file name must be the same
as YAML file.
Example:
If theme color definition is name new_theme.yml graphic preview file must be
named new_theme.png


EdgeTX 2.5 Theme definition YAML file structure
-----------------------------------------------
Data in YAML file is structured using basic scheme "name: value"
Leading spaces are important as they define data group assignment.

Example of theme colors definition:

---
summary:
name: Theme name
author: Creator
info: Here is short description
colors:
PRIMARY1: 0xA0A0A0
PRIMARY2: 0x202020
PRIMARY3: 0x505050
SECONDARY1: 0x808080
SECONDARY2: 0x505050
SECONDARY3: 0x303030
FOCUS: 0xC0C0C0
EDIT: 0xEEEEEE
ACTIVE: 0xD0D0D0
WARNING: 0x404040
DISABLED: 0x808080

'---' YAML format marker (must be placed as first line)
'summary: ' Group marker (description)
' name: ' Name of theme displayed in EdgeTX UI
' author: ' Name of author displayed in EdgeTX UI
' info: ' Short info about theme displayed in EdgeTX UI
'colors: ' Group marker (colors definition)
' PRIMARY1: ' ETX color variable in 0xRRGGBB format (0x means value is in hex)
' PRIMARY2: ' ETX color variable in 0xRRGGBB format (0x means value is in hex)
etc


ETX 2.5 UI elements color variables assignment
----------------------------------------------
PRIMARY1
Label text
Button text (not focused)
PRIMARY2
ETX Logo icon,
TopBar Icons
TopBar text
TopBar tab name text
BottomBar text
Editable field background
Editable field text (editing)
Button text (focused)
PopUp selectable field background
Trim knob
Slider knob
PRIMARY3
Scroll marker
Inactive part of TopBar icons
SECONDARY1
TopBar background
BottomBar background
Trim knob path
Trim Knob shadow
Slider path
Slider knob shadow
SECONDARY2
Label background
Button background
SECONDARY3
Main screen's background
PopUp's background
FOCUS
ETX Logo background
TopBar icon background (selected)
Label background (focused)
Editable field background (focused)
Trim knob
Slider knob
EDIT
Editable field background (editing)
ACTIVE
Buttons background (button active)
Editable field background (variable active)
WARNING
Label text (warning)
DISABLED
Disabled elements


Creating EdgeTX 2.5 theme color definition
-------------------------------------------
1. Create *.yml file with theme definition
2. Create *.png file with theme preview
3. Place *.yml & *.png files in /THEMES folder on radio's SD Card
4. Reboot radio
5. Navigate to 'User Interface' Tab in EdgeTX
6. Select new theme from the dropdown list.


EdgeTX 2.5 Theme implementation
-------------------------------
1. If there is no files in /THEMES folder default EdgeTX theme will be applied.
2. selectedtheme.txt file holds name of selected theme YAML file. If empty or
not present default EdgeTX theme will be applied.
3. If color variable definition is omitted in YAML file, last applied color
value is used (color value from previously used theme)
4. If *.png file in not present or has different name than YAML file it won't be
displayed in EdgeTX UI

0 comments on commit f67e3ec

Please sign in to comment.