Skip to content

Commit a07dfb1

Browse files
authored
Telemetry script fixes after #254 (#259)
Telemetry script fixes after #254
2 parents 578e60b + cca694c commit a07dfb1

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

src/SCRIPTS/BF/ui.lua

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -291,10 +291,10 @@ function run_ui(event)
291291
-- if lastRunTS old than 500ms
292292
if lastRunTS + 50 < now then
293293
invalidatePages()
294-
if useMenu then
295-
currentState = pageStatus.mainMenu
296-
else
294+
if isTelemetryScript then
297295
currentState = pageStatus.display
296+
else
297+
currentState = pageStatus.mainMenu
298298
end
299299
end
300300
lastRunTS = now
@@ -353,11 +353,11 @@ function run_ui(event)
353353
currentState = pageStatus.editing
354354
end
355355
elseif event == EVT_VIRTUAL_EXIT then
356-
if useMenu then
357-
stopDisplay = true
358-
else
356+
if isTelemetryScript then
359357
return protocol.exitFunc();
360-
end
358+
else
359+
stopDisplay = true
360+
end
361361
end
362362
-- editing value
363363
elseif currentState == pageStatus.editing then
@@ -406,7 +406,7 @@ function run_ui(event)
406406
lcd.drawText(SaveBox.x+SaveBox.x_offset,SaveBox.y+SaveBox.h_offset,"Retrying",DBLSIZE + (globalTextOptions))
407407
end
408408
end
409-
if currentState == pageStatus.mainMenu and useMenu then
409+
if currentState == pageStatus.mainMenu and (not isTelemetryScript) then
410410
if event == EVT_VIRTUAL_EXIT then
411411
return 2
412412
elseif event == EVT_VIRTUAL_NEXT then
@@ -438,7 +438,7 @@ function run_ui(event)
438438
end
439439
end
440440
end
441-
if stopDisplay then
441+
if stopDisplay and (not isTelemetryScript) then
442442
currentState = pageStatus.mainMenu
443443
stopDisplay = false
444444
end

src/SCRIPTS/TELEMETRY/bf.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ local lastMenuEvent = 0
2020

2121
function run(event)
2222
lastMenuEvent = getTime()
23-
2423
run_ui(event)
2524
end
2625

src/SCRIPTS/TOOLS/bf.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ local toolName = "TNS|Betaflight setup|TNE"
22
SCRIPT_HOME = "/SCRIPTS/BF"
33

44
apiVersion = 0
5-
useMenu = true
5+
isTelemetryScript = false
66

77
protocol = assert(loadScript(SCRIPT_HOME.."/protocols.lua"))()
88
radio = assert(loadScript(SCRIPT_HOME.."/radios.lua"))()

0 commit comments

Comments
 (0)