Merge branch 'devel' into 225-consolidate-network-channels

2023-06-05 01:18:13 -04:00
parent 337fca7e7c 38fc7189ba
commit 9a5fc92c86
95 changed files with 2338 additions and 847 deletions
--- a/pocket/renderer.lua
+++ b/pocket/renderer.lua
@@ -70,9 +70,9 @@ end
 function renderer.ui_ready() return ui.display ~= nil end

 -- handle a mouse event
---@param event mouse_interaction
+---@param event mouse_interaction|nil
 function renderer.handle_mouse(event)
-    if ui.display ~= nil then
+    if ui.display ~= nil and event ~= nil then
        ui.display.handle_mouse(event)
    end
 end
--- a/pocket/startup.lua
+++ b/pocket/startup.lua
@@ -4,20 +4,20 @@

 require("/initenv").init_env()

-local crash        = require("scada-common.crash")
-local log          = require("scada-common.log")
-local ppm          = require("scada-common.ppm")
-local tcallbackdsp = require("scada-common.tcallbackdsp")
-local util         = require("scada-common.util")
+local crash    = require("scada-common.crash")
+local log      = require("scada-common.log")
+local ppm      = require("scada-common.ppm")
+local tcd      = require("scada-common.tcd")
+local util     = require("scada-common.util")

-local core         = require("graphics.core")
+local core     = require("graphics.core")

-local config       = require("pocket.config")
-local coreio       = require("pocket.coreio")
-local pocket       = require("pocket.pocket")
-local renderer     = require("pocket.renderer")
+local config   = require("pocket.config")
+local coreio   = require("pocket.coreio")
+local pocket   = require("pocket.pocket")
+local renderer = require("pocket.renderer")

-local POCKET_VERSION = "alpha-v0.2.6"
+local POCKET_VERSION = "alpha-v0.3.7"

 local println = util.println
 local println_ts = util.println_ts
@@ -36,7 +36,6 @@ cfv.assert_type_num(config.COMMS_TIMEOUT)
 cfv.assert_min(config.COMMS_TIMEOUT, 2)
 cfv.assert_type_str(config.LOG_PATH)
 cfv.assert_type_int(config.LOG_MODE)
-cfv.assert_type_bool(config.LOG_DEBUG)

 assert(cfv.valid(), "bad config file: missing/invalid fields")

@@ -44,7 +43,7 @@ assert(cfv.valid(), "bad config file: missing/invalid fields")
 -- log init
 ----------------------------------------

-log.init(config.LOG_PATH, config.LOG_MODE, config.LOG_DEBUG)
+log.init(config.LOG_PATH, config.LOG_MODE, config.LOG_DEBUG == true)

 log.info("========================================")
 log.info("BOOTING pocket.startup " .. POCKET_VERSION)
@@ -121,54 +120,54 @@ local function main()
        conn_wd.sv.feed()
        conn_wd.api.feed()
        log.debug("startup> conn watchdog started")
-    end

-    -- main event loop
-    while ui_ok do
-        local event, param1, param2, param3, param4, param5 = util.pull_event()
+        -- main event loop
+        while true do
+            local event, param1, param2, param3, param4, param5 = util.pull_event()

-        -- handle event
-        if event == "timer" then
-            if loop_clock.is_clock(param1) then
-                -- main loop tick
+            -- handle event
+            if event == "timer" then
+                if loop_clock.is_clock(param1) then
+                    -- main loop tick

-                -- relink if necessary
-                pocket_comms.link_update()
+                    -- relink if necessary
+                    pocket_comms.link_update()

-                loop_clock.start()
-            elseif conn_wd.sv.is_timer(param1) then
-                -- supervisor watchdog timeout
-                log.info("supervisor server timeout")
-                pocket_comms.close_sv()
-            elseif conn_wd.api.is_timer(param1) then
-                -- coordinator watchdog timeout
-                log.info("coordinator api server timeout")
-                pocket_comms.close_api()
-            else
-                -- a non-clock/main watchdog timer event
-                -- notify timer callback dispatcher
-                tcallbackdsp.handle(param1)
+                    loop_clock.start()
+                elseif conn_wd.sv.is_timer(param1) then
+                    -- supervisor watchdog timeout
+                    log.info("supervisor server timeout")
+                    pocket_comms.close_sv()
+                elseif conn_wd.api.is_timer(param1) then
+                    -- coordinator watchdog timeout
+                    log.info("coordinator api server timeout")
+                    pocket_comms.close_api()
+                else
+                    -- a non-clock/main watchdog timer event
+                    -- notify timer callback dispatcher
+                    tcd.handle(param1)
+                end
+            elseif event == "modem_message" then
+                -- got a packet
+                local packet = pocket_comms.parse_packet(param1, param2, param3, param4, param5)
+                pocket_comms.handle_packet(packet)
+            elseif event == "mouse_click" or event == "mouse_up" or event == "mouse_drag" or event == "mouse_scroll" then
+                -- handle a monitor touch event
+                renderer.handle_mouse(core.events.new_mouse_event(event, param1, param2, param3))
+            end
+
+            -- check for termination request
+            if event == "terminate" or ppm.should_terminate() then
+                log.info("terminate requested, closing server connections...")
+                pocket_comms.close()
+                log.info("connections closed")
+                break
            end
-        elseif event == "modem_message" then
-            -- got a packet
-            local packet = pocket_comms.parse_packet(param1, param2, param3, param4, param5)
-            pocket_comms.handle_packet(packet)
-        elseif event == "mouse_click" then
-            -- handle a monitor touch event
-            renderer.handle_mouse(core.events.touch(param1, param2, param3))
        end

-        -- check for termination request
-        if event == "terminate" or ppm.should_terminate() then
-            log.info("terminate requested, closing server connections...")
-            pocket_comms.close()
-            log.info("connections closed")
-            break
-        end
+        renderer.close_ui()
    end

-    renderer.close_ui()
-
    println_ts("exited")
    log.info("exited")
 end
--- a/pocket/ui/components/conn_waiting.lua
+++ b/pocket/ui/components/conn_waiting.lua
@@ -11,9 +11,9 @@ local TextBox     = require("graphics.elements.textbox")

 local WaitingAnim = require("graphics.elements.animations.waiting")

-local TEXT_ALIGN = core.graphics.TEXT_ALIGN
+local TEXT_ALIGN = core.TEXT_ALIGN

-local cpair = core.graphics.cpair
+local cpair = core.cpair

 -- create a waiting view
 ---@param parent graphics_element parent
@@ -25,7 +25,7 @@ local function init(parent, y, is_api)
    -- bounding box div
    local box = Div{parent=root,x=1,y=y,height=5}

-    local waiting_x = math.floor(parent.width() / 2) - 1
+    local waiting_x = math.floor(parent.get_width() / 2) - 1

    if is_api then
        WaitingAnim{parent=box,x=waiting_x,y=1,fg_bg=cpair(colors.blue,style.root.bkg)}
--- a/pocket/ui/main.lua
+++ b/pocket/ui/main.lua
@@ -8,11 +8,11 @@ local style        = require("pocket.ui.style")

 local conn_waiting = require("pocket.ui.components.conn_waiting")

-local home_page    = require("pocket.ui.components.home_page")
-local unit_page    = require("pocket.ui.components.unit_page")
-local reactor_page = require("pocket.ui.components.reactor_page")
-local boiler_page  = require("pocket.ui.components.boiler_page")
-local turbine_page = require("pocket.ui.components.turbine_page")
+local home_page    = require("pocket.ui.pages.home_page")
+local unit_page    = require("pocket.ui.pages.unit_page")
+local reactor_page = require("pocket.ui.pages.reactor_page")
+local boiler_page  = require("pocket.ui.pages.boiler_page")
+local turbine_page = require("pocket.ui.pages.turbine_page")

 local core         = require("graphics.core")

@@ -22,9 +22,9 @@ local TextBox      = require("graphics.elements.textbox")

 local Sidebar      = require("graphics.elements.controls.sidebar")

-local TEXT_ALIGN = core.graphics.TEXT_ALIGN
+local TEXT_ALIGN = core.TEXT_ALIGN

-local cpair = core.graphics.cpair
+local cpair = core.cpair

 -- create new main view
 ---@param main graphics_element main displaybox
@@ -45,7 +45,7 @@ local function init(main)

    local root_pane = MultiPane{parent=root_pane_div,x=1,y=1,panes=root_panes}

-    coreio.core_ps().subscribe("link_state", function (state)
+    root_pane.register(coreio.core_ps(), "link_state", function (state)
        if state == coreio.LINK_STATE.UNLINKED or state == coreio.LINK_STATE.API_LINK_ONLY then
            root_pane.set_value(1)
        elseif state == coreio.LINK_STATE.SV_LINK_ONLY then
--- a/pocket/ui/components/boiler_page.lua
+++ b/pocket/ui/components/boiler_page.lua
@@ -5,9 +5,9 @@ local core    = require("graphics.core")
 local Div     = require("graphics.elements.div")
 local TextBox = require("graphics.elements.textbox")

-- local cpair = core.graphics.cpair
+-- local cpair = core.cpair

-local TEXT_ALIGN = core.graphics.TEXT_ALIGN
+local TEXT_ALIGN = core.TEXT_ALIGN

 -- new boiler page view
 ---@param root graphics_element parent
--- a/pocket/ui/components/home_page.lua
+++ b/pocket/ui/components/home_page.lua
@@ -5,9 +5,9 @@ local core    = require("graphics.core")
 local Div     = require("graphics.elements.div")
 local TextBox = require("graphics.elements.textbox")

-- local cpair = core.graphics.cpair
+-- local cpair = core.cpair

-local TEXT_ALIGN = core.graphics.TEXT_ALIGN
+local TEXT_ALIGN = core.TEXT_ALIGN

 -- new home page view
 ---@param root graphics_element parent
--- a/pocket/ui/components/reactor_page.lua
+++ b/pocket/ui/components/reactor_page.lua
@@ -5,9 +5,9 @@ local core    = require("graphics.core")
 local Div     = require("graphics.elements.div")
 local TextBox = require("graphics.elements.textbox")

-- local cpair = core.graphics.cpair
+-- local cpair = core.cpair

-local TEXT_ALIGN = core.graphics.TEXT_ALIGN
+local TEXT_ALIGN = core.TEXT_ALIGN

 -- new reactor page view
 ---@param root graphics_element parent
--- a/pocket/ui/components/turbine_page.lua
+++ b/pocket/ui/components/turbine_page.lua
@@ -5,9 +5,9 @@ local core    = require("graphics.core")
 local Div     = require("graphics.elements.div")
 local TextBox = require("graphics.elements.textbox")

-- local cpair = core.graphics.cpair
+-- local cpair = core.cpair

-local TEXT_ALIGN = core.graphics.TEXT_ALIGN
+local TEXT_ALIGN = core.TEXT_ALIGN

 -- new turbine page view
 ---@param root graphics_element parent
--- a/pocket/ui/components/unit_page.lua
+++ b/pocket/ui/components/unit_page.lua
@@ -5,9 +5,9 @@ local core    = require("graphics.core")
 local Div     = require("graphics.elements.div")
 local TextBox = require("graphics.elements.textbox")

-- local cpair = core.graphics.cpair
+-- local cpair = core.cpair

-local TEXT_ALIGN = core.graphics.TEXT_ALIGN
+local TEXT_ALIGN = core.TEXT_ALIGN

 -- new unit page view
 ---@param root graphics_element parent
--- a/pocket/ui/style.lua
+++ b/pocket/ui/style.lua
@@ -6,7 +6,7 @@ local core = require("graphics.core")

 local style = {}

-local cpair = core.graphics.cpair
+local cpair = core.cpair

 -- GLOBAL --