feat: updates to Value2, GaugeRotary and BattAnalog widgets

sdcard/c480x272/WIDGETS/BattAnalog/lib_widget_tools.lua

@@ -1,17 +1,60 @@
-local app_name, p2 = ...
+local m_log, app_name = ...
 
 local M = {}
+--M.m_log = m_log
 M.app_name = app_name
 M.tele_src_name = nil
 M.tele_src_id = nil
 
+local getTime = getTime
+local lcd = lcd
 
---------------------------------------------------------------
-local function log(s)
-    print(M.app_name .. ": " .. s)
+-- better font names
+local FONT_38 = XXLSIZE -- 38px
+local FONT_16 = DBLSIZE -- 16px
+local FONT_12 = MIDSIZE -- 12px
+local FONT_8 = 0 -- Default 8px
+local FONT_6 = SMLSIZE -- 6px
+
+local FONT_LIST = {FONT_6, FONT_8, FONT_12, FONT_16, FONT_38}
+
+---------------------------------------------------------------------------------------------------
+local function log(fmt, ...)
+    --m_log.info(fmt, ...)
+    print("[" .. M.app_name .. "] " .. string.format(fmt, ...))
 end
 ---------------------------------------------------------------------------------------------------
 
+-- const's
+local UNIT_ID_TO_STRING = {
+    "V", "A", "mA", "kts", "m/s", "f/s", "km/h", "mph", "m", "f",
+    "�C", "�F", "%", "mAh", "W", "mW", "dB", "rpm", "g", "�",
+    "rad", "ml", "fOz", "ml/m", "Hz", "mS", "uS", "km"
+}
+
+function M.unitIdToString(unitId)
+    if unitId == nil then
+        return ""
+    end
+    -- UNIT_RAW
+    if unitId == "0" then
+        return ""
+    end
+
+    --log("idUnit: " .. unitId)
+
+    if (unitId > 0 and unitId <= #UNIT_ID_TO_STRING) then
+        local txtUnit = UNIT_ID_TO_STRING[unitId]
+        --log("txtUnit: " .. txtUnit)
+        return txtUnit
+    end
+
+    --return "-#-"
+    return ""
+end
+
+---------------------------------------------------------------------------------------------------
+
 function M.periodicInit()
     local t = {}
     t.startTime = -1;
@@ -24,33 +67,37 @@ function M.periodicStart(t, durationMili)
     t.durationMili = durationMili;
 end
 
-function M.periodicHasPassed(t)
+function M.periodicHasPassed(t, show_log)
     -- not started yet
     if (t.durationMili <= 0) then
         return false;
     end
 
     local elapsed = getTime() - t.startTime;
-    log(string.format('elapsed: %d (t.durationMili: %d)', elapsed, t.durationMili))
+    --log('elapsed: %d (t.durationMili: %d)', elapsed, t.durationMili)
+    if show_log == true then
+        log('elapsed: %0.1f/%0.1f sec', elapsed/100, t.durationMili/1000)
+    end
     local elapsedMili = elapsed * 10;
     if (elapsedMili < t.durationMili) then
         return false;
     end
     return true;
 end
 
-function M.periodicGetElapsedTime(t)
+function M.periodicGetElapsedTime(t, show_log)
     local elapsed = getTime() - t.startTime;
-    log(string.format("elapsed: %d",elapsed));
     local elapsedMili = elapsed * 10;
-    log(string.format("elapsedMili: %d",elapsedMili));
+    if show_log == true then
+        log('elapsed: %0.1f/%0.1f sec', elapsed/100, t.durationMili/1000)
+    end
     return elapsedMili;
 end
 
 function M.periodicReset(t)
     t.startTime = getTime();
-    log(string.format("periodicReset()"));
-    periodicGetElapsedTime(t)
+    --log("periodicReset()");
+    M.periodicGetElapsedTime(t)
 end
 
 function M.getDurationMili(t)
@@ -62,27 +109,27 @@ end
 function M.isTelemetryAvailable()
     -- select telemetry source
     if not M.tele_src_id then
-        log("select telemetry source")
-        tele_src = getFieldInfo("RSSI")
-        if not tele_src then tele_src = getFieldInfo("RxBt") end
-        if not tele_src then tele_src = getFieldInfo("A1") end
-        if not tele_src then tele_src = getFieldInfo("A2") end
+        --log("select telemetry source")
+        local tele_src = getFieldInfo("RSSI")
         if not tele_src then tele_src = getFieldInfo("1RSS") end
         if not tele_src then tele_src = getFieldInfo("2RSS") end
         if not tele_src then tele_src = getFieldInfo("RQly") end
-        if not tele_src then tele_src = getFieldInfo("TRSS") end
         if not tele_src then tele_src = getFieldInfo("VFR%") end
+        if not tele_src then tele_src = getFieldInfo("TRSS") end
+        if not tele_src then tele_src = getFieldInfo("RxBt") end
+        if not tele_src then tele_src = getFieldInfo("A1") end
 
         if tele_src == nil then
-            log("no telemetry sensor found")
+            --log("no telemetry sensor found")
             M.tele_src_id = nil
             M.tele_src_name = "---"
-            tele_is_available = false
-            return
+            return false
+        else
+            --log("telemetry sensor found: " .. tele_src.name)
+            M.tele_src_id = tele_src.id
+            M.tele_src_name = tele_src.name
         end
     end
-    M.tele_src_id = tele_src.id
-    M.tele_src_name = tele_src.name
 
     if M.tele_src_id == nil then
         return false
@@ -95,7 +142,7 @@ function M.isTelemetryAvailable()
     return false
 end
 
---------------------------------------------------------------------------------------------------------
+---------------------------------------------------------------------------------------------------
 
 -- workaround to detect telemetry-reset event, until a proper implementation on the lua interface will be created
 -- this workaround assume that:
@@ -105,7 +152,6 @@ end
 -- on event detection, the function onTelemetryResetEvent() will be trigger
 --
 function M.detectResetEvent(wgt, callback_onTelemetryResetEvent)
-
     local currMinRSSI = getValue('RSSI-')
     if (currMinRSSI == nil) then
         log("telemetry reset event: can not be calculated")
@@ -132,6 +178,173 @@ function M.detectResetEvent(wgt, callback_onTelemetryResetEvent)
 end
 
 ---------------------------------------------------------------------------------------------------
+function M.getSensorPrecession(sensorName)
+
+    for i=0, 30, 1 do
+        local s2 = model.getSensor(i)
+        --type (number) 0 = custom, 1 = calculated
+        --name (string) Name
+        --unit (number) See list of units in the appendix of the OpenTX Lua Reference Guide
+        --prec (number) Number of decimals
+        --id (number) Only custom sensors
+        --instance (number) Only custom sensors
+        --formula (number) Only calculated sensors. 0 = Add etc. see list of formula choices in Companion popup
+
+        --log("getSensorPrecession: %d. name: %s, unit: %s , prec: %s , id: %s , instance: %s ", i, s2.name, s2.unit, s2.prec, s2.id, s2.instance)
+
+        if s2.name == sensorName then
+            return s2.prec
+        end
+    end
+
+    return -1
+end
+
+--function M.getSensors()
+--    local sensors = {}
+--    for i=0, 30, 1 do
+--        local s1 = {}
+--        local s2 = model.getSensor(i)
+--
+--        --type (number) 0 = custom, 1 = calculated
+--        s1.type = s2.type
+--        --name (string) Name
+--        s1.name = s2.name
+--        --unit (number) See list of units in the appendix of the OpenTX Lua Reference Guide
+--        s1.unit = s2.unit
+--        --prec (number) Number of decimals
+--        s1.prec = s2.prec
+--        --id (number) Only custom sensors
+--        s1.id = s2.id
+--        --instance (number) Only custom sensors
+--        s1.instance = s2.instance
+--        --formula (number) Only calculated sensors. 0 = Add etc. see list of formula choices in Companion popup
+--        s1.formula = s2.formula
+--
+--        s1.appendix
+--
+--        log("getSensorPrecession: %d. name: %s, unit: %s , prec: %s , id: %s , instance: %s ", i, s2.name, s2.unit, s2.prec, s2.id, s2.instance)
+--
+--        if s2.name == sensorName then
+--            return s2.prec
+--        end
+--    end
+--
+--    return -1
+--end
+
 ---------------------------------------------------------------------------------------------------
+-- workaround for bug in getFiledInfo()  -- ???? why?
+function M.cleanInvalidCharFromGetFiledInfo(sourceName)
+
+    if string.byte(string.sub(sourceName, 1, 1)) > 127 then
+        sourceName = string.sub(sourceName, 2, -1)
+    end
+    if string.byte(string.sub(sourceName, 1, 1)) > 127 then
+        sourceName = string.sub(sourceName, 2, -1)
+    end
+
+    return sourceName
+end
+
+------------------------------------------------------------------------------------------------------
+function M.getFontSizeRelative(orgFontSize, delta)
+    for i = 1, #FONT_LIST do
+        if FONT_LIST[i] == orgFontSize then
+            local newIndex = i + delta
+            newIndex = math.min(newIndex, #FONT_LIST)
+            newIndex = math.max(newIndex, 1)
+            return FONT_LIST[newIndex]
+        end
+    end
+    return orgFontSize
+end
+
+------------------------------------------------------------------------------------------------------
+function M.lcdSizeTextFixed(txt, font_size)
+    local ts_w, ts_h = lcd.sizeText(txt, font_size)
+
+    local v_offset = 0
+    if font_size == FONT_38 then
+        v_offset = -15
+    elseif font_size == FONT_16 then
+        v_offset = -8
+    elseif font_size == FONT_12 then
+        v_offset = -6
+    elseif font_size == FONT_8 then
+        v_offset = -4
+    elseif font_size == FONT_6 then
+        v_offset = -3
+    end
+    return ts_w, ts_h +2*v_offset, v_offset
+end
+
+------------------------------------------------------------------------------------------------------
+function M.drawText(x, y, text, font_size, text_color, bg_color)
+    local ts_w, ts_h, v_offset = M.lcdSizeTextFixed(text, font_size)
+    lcd.drawRectangle(x, y, ts_w, ts_h, BLUE)
+    lcd.drawText(x, y + v_offset, text, font_size + text_color)
+    return ts_w, ts_h, v_offset
+end
+
+function M.drawBadgedText(txt, txtX, txtY, font_size, text_color, bg_color)
+    local ts_w, ts_h, v_offset = M.lcdSizeTextFixed(txt, font_size)
+    local v_space = 2
+    local bdg_h = v_space + ts_h + v_space
+    local r = bdg_h / 2
+    lcd.drawFilledCircle(txtX , txtY + r, r, bg_color)
+    lcd.drawFilledCircle(txtX + ts_w , txtY + r, r, bg_color)
+    lcd.drawFilledRectangle(txtX, txtY , ts_w, bdg_h, bg_color)
+
+    lcd.drawText(txtX, txtY + v_offset + v_space, txt, font_size + text_color)
+
+    --lcd.drawRectangle(txtX, txtY , ts_w, bdg_h, RED) -- dbg
+end
+
+function M.drawBadgedTextCenter(txt, txtX, txtY, font_size, text_color, bg_color)
+    local ts_w, ts_h, v_offset = M.lcdSizeTextFixed(txt, font_size)
+    local r = ts_h / 2
+    local x = txtX - ts_w/2
+    local y = txtY - ts_h/2
+    lcd.drawFilledCircle(x + r * 0.3, y + r, r, bg_color)
+    lcd.drawFilledCircle(x - r * 0.3 + ts_w , y + r, r, bg_color)
+    lcd.drawFilledRectangle(x, y, ts_w, ts_h, bg_color)
+
+    lcd.drawText(x, y + v_offset, txt, font_size + text_color)
+
+    -- dbg
+    --lcd.drawRectangle(x, y , ts_w, ts_h, RED) -- dbg
+    --lcd.drawLine(txtX-30, txtY, txtX+30, txtY, SOLID, RED) -- dbg
+    --lcd.drawLine(txtX, txtY-20, txtX, txtY+20, SOLID, RED) -- dbg
+end
+
+------------------------------------------------------------------------------------------------------
+-- usage:
+--log("bbb----------------------------------------------------------")
+--wgt.tools.heap_dump(wgt, 0, 60)
+--log("ccc----------------------------------------------------------")
+function M.heap_dump(tbl, indent, max_dept)
+    local spaces = string.rep("  ", indent)
+    if max_dept == 0 then
+        log(spaces .. "---- max dept ----")
+        return
+    end
+    max_dept = max_dept -1
+    indent = indent or 0
+
+    for key, value in pairs(tbl) do
+        if key ~= "_G" then
+            if type(value) == "table" then
+                --log(spaces .. key .. " (table) = {")
+                log(spaces .. key .. " = {")
+                M.heap_dump(value, indent + 1, max_dept)
+                log(spaces .. "}")
+            else
+                log(spaces .. key .. " = " .. tostring(value))
+            end
+        end
+    end
+end
+------------------------------------------------------------------------------------------------------
 
 return M