Skip to content
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

Jump to bottom

SoarETX for 2.8 #88

Merged
merged 4 commits into from
Nov 24, 2022
Merged

SoarETX for 2.8 #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
232e7c9
Workaround for the bug sending EVT_VIRTUAL_ENTER_LONG to Lua during s…
jfrickmann Nov 21, 2022
f497425
Adjustment to different space character width in ETX 2.8
jfrickmann Nov 21, 2022
e5aac77
Moved battery check to main, because of bug in ETX not running top ba…
jfrickmann Nov 21, 2022
758df2f
It seems like it is using a stale sensor ID after model change, so up…
jfrickmann Nov 22, 2022
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
8 changes: 6 additions & 2 deletions sdcard/c480x272/WIDGETS/LibGUI/libgui.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
-- The dynamically loadable part of the shared Lua GUI library. --
-- --
-- Author: Jesper Frickmann --
-- Date: 2022-05-05 --
-- Version: 1.0.1 --
-- Date: 2022-11-20 --
-- Version: 1.0.2 --
-- --
-- Copyright (C) EdgeTX --
-- --
Expand Down Expand Up @@ -292,6 +292,10 @@ function lib.newGUI()
event = EVT_TOUCH_TAP
end
end
-- ETX 2.8 rc 4 bug fix
if scrolling and event == EVT_VIRTUAL_ENTER_LONG then
return
end
-- If we put a finger down on a menu item and immediately slide, then we can scroll
if event == EVT_TOUCH_SLIDE then
if not scrolling then
Expand Down
45 changes: 2 additions & 43 deletions sdcard/c480x272/WIDGETS/SoarETX/1/battery.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
-- SoarETX, loadable component --
-- --
-- Author: Jesper Frickmann --
-- Date: 2022-02-17 --
-- Version: 1.0.0 --
-- Date: 2022-11-21 --
-- Version: 1.0.1 --
-- --
-- Copyright (C) EdgeTX --
-- --
Expand All @@ -21,48 +21,7 @@

local widget, soarGlobals = ...

-- Battery variables
local rxBatSrc
local rxBatNxtWarn = 0

local function getWarningLevel()
return 0.1 * (soarGlobals.getParameter(soarGlobals.batteryParameter) + 100)
end

function widget.background()
local now = getTime()

-- Receiver battery
if not rxBatSrc then
rxBatSrc = getFieldInfo("Cels")
if not rxBatSrc then rxBatSrc = getFieldInfo("RxBt") end
if not rxBatSrc then rxBatSrc = getFieldInfo("A1") end
if not rxBatSrc then rxBatSrc = getFieldInfo("A2") end
end

if rxBatSrc then
soarGlobals.battery = getValue(rxBatSrc.id)

if type(soarGlobals.battery) == "table" then
for i = 2, #soarGlobals.battery do
soarGlobals.battery[1] = math.min(soarGlobals.battery[1], soarGlobals.battery[i])
end
soarGlobals.battery = soarGlobals.battery[1]
end
end

-- Warn about low receiver battery or Rx off
if now > rxBatNxtWarn and soarGlobals.battery > 0 and soarGlobals.battery < getWarningLevel() then
playHaptic(200, 0, 1)
playFile("lowbat.wav")
playNumber(10 * soarGlobals.battery + 0.5, 1, PREC1)
rxBatNxtWarn = now + 2000
end
end -- background()

function widget.refresh(event, touchState)
widget.background()

if event then
lcd.exitFullScreen()
end
Expand Down
12 changes: 6 additions & 6 deletions sdcard/c480x272/WIDGETS/SoarETX/1/f3k.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
-- SoarETX F3K score keeper, loadable component --
-- --
-- Author: Jesper Frickmann --
-- Date: 2022-03-08 --
-- Version: 1.0.0 --
-- Date: 2022-11-20 --
-- Version: 1.0.1 --
-- --
-- Copyright (C) EdgeTX --
-- --
Expand Down Expand Up @@ -631,7 +631,7 @@ function libGUI.widgetRefresh()
for i = 1, taskScores do
lcd.drawText(COL1, y, string.format("%i.", i), colors.primary1 + DBLSIZE)
if i > #scores then
lcd.drawText(COL2, y, " - - -", colors.primary1 + DBLSIZE)
lcd.drawText(COL2, y, "- - -", colors.primary1 + DBLSIZE)
else
lcd.drawTimer(COL2, y, scores[i], colors.primary1 + DBLSIZE)
end
Expand Down Expand Up @@ -918,14 +918,14 @@ do -- Setup score keeper screen for F3K and Practice tasks

local s = screenTask.timer(LEFT + 40, y, 60, HEIGHT, 0, nil)
s.disabled = true
s.value = " - - -"
s.value = "- - -"
screenTask.scores[i] = s

-- Modify timer's draw function to insert score value
local draw = s.draw
function s.draw(idx)
if i > #scores then
screenTask.scores[i].value = " - - -"
screenTask.scores[i].value = "- - -"
else
screenTask.scores[i].value = scores[i]
end
Expand Down Expand Up @@ -1124,7 +1124,7 @@ do -- Setup score browser screen
lcd.drawText(x, y, j .. ".")

if j > #record.scores then
lcd.drawText(x + 18, y, " - - -")
lcd.drawText(x + 18, y, "- - -")
elseif record.unitStr == "s" then
lcd.drawTimer(x + 18, y, record.scores[j])
else
Expand Down
46 changes: 44 additions & 2 deletions sdcard/c480x272/WIDGETS/SoarETX/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
-- SoarETX widget --
-- --
-- Author: Jesper Frickmann --
-- Date: 2022-02-08 --
-- Version: 1.0.0 --
-- Date: 2022-11-22 --
-- Version: 1.0.1 --
-- --
-- Copyright (C) EdgeTX --
-- --
Expand All @@ -23,8 +23,48 @@ local options = {
{ "Version", VALUE, 1, 1, 99 },
{ "FileName", STRING, "" }
}

local soarGlobals

-- Battery - moved here from battery.lua because of bugs in ETX not calling background() on topbar widgets
local rxBatNxtWarn = 0
local rxBatNxtCheck = 0

function rxBatCheck()
local now = getTime()

if now < rxBatNxtCheck then
return
end

rxBatNxtCheck = now + 100

local rxBatSrc = getFieldInfo("Cels")
if not rxBatSrc then rxBatSrc = getFieldInfo("RxBt") end
if not rxBatSrc then rxBatSrc = getFieldInfo("A1") end
if not rxBatSrc then rxBatSrc = getFieldInfo("A2") end

if rxBatSrc then
soarGlobals.battery = getValue(rxBatSrc.id)

if type(soarGlobals.battery) == "table" then
for i = 2, #soarGlobals.battery do
soarGlobals.battery[1] = math.min(soarGlobals.battery[1], soarGlobals.battery[i])
end
soarGlobals.battery = soarGlobals.battery[1]
end
end

-- Warn about low receiver battery
local rxBatMin = 0.1 * (soarGlobals.getParameter(soarGlobals.batteryParameter) + 100)
if now > rxBatNxtWarn and soarGlobals.battery > 0 and soarGlobals.battery < rxBatMin then
playHaptic(200, 0, 1)
playFile("lowbat.wav")
playNumber(10 * soarGlobals.battery + 0.5, 1, PREC1)
rxBatNxtWarn = now + 2000
end
end -- rxBatCheck()

-- Load a Lua component dynamically based on option values
local function Load(widget)
local chunk, errMsg = loadScript(soarGlobals.path .. widget.options.Version .. "/" .. widget.options.FileName .. ".lua")
Expand Down Expand Up @@ -109,6 +149,8 @@ local function refresh(widget, event, touchState)
end

local function background(widget)
rxBatCheck()

if widget.background then
widget.background()
end
Expand Down