tidy-up and cms screen buffer logic fix

Author: codecae

src/SCRIPTS/BF/CMS/common.lua

@@ -1,4 +1,4 @@
-local _ = {
+local CONST = {
     bitmask = {
         firstChunk = 0x80,
         lastChunk = 0x40,
@@ -17,16 +17,16 @@ local function cRleDecode(buf)
     local dest = {}
     local rpt = false
     local c = nil
-    for i=1, #buf do
+    for i = 1, #buf do
         if (rpt == false) then
-            c = bit32.band(buf[i], _.bitmask.rleCharValueMask)
-            if (bit32.band(buf[i], _.bitmask.rleCharRepeatedMask) > 0) then
+            c = bit32.band(buf[i], CONST.bitmask.rleCharValueMask)
+            if (bit32.band(buf[i], CONST.bitmask.rleCharRepeatedMask) > 0) then
                 rpt = true
             else
                 dest[#dest + 1] = c
             end
         else
-            for j=1, buf[i] do
+            for j = 1, buf[i] do
                 dest[#dest + 1] = c
             end
             rpt = false
@@ -48,15 +48,15 @@ screen = {
         screen.sequence = 0
     end,
     draw = function()
-        if (#screen.buffer ~= nil and screen.config ~= nil and #screen.buffer > 0) then
+        if (screen.buffer ~= nil and screen.config ~= nil and #screen.buffer > 0) then
             lcd.clear()
-            for char=1,#screen.buffer do
+            for char = 1, #screen.buffer do
                 if (screen.buffer[char] ~= 32) then -- skip spaces to avoid CPU spikes
                     c = string.char(screen.buffer[char])
-                    row = math.ceil(char/screen.config.cols)
-                    col = char-((row-1)*screen.config.cols)
-                    xPos = ((col-1)*screen.config.pixelsPerChar)+screen.config.xIndent+1
-                    yPos = ((row-1)*screen.config.pixelsPerRow)+screen.config.yOffset+1
+                    row = math.ceil(char / screen.config.cols)
+                    col = char - ((row - 1) * screen.config.cols)
+                    xPos = ((col - 1) * screen.config.pixelsPerChar) + screen.config.xIndent + 1
+                    yPos = ((row - 1) * screen.config.pixelsPerRow) + screen.config.yOffset + 1
                     lcd.drawText(xPos, yPos, c, screen.config.textSize)
                 end
             end
@@ -86,13 +86,13 @@ cms = {
     update = function()
         local command, data = protocol.cms.poll()
         if (command == "update") then
-            local firstChunk = bit32.band(data[_.offset.meta], _.bitmask.firstChunk)
-            local lastChunk = bit32.band(data[_.offset.meta], _.bitmask.lastChunk)
-            local batchId = bit32.band(data[_.offset.meta], _.bitmask.batchId)
-            local sequence  = data[_.offset.sequence]
+            local firstChunk = bit32.band(data[CONST.offset.meta], CONST.bitmask.firstChunk)
+            local lastChunk = bit32.band(data[CONST.offset.meta], CONST.bitmask.lastChunk)
+            local batchId = bit32.band(data[CONST.offset.meta], CONST.bitmask.batchId)
+            local sequence  = data[CONST.offset.sequence]
             local frameData = {}
-            for i=_.offset.data, #data do
-                frameData[#frameData+1] = data[i]
+            for i = CONST.offset.data, #data do
+                frameData[#frameData + 1] = data[i]
             end
             if (firstChunk ~= 0) then
                 screen.reset()
@@ -101,7 +101,7 @@ cms = {
             end
             if (screen.batchId == batchId) and (screen.sequence == sequence) then
                 screen.sequence = sequence + 1
-                for i=1,#frameData do
+                for i = 1, #frameData do
                     screen.data[#screen.data + 1] = frameData[i]
                 end
                 if (lastChunk ~= 0) then

src/SCRIPTS/BF/CMS/crsf.lua

@@ -1,4 +1,4 @@
-local _ = {
+local CONST = {
     frame = {
         destination = 1,
         source = 2,
@@ -22,43 +22,43 @@ local _ = {
 }
 
 local function crsfDisplayPortCmd(cmd, data)
-    local payloadOut = { _.address.betaflight, _.address.transmitter, cmd }
+    local payloadOut = { CONST.address.betaflight, CONST.address.transmitter, cmd }
     if data ~= nil then
-        for i=1,#(data) do
-            payloadOut[3+i] = data[i]
+        for i = 1, #(data) do
+            payloadOut[3 + i] = data[i]
         end
     end
-    return crossfireTelemetryPush(_.frameType.displayPort, payloadOut) 
+    return crossfireTelemetryPush(CONST.frameType.displayPort, payloadOut) 
 end
 
 protocol.cms.poll = function()
     local command = nil
     local dataOut = {}
     local frameType, data = crossfireTelemetryPop()
     if (data ~= nil) and (#data > 2) then
-        if (frameType == _.frameType.displayPort) and (data[_.frame.destination] == _.address.transmitter) and (data[_.frame.source] == _.address.betaflight) then
-            for k,v in pairs(_.command) do
-                if (v == data[_.frame.command]) then
+        if (frameType == CONST.frameType.displayPort) and (data[CONST.frame.destination] == CONST.address.transmitter) and (data[CONST.frame.source] == CONST.address.betaflight) then
+            for k,v in pairs(CONST.command) do
+                if (v == data[CONST.frame.command]) then
                     command = k
                 end
             end
-            for i=_.frame.content, #data do
-                dataOut[#dataOut+1] = data[i]
+            for i = CONST.frame.content, #data do
+                dataOut[#dataOut + 1] = data[i]
             end
         end
     end
     return command, dataOut
 end
 
 protocol.cms.open = function(rows, cols) 
-    return crsfDisplayPortCmd(_.command.open, { rows, cols })
+    return crsfDisplayPortCmd(CONST.command.open, { rows, cols })
 end
 
 protocol.cms.close = function()
-    return crsfDisplayPortCmd(_.command.close, nil)
+    return crsfDisplayPortCmd(CONST.command.close, nil)
 end
 
 protocol.cms.refresh = function()
-    return crsfDisplayPortCmd(_.command.refresh, nil)
+    return crsfDisplayPortCmd(CONST.command.refresh, nil)
 end
 

src/SCRIPTS/FUNCTIONS/bfbkgd.lua

@@ -1,7 +1,7 @@
 chdir("/SCRIPTS/BF")
 apiVersion = 0
 protocol = assert(loadScript("protocols.lua"))()
-assert(loadScript(protocol.transport))()
+assert(loadScript(protocol.mspTransport))()
 assert(loadScript("MSP/common.lua"))()
 local background = assert(loadScript("background.lua"))()