Skip to content

ethos 26 theme support #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robthomson merged 1 commit into from
May 13, 2026
Merged

ethos 26 theme support #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 45 additions & 26 deletions src/dashx/app/modules/logs/logs_view.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,44 @@
local dashx = require("dashx")

local utils = assert(loadfile("SCRIPTS:/" .. dashx.config.baseDir .. "/app/modules/logs/lib/utils.lua"))()

local dashboardUtils = nil

local function getDashboardUtils()
if dashboardUtils ~= nil then
return dashboardUtils or nil
end

dashboardUtils = dashx.widgets and dashx.widgets.dashboard and dashx.widgets.dashboard.utils
if dashboardUtils then
return dashboardUtils
end

local loader = loadfile("SCRIPTS:/" .. dashx.config.baseDir .. "/widgets/dashboard/lib/utils.lua")
if loader then
dashboardUtils = loader()
return dashboardUtils
end

dashboardUtils = false
return nil
end

local function getThemeState()
local du = getDashboardUtils()
if du and du.getThemeState then
return du.getThemeState()
end

local dark = lcd.darkMode and lcd.darkMode() or false
return {
darkMode = dark,
usesThemeColors = false,
primaryColor = dark and lcd.RGB(255, 255, 255) or lcd.RGB(0, 0, 0),
secondaryColor = lcd.RGB(160, 160, 160),
secondaryBgColor = dark and lcd.RGB(40, 40, 40) or lcd.RGB(240, 240, 240)
}
end
local res = system.getVersion()
local LCD_W = res.lcdWidth
local LCD_H = res.lcdHeight
Expand Down Expand Up @@ -266,11 +304,7 @@ local function drawKey(name, keyunit, keyminmax, keyfloor, color, minimum, maxim
lcd.drawText(x + 5, textY, name, LEFT)

lcd.font(dashx.app.radio.logKeyFontSmall)
if lcd.darkMode() then
lcd.color(COLOR_WHITE)
else
lcd.color(COLOR_BLACK)
end
lcd.color(getThemeState().primaryColor or COLOR_WHITE)

local min_trunc
if keyunit == "rpm" and (minimum >= 100000 or maximum >= 1000000) then
Expand Down Expand Up @@ -337,13 +371,10 @@ local function drawCurrentIndex(points, position, totalPoints, keyindex, keyunit
if position > 50 then boxPos = boxPos - tw - (boxpadding * 2) end

lcd.color(color)
local themeState = getThemeState()
lcd.drawFilledRectangle(boxPos, boxY, tw + (boxpadding * 2), boxHeight)

if lcd.darkMode() then
lcd.color(COLOR_BLACK)
else
lcd.color(COLOR_WHITE)
end
lcd.color(themeState.primaryColor or COLOR_WHITE)
lcd.drawText(idxPos, textY, value, textAlign)

if laneNumber == 1 then
Expand All @@ -365,21 +396,13 @@ local function drawCurrentIndex(points, position, totalPoints, keyindex, keyunit
lcd.font(dashx.app.radio.logKeyFont)
local ty = graphPos['height'] + graphPos['menu_offset'] - 10

lcd.color(COLOR_WHITE)
lcd.color(themeState.primaryColor or COLOR_WHITE)
lcd.drawText(idxPos, ty, full_label, textAlign)

if lcd.darkMode() then
lcd.color(COLOR_WHITE)
else
lcd.color(COLOR_BLACK)
end
lcd.color(themeState.primaryColor or COLOR_WHITE)
lcd.drawLine(linePos, graphPos['menu_offset'] - 5, linePos, graphPos['menu_offset'] + graphPos['height'])

if lcd.darkMode() then
lcd.color(lcd.RGB(40, 40, 40))
else
lcd.color(lcd.RGB(240, 240, 240))
end
lcd.color(themeState.secondaryBgColor or lcd.RGB(40, 40, 40))

local z_x = (LCD_W - 25)
local z_y = graphPos['slider_y']
Expand All @@ -392,11 +415,7 @@ local function drawCurrentIndex(points, position, totalPoints, keyindex, keyunit
lcd.drawFilledRectangle(z_x, z_y, z_w, z_h)

if zoomCount > 1 then
if lcd.darkMode() then
lcd.color(COLOR_WHITE)
else
lcd.color(COLOR_BLACK)
end
lcd.color(themeState.primaryColor or COLOR_WHITE)
else
lcd.color(COLOR_GREY)
end
Expand Down
136 changes: 125 additions & 11 deletions src/dashx/tools/logs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,106 @@ local tool = {
progressDialog = nil
}

local FALLBACK_THEME_STATE = {
dark = {
darkMode = true,
usesThemeColors = false,
primaryColor = COLOR_WHITE_SAFE,
primaryBgColor = COLOR_BLACK_SAFE,
secondaryColor = COLOR_GREY_SAFE,
secondaryBgColor = lcd.RGB(40, 40, 40),
focusBgColor = lcd.RGB(40, 40, 40),
focusColor = COLOR_WHITE_SAFE,
highlightInvertColor = COLOR_BLACK_SAFE,
warningColor = lcd.RGB(220, 92, 92),
activeColor = lcd.RGB(102, 214, 129),
buttonBorderActiveColor = COLOR_WHITE_SAFE,
buttonBorderColor = lcd.RGB(86, 96, 106),
pageBgColor = lcd.RGB(10, 14, 18)
},
light = {
darkMode = false,
usesThemeColors = false,
primaryColor = COLOR_BLACK_SAFE,
primaryBgColor = COLOR_WHITE_SAFE,
secondaryColor = lcd.RGB(108, 116, 124),
secondaryBgColor = lcd.RGB(240, 240, 240),
focusBgColor = lcd.RGB(240, 240, 240),
focusColor = COLOR_BLACK_SAFE,
highlightInvertColor = COLOR_WHITE_SAFE,
warningColor = lcd.RGB(200, 0, 0),
activeColor = lcd.RGB(0, 140, 0),
buttonBorderActiveColor = COLOR_BLACK_SAFE,
buttonBorderColor = lcd.RGB(196, 202, 208),
pageBgColor = lcd.RGB(246, 247, 249)
}
}
local FALLBACK_CHROME_THEME = {
dark = {
background = lcd.RGB(10, 14, 18),
panel = lcd.RGB(22, 28, 34),
panelAlt = lcd.RGB(17, 22, 27),
text = COLOR_WHITE_SAFE,
muted = lcd.RGB(166, 174, 182),
border = lcd.RGB(86, 96, 106)
},
light = {
background = lcd.RGB(246, 247, 249),
panel = COLOR_WHITE_SAFE,
panelAlt = lcd.RGB(240, 242, 245),
text = COLOR_BLACK_SAFE,
muted = lcd.RGB(108, 116, 124),
border = lcd.RGB(196, 202, 208)
}
}
local dashboardUtils = nil

local function getDashboardUtils()
if dashboardUtils ~= nil then
return dashboardUtils or nil
end

dashboardUtils = dashx.widgets and dashx.widgets.dashboard and dashx.widgets.dashboard.utils
if dashboardUtils then
return dashboardUtils
end

local loader = loadfile("SCRIPTS:/" .. dashx.config.baseDir .. "/widgets/dashboard/lib/utils.lua")
if loader then
dashboardUtils = loader()
return dashboardUtils
end

dashboardUtils = false
return nil
end

local function getThemeState()
local utils = getDashboardUtils()
if utils and utils.getThemeState then
return utils.getThemeState()
end

return (lcd.darkMode and lcd.darkMode() or false) and FALLBACK_THEME_STATE.dark or FALLBACK_THEME_STATE.light
end

local function getChromeTheme()
local utils = getDashboardUtils()
if utils and utils.getChromeTheme then
return utils.getChromeTheme()
end

return getThemeState().darkMode and FALLBACK_CHROME_THEME.dark or FALLBACK_CHROME_THEME.light
end

local function getGraphValueTextColor(themeState)
if themeState.usesThemeColors then
return themeState.focusColor or themeState.highlightInvertColor or COLOR_WHITE_SAFE
end

return themeState.darkMode and COLOR_BLACK_SAFE or COLOR_WHITE_SAFE
end

local function openProgressDialog(title, message)
if form.openWaitDialog and dashx.utils.ethosVersionAtLeast({26, 1, 0}) then
return form.openWaitDialog({title = title, message = message, progress = true})
Expand All @@ -152,7 +252,19 @@ local function closeProgressDialog()
end

local function buildColorTable()
if lcd.darkMode() then
local themeState = getThemeState()

if themeState.usesThemeColors then
return {
voltage = themeState.warningColor or lcd.RGB(220, 92, 92),
current = themeState.focusBgColor or themeState.buttonBorderActiveColor or lcd.RGB(255, 168, 58),
rpm = themeState.activeColor or lcd.RGB(102, 214, 129),
temp_esc = themeState.focusColor or themeState.secondaryColor or lcd.RGB(90, 180, 255),
throttle_percent = themeState.buttonBorderActiveColor or themeState.primaryColor or lcd.RGB(248, 215, 90)
}
end

if themeState.darkMode then
return {
voltage = lcd.RGB(220, 92, 92),
current = lcd.RGB(255, 168, 58),
Expand Down Expand Up @@ -1088,7 +1200,7 @@ local function drawKey(name, keyunit, keyminmax, keyfloor, color, minimum, maxim
lcd.drawText(x + 5, textY, name, LEFT)

lcd.font(radio.logKeyFontSmall)
lcd.color(lcd.darkMode() and COLOR_WHITE_SAFE or COLOR_BLACK_SAFE)
lcd.color(getThemeState().primaryColor or COLOR_WHITE_SAFE)

if keyunit == "rpm" and ((minimum >= 10000) or (maximum >= 10000)) then
minText = string_format("%.1fK", minimum / 10000)
Expand Down Expand Up @@ -1143,10 +1255,11 @@ local function drawCurrentIndex(points, position, totalPoints, keyunit, keyfloor
boxX = linePos + boxPadding
end

local themeState = getThemeState()
lcd.color(color)
lcd.drawFilledRectangle(boxX, boxY, textW + (boxPadding * 2), boxHeight)

lcd.color(lcd.darkMode() and COLOR_BLACK_SAFE or COLOR_WHITE_SAFE)
lcd.color(getGraphValueTextColor(themeState))
lcd.drawText(textX, textY, valueLabel, textAlign)

if laneNumber == 1 then
Expand All @@ -1167,13 +1280,13 @@ local function drawCurrentIndex(points, position, totalPoints, keyunit, keyfloor
local timeY = graphPos.height + graphPos.menu_offset - 10

lcd.font(radio.logKeyFont)
lcd.color(COLOR_WHITE_SAFE)
lcd.color(themeState.primaryColor or COLOR_WHITE_SAFE)
lcd.drawText(textX, timeY, fullLabel, textAlign)

lcd.color(lcd.darkMode() and COLOR_WHITE_SAFE or COLOR_BLACK_SAFE)
lcd.color(themeState.primaryColor or COLOR_WHITE_SAFE)
lcd.drawLine(linePos, graphPos.menu_offset - 5, linePos, graphPos.menu_offset + graphPos.height)

lcd.color(lcd.darkMode() and lcd.RGB(40, 40, 40) or lcd.RGB(240, 240, 240))
lcd.color(themeState.secondaryBgColor or lcd.RGB(40, 40, 40))
local zoomX = graphPos.lcdWidth - 25
local zoomY = graphPos.slider_y
local zoomW = 20
Expand All @@ -1182,26 +1295,27 @@ local function drawCurrentIndex(points, position, totalPoints, keyunit, keyfloor
local lineOffsetY = (tool.state.zoomCount - tool.state.zoomLevel) * zoomLineH

lcd.drawFilledRectangle(zoomX, zoomY, zoomW, zoomH)
lcd.color(tool.state.zoomCount > 1 and (lcd.darkMode() and COLOR_WHITE_SAFE or COLOR_BLACK_SAFE) or COLOR_GREY_SAFE)
lcd.color(tool.state.zoomCount > 1 and (themeState.primaryColor or COLOR_WHITE_SAFE) or COLOR_GREY_SAFE)
lcd.drawFilledRectangle(zoomX, zoomY + lineOffsetY, zoomW, zoomLineH)
end
end

local function paintLoadingMessage(message, detail)
local _, width, height = getRadio()
local theme = getChromeTheme()

lcd.color(lcd.darkMode() and lcd.RGB(22, 28, 34) or lcd.RGB(255, 255, 255))
lcd.color(theme.panel)
lcd.drawFilledRectangle(20, math_floor(height * 0.35), width - 40, 70)
lcd.color(lcd.darkMode() and lcd.RGB(86, 96, 106) or lcd.RGB(196, 202, 208))
lcd.color(theme.border)
lcd.drawRectangle(20, math_floor(height * 0.35), width - 40, 70, 1)

lcd.font(FONT_STD)
lcd.color(lcd.darkMode() and COLOR_WHITE_SAFE or COLOR_BLACK_SAFE)
lcd.color(theme.text)
lcd.drawText(math_floor(width / 2), math_floor(height * 0.35) + 14, message, CENTERED)

if detail then
lcd.font(FONT_XXS)
lcd.color(COLOR_GREY_SAFE)
lcd.color(theme.muted or COLOR_GREY_SAFE)
lcd.drawText(math_floor(width / 2), math_floor(height * 0.35) + 38, tostring(detail), CENTERED)
end
end
Expand Down
15 changes: 12 additions & 3 deletions src/dashx/widgets/dashboard/dashboard.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ local themesUserPath = "SCRIPTS:/" .. dashx.config.preferences .. "/dashboard/"
local currentState = nil
local loadedStates = {}
local lastSizeKey = nil
local darkModeState = lcd.darkMode()
local themeStateSignature = nil
local nextThemeStateCheck = 0
local themeStateCheckInterval = 0.25
local unsupportedResolution = false
local forceFullRepaint = true
local lastInvalidateAt = 0
Expand Down Expand Up @@ -224,6 +226,8 @@ local function loadObjects(module)
end

local function reloadTheme()
themeStateSignature = dashboard.utils and dashboard.utils.getThemeSignature and dashboard.utils.getThemeSignature() or themeStateSignature
nextThemeStateCheck = os.clock() + themeStateCheckInterval
loadedStates = {
preflight = loadStateScript(getThemeForState("preflight"), "preflight"),
inflight = loadStateScript(getThemeForState("inflight"), "inflight"),
Expand Down Expand Up @@ -612,9 +616,14 @@ function dashboard.wakeup(widget)
return
end

if runtimeState.model_changed or lcd.darkMode() ~= darkModeState then
darkModeState = lcd.darkMode()
if runtimeState.model_changed then
reloadTheme()
elseif now >= nextThemeStateCheck then
nextThemeStateCheck = now + themeStateCheckInterval
local currentThemeSignature = dashboard.utils.getThemeSignature()
if currentThemeSignature ~= themeStateSignature then
reloadTheme()
end
end

if dashx.session and dashx.session.dashboardThemeReloadPending then
Expand Down
Loading
Loading