Merge pull request #190 from mikeller/unload_data_init

Unloading MSP data initialiser after use.

Author: mikeller

src/SCRIPTS/BF/background.lua

@@ -1,12 +1,11 @@
 local INTERVAL          = 50         -- in 1/100th seconds
-local MSP_API_VERSION   = 1
+
 local MSP_TX_INFO       = 186
-local MSP_SET_RTC       = 246
 
 local lastRunTS
 local sensorId = -1
-local apiVersionReceived = false
-local timeIsSet = false
+local dataInitialised = false
+local data_init = nil
 
 local function getSensorValue()
     if sensorId == -1 then
@@ -26,64 +25,25 @@ local function init()
     lastRunTS = 0
 end
 
-local function processMspReply(cmd,rx_buf)
-    if cmd == nil or rx_buf == nil then
-        return
-    end
-    if cmd == MSP_API_VERSION and #(rx_buf) >= 3 then
-        apiVersion = rx_buf[2] + rx_buf[3] / 1000
-
-        apiVersionReceived = true
-    end
-end
-
 local function run_bg()
     -- run in intervals
     if lastRunTS == 0 or lastRunTS + INTERVAL < getTime() then
         local sensorValue = getSensorValue()
         if modelActive(sensorValue) then
             -- Send data when the telemetry connection is available
             -- assuming when sensor value higher than 0 there is an telemetry connection
-            if not apiVersionReceived then
-                protocol.mspRead(MSP_API_VERSION)
-
-                processMspReply(mspPollReply())
-            elseif apiVersionReceived and not timeIsSet then
-                -- only send datetime one time after telemetry connection became available
-                -- or when connection is restored after e.g. lipo refresh
-
-                if apiVersion >= 1.041 then
-                    -- format: seconds after the epoch (32) / milliseconds (16)
-                    local now = getRtcTime()
-
-                    values = {}
+            if not dataInitialised then
+                if data_init == nil then
+                    data_init = assert(loadScript(SCRIPT_HOME .. "/data_init.lua"))()
+                end
 
-                    for i = 1, 4 do
-                        values[i] = bit32.band(now, 0xFF)
-                        now = bit32.rshift(now, 8)
-                    end
+                dataInitialised = data_init.init();
 
-                    values[5] = 0 -- we don't have milliseconds
-                    values[6] = 0
-                else
-                    -- format: year (16) / month (8) / day (8) / hour (8) / min (8) / sec (8)
-                    local now = getDateTime()
-                    local year = now.year;
+                if dataInitialised then
+                    data_init = nil
 
-                    values = {}
-                    values[1] = bit32.band(year, 0xFF)
-                    year = bit32.rshift(year, 8)
-                    values[2] = bit32.band(year, 0xFF)
-                    values[3] = now.mon
-                    values[4] = now.day
-                    values[5] = now.hour
-                    values[6] = now.min
-                    values[7] = now.sec
+                    collectgarbage()
                 end
-
-                protocol.mspWrite(MSP_SET_RTC, values)
-
-                timeIsSet = true
             else
                 local rssi, alarm_low, alarm_crit = getRSSI()
                 -- Scale the [0, 85] (empirical) RSSI values to [0, 255]
@@ -98,8 +58,7 @@ local function run_bg()
                 protocol.mspWrite(MSP_TX_INFO, values)
             end
         else
-            apiVersionReceived = false
-            timeIsSet = false
+            dataInitialised = false
         end
 
         lastRunTS = getTime()

src/SCRIPTS/BF/data_init.lua

@@ -0,0 +1,64 @@
+local MSP_API_VERSION   = 1
+local MSP_SET_RTC       = 246
+
+local apiVersionReceived = false
+local timeIsSet = false
+
+local function processMspReply(cmd,rx_buf)
+    if cmd == nil or rx_buf == nil then
+        return
+    end
+    if cmd == MSP_API_VERSION and #(rx_buf) >= 3 then
+        apiVersion = rx_buf[2] + rx_buf[3] / 1000
+
+        apiVersionReceived = true
+    end
+end
+
+local function init()
+    if not apiVersionReceived then
+        protocol.mspRead(MSP_API_VERSION)
+
+        processMspReply(mspPollReply())
+    elseif apiVersionReceived and not timeIsSet then
+        -- only send datetime one time after telemetry connection became available
+        -- or when connection is restored after e.g. lipo refresh
+
+        if apiVersion >= 1.041 then
+            -- format: seconds after the epoch (32) / milliseconds (16)
+            local now = getRtcTime()
+
+            values = {}
+
+            for i = 1, 4 do
+                values[i] = bit32.band(now, 0xFF)
+                now = bit32.rshift(now, 8)
+            end
+
+            values[5] = 0 -- we don't have milliseconds
+            values[6] = 0
+        else
+            -- format: year (16) / month (8) / day (8) / hour (8) / min (8) / sec (8)
+            local now = getDateTime()
+            local year = now.year;
+
+            values = {}
+            values[1] = bit32.band(year, 0xFF)
+            year = bit32.rshift(year, 8)
+            values[2] = bit32.band(year, 0xFF)
+            values[3] = now.mon
+            values[4] = now.day
+            values[5] = now.hour
+            values[6] = now.min
+            values[7] = now.sec
+        end
+
+        protocol.mspWrite(MSP_SET_RTC, values)
+
+        timeIsSet = true
+    end
+
+    return apiVersionReceived and timeIsSet
+end
+
+return { init=init }