Update TELEMETRY/wdgts2_sub.lua, WIDGETS/widgets.lua

- Add error handling for nonexistent widget file
Matze-Jung · Dec 7, 2019 · 6c7ea24 · 6c7ea24
1 parent aa760cb
commit 6c7ea24
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/src/SCRIPTS/TELEMETRY/wdgts2_sub.lua b/src/SCRIPTS/TELEMETRY/wdgts2_sub.lua
@@ -39,7 +39,7 @@ local layout = {
         {
             id="value",
             opts={
-                src=function() return getGraphRange(5).min..' / '..getGraphRange(5).max end,
+                src=function() return getGraphRange and getGraphRange(5).min..' / '..getGraphRange(5).max or '?' end,
                 lbl="min / max",
                 unit="dB",
                 style=SMLSIZE,

diff --git a/src/SCRIPTS/WIDGETS/widgets.lua b/src/SCRIPTS/WIDGETS/widgets.lua
@@ -61,8 +61,12 @@ local function run(event, zone)
             local wdgt = widgets[col][row]
 
             if wdgt.opts then
-                if not wdgt.func then
-                    lcd.drawRectangle(x, y, w, h)
+                if type(wdgt.func) ~= "table" then
+                    if wdgt.func then
+                        lcd.drawText(x+w/2-4, y+h/2-4, "id?", SMLSIZE+BLINK)
+                    else
+                        lcd.drawRectangle(x, y, w, h)
+                    end
                 else
                     if wdgt.opts.parent then
                         wdgt.func.run(event, {x=x, y=y, w=w , h=h})
@@ -80,6 +84,16 @@ local function run(event, zone)
     end
 end
 
+local function file_exists(name)
+    local f=io.open(name,"r")
+    if f~=nil then
+        io.close(f)
+        return true
+    end
+
+    return
+end
+
 local function init()
     for col=1, #layout, 1
     do
@@ -94,13 +108,22 @@ local function init()
             local c = layout[col][row]
             local w = { run=function()end }
             if c.id then
+                local wdgtFile = "/SCRIPTS/WIDGETS/"..(c.id)..".lua"
+
                 w.opts = c.opts or {}
-                w.func = c.id ~= ""
-                    and assert(loadScript("/SCRIPTS/WIDGETS/"..(c.id)..".lua"))(event)
-                    or false
+                w.func = false
+
+                if c.id ~= "" then
+                    if file_exists(wdgtFile) then
+                        w.func = assert(loadScript(wdgtFile))(event)
+
+                        -- initalize widget
+                        if w.func and w.func.init then w.func.init() end
+                    else
+                        w.func = true
+                    end
+                end
 
-                -- initalize widget
-                if w.func and w.func.init then w.func.init() end
             end
             widgets[col][row] = w
         end