#344 renderer integration with new assertion handling

supervisor/renderer.lua

@@ -6,18 +6,23 @@ local panel_view = require("supervisor.panel.front_panel")
 local pgi        = require("supervisor.panel.pgi")
 local style      = require("supervisor.panel.style")
 
+local core       = require("graphics.core")
 local flasher    = require("graphics.flasher")
 
 local DisplayBox = require("graphics.elements.displaybox")
 
+---@class supervisor_renderer
 local renderer = {}
 
 local ui = {
     display = nil
 }
 
--- start the UI
-function renderer.start_ui()
+-- try to start the UI
+---@return boolean success, any error_msg
+function renderer.try_start_ui()
+    local status, msg = true, nil
+
     if ui.display == nil then
         -- reset terminal
         term.setTextColor(colors.white)
@@ -31,12 +36,22 @@ function renderer.start_ui()
         end
 
         -- init front panel view
-        ui.display = DisplayBox{window=term.current(),fg_bg=style.root}
-        panel_view(ui.display)
+        status, msg = pcall(function ()
+            ui.display = DisplayBox{window=term.current(),fg_bg=style.root}
+            panel_view(ui.display)
+        end)
 
-        -- start flasher callback task
-        flasher.run()
+        if status then
+            -- start flasher callback task
+            flasher.run()
+        else
+            -- report fail and close ui
+            msg = core.extract_assert_msg(msg)
+            renderer.close_ui()
+        end
     end
+
+    return status, msg
 end
 
 -- close out the UI

supervisor/startup.lua

@@ -21,7 +21,7 @@ local supervisor = require("supervisor.supervisor")
 
 local svsessions = require("supervisor.session.svsessions")
 
-local SUPERVISOR_VERSION = "v1.0.5"
+local SUPERVISOR_VERSION = "v1.0.6"
 
 local println = util.println
 local println_ts = util.println_ts
@@ -117,10 +117,9 @@ local function main()
     databus.tx_hw_modem(true)
 
     -- start UI
-    local fp_ok, message = pcall(renderer.start_ui)
+    local fp_ok, message = renderer.try_start_ui()
 
     if not fp_ok then
-        renderer.close_ui()
         println_ts(util.c("UI error: ", message))
         log.error(util.c("front panel GUI render failed with error ", message))
     else