Skip to content

feat(Flights): updates for TX16S mk3 800x480 screen and flight logic rules #257

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
pfeerick merged 1 commit into from
Mar 7, 2026
Merged

feat(Flights): updates for TX16S mk3 800x480 screen and flight logic rules #257

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
244 changes: 75 additions & 169 deletions sdcard/c480x272/WIDGETS/Flights/app.lua
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion sdcard/c480x272/WIDGETS/Flights/lib_log.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ local app_name, script_dir = ...

local ENABLE_LOG_TO_CONSOLE = true
local ENABLE_LOG_TO_FILE = false
local ENABLE_LOG_TO_SERIAL = false


local M = {}
Expand All @@ -17,6 +18,7 @@ local log = {
outfile = script_dir .. "/app.log",
enable_file = ENABLE_LOG_TO_FILE,
enable_console = ENABLE_LOG_TO_CONSOLE and is_simulator(),
enable_serial_dbg = ENABLE_LOG_TO_SERIAL,
current_level = nil,

-- func
Expand Down Expand Up @@ -61,7 +63,7 @@ local function tostring(...)
end

function M.do_log(iLevel, ulevel, fmt, ...)
if log.enable_console == false and log.enable_file == false then
if log.enable_console == false and log.enable_file == false and log.enable_serial_dbg == false then
return
end

Expand Down Expand Up @@ -91,6 +93,12 @@ function M.do_log(iLevel, ulevel, fmt, ...)
io.write(fp, msg2 .. "\n")
io.close(fp)
end

-- Output to log file
if log.enable_serial_dbg == true then
serialWrite(msg2.."\r\n") -- 115200 bps
end

end

function M.trace(fmt, ...)
Expand Down
172 changes: 140 additions & 32 deletions sdcard/c480x272/WIDGETS/Flights/lib_widget_tools.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
local m_log, app_name = ...
local args = {...}
local m_log = args[1]
local app_name = args[2]

local M = {}
M.m_log = m_log
Expand All @@ -9,18 +11,20 @@ M.tele_src_id = nil
local getTime = getTime
local lcd = lcd

-- better font names
local FONT_38 = XXLSIZE -- 38px
local FONT_16 = DBLSIZE -- 16px
local FONT_12 = MIDSIZE -- 12px
local FONT_8 = 0 -- Default 8px
local FONT_6 = SMLSIZE -- 6px
-- better font size names
local FS={FONT_38=XXLSIZE,FONT_16=DBLSIZE,FONT_12=MIDSIZE,FONT_8=0,FONT_6=SMLSIZE}
M.FS = FS
M.FONT_LIST = {FS.FONT_6, FS.FONT_8, FS.FONT_12, FS.FONT_16, FS.FONT_38}
local lvSCALE = lvgl.LCD_SCALE or 1

local FONT_LIST = {FONT_6, FONT_8, FONT_12, FONT_16, FONT_38}

---------------------------------------------------------------------------------------------------
local function log(fmt, ...)
m_log.info(fmt, ...)
if M.m_log then
M.m_log.info(fmt, ...)
else
print("[" .. M.app_name .. "] " .. string.format(fmt, ...))
end
end
---------------------------------------------------------------------------------------------------

Expand Down Expand Up @@ -55,9 +59,10 @@ end
---------------------------------------------------------------------------------------------------

function M.periodicInit()
local t = {}
t.startTime = -1;
t.durationMili = -1;
local t = {
startTime = -1,
durationMili = -1
}
return t
end

Expand All @@ -66,6 +71,10 @@ function M.periodicStart(t, durationMili)
t.durationMili = durationMili;
end

function M.periodicStop(t)
t.durationMili = -1;
end

function M.periodicHasPassed(t, show_log)
-- not started yet
if (t.durationMili <= 0) then
Expand Down Expand Up @@ -110,6 +119,43 @@ function M.isTelemetryAvailable()
return is_telem > 0
end

function M.isTelemetryAvailableOld()
-- select telemetry source
if not M.tele_src_id then
--log("select telemetry source")
local tele_src = getFieldInfo("RSSI")
if not tele_src then tele_src = getFieldInfo("1RSS") end
if not tele_src then tele_src = getFieldInfo("2RSS") end
if not tele_src then tele_src = getFieldInfo("RQly") end
if not tele_src then tele_src = getFieldInfo("VFR%") end
if not tele_src then tele_src = getFieldInfo("VFR") end
if not tele_src then tele_src = getFieldInfo("TRSS") end
if not tele_src then tele_src = getFieldInfo("RxBt") end
if not tele_src then tele_src = getFieldInfo("A1") end

if tele_src == nil then
--log("no telemetry sensor found")
M.tele_src_id = nil
M.tele_src_name = "---"
return false
else
--log("telemetry sensor found: " .. tele_src.name)
M.tele_src_id = tele_src.id
M.tele_src_name = tele_src.name
end
end

if M.tele_src_id == nil then
return false
end

local rx_val = getValue(M.tele_src_id)
if rx_val ~= 0 then
return true
end
return false
end

---------------------------------------------------------------------------------------------------

-- workaround to detect telemetry-reset event, until a proper implementation on the lua interface will be created
Expand All @@ -120,7 +166,6 @@ end
-- on event detection, the function onTelemetryResetEvent() will be trigger
--
function M.detectResetEvent(wgt, callback_onTelemetryResetEvent)

local currMinRSSI = getValue('RSSI-')
if (currMinRSSI == nil) then
log("telemetry reset event: can not be calculated")
Expand Down Expand Up @@ -160,8 +205,8 @@ function M.getSensorInfoByName(sensorName)
s1.type = s2.type
--name (string) Name
s1.name = s2.name
--unit (number) See list of units in the appendix of the OpenTX Lua Reference Guide
s1.unit = s2.unit
--unit (number->string) See list of units in the appendix of the OpenTX Lua Reference Guide
s1.unit = M.unitIdToString(s2.unit)
--prec (number) Number of decimals
s1.prec = s2.prec
--id (number) Only custom sensors
Expand Down Expand Up @@ -213,9 +258,10 @@ function M.isSensorExist(sensorName)
end

---------------------------------------------------------------------------------------------------
-- workaround for bug in getFiledInfo() -- ???? why?
-- workaround for bug in getFiledInfo() why?
function M.cleanInvalidCharFromGetFiledInfo(sourceName)
if string.byte(string.sub(sourceName, 1, 1)) > 127 then

if string.byte(string.sub(sourceName, 1, 1)) > 127 then
sourceName = string.sub(sourceName, 2, -1)
end
if string.byte(string.sub(sourceName, 1, 1)) > 127 then
Expand All @@ -235,35 +281,97 @@ function M.getSourceNameCleaned(source)
end

------------------------------------------------------------------------------------------------------

function M.getFontSizeRelative(orgFontSize, delta)
for i = 1, #FONT_LIST do
if FONT_LIST[i] == orgFontSize then
for i = 1, #M.FONT_LIST do
if M.FONT_LIST[i] == orgFontSize then
local newIndex = i + delta
newIndex = math.min(newIndex, #FONT_LIST)
newIndex = math.min(newIndex, #M.FONT_LIST)
newIndex = math.max(newIndex, 1)
return FONT_LIST[newIndex]
return M.FONT_LIST[newIndex]
end
end
return orgFontSize
end

function M.getFontIndex(fontSize, defaultFontSize)
for i = 1, #M.FONT_LIST do
-- log("M.FONT_SIZES[%d]: %d (%d)", i, M.FONT_LIST[i], fontSize)
if M.FONT_LIST[i] == fontSize then
return i
end
end
return defaultFontSize
end

------------------------------------------------------------------------------------------------------

function M.lcdSizeTextFixed(txt, font_size)
local ts_w, ts_h = lcd.sizeText(txt, font_size)

local v_offset = 0
if font_size == FONT_38 then
v_offset = -15
elseif font_size == FONT_16 then
v_offset = -8
elseif font_size == FONT_12 then
v_offset = -6
elseif font_size == FONT_8 then
v_offset = -4
elseif font_size == FONT_6 then
v_offset = -3
if font_size == FS.FONT_38 then
v_offset = -6*lvSCALE
ts_h = 52*lvSCALE
ts_w=ts_w-3
elseif font_size == FS.FONT_16 then
v_offset = -6*lvSCALE
ts_h = 28*lvSCALE
elseif font_size == FS.FONT_12 then
v_offset = -5*lvSCALE
ts_h = 20*lvSCALE
elseif font_size == FS.FONT_8 then
v_offset = -3*lvSCALE
ts_h = 15*lvSCALE
elseif font_size == FS.FONT_6 then
v_offset = -2*lvSCALE
ts_h = 14*lvSCALE
end
return ts_w, ts_h, v_offset
end

function M.getFontSize(wgt, txt, max_w, max_h, max_font_size)
local maxFontIndex = M.getFontIndex(max_font_size, nil)
--log("getFontSize() [%s] %dx%d (maxIndex: %d)", txt, max_w, max_h, maxFontIndex)

if maxFontIndex>=5 then
local w, h, v_offset = M.lcdSizeTextFixed(txt, FS.FONT_38)
if w <= max_w and h <= max_h then
log("[%s] FS.FONT_38 %dx%d", txt, w, h)
return FS.FONT_38, w, h, v_offset
else
log("[%s] FS.FONT_38 %dx%d (too small)", txt, w, h)
end
end

local w, h, v_offset
if maxFontIndex>=4 then
w, h, v_offset = M.lcdSizeTextFixed(txt, FS.FONT_16)
if w <= max_w and h <= max_h then
-- log("[%s] FS.FONT_16 %dx%d", txt, w, h, txt)
return FS.FONT_16, w, h, v_offset
end
end

if maxFontIndex>=3 then
w, h, v_offset = M.lcdSizeTextFixed(txt, FS.FONT_12)
if w <= max_w and h <= max_h then
-- log("[%s] FS.FONT_12 %dx%d", txt, w, h, txt)
return FS.FONT_12, w, h, v_offset
end
end
return ts_w, ts_h +2*v_offset, v_offset

if maxFontIndex>=2 then
w, h, v_offset = M.lcdSizeTextFixed(txt, FS.FONT_8)
if w <= max_w and h <= max_h then
-- log("[%s] FS.FONT_8 %dx%d", txt, w, h, txt)
return FS.FONT_8, w, h, v_offset
end
end

w, h, v_offset = M.lcdSizeTextFixed(txt, FS.FONT_6)
-- log("[%s] FS.FONT_6 %dx%d", txt, w, h, txt)
return FS.FONT_6, w, h, v_offset
end

------------------------------------------------------------------------------------------------------
Expand Down
31 changes: 24 additions & 7 deletions sdcard/c480x272/WIDGETS/Flights/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,27 @@ local tool = nil

local default_flight_starting_duration = 30 -- 30 sec to detect flight success

local triggerTypeDefs = {
labels = {
"1. Plane with Telemetry",
"2. Plane no Telemetry",
"3. Heli [RPM]",
"4. Heli [Arm]",
"5. By switch",
"6. DLG [Height]",
"7. Glider [Height]",
},
info = {
{desc = "1=Plane with Telemetry (mot+Arm+Telm)", file = "1_plane_tlm.lua" },
{desc = "2=Plane no Telemetry (mot+Arm)", file = "2_plane_no_tlm.lua" },
{desc = "3=Heli [RPM] (RPM+Telm)", file = "3_heli_rpm.lua" },
{desc = "4=Heli [Arm] (Arm+Telm)", file = "4_heli_arm.lua" },
{desc = "5=By switch", file = "5_by_switch.lua" },
{desc = "6=DLG [Vario] (Height)", file = "6_dlg.lua" },
{desc = "7=Glider [Vario] (mot+Arm+Height)", file = "7_glider.lua" },
}
}

-- for backward compatibility
local function getSwitchIds(key)
local OS_SWITCH_ID = {
Expand All @@ -21,27 +42,23 @@ end
local DEFAULT_MOTOR_CHANNEL_ID = getSourceIndex("CH3") or getSourceIndex("thr111") or getSwitchIds("CH3") -- motor_channel=CH3

local options = {
{ "triggerType" , CHOICE, 1 , triggerTypeDefs.labels},
{ "arm_switch_id" , SWITCH, "SF"..CHAR_UP}, -- CHAR_UP|-|CHAR_DOWN
{ "motor_channel" , SOURCE, DEFAULT_MOTOR_CHANNEL_ID },
{ "heli_mode" , BOOL, 0}, -- ignore motor direction detection, and throttle position
{ "text_color" , COLOR, YELLOW},--, COLOR_THEME_PRIMARY2 },
{ "min_flight_duration" , VALUE, default_flight_starting_duration, -30, 120 },
{ "enable_sounds" , BOOL, 1}, -- 0=no sound, 1=play blip sound on increment & on flight end
{ "use_telemetry" , BOOL, 1}, -- 0=do not use telemetry, 1=use telemetry in state machine
{ "auto_debug" , BOOL, 1}, -- show debug status on screen if widget is large enough
-- { "ground_on_switch" , BOOL, 0}, -- 0=auto detect ground by time, 1=ground on switch is used (not auto)
}

local function translate(name)
local translations = {
arm_switch_id="Arm Switch Position",
motor_channel="Motor Channel",
heli_mode="Heli mode (ignore motor ch)",
min_flight_duration = "Min flight duration (sec)",
text_color = "Text color",
enable_sounds = "Enable sounds",
use_telemetry = "Use telemetry",
-- ground_on_switch = "Ground on switch",
triggerType = "Type",
auto_debug = "Auto debug",
}
return translations[name]
Expand All @@ -50,7 +67,7 @@ end

local function create(zone, options)
-- print(string.format("1111 Flights create: %s", name))
tool = assert(loadScript("/WIDGETS/"..app_name.."/app.lua", "btd"))()
tool = assert(loadScript("/WIDGETS/"..app_name.."/app.lua", "btd"))(triggerTypeDefs)
return tool.create(zone, options)
end
local function update(wgt, options) return tool.update(wgt, options) end
Expand Down
Loading