From 9eeb8f38cc9b5c884e47d6a63efbed6c316d5578 Mon Sep 17 00:00:00 2001 From: Hans Christian Olaussen <41271048+klutvott123@users.noreply.github.com> Date: Sat, 25 Jan 2020 22:23:15 +0100 Subject: [PATCH] Remove TELEMETRY script Removes the telemetry version of the script. bf.lua still exists but only displays a message telling the user to use the TOOLS version instead. bf.lua should be removed from the TELEMETRY folder at a later time. --- src/SCRIPTS/BF/protocols.lua | 2 -- src/SCRIPTS/BF/ui.lua | 41 ++++++++---------------------------- src/SCRIPTS/TELEMETRY/bf.lua | 39 +++------------------------------- src/SCRIPTS/TOOLS/bf.lua | 2 -- 4 files changed, 12 insertions(+), 72 deletions(-) diff --git a/src/SCRIPTS/BF/protocols.lua b/src/SCRIPTS/BF/protocols.lua index 270d4ce1..4c409bed 100644 --- a/src/SCRIPTS/BF/protocols.lua +++ b/src/SCRIPTS/BF/protocols.lua @@ -4,7 +4,6 @@ local supportedProtocols = { transport = SCRIPT_HOME.."/MSP/sp.lua", rssi = function() return getValue("RSSI") end, - exitFunc = function() return 0 end, stateSensor = "Tmp1", push = sportTelemetryPush, maxTxBufferSize = 6, @@ -16,7 +15,6 @@ local supportedProtocols = { transport = SCRIPT_HOME.."/MSP/crsf.lua", rssi = function() return getValue("TQly") end, - exitFunc = function() return "/CROSSFIRE/crossfire.lua" end, stateSensor = "1RSS", push = crossfireTelemetryPush, maxTxBufferSize = 8, diff --git a/src/SCRIPTS/BF/ui.lua b/src/SCRIPTS/BF/ui.lua index 17aff567..8ec04c9e 100644 --- a/src/SCRIPTS/BF/ui.lua +++ b/src/SCRIPTS/BF/ui.lua @@ -29,9 +29,7 @@ local saveTimeout = 0 local saveRetries = 0 local saveMaxRetries = 0 local popupMenuActive = false -local lastRunTS = 0 local killEnterBreak = 0 -local stopDisplay = false local pageScrollY = 0 local mainMenuScrollY = 0 local PageFiles = nil @@ -273,13 +271,6 @@ local function drawPopupMenu() end local function run_ui(event) - local now = getTime() - -- if lastRunTS old than 500ms - if lastRunTS + 50 < now then - invalidatePages() - uiState = uiStatus.init - end - lastRunTS = now if uiState == uiStatus.init then local yMinLim = radio.yMinLimit lcd.clear() @@ -295,11 +286,7 @@ local function run_ui(event) background = nil PageFiles = assert(loadScript("/SCRIPTS/BF/pages.lua"))() invalidatePages() - if isTelemetryScript then - uiState = uiStatus.pages - else - uiState = uiStatus.mainMenu - end + uiState = uiStatus.mainMenu end elseif uiState == uiStatus.mainMenu then if event == EVT_VIRTUAL_EXIT then @@ -336,7 +323,7 @@ local function run_ui(event) end elseif uiState == uiStatus.pages then if (pageState == pageStatus.saving) then - if (saveTS + saveTimeout < now) then + if (saveTS + saveTimeout < getTime()) then if saveRetries < saveMaxRetries then saveSettings() else @@ -347,10 +334,7 @@ local function run_ui(event) end end -- navigation - if isTelemetryScript and event == EVT_VIRTUAL_MENU_LONG then -- telemetry script - popupMenuActive = 1 - pageState = pageStatus.popupMenu - elseif (not isTelemetryScript) and event == EVT_VIRTUAL_ENTER_LONG then -- standalone + if event == EVT_VIRTUAL_ENTER_LONG then popupMenuActive = 1 killEnterBreak = 1 pageState = pageStatus.popupMenu @@ -372,10 +356,10 @@ local function run_ui(event) end -- normal page viewing elseif pageState <= pageStatus.display then - if not isTelemetryScript and event == EVT_VIRTUAL_PREV_PAGE then + if event == EVT_VIRTUAL_PREV_PAGE then incPage(-1) killEvents(event) -- X10/T16 issue: pageUp is a long press - elseif (not isTelemetryScript and event == EVT_VIRTUAL_NEXT_PAGE) or (isTelemetryScript and event == EVT_VIRTUAL_MENU) then + elseif event == EVT_VIRTUAL_NEXT_PAGE then incPage(1) elseif event == EVT_VIRTUAL_PREV or event == EVT_VIRTUAL_PREV_REPT then incField(-1) @@ -389,11 +373,10 @@ local function run_ui(event) end end elseif event == EVT_VIRTUAL_EXIT then - if isTelemetryScript then - return protocol.exitFunc(); - else - stopDisplay = true - end + invalidatePages() + currentField = 1 + uiState = uiStatus.mainMenu + return 0 end -- editing value elseif pageState == pageStatus.editing then @@ -433,12 +416,6 @@ local function run_ui(event) lcd.drawText(radio.SaveBox.x+radio.SaveBox.x_offset,radio.SaveBox.y+radio.SaveBox.h_offset,"Retrying",DBLSIZE + (globalTextOptions)) end end - if stopDisplay and (not isTelemetryScript) then - invalidatePages() - currentField = 1 - uiState = uiStatus.mainMenu - stopDisplay = false - end end -- process send queue mspProcessTxQ() diff --git a/src/SCRIPTS/TELEMETRY/bf.lua b/src/SCRIPTS/TELEMETRY/bf.lua index 48254f30..3b931cfd 100644 --- a/src/SCRIPTS/TELEMETRY/bf.lua +++ b/src/SCRIPTS/TELEMETRY/bf.lua @@ -1,39 +1,6 @@ -SCRIPT_HOME = "/SCRIPTS/BF" - -apiVersion = 0 -isTelemetryScript = true - -protocol = assert(loadScript(SCRIPT_HOME.."/protocols.lua"))() -radio = assert(loadScript(SCRIPT_HOME.."/radios.lua"))() - -assert(loadScript(SCRIPT_HOME.."/pages.lua"))() -assert(loadScript(protocol.transport))() -assert(loadScript(SCRIPT_HOME.."/MSP/common.lua"))() - -local run_ui = assert(loadScript(SCRIPT_HOME.."/ui.lua"))() -local background = assert(loadScript(SCRIPT_HOME.."/background.lua"))() - -local MENU_TIMESLICE = 100 - -local lastMenuEvent = 0 - local function run(event) - if background then - background = nil - collectgarbage() - end - lastMenuEvent = getTime() - run_ui(event) -end - -local function run_bg() - if lastMenuEvent + MENU_TIMESLICE < getTime() then - if not background then - background = assert(loadScript(SCRIPT_HOME.."/background.lua"))() - collectgarbage() - end - background() - end + lcd.clear() + lcd.drawText(2, 2, "Use TOOLS menu instead of this") end -return { run=run, background=run_bg } +return { run=run } diff --git a/src/SCRIPTS/TOOLS/bf.lua b/src/SCRIPTS/TOOLS/bf.lua index fdbdd054..c6f4d57d 100644 --- a/src/SCRIPTS/TOOLS/bf.lua +++ b/src/SCRIPTS/TOOLS/bf.lua @@ -2,12 +2,10 @@ local toolName = "TNS|Betaflight setup|TNE" SCRIPT_HOME = "/SCRIPTS/BF" apiVersion = 0 -isTelemetryScript = false protocol = assert(loadScript(SCRIPT_HOME.."/protocols.lua"))() radio = assert(loadScript(SCRIPT_HOME.."/radios.lua"))() -assert(loadScript(SCRIPT_HOME.."/pages.lua"))() assert(loadScript(protocol.transport))() assert(loadScript(SCRIPT_HOME.."/MSP/common.lua"))()