Merge branch 'unified-lua-lsp-strings' into unified-lua-lsp

Author: jurgelenas

src/SCRIPTS/TOOLS/ExpressLRS/protocol.lua

@@ -420,7 +420,7 @@ function Protocol.fieldFloatLoad(field, data, offset)
     field.prec = 3
   end
   field.step = Protocol.fieldGetValue(data, offset + 17, 4)
-  field.fmt = shim.tableConcat({ "%.", tostring(field.prec), "f", field.unit or "" })
+  field.fmt = shim.tableConcat({ "%.", tostring(field.prec), "f" })
   field.prec = 10 ^ field.prec
 end
 
@@ -483,6 +483,23 @@ function Protocol.fieldIntSave(field)
   Protocol.push(Protocol.CRSF.FRAMETYPE_PARAMETER_WRITE, frame)
 end
 
+function Protocol.fieldStringSave(field)
+  local frame = { Protocol.deviceId, Protocol.handsetId, field.id }
+  local val = field.value or ""
+  local maxlen = field.maxlen or 32
+  if #val > maxlen then
+    val = string.sub(val, 1, maxlen)
+  end
+  for i = 1, #val do
+    local b = string.byte(val, i)
+    if b ~= 0 then
+      frame[#frame + 1] = b
+    end
+  end
+  frame[#frame + 1] = 0
+  Protocol.push(Protocol.CRSF.FRAMETYPE_PARAMETER_WRITE, frame)
+end
+
 -- ============================================================================
 -- Related fields reload (for value changes)
 -- ============================================================================
@@ -575,7 +592,7 @@ Protocol.handlers = {
   [Protocol.CRSF.INT64 + 1] = nil,
   [Protocol.CRSF.FLOAT + 1] = { load = Protocol.fieldFloatLoad, save = Protocol.fieldIntSave },
   [Protocol.CRSF.TEXT_SELECTION + 1] = { load = Protocol.fieldTextSelLoad, save = Protocol.fieldIntSave },
-  [Protocol.CRSF.STRING + 1] = { load = Protocol.fieldStringLoad, save = nil },
+  [Protocol.CRSF.STRING + 1] = { load = Protocol.fieldStringLoad, save = Protocol.fieldStringSave },
   [Protocol.CRSF.FOLDER + 1] = { load = Protocol.fieldFolderLoad, save = nil },
   [Protocol.CRSF.INFO + 1] = { load = Protocol.fieldStringLoad, save = nil },
   [Protocol.CRSF.COMMAND + 1] = { load = Protocol.fieldCommandLoad, save = Protocol.handleCommandSave },

src/SCRIPTS/TOOLS/ExpressLRS/ui/lcd.lua

@@ -378,7 +378,7 @@ local function fieldIntDisplay(field, y, attr)
 end
 
 local function fieldFloatDisplay(field, y, attr)
-  lcd.drawText(UI.COL2, y, string.format(field.fmt, field.value / field.prec), attr)
+  lcd.drawText(UI.COL2, y, string.format(field.fmt, field.value / field.prec) .. (field.unit or ""), attr)
 end
 
 local function fieldTextSelDisplay(field, y, attr)

src/SCRIPTS/TOOLS/ExpressLRS/ui/lvgl.lua

@@ -730,6 +730,7 @@ end
 
 local IS_NARROW = LCD_W < 400
 local LABEL_PCT = lvgl.PERCENT_SIZE + (IS_NARROW and 42 or 50)
+local VALUE_PCT = lvgl.PERCENT_SIZE + (IS_NARROW and 58 or 50)
 
 function UI.createToggleRow(pg, field)
   pg:setting({
@@ -830,54 +831,108 @@ function UI.createChoiceRow(pg, field)
 end
 
 function UI.createNumberRow(pg, field)
+  local isFloat = field.type == Protocol.CRSF.FLOAT
+  local numberEdit = {
+    type = lvgl.NUMBER_EDIT,
+    min = field.min or 0,
+    max = field.max or 255,
+    get = function()
+      return field.value or 0
+    end,
+    set = function(val)
+      field.value = val
+    end,
+    edited = function(val)
+      field.value = val
+      Protocol.fieldIntSave(field)
+      Protocol.reloadParentFolder(field)
+    end,
+    display = function(val)
+      if isFloat then
+        return string.format(field.fmt or "%.0f", val / (field.prec or 1))
+      end
+      return tostring(val)
+    end,
+    active = function()
+      return not field.disabled
+    end,
+  }
+
+  local children
+  if field.unit then
+    children = {
+      {
+        type = lvgl.BOX,
+        x = LABEL_PCT,
+        flexFlow = lvgl.FLOW_ROW,
+        flexPad = lvgl.PAD_MEDIUM,
+        align = LEFT,
+        children = {
+          numberEdit,
+          {
+            type = lvgl.BOX,
+            h = lvgl.UI_ELEMENT_HEIGHT,
+            children = {
+              {
+                type = lvgl.LABEL,
+                y = lvgl.PAD_MEDIUM,
+                text = field.unit,
+              },
+            },
+          },
+        },
+      },
+    }
+  else
+    numberEdit.x = LABEL_PCT
+    children = { numberEdit }
+  end
+
+  pg:setting({
+    w = lvgl.PERCENT_SIZE + 100,
+    title = field.name,
+    children = children,
+  })
+end
+
+function UI.createInfoRow(pg, field)
   pg:build({
     {
       type = lvgl.SETTING,
       w = lvgl.PERCENT_SIZE + 100,
       title = field.name,
       children = {
         {
-          type = lvgl.NUMBER_EDIT,
+          type = lvgl.LABEL,
           x = LABEL_PCT,
-          min = field.min or 0,
-          max = field.max or 255,
-          get = function()
-            return field.value or 0
-          end,
-          set = function(val)
-            field.value = val
-          end,
-          edited = function(val)
-            field.value = val
-            Protocol.fieldIntSave(field)
-            Protocol.reloadParentFolder(field)
-          end,
-          display = function(val)
-            if field.type == Protocol.CRSF.FLOAT then
-              return string.format(field.fmt or "%.0f", val / (field.prec or 1))
-            end
-            return table.concat({ tostring(val), field.unit or "" })
-          end,
-          active = function()
-            return not field.disabled
-          end,
+          text = field.value,
         },
       },
     },
   })
 end
 
-function UI.createInfoRow(pg, field)
+function UI.createStringRow(pg, field)
   pg:build({
     {
       type = lvgl.SETTING,
       w = lvgl.PERCENT_SIZE + 100,
       title = field.name,
       children = {
         {
-          type = lvgl.LABEL,
+          type = lvgl.TEXT_EDIT,
           x = LABEL_PCT,
-          text = field.value,
+          w = VALUE_PCT,
+          value = field.value or "",
+          length = math.min(math.max(field.maxlen or 32, 32), 128),
+          set = function(val)
+            field.value = val
+            Protocol.fieldStringSave(field)
+            Protocol.reloadParentFolder(field)
+          end,
+          active = function()
+            return not field.disabled
+          end,
         },
       },
     },
@@ -932,7 +987,11 @@ function UI.buildFieldWidget(pg, field, folderWidth)
     end
   end
 
-  if fieldType == Protocol.CRSF.STRING or fieldType == Protocol.CRSF.INFO then
+  if fieldType == Protocol.CRSF.STRING then
+    return UI.createStringRow(pg, field)
+  end
+
+  if fieldType == Protocol.CRSF.INFO then
     return UI.createInfoRow(pg, field)
   end
 end

test/SCRIPTS/CRSFSimulator/csrfsimulator.lua

@@ -296,9 +296,11 @@ local function encodeParameterEntry(device, param, _chunk, destAddr)
       end
     end
     data[#data + 1] = 0xFF -- terminator
-  elseif t == CRSF.INFO or t == CRSF.STRING then
-    -- INFO (read-only) and STRING (editable) both encode as null-terminated string
+  elseif t == CRSF.INFO then
     appendString(data, param.value or "")
+  elseif t == CRSF.STRING then
+    appendString(data, param.value or "")
+    data[#data + 1] = param.maxlen or 32
   elseif t == CRSF.UINT8 then
     -- value, min, max (1 byte each)
     data[#data + 1] = param.value or 0
@@ -381,7 +383,7 @@ local txDevice = {
   serialNo = CRSF.ELRS_SERIAL_ID,
   hwVer = 0,
   swVer = 0x00030500, -- 3.5.0
-  fieldCount = 21, -- total parameter count
+  fieldCount = 23, -- total parameter count
   params = {
     {
       id = 1,
@@ -533,11 +535,36 @@ local txDevice = {
       info = "",
     },
 
+    -- Editable string field
+    {
+      id = 20,
+      parent = 0,
+      type = CRSF.STRING,
+      name = "Bind Phrase",
+      value = "default",
+      maxlen = 16,
+    },
+
+    -- Float field (scaled integer with precision)
+    {
+      id = 21,
+      parent = 0,
+      type = CRSF.FLOAT,
+      name = "Freq Offset",
+      value = 0,
+      min = -5000,
+      max = 5000,
+      default = 0,
+      prec = 2,
+      step = 1,
+      units = "kHz",
+    },
+
     -- Bad/Good (hidden from ELRS Lua, visible to other UIs)
-    { id = 20, parent = 0, type = CRSF.INFO, name = "Bad/Good", value = "0/250", hidden = true },
+    { id = 22, parent = 0, type = CRSF.INFO, name = "Bad/Good", value = "0/250", hidden = true },
 
     -- Version + regulatory domain (name = version+domain, value = commit hash)
-    { id = 21, parent = 0, type = CRSF.INFO, name = "3.5.0 ISM2G4", value = "825ed8" },
+    { id = 23, parent = 0, type = CRSF.INFO, name = "3.5.0 ISM2G4", value = "825ed8" },
   },
 }
 
@@ -1100,9 +1127,33 @@ local function mockPush(command, data)
           local destAddr = data[2] or CRSF.ADDRESS_RADIO_TRANSMITTER
           queuePush(CRSF.FRAMETYPE_PARAMETER_SETTINGS_ENTRY, encodeParameterEntry(device, param, 0, destAddr))
         else
-          -- Value write: update the stored value immediately (matches
-          -- firmware config.Set*() which stores in RAM right away).
-          param.value = writeValue
+          -- Value write: decode based on field type
+          if t == CRSF.STRING then
+            local chars = {}
+            local i = 4
+            while data[i] and data[i] ~= 0 do
+              chars[#chars + 1] = data[i]
+              i = i + 1
+            end
+            param.value = (#chars > 0) and string.char(table.unpack(chars)) or ""
+          elseif t == CRSF.FLOAT then
+            local v = bit32.lshift(data[4] or 0, 24)
+              + bit32.lshift(data[5] or 0, 16)
+              + bit32.lshift(data[6] or 0, 8)
+              + (data[7] or 0)
+            if v >= 0x80000000 then
+              v = v - 0x100000000
+            end
+            param.value = v
+          elseif t == CRSF.UINT16 or t == CRSF.INT16 then
+            local v = bit32.lshift(data[4] or 0, 8) + (data[5] or 0)
+            if t == CRSF.INT16 and v >= 0x8000 then
+              v = v - 0x10000
+            end
+            param.value = v
+          else
+            param.value = writeValue
+          end
           -- Defer folder name and bandwidth updates to the next poll cycle.
           -- Real firmware runs updateFolderNames() in the event loop, not
           -- in the PARAMETER_WRITE handler. No auto-send of parent folder