Skip to content

X20rs map toggle #306

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

Open
typicalaimster wants to merge 2 commits into
base: master
Choose a base branch
from
Open

X20rs map toggle #306

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d63d37d
add switches
typicalaimster May 9, 2026
5c9b943
Merge remote-tracking branch 'origin/master' into x20rs-map-toggle
typicalaimster Jun 10, 2026
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
39 changes: 30 additions & 9 deletions ETHOS/c800x480/SD/scripts/yaaputelemetry/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ local status = {
mapTrailDots = 10,
enableMapGrid = true,
screenToggleChannelId = 0,
screenToggleSource = nil,
screenWheelChannelId = 0,
screenWheelChannelDelay = 20,
gpsFormat = 2, -- decimal
Expand Down Expand Up @@ -321,6 +322,7 @@ local status = {
showMinMaxValues = false,
-- maps
screenTogglePage = 1,
activeScreen = 1,
mapZoomLevel = 19,
-- flightmode
strFlightMode = nil,
Expand Down Expand Up @@ -1052,9 +1054,9 @@ local function paint(widget)
lcd.pen(SOLID)

local now = getTime()
if status.lastScreen ~= widget.screen then
if status.lastScreen ~= status.activeScreen then
onScreenChange(widget)
status.lastScreen = widget.screen
status.lastScreen = status.activeScreen
end

if not checkSize(widget) then
Expand All @@ -1069,13 +1071,13 @@ local function paint(widget)
else
lcd.color(status.colors.background)
lcd.drawFilledRectangle(0,0,800,480)
status.layout[widget.screen].draw(widget)
status.layout[status.activeScreen].draw(widget)

if status.layout[widget.screen].showArmingStatus == true then
if status.layout[status.activeScreen].showArmingStatus == true then
libs.drawLib.drawArmingStatus(widget)
end

if status.layout[widget.screen].showFailsafe == true then
if status.layout[status.activeScreen].showFailsafe == true then
libs.drawLib.drawFailsafe(widget)
end
end
Expand Down Expand Up @@ -1126,7 +1128,7 @@ local function event(widget, category, value, x, y)
local kill = false
if category == EVT_TOUCH then
--and value == TOUCH_ENTER
if widget.screen == 1 and value == 16641 then
if status.activeScreen == 1 and value == 16641 then
kill = true
-- main view
if y < 480*0.73 then
Expand All @@ -1139,7 +1141,7 @@ local function event(widget, category, value, x, y)
status.showMessages = true
end
end
elseif widget.screen == 2 and value == 16641 then
elseif status.activeScreen == 2 and value == 16641 then
kill = true
if libs.drawLib.isInside(x, y, 800*0.625, 0,800, 480/2) == true then
status.mapZoomLevel = math.min(status.conf.mapZoomMax, status.mapZoomLevel+1)
Expand All @@ -1148,7 +1150,7 @@ local function event(widget, category, value, x, y)
else
kill = false
end
elseif widget.screen == 3 then
elseif status.activeScreen == 3 then
end
end
if kill then
Expand All @@ -1162,7 +1164,7 @@ end
local function menu(widget)
local startStopLabel = "Yaapu: "..(status.pauseTelemetry == false and "Pause widget" or "Start widget")

if widget.screen == 2 then
if status.activeScreen == 2 then
return {
{ "Yaapu: Zoom in", function() status.mapZoomLevel = math.min(status.conf.mapZoomMax, status.mapZoomLevel+1) end},
{ "Yaapu: Zoom out", function() status.mapZoomLevel = math.max(status.conf.mapZoomMin, status.mapZoomLevel-1) end},
Expand Down Expand Up @@ -1208,10 +1210,23 @@ local function wakeup(widget)
bgtasks(widget)
end

if status.conf.screenToggleSource ~= nil then
local v = status.conf.screenToggleSource:value()
if v ~= nil and v > 600 then
status.activeScreen = 2
else
status.activeScreen = widget.screen
end
else
status.activeScreen = widget.screen
end

if not widget.ready or status.layout[widget.screen] == nil then
loadLayout(widget);
end
if status.layout[status.activeScreen] == nil then
status.layout[status.activeScreen] = loadLib(status.layoutFilenames[status.activeScreen])
end

--[[
print("=========================")
Expand Down Expand Up @@ -1333,6 +1348,10 @@ local function configure(widget)
widget.rightPanelField:enable(widget.screen == 1)
end
);
line = form.addLine("Screen toggle channel")
form.addSourceField(line, form.getFieldSlots(line)[0],
function() return status.conf.screenToggleSource end,
function(value) status.conf.screenToggleSource = value end)
-- Center
line = form.addLine("Center Panel")
widget.centerPanelField = form.addChoiceField(line, form.getFieldSlots(line)[0], {{"default",1}}, function() return widget.centerPanelIndex end, function(value) widget.centerPanelIndex = value end);
Expand Down Expand Up @@ -1661,6 +1680,7 @@ local function read(widget)
status.conf.gpsSource = storageToConfig("gpsSource", nil)
status.conf.languageId = storageToConfig("language", nil)
status.conf.mapTilesStorage = storageToConfig("mapTilesStorage", nil)
status.conf.screenToggleSource = storage.read("screenToggleSource")
-- apply config
applyConfig()
end
Expand Down Expand Up @@ -1716,6 +1736,7 @@ local function write(widget)
storage.write("gpsSource", status.conf.gpsSource)
storage.write("language", status.conf.languageId)
storage.write("mapTilesStorage", status.conf.mapTilesStorage)
storage.write("screenToggleSource", status.conf.screenToggleSource)
-- apply config
applyConfig()

Expand Down