Merge pull request #599 from MikaylaFischler/devel

Pocket Beta Release

build/safemin.py

@@ -28,6 +28,9 @@ def minify(path: str):
     contents = f.read()
     f.close()
 
+    # remove --[[@as type]] hints before anything, since it would detect as multiline comments
+    contents = re.sub(r' --+\[.+]]', '', contents)
+
     if re.search(r'--+\[+', contents) != None:
         # absolutely not dealing with lua multiline comments
         # - there are more important things to do

ccmsi.lua

@@ -15,7 +15,7 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]--
 
-local CCMSI_VERSION = "v1.19"
+local CCMSI_VERSION = "v1.21"
 
 local install_dir = "/.install-cache"
 local manifest_path = "https://mikaylafischler.github.io/cc-mek-scada/manifests/"
@@ -149,16 +149,16 @@ local function get_remote_manifest()
 end
 
 -- record the local installation manifest
-local function write_install_manifest(manifest, dependencies)
+local function write_install_manifest(manifest, deps)
     local versions = {}
     for key, value in pairs(manifest.versions) do
-        local is_dependency = false
+        local is_dep = false
-        for _, dependency in pairs(dependencies) do
+        for _, dep in pairs(deps) do
-            if (key == "bootloader" and dependency == "system") or key == dependency then
+            if (key == "bootloader" and dep == "system") or key == dep then
-                is_dependency = true;break
+                is_dep = true;break
             end
         end
-        if key == app or key == "comms" or is_dependency then versions[key] = value end
+        if key == app or key == "comms" or is_dep then versions[key] = value end
     end
 
     manifest.versions = versions
@@ -321,23 +321,38 @@ if #opts == 0 or opts[1] == "help" then
     end
     return
 else
+
     mode = get_opt(opts[1], { "check", "install", "update", "uninstall" })
     if mode == nil then
         red();println("Unrecognized mode.");white()
         return
     end
 
-    app = get_opt(opts[2], { "reactor-plc", "rtu", "supervisor", "coordinator", "pocket", "installer" })
+    local next_opt = 3
+    local apps = { "reactor-plc", "rtu", "supervisor", "coordinator", "pocket", "installer" }
+    app = get_opt(opts[2], apps)
+    if app == nil then
+        for _, a in pairs(apps) do
+            if fs.exists(a) and fs.isDir(a) then
+                app = a
+                next_opt = 2
+                break
+            end
+        end
+    end
+
     if app == nil and mode ~= "check" then
         red();println("Unrecognized application.");white()
         return
+    elseif mode == "check" then
+        next_opt = 2
     elseif app == "installer" and mode ~= "update" then
         red();println("Installer app only supports 'update' option.");white()
         return
     end
 
     -- determine target
-    if mode == "check" then target = opts[2] else target = opts[3] end
+    target = opts[next_opt]
     if (target ~= "main") and (target ~= "devel") then
         if (target and target ~= "") then yellow();println("Unknown target, defaulting to 'main'");white() end
         target = "main"
@@ -383,8 +398,10 @@ if mode == "check" then
         yellow();println("\nA different version of the installer is available, it is recommended to update (use 'ccmsi update installer').");white()
     end
 elseif mode == "install" or mode == "update" then
+    local ok, r_manifest, l_manifest
+
     local update_installer = app == "installer"
-    local ok, manifest = get_remote_manifest()
+    ok, r_manifest = get_remote_manifest()
     if not ok then return end
 
     local ver = {
@@ -397,27 +414,27 @@ elseif mode == "install" or mode == "update" then
     }
 
     -- try to find local versions
-    local local_ok, lmnf = read_local_manifest()
+    ok, l_manifest = read_local_manifest()
-    if not local_ok then
+    if mode == "update" and not update_installer then
-        if mode == "update" then
+        if not ok then
             red();println("Failed to load local installation information, cannot update.");white()
             return
-        end
+        else
-    elseif not update_installer then
+            ver.boot.v_local = l_manifest.versions.bootloader
-        ver.boot.v_local = lmnf.versions.bootloader
+            ver.app.v_local = l_manifest.versions[app]
-        ver.app.v_local = lmnf.versions[app]
+            ver.comms.v_local = l_manifest.versions.comms
-        ver.comms.v_local = lmnf.versions.comms
+            ver.common.v_local = l_manifest.versions.common
-        ver.common.v_local = lmnf.versions.common
+            ver.graphics.v_local = l_manifest.versions.graphics
-        ver.graphics.v_local = lmnf.versions.graphics
+            ver.lockbox.v_local = l_manifest.versions.lockbox
-        ver.lockbox.v_local = lmnf.versions.lockbox
 
-        if lmnf.versions[app] == nil then
+            if l_manifest.versions[app] == nil then
-            red();println("Another application is already installed, please uninstall it before installing a new application.");white()
+                red();println("Another application is already installed, please uninstall it before installing a new application.");white()
-            return
+                return
+            end
         end
     end
 
-    if manifest.versions.installer ~= CCMSI_VERSION then
+    if r_manifest.versions.installer ~= CCMSI_VERSION then
         if not update_installer then yellow();println("A different version of the installer is available, it is recommended to update to it.");white() end
         if update_installer or ask_y_n("Would you like to update now", true) then
             lgray();println("GET ccmsi.lua")
@@ -440,12 +457,12 @@ elseif mode == "install" or mode == "update" then
         return
     end
 
-    ver.boot.v_remote = manifest.versions.bootloader
+    ver.boot.v_remote = r_manifest.versions.bootloader
-    ver.app.v_remote = manifest.versions[app]
+    ver.app.v_remote = r_manifest.versions[app]
-    ver.comms.v_remote = manifest.versions.comms
+    ver.comms.v_remote = r_manifest.versions.comms
-    ver.common.v_remote = manifest.versions.common
+    ver.common.v_remote = r_manifest.versions.common
-    ver.graphics.v_remote = manifest.versions.graphics
+    ver.graphics.v_remote = r_manifest.versions.graphics
-    ver.lockbox.v_remote = manifest.versions.lockbox
+    ver.lockbox.v_remote = r_manifest.versions.lockbox
 
     green()
     if mode == "install" then print("Installing ") else print("Updating ") end
@@ -461,36 +478,33 @@ elseif mode == "install" or mode == "update" then
     ver.graphics.changed = show_pkg_change("graphics", ver.graphics)
     ver.lockbox.changed = show_pkg_change("lockbox", ver.lockbox)
 
-    --------------------------
+    -- start install/update
-    -- START INSTALL/UPDATE --
-    --------------------------
 
-    local space_required = manifest.sizes.manifest
+    local space_req = r_manifest.sizes.manifest
-    local space_available = fs.getFreeSpace("/")
+    local space_avail = fs.getFreeSpace("/")
 
-    local single_file_mode = false
+    local file_list = r_manifest.files
-    local file_list = manifest.files
+    local size_list = r_manifest.sizes
-    local size_list = manifest.sizes
+    local deps = r_manifest.depends[app]
-    local dependencies = manifest.depends[app]
 
-    table.insert(dependencies, app)
+    table.insert(deps, app)
 
     -- helper function to check if a dependency is unchanged
-    local function unchanged(dependency)
+    local function unchanged(dep)
-        if dependency == "system" then return not ver.boot.changed
+        if dep == "system" then return not ver.boot.changed
-        elseif dependency == "graphics" then return not ver.graphics.changed
+        elseif dep == "graphics" then return not ver.graphics.changed
-        elseif dependency == "lockbox" then return not ver.lockbox.changed
+        elseif dep == "lockbox" then return not ver.lockbox.changed
-        elseif dependency == "common" then return not (ver.common.changed or ver.comms.changed)
+        elseif dep == "common" then return not (ver.common.changed or ver.comms.changed)
-        elseif dependency == app then return not ver.app.changed
+        elseif dep == app then return not ver.app.changed
         else return true end
     end
 
     local any_change = false
 
-    for _, dependency in pairs(dependencies) do
+    for _, dep in pairs(deps) do
-        local size = size_list[dependency]
+        local size = size_list[dep]
-        space_required = space_required + size
+        space_req = space_req + size
-        any_change = any_change or not unchanged(dependency)
+        any_change = any_change or not unchanged(dep)
     end
 
     if mode == "update" and not any_change then
@@ -501,10 +515,7 @@ elseif mode == "install" or mode == "update" then
     -- ask for confirmation
     if not ask_y_n("Continue", false) then return end
 
-    -- check space constraints
+    local single_file_mode = space_avail < space_req
-    if space_available < space_required then
-        single_file_mode = true
-    end
 
     local success = true
 
@@ -548,7 +559,7 @@ elseif mode == "install" or mode == "update" then
                     success = false
                     return
                 end
-                clean(manifest)
+                clean(r_manifest)
                 sf_install(3)
             elseif attempt == 3 then
                 yellow()
@@ -574,30 +585,30 @@ elseif mode == "install" or mode == "update" then
         local abort_attempt = false
         success = true
 
-        for _, dependency in pairs(dependencies) do
+        for _, dep in pairs(deps) do
-            if mode == "update" and unchanged(dependency) then
+            if mode == "update" and unchanged(dep) then
-                pkg_message("skipping install of unchanged package", dependency)
+                pkg_message("skipping install of unchanged package", dep)
             else
-                pkg_message("installing package", dependency)
+                pkg_message("installing package", dep)
                 lgray()
 
                 -- beginning on the second try, delete the directory before starting
                 if attempt >= 2 then
-                    if dependency == "system" then
+                    if dep == "system" then
-                    elseif dependency == "common" then
+                    elseif dep == "common" then
                         if fs.exists("/scada-common") then
                             fs.delete("/scada-common")
                             println("deleted /scada-common")
                         end
                     else
-                        if fs.exists("/"..dependency) then
+                        if fs.exists("/"..dep) then
-                            fs.delete("/"..dependency)
+                            fs.delete("/"..dep)
-                            println("deleted /"..dependency)
+                            println("deleted /"..dep)
                         end
                     end
                 end
 
-                local files = file_list[dependency]
+                local files = file_list[dep]
                 for _, file in pairs(files) do
                     println("GET "..file)
                     mitigate_case(file)
@@ -620,14 +631,14 @@ elseif mode == "install" or mode == "update" then
         if fs.exists(install_dir) then fs.delete(install_dir);fs.makeDir(install_dir) end
 
         -- download all dependencies
-        for _, dependency in pairs(dependencies) do
+        for _, dep in pairs(deps) do
-            if mode == "update" and unchanged(dependency) then
+            if mode == "update" and unchanged(dep) then
-                pkg_message("skipping download of unchanged package", dependency)
+                pkg_message("skipping download of unchanged package", dep)
             else
-                pkg_message("downloading package", dependency)
+                pkg_message("downloading package", dep)
                 lgray()
 
-                local files = file_list[dependency]
+                local files = file_list[dep]
                 for _, file in pairs(files) do
                     println("GET "..file)
                     local dl_stat = http_get_file(file, install_dir.."/")
@@ -650,14 +661,14 @@ elseif mode == "install" or mode == "update" then
 
         -- copy in downloaded files (installation)
         if success then
-            for _, dependency in pairs(dependencies) do
+            for _, dep in pairs(deps) do
-                if mode == "update" and unchanged(dependency) then
+                if mode == "update" and unchanged(dep) then
-                    pkg_message("skipping install of unchanged package", dependency)
+                    pkg_message("skipping install of unchanged package", dep)
                 else
-                    pkg_message("installing package", dependency)
+                    pkg_message("installing package", dep)
                     lgray()
 
-                    local files = file_list[dependency]
+                    local files = file_list[dep]
                     for _, file in pairs(files) do
                         local temp_file = install_dir.."/"..file
                         if fs.exists(file) then fs.delete(file) end
@@ -671,13 +682,13 @@ elseif mode == "install" or mode == "update" then
     end
 
     if success then
-        write_install_manifest(manifest, dependencies)
+        write_install_manifest(r_manifest, deps)
         green()
         if mode == "install" then
             println("Installation completed successfully.")
         else println("Update completed successfully.") end
         white();println("Ready to clean up unused files, press any key to continue...")
-        any_key();clean(manifest)
+        any_key();clean(r_manifest)
         white();println("Done.")
     else
         red()
@@ -712,14 +723,14 @@ elseif mode == "uninstall" then
     clean(manifest)
 
     local file_list = manifest.files
-    local dependencies = manifest.depends[app]
+    local deps = manifest.depends[app]
 
-    table.insert(dependencies, app)
+    table.insert(deps, app)
 
     -- delete all installed files
     lgray()
-    for _, dependency in pairs(dependencies) do
+    for _, dep in pairs(deps) do
-        local files = file_list[dependency]
+        local files = file_list[dep]
         for _, file in pairs(files) do
             if fs.exists(file) then fs.delete(file);println("deleted "..file) end
         end

configure.lua

@@ -1,11 +1,12 @@
 print("CONFIGURE> SCANNING FOR CONFIGURATOR...")
 
-if fs.exists("reactor-plc/configure.lua") then require("reactor-plc.configure").configure()
+for _, app in ipairs({ "reactor-plc", "rtu", "supervisor", "coordinator", "pocket" }) do
-elseif fs.exists("rtu/configure.lua") then require("rtu.configure").configure()
+    if fs.exists(app .. "/configure.lua") then
-elseif fs.exists("supervisor/configure.lua") then require("supervisor.configure").configure()
+        local _, _, launch = require(app .. ".configure").configure()
-elseif fs.exists("coordinator/configure.lua") then require("coordinator.configure").configure()
+        if launch then shell.execute("/startup") end
-elseif fs.exists("pocket/configure.lua") then require("pocket.configure").configure()
+        return
-else
+    end
-    print("CONFIGURE> NO CONFIGURATOR FOUND")
-    print("CONFIGURE> EXIT")
 end
+
+print("CONFIGURE> NO CONFIGURATOR FOUND")
+print("CONFIGURE> EXIT")

coordinator/config/facility.lua

@@ -231,7 +231,7 @@ function facility.create(tool_ctl, main_pane, cfg_sys, fac_cfg, style)
     TextBox{parent=fac_c_2,x=1,y=1,height=3,text="Please enter the number of reactors you have, also referred to as reactor units or 'units' for short. A maximum of 4 is currently supported."}
     tool_ctl.num_units = NumberField{parent=fac_c_2,x=1,y=5,width=5,max_chars=2,default=ini_cfg.UnitCount,min=1,max=4,fg_bg=bw_fg_bg}
     TextBox{parent=fac_c_2,x=7,y=5,text="reactors"}
-    TextBox{parent=fac_c_2,x=1,y=7,height=3,text="This will decide how many monitors you need. If this does not match the supervisor's number of reactor units, the coordinator will not connect.",fg_bg=g_lg_fg_bg}
+    TextBox{parent=fac_c_2,x=1,y=7,height=3,text="This will decide how many monitors you need. If this does not match the supervisor's number of reactor units, the coordinator will not connect.",fg_bg=cpair(colors.yellow,colors._INHERIT)}
     TextBox{parent=fac_c_2,x=1,y=10,height=3,text="Since you skipped supervisor sync, the main monitor minimum height can't be determined precisely. It is marked with * on the next page.",fg_bg=g_lg_fg_bg}
 
     local nu_error = TextBox{parent=fac_c_2,x=8,y=14,width=35,text="Please set the number of reactors.",fg_bg=cpair(colors.red,colors.lightGray),hidden=true}

coordinator/configure.lua

@@ -58,6 +58,7 @@ style.btn_dis_fg_bg = cpair(colors.lightGray,colors.white)
 local tool_ctl = {
     sv_cool_conf = nil,       ---@type [ integer, integer ][] list of boiler & turbine counts
 
+    launch_startup = false,
     start_fail = 0,
     fail_message = "",
     has_config = false,
@@ -210,7 +211,7 @@ local function config_view(display)
         TextBox{parent=main_page,x=2,y=y_start,height=4,width=49,text=msg,fg_bg=cpair(colors.red,colors.lightGray)}
         y_start = y_start + 5
     elseif tool_ctl.start_fail > 0 then
-        TextBox{parent=main_page,x=2,y=y_start,height=4,width=49,text="Notice: This device had no valid config so the configurator has been automatically started. If you previously had a valid config, you may want to check the Change Log to see what changed.",fg_bg=cpair(colors.red,colors.lightGray)}
+        TextBox{parent=main_page,x=2,y=y_start,height=4,width=49,text="Notice: This device is not configured for this version of the coordinator. If you previously had a valid config, it's not lost. You may want to check the Change Log to see what changed.",fg_bg=cpair(colors.red,colors.lightGray)}
         y_start = y_start + 5
     end
 
@@ -236,9 +237,17 @@ local function config_view(display)
         main_pane.set_value(8)
     end
 
+    local function startup()
+        tool_ctl.launch_startup = true
+        exit()
+    end
+
     PushButton{parent=main_page,x=2,y=17,min_width=6,text="Exit",callback=exit,fg_bg=cpair(colors.black,colors.red),active_fg_bg=btn_act_fg_bg}
-    tool_ctl.color_cfg = PushButton{parent=main_page,x=23,y=17,min_width=15,text="Color Options",callback=jump_color,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg,dis_fg_bg=cpair(colors.lightGray,colors.white)}
+    local start_btn = PushButton{parent=main_page,x=42,y=17,min_width=9,text="Startup",callback=startup,fg_bg=cpair(colors.black,colors.green),active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg}
-    PushButton{parent=main_page,x=39,y=17,min_width=12,text="Change Log",callback=function()main_pane.set_value(10)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    tool_ctl.color_cfg = PushButton{parent=main_page,x=36,y=y_start,min_width=15,text="Color Options",callback=jump_color,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg,dis_fg_bg=cpair(colors.lightGray,colors.white)}
+    PushButton{parent=main_page,x=39,y=y_start+2,min_width=12,text="Change Log",callback=function()main_pane.set_value(10)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+
+    if tool_ctl.start_fail ~= 0 then start_btn.disable() end
 
     if not tool_ctl.has_config then
         tool_ctl.view_cfg.disable()
@@ -372,7 +381,7 @@ function configurator.configure(start_code, message)
         println("configurator error: " .. error)
     end
 
-    return status, error
+    return status, error, tool_ctl.launch_startup
 end
 
 return configurator

coordinator/coordinator.lua

@@ -24,6 +24,7 @@ local LINK_TIMEOUT = 60.0
 local coordinator = {}
 
 ---@type crd_config
+---@diagnostic disable-next-line: missing-fields
 local config = {}
 
 coordinator.config = config

coordinator/iocontrol.lua

@@ -20,6 +20,13 @@ local ENERGY_UNITS = types.ENERGY_SCALE_UNITS
 local TEMP_SCALE = types.TEMP_SCALE
 local TEMP_UNITS = types.TEMP_SCALE_UNITS
 
+local RCT_STATE = types.REACTOR_STATE
+local BLR_STATE = types.BOILER_STATE
+local TRB_STATE = types.TURBINE_STATE
+local TNK_STATE = types.TANK_STATE
+local MTX_STATE = types.IMATRIX_STATE
+local SPS_STATE = types.SPS_STATE
+
 -- nominal RTT is ping (0ms to 10ms usually) + 500ms for CRD main loop tick
 local WARN_RTT = 1000   -- 2x as long as expected w/ 0 ping
 local HIGH_RTT = 1500   -- 3.33x as long as expected w/ 0 ping
@@ -81,6 +88,8 @@ function iocontrol.init(conf, comms, temp_scale, energy_scale)
         tank_mode = conf.cooling.fac_tank_mode,
         tank_defs = conf.cooling.fac_tank_defs,
         tank_list = conf.cooling.fac_tank_list,
+        tank_conns = conf.cooling.fac_tank_conns,
+        tank_fluid_types = conf.cooling.tank_fluid_types,
         all_sys_ok = false,
         rtu_count = 0,
 
@@ -94,7 +103,7 @@ function iocontrol.init(conf, comms, temp_scale, energy_scale)
         auto_scram = false,
         ---@type ascram_status
         ascram_status = {
-            matrix_dc = false,
+            matrix_fault = false,
             matrix_fill = false,
             crit_alarm = false,
             radiation = false,
@@ -105,10 +114,11 @@ function iocontrol.init(conf, comms, temp_scale, energy_scale)
         auto_current_waste_product = types.WASTE_PRODUCT.PLUTONIUM,
         auto_pu_fallback_active = false,
         auto_sps_disabled = false,
+        waste_stats = { 0, 0, 0, 0, 0, 0 }, -- waste in, pu, po, po pellets, am, spent waste
 
         radiation = types.new_zero_radiation_reading(),
 
-        save_cfg_ack = nil,      ---@type fun(success: boolean)
+        save_cfg_ack = nil, ---@type fun(success: boolean)
 
         ---@type { [TONE]: boolean }
         alarm_tones = { false, false, false, false, false, false, false, false },
@@ -149,10 +159,6 @@ function iocontrol.init(conf, comms, temp_scale, energy_scale)
         local entry = {
             unit_id = i,
             connected = false,
-            rtu_hw = {
-                boilers = {},   ---@type { connected: boolean, faulted: boolean }[]
-                turbines = {}   ---@type { connected: boolean, faulted: boolean }[]
-            },
 
             num_boilers = 0,
             num_turbines = 0,
@@ -174,6 +180,7 @@ function iocontrol.init(conf, comms, temp_scale, energy_scale)
 
             waste_mode = types.WASTE_MODE.MANUAL_PLUTONIUM,
             waste_product = types.WASTE_PRODUCT.PLUTONIUM,
+            waste_stats = { 0, 0, 0 },  -- plutonium, polonium, po pellets
 
             last_rate_change_ms = 0,
             turbine_flow_stable = false,
@@ -221,6 +228,7 @@ function iocontrol.init(conf, comms, temp_scale, energy_scale)
                 ALARM_STATE.INACTIVE  -- turbine trip
             },
 
+---@diagnostic disable-next-line: missing-fields
             annunciator = {},       ---@type annunciator
 
             unit_ps = psil.create(),
@@ -245,14 +253,12 @@ function iocontrol.init(conf, comms, temp_scale, energy_scale)
         for _ = 1, conf.cooling.r_cool[i].BoilerCount do
             table.insert(entry.boiler_ps_tbl, psil.create())
             table.insert(entry.boiler_data_tbl, {})
-            table.insert(entry.rtu_hw.boilers, { connected = false, faulted = false })
         end
 
         -- create turbine tables
         for _ = 1, conf.cooling.r_cool[i].TurbineCount do
             table.insert(entry.turbine_ps_tbl, psil.create())
             table.insert(entry.turbine_data_tbl, {})
-            table.insert(entry.rtu_hw.turbines, { connected = false, faulted = false })
         end
 
         -- create tank tables
@@ -363,6 +369,7 @@ local function _record_multiblock_build(id, entry, data_tbl, ps_tbl, create)
     if exists or create then
         if not exists then
             ps_tbl[id] = psil.create()
+---@diagnostic disable-next-line: missing-fields
             data_tbl[id] = {}
         end
 
@@ -488,6 +495,49 @@ end
 
 --#region Statuses
 
+-- generate the text string for the induction matrix charge/discharge ETA
+---@param eta_ms number eta in milliseconds
+local function gen_eta_text(eta_ms)
+    local str, pre = "", util.trinary(eta_ms >= 0, "Full in ", "Empty in ")
+
+    local seconds = math.abs(eta_ms) / 1000
+    local minutes = seconds / 60
+    local hours   = minutes / 60
+    local days    = hours / 24
+
+    if math.abs(eta_ms) < 1000 or (eta_ms ~= eta_ms) then
+        -- really small or NaN
+        str = "No ETA"
+    elseif days < 1000 then
+        days    = math.floor(days)
+        hours   = math.floor(hours % 24)
+        minutes = math.floor(minutes % 60)
+        seconds = math.floor(seconds % 60)
+
+        if days > 0 then
+            str = days .. "d"
+        elseif hours > 0 then
+            str = hours .. "h " .. minutes .. "m"
+        elseif minutes > 0 then
+            str = minutes .. "m " .. seconds .. "s"
+        elseif seconds > 0 then
+            str = seconds .. "s"
+        end
+
+        str = pre .. str
+    else
+        local years = math.floor(days / 365.25)
+
+        if years <= 99999999 then
+            str = pre .. years .. "y"
+        else
+            str = pre .. "eras"
+        end
+    end
+
+    return str
+end
+
 -- record and publish multiblock status data
 ---@param entry any
 ---@param data imatrix_session_db|sps_session_db|dynamicv_session_db|turbinev_session_db|boilerv_session_db
@@ -540,7 +590,7 @@ function iocontrol.update_facility_status(status)
             fac.auto_saturated = ctl_status[5]
 
             fac.auto_scram = ctl_status[6]
-            fac.ascram_status.matrix_dc = ctl_status[7]
+            fac.ascram_status.matrix_fault = ctl_status[7]
             fac.ascram_status.matrix_fill = ctl_status[8]
             fac.ascram_status.crit_alarm = ctl_status[9]
             fac.ascram_status.radiation = ctl_status[10]
@@ -555,7 +605,7 @@ function iocontrol.update_facility_status(status)
             fac.ps.publish("auto_ramping", fac.auto_ramping)
             fac.ps.publish("auto_saturated", fac.auto_saturated)
             fac.ps.publish("auto_scram", fac.auto_scram)
-            fac.ps.publish("as_matrix_dc", fac.ascram_status.matrix_dc)
+            fac.ps.publish("as_matrix_fault", fac.ascram_status.matrix_fault)
             fac.ps.publish("as_matrix_fill", fac.ascram_status.matrix_fill)
             fac.ps.publish("as_crit_alarm", fac.ascram_status.crit_alarm)
             fac.ps.publish("as_radiation", fac.ascram_status.radiation)
@@ -609,6 +659,7 @@ function iocontrol.update_facility_status(status)
                 ps.publish("avg_inflow", in_f)
                 ps.publish("avg_outflow", out_f)
                 ps.publish("eta_ms", eta)
+                ps.publish("eta_string", gen_eta_text(eta or 0))
 
                 ps.publish("is_charging", in_f > out_f)
                 ps.publish("is_discharging", out_f > in_f)
@@ -624,10 +675,12 @@ function iocontrol.update_facility_status(status)
 
             -- induction matricies statuses
             if type(rtu_statuses.induction) == "table" then
+                local matrix_status = MTX_STATE.OFFLINE
+
                 for id = 1, #fac.induction_ps_tbl do
                     if rtu_statuses.induction[id] == nil then
                         -- disconnected
-                        fac.induction_ps_tbl[id].publish("computed_status", 1)
+                        fac.induction_ps_tbl[id].publish("computed_status", matrix_status)
                     end
                 end
 
@@ -639,18 +692,20 @@ function iocontrol.update_facility_status(status)
                         local rtu_faulted = _record_multiblock_status(matrix, data, ps)
 
                         if rtu_faulted then
-                            ps.publish("computed_status", 3)     -- faulted
+                            matrix_status = MTX_STATE.FAULT
                         elseif data.formed then
                             if data.tanks.energy_fill >= 0.99 then
-                                ps.publish("computed_status", 6) -- full
+                                matrix_status = MTX_STATE.HIGH_CHARGE
                             elseif data.tanks.energy_fill <= 0.01 then
-                                ps.publish("computed_status", 5) -- empty
+                                matrix_status = MTX_STATE.LOW_CHARGE
                             else
-                                ps.publish("computed_status", 4) -- on-line
+                                matrix_status = MTX_STATE.ONLINE
                             end
                         else
-                            ps.publish("computed_status", 2)     -- not formed
+                            matrix_status = MTX_STATE.UNFORMED
                         end
+
+                        ps.publish("computed_status", matrix_status)
                     else
                         log.debug(util.c(log_header, "invalid induction matrix id ", id))
                     end
@@ -662,10 +717,12 @@ function iocontrol.update_facility_status(status)
 
             -- SPS statuses
             if type(rtu_statuses.sps) == "table" then
+                local sps_status = SPS_STATE.OFFLINE
+
                 for id = 1, #fac.sps_ps_tbl do
                     if rtu_statuses.sps[id] == nil then
                         -- disconnected
-                        fac.sps_ps_tbl[id].publish("computed_status", 1)
+                        fac.sps_ps_tbl[id].publish("computed_status", sps_status)
                     end
                 end
 
@@ -677,16 +734,13 @@ function iocontrol.update_facility_status(status)
                         local rtu_faulted = _record_multiblock_status(sps, data, ps)
 
                         if rtu_faulted then
-                            ps.publish("computed_status", 3)     -- faulted
+                            sps_status = SPS_STATE.FAULT
                         elseif data.formed then
-                            if data.state.process_rate > 0 then
+                            -- active / idle
-                                ps.publish("computed_status", 5) -- active
+                            sps_status = util.trinary(data.state.process_rate > 0, SPS_STATE.ACTIVE, SPS_STATE.IDLE)
-                            else
+                        else sps_status = SPS_STATE.UNFORMED end
-                                ps.publish("computed_status", 4) -- idle
+
-                            end
+                        ps.publish("computed_status", sps_status)
-                        else
-                            ps.publish("computed_status", 2)     -- not formed
-                        end
 
                         io.facility.ps.publish("am_rate", data.state.process_rate * 1000)
                     else
@@ -700,10 +754,12 @@ function iocontrol.update_facility_status(status)
 
             -- dynamic tank statuses
             if type(rtu_statuses.tanks) == "table" then
+                local tank_status = TNK_STATE.OFFLINE
+
                 for id = 1, #fac.tank_ps_tbl do
                     if rtu_statuses.tanks[id] == nil then
                         -- disconnected
-                        fac.tank_ps_tbl[id].publish("computed_status", 1)
+                        fac.tank_ps_tbl[id].publish("computed_status", tank_status)
                     end
                 end
 
@@ -715,18 +771,18 @@ function iocontrol.update_facility_status(status)
                         local rtu_faulted = _record_multiblock_status(tank, data, ps)
 
                         if rtu_faulted then
-                            ps.publish("computed_status", 3)     -- faulted
+                            tank_status = TNK_STATE.FAULT
                         elseif data.formed then
                             if data.tanks.fill >= 0.99 then
-                                ps.publish("computed_status", 6) -- full
+                                tank_status = TNK_STATE.HIGH_FILL
                             elseif data.tanks.fill < 0.20 then
-                                ps.publish("computed_status", 5) -- low
+                                tank_status = TNK_STATE.LOW_FILL
                             else
-                                ps.publish("computed_status", 4) -- on-line
+                                tank_status = TNK_STATE.ONLINE
                             end
-                        else
+                        else tank_status = TNK_STATE.UNFORMED end
-                            ps.publish("computed_status", 2)     -- not formed
+
-                        end
+                        ps.publish("computed_status", tank_status)
                     else
                         log.debug(util.c(log_header, "invalid dynamic tank id ", id))
                     end
@@ -826,9 +882,11 @@ function iocontrol.update_unit_statuses(statuses)
                     log.debug(log_header .. "reactor status not a table")
                 end
 
+                local computed_status = RCT_STATE.OFFLINE
+
                 if #reactor_status == 0 then
                     unit.connected = false
-                    unit.unit_ps.publish("computed_status", 1)   -- disconnected
+                    unit.unit_ps.publish("computed_status", computed_status)
                 elseif #reactor_status == 3 then
                     local mek_status = reactor_status[1]
                     local rps_status = reactor_status[2]
@@ -867,22 +925,23 @@ function iocontrol.update_unit_statuses(statuses)
                     burn_rate_sum = burn_rate_sum + burn_rate
 
                     if unit.reactor_data.mek_status.status then
-                        unit.unit_ps.publish("computed_status", 5)     -- running
+                        computed_status = RCT_STATE.ACTIVE
                     else
                         if unit.reactor_data.no_reactor then
-                            unit.unit_ps.publish("computed_status", 3) -- faulted
+                            computed_status = RCT_STATE.FAULT
                         elseif not unit.reactor_data.formed then
-                            unit.unit_ps.publish("computed_status", 2) -- multiblock not formed
+                            computed_status = RCT_STATE.UNFORMED
                         elseif unit.reactor_data.rps_status.force_dis then
-                            unit.unit_ps.publish("computed_status", 7) -- reactor force disabled
+                            computed_status = RCT_STATE.FORCE_DISABLED
                         elseif unit.reactor_data.rps_tripped and unit.reactor_data.rps_trip_cause ~= "manual" then
-                            unit.unit_ps.publish("computed_status", 6) -- SCRAM
+                            computed_status = RCT_STATE.SCRAMMED
                         else
-                            unit.unit_ps.publish("computed_status", 4) -- disabled
+                            computed_status = RCT_STATE.DISABLED
                         end
                     end
 
                     unit.connected = true
+                    unit.unit_ps.publish("computed_status", computed_status)
                 else
                     log.debug(log_header .. "reactor status length mismatch")
                     valid = false
@@ -896,13 +955,11 @@ function iocontrol.update_unit_statuses(statuses)
                     if type(rtu_statuses.boilers) == "table" then
                         local boil_sum = 0
 
-                        for id = 1, #unit.boiler_ps_tbl do
+                        computed_status = BLR_STATE.OFFLINE
-                            local connected = rtu_statuses.boilers[id] ~= nil
-                            unit.rtu_hw.boilers[id].connected = connected
 
-                            if not connected then
+                        for id = 1, #unit.boiler_ps_tbl do
-                                -- disconnected
+                            if rtu_statuses.boilers[id] == nil then
-                                unit.boiler_ps_tbl[id].publish("computed_status", 1)
+                                unit.boiler_ps_tbl[id].publish("computed_status", computed_status)
                             end
                         end
 
@@ -912,21 +969,15 @@ function iocontrol.update_unit_statuses(statuses)
                                 local ps   = unit.boiler_ps_tbl[id]
 
                                 local rtu_faulted = _record_multiblock_status(boiler, data, ps)
-                                unit.rtu_hw.boilers[id].faulted = rtu_faulted
 
                                 if rtu_faulted then
-                                    ps.publish("computed_status", 3)     -- faulted
+                                    computed_status = BLR_STATE.FAULT
                                 elseif data.formed then
                                     boil_sum = boil_sum + data.state.boil_rate
+                                    computed_status = util.trinary(data.state.boil_rate > 0, BLR_STATE.ACTIVE, BLR_STATE.IDLE)
+                                else computed_status = BLR_STATE.UNFORMED end
 
-                                    if data.state.boil_rate > 0 then
+                                unit.boiler_ps_tbl[id].publish("computed_status", computed_status)
-                                        ps.publish("computed_status", 5) -- active
-                                    else
-                                        ps.publish("computed_status", 4) -- idle
-                                    end
-                                else
-                                    ps.publish("computed_status", 2)     -- not formed
-                                end
                             else
                                 log.debug(util.c(log_header, "invalid boiler id ", id))
                                 valid = false
@@ -943,13 +994,11 @@ function iocontrol.update_unit_statuses(statuses)
                     if type(rtu_statuses.turbines) == "table" then
                         local flow_sum = 0
 
-                        for id = 1, #unit.turbine_ps_tbl do
+                        computed_status = TRB_STATE.OFFLINE
-                            local connected = rtu_statuses.turbines[id] ~= nil
-                            unit.rtu_hw.turbines[id].connected = connected
 
-                            if not connected then
+                        for id = 1, #unit.turbine_ps_tbl do
-                                -- disconnected
+                            if rtu_statuses.turbines[id] == nil then
-                                unit.turbine_ps_tbl[id].publish("computed_status", 1)
+                                unit.turbine_ps_tbl[id].publish("computed_status", computed_status)
                             end
                         end
 
@@ -959,23 +1008,22 @@ function iocontrol.update_unit_statuses(statuses)
                                 local ps   = unit.turbine_ps_tbl[id]
 
                                 local rtu_faulted = _record_multiblock_status(turbine, data, ps)
-                                unit.rtu_hw.turbines[id].faulted = rtu_faulted
 
                                 if rtu_faulted then
-                                    ps.publish("computed_status", 3)     -- faulted
+                                    computed_status = TRB_STATE.FAULT
                                 elseif data.formed then
                                     flow_sum = flow_sum + data.state.flow_rate
 
                                     if data.tanks.energy_fill >= 0.99 then
-                                        ps.publish("computed_status", 6) -- trip
+                                        computed_status = TRB_STATE.TRIPPED
                                     elseif data.state.flow_rate < 100 then
-                                        ps.publish("computed_status", 4) -- idle
+                                        computed_status = TRB_STATE.IDLE
                                     else
-                                        ps.publish("computed_status", 5) -- active
+                                        computed_status = TRB_STATE.ACTIVE
                                     end
-                                else
+                                else computed_status = TRB_STATE.UNFORMED end
-                                    ps.publish("computed_status", 2)     -- not formed
+
-                                end
+                                unit.turbine_ps_tbl[id].publish("computed_status", computed_status)
                             else
                                 log.debug(util.c(log_header, "invalid turbine id ", id))
                                 valid = false
@@ -990,10 +1038,11 @@ function iocontrol.update_unit_statuses(statuses)
 
                     -- dynamic tank statuses
                     if type(rtu_statuses.tanks) == "table" then
+                        computed_status = TNK_STATE.OFFLINE
+
                         for id = 1, #unit.tank_ps_tbl do
                             if rtu_statuses.tanks[id] == nil then
-                                -- disconnected
+                                unit.tank_ps_tbl[id].publish("computed_status", computed_status)
-                                unit.tank_ps_tbl[id].publish("computed_status", 1)
                             end
                         end
 
@@ -1005,18 +1054,18 @@ function iocontrol.update_unit_statuses(statuses)
                                 local rtu_faulted = _record_multiblock_status(tank, data, ps)
 
                                 if rtu_faulted then
-                                    ps.publish("computed_status", 3)     -- faulted
+                                    computed_status = TNK_STATE.FAULT
                                 elseif data.formed then
                                     if data.tanks.fill >= 0.99 then
-                                        ps.publish("computed_status", 6) -- full
+                                        computed_status = TNK_STATE.HIGH_FILL
                                     elseif data.tanks.fill < 0.20 then
-                                        ps.publish("computed_status", 5) -- low
+                                        computed_status = TNK_STATE.LOW_FILL
                                     else
-                                        ps.publish("computed_status", 4) -- on-line
+                                        computed_status = TNK_STATE.ONLINE
                                     end
-                                else
+                                else computed_status = TNK_STATE.UNFORMED end
-                                    ps.publish("computed_status", 2)     -- not formed
+
-                                end
+                                unit.tank_ps_tbl[id].publish("computed_status", computed_status)
                             else
                                 log.debug(util.c(log_header, "invalid dynamic tank id ", id))
                                 valid = false
@@ -1081,6 +1130,7 @@ function iocontrol.update_unit_statuses(statuses)
                 unit.annunciator = status[3]
 
                 if type(unit.annunciator) ~= "table" then
+---@diagnostic disable-next-line: missing-fields
                     unit.annunciator = {}
                     log.debug(log_header .. "annunciator state not a table")
                     valid = false
@@ -1192,6 +1242,7 @@ function iocontrol.update_unit_statuses(statuses)
                 local u_spent_rate = waste_rate
                 local u_pu_rate = util.trinary(is_pu, waste_rate, 0.0)
                 local u_po_rate = unit.sna_out_rate
+                local u_po_pl_rate = 0
 
                 unit.unit_ps.publish("pu_rate", u_pu_rate)
                 unit.unit_ps.publish("po_rate", u_po_rate)
@@ -1202,6 +1253,7 @@ function iocontrol.update_unit_statuses(statuses)
                     u_spent_rate = u_po_rate
                     unit.unit_ps.publish("po_pl_rate", u_po_rate)
                     unit.unit_ps.publish("po_am_rate", 0)
+                    u_po_pl_rate = u_po_rate
                     po_pl_rate = po_pl_rate + u_po_rate
                 elseif unit.waste_product == types.WASTE_PRODUCT.ANTI_MATTER then
                     u_spent_rate = 0
@@ -1213,6 +1265,8 @@ function iocontrol.update_unit_statuses(statuses)
                     unit.unit_ps.publish("po_am_rate", 0)
                 end
 
+                unit.waste_stats = { u_pu_rate, u_po_rate, u_po_pl_rate }
+
                 unit.unit_ps.publish("ws_rate", u_spent_rate)
 
                 pu_rate = pu_rate + u_pu_rate
@@ -1221,6 +1275,8 @@ function iocontrol.update_unit_statuses(statuses)
             end
         end
 
+        io.facility.waste_stats = { burn_rate_sum, pu_rate, po_rate, po_pl_rate, po_am_rate, spent_rate }
+
         io.facility.ps.publish("burn_sum", burn_rate_sum)
         io.facility.ps.publish("sna_count", sna_count_sum)
         io.facility.ps.publish("pu_rate", pu_rate)

coordinator/process.lua

@@ -286,6 +286,7 @@ function process.create_handle()
     handle.unit_ack = {}
 
     for u = 1, pctl.io.facility.num_units do
+---@diagnostic disable-next-line: missing-fields
         handle.unit_ack[u] = {}
 
         ---@class process_unit_ack
@@ -445,36 +446,21 @@ end
 ---@param product WASTE_PRODUCT waste product for auto control
 function process.set_process_waste(product)
     pctl.comms.send_fac_command(F_CMD.SET_WASTE_MODE, product)
-
     log.debug(util.c("PROCESS: SET WASTE ", product))
-
-    -- update config table and save
-    pctl.control_states.process.waste_product = product
-    _write_auto_config()
 end
 
 -- set automatic process control plutonium fallback
 ---@param enabled boolean whether to enable plutonium fallback
 function process.set_pu_fallback(enabled)
     pctl.comms.send_fac_command(F_CMD.SET_PU_FB, enabled)
-
     log.debug(util.c("PROCESS: SET PU FALLBACK ", enabled))
-
-    -- update config table and save
-    pctl.control_states.process.pu_fallback = enabled
-    _write_auto_config()
 end
 
 -- set automatic process control SPS usage at low power
 ---@param enabled boolean whether to enable SPS usage at low power
 function process.set_sps_low_power(enabled)
     pctl.comms.send_fac_command(F_CMD.SET_SPS_LP, enabled)
-
     log.debug(util.c("PROCESS: SET SPS LOW POWER ", enabled))
-
-    -- update config table and save
-    pctl.control_states.process.sps_low_power = enabled
-    _write_auto_config()
 end
 
 -- save process control settings
@@ -527,21 +513,30 @@ end
 -- record waste product settting after attempting to change it
 ---@param response WASTE_PRODUCT supervisor waste product settting
 function process.waste_ack_handle(response)
+    -- update config table and save
     pctl.control_states.process.waste_product = response
+    _write_auto_config()
+
     pctl.io.facility.ps.publish("process_waste_product", response)
 end
 
 -- record plutonium fallback settting after attempting to change it
 ---@param response boolean supervisor plutonium fallback settting
 function process.pu_fb_ack_handle(response)
+    -- update config table and save
     pctl.control_states.process.pu_fallback = response
+    _write_auto_config()
+
     pctl.io.facility.ps.publish("process_pu_fallback", response)
 end
 
 -- record SPS low power settting after attempting to change it
 ---@param response boolean supervisor SPS low power settting
 function process.sps_lp_ack_handle(response)
+    -- update config table and save
     pctl.control_states.process.sps_low_power = response
+    _write_auto_config()
+
     pctl.io.facility.ps.publish("process_sps_low_power", response)
 end
 

coordinator/session/pocket.lua

@@ -1,6 +1,7 @@
 local comms     = require("scada-common.comms")
 local log       = require("scada-common.log")
 local mqueue    = require("scada-common.mqueue")
+local types     = require("scada-common.types")
 local util      = require("scada-common.util")
 
 local iocontrol = require("coordinator.iocontrol")
@@ -14,6 +15,9 @@ local MGMT_TYPE = comms.MGMT_TYPE
 local FAC_COMMAND = comms.FAC_COMMAND
 local UNIT_COMMAND = comms.UNIT_COMMAND
 
+local AUTO_GROUP = types.AUTO_GROUP
+local WASTE_MODE = types.WASTE_MODE
+
 -- retry time constants in ms
 -- local INITIAL_WAIT = 1500
 -- local RETRY_PERIOD = 1000
@@ -166,8 +170,26 @@ function pocket.new_session(id, s_addr, i_seq_num, in_queue, out_queue, timeout)
                         log.info(log_tag .. "FAC ACK ALL ALARMS")
                         self.proc_handle.fac_ack_alarms()
                     elseif cmd == FAC_COMMAND.SET_WASTE_MODE then
+                        if pkt.length == 2 then
+                            log.info(util.c(log_tag, " SET WASTE ", pkt.data[2]))
+                            process.set_process_waste(pkt.data[2])
+                        else
+                            log.debug(log_tag .. "CRDN set waste mode packet length mismatch")
+                        end
                     elseif cmd == FAC_COMMAND.SET_PU_FB then
+                        if pkt.length == 2 then
+                            log.info(util.c(log_tag, " SET PU FALLBACK ", pkt.data[2]))
+                            process.set_pu_fallback(pkt.data[2] == true)
+                        else
+                            log.debug(log_tag .. "CRDN set pu fallback packet length mismatch")
+                        end
                     elseif cmd == FAC_COMMAND.SET_SPS_LP then
+                        if pkt.length == 2 then
+                            log.info(util.c(log_tag, " SET SPS LOW POWER ", pkt.data[2]))
+                            process.set_sps_low_power(pkt.data[2] == true)
+                        else
+                            log.debug(log_tag .. "CRDN set sps low power packet length mismatch")
+                        end
                     else
                         log.debug(log_tag .. "CRDN facility command unknown")
                     end
@@ -192,20 +214,28 @@ function pocket.new_session(id, s_addr, i_seq_num, in_queue, out_queue, timeout)
                             log.info(util.c(log_tag, "UNIT[", uid, "] RESET RPS"))
                             self.proc_handle.reset_rps(uid)
                         elseif cmd == UNIT_COMMAND.SET_BURN then
-                            if pkt.length == 3 then
+                            if (pkt.length == 3) and (type(pkt.data[3]) == "number") then
                                 log.info(util.c(log_tag, "UNIT[", uid, "] SET BURN ", pkt.data[3]))
                                 process.set_rate(uid, pkt.data[3])
                             else
                                 log.debug(log_tag .. "CRDN unit command burn rate missing option")
                             end
                         elseif cmd == UNIT_COMMAND.SET_WASTE then
+                            if (pkt.length == 3) and (type(pkt.data[3]) == "number") and
+                               (pkt.data[3] >= WASTE_MODE.AUTO) and (pkt.data[3] <= WASTE_MODE.MANUAL_ANTI_MATTER) then
+                                log.info(util.c(log_tag, "UNIT[", id, "] SET WASTE ", pkt.data[3]))
+                                process.set_unit_waste(uid, pkt.data[3])
+                            else
+                                log.debug(log_tag .. "CRDN unit command set waste missing/invalid option")
+                            end
                         elseif cmd == UNIT_COMMAND.ACK_ALL_ALARMS then
                             log.info(util.c(log_tag, "UNIT[", uid, "] ACK ALL ALARMS"))
                             self.proc_handle.ack_all_alarms(uid)
                         elseif cmd == UNIT_COMMAND.ACK_ALARM then
                         elseif cmd == UNIT_COMMAND.RESET_ALARM then
                         elseif cmd == UNIT_COMMAND.SET_GROUP then
-                            if pkt.length == 3 then
+                            if (pkt.length == 3) and (type(pkt.data[3]) == "number") and
+                               (pkt.data[3] >= AUTO_GROUP.MANUAL) and (pkt.data[3] <= AUTO_GROUP.BACKUP) then
                                 log.info(util.c(log_tag, "UNIT[", uid, "] SET GROUP ", pkt.data[3]))
                                 process.set_group(uid, pkt.data[3])
                             else
@@ -230,20 +260,67 @@ function pocket.new_session(id, s_addr, i_seq_num, in_queue, out_queue, timeout)
                     { fac.auto_ready, fac.auto_active, fac.auto_ramping, fac.auto_saturated },
                     { fac.auto_current_waste_product, fac.auto_pu_fallback_active },
                     util.table_len(fac.tank_data_tbl),
-                    fac.induction_data_tbl[1] ~= nil,
+                    fac.induction_data_tbl[1] ~= nil,   ---@fixme this means nothing
-                    fac.sps_data_tbl[1] ~= nil,
+                    fac.sps_data_tbl[1] ~= nil          ---@fixme this means nothing
                 }
 
                 _send(CRDN_TYPE.API_GET_FAC, data)
+            elseif pkt.type == CRDN_TYPE.API_GET_FAC_DTL then
+                local fac = db.facility
+                local mtx_sps = fac.induction_ps_tbl[1]
+
+                local units = {}
+                local tank_statuses = {}
+
+                for i = 1, #db.units do
+                    local u = db.units[i]
+                    units[i] = { u.connected, u.annunciator, u.reactor_data, u.tank_data_tbl }
+                    for t = 1, #u.tank_ps_tbl do table.insert(tank_statuses, u.tank_ps_tbl[t].get("computed_status")) end
+                end
+
+                for i = 1, #fac.tank_ps_tbl do table.insert(tank_statuses, fac.tank_ps_tbl[i].get("computed_status")) end
+
+                local matrix_data = {
+                    mtx_sps.get("eta_string"),
+                    mtx_sps.get("avg_charge"),
+                    mtx_sps.get("avg_inflow"),
+                    mtx_sps.get("avg_outflow"),
+                    mtx_sps.get("is_charging"),
+                    mtx_sps.get("is_discharging"),
+                    mtx_sps.get("at_max_io")
+                }
+
+                local data = {
+                    fac.all_sys_ok,
+                    fac.rtu_count,
+                    fac.auto_scram,
+                    fac.ascram_status,
+                    tank_statuses,
+                    fac.tank_data_tbl,
+                    fac.induction_ps_tbl[1].get("computed_status") or types.IMATRIX_STATE.OFFLINE,
+                    fac.induction_data_tbl[1],
+                    matrix_data,
+                    fac.sps_ps_tbl[1].get("computed_status") or types.SPS_STATE.OFFLINE,
+                    fac.sps_data_tbl[1],
+                    units
+                }
+
+                _send(CRDN_TYPE.API_GET_FAC_DTL, data)
             elseif pkt.type == CRDN_TYPE.API_GET_UNIT then
                 if pkt.length == 1 and type(pkt.data[1]) == "number" then
                     local u = db.units[pkt.data[1]]
 
+                    local statuses = { u.unit_ps.get("computed_status") }
+
+                    for i = 1, #u.boiler_ps_tbl do table.insert(statuses, u.boiler_ps_tbl[i].get("computed_status")) end
+                    for i = 1, #u.turbine_ps_tbl do table.insert(statuses, u.turbine_ps_tbl[i].get("computed_status")) end
+                    for i = 1, #u.tank_ps_tbl do table.insert(statuses, u.tank_ps_tbl[i].get("computed_status")) end
+
                     if u then
                         local data = {
                             u.unit_id,
                             u.connected,
-                            u.rtu_hw,
+                            statuses,
                             u.a_group,
                             u.alarms,
                             u.annunciator,
@@ -275,7 +352,6 @@ function pocket.new_session(id, s_addr, i_seq_num, in_queue, out_queue, timeout)
                         u.annunciator.AutoControl,
                         u.a_group
                     }
-
                 end
 
                 _send(CRDN_TYPE.API_GET_CTRL, data)
@@ -310,6 +386,47 @@ function pocket.new_session(id, s_addr, i_seq_num, in_queue, out_queue, timeout)
                 }
 
                 _send(CRDN_TYPE.API_GET_PROC, data)
+            elseif pkt.type == CRDN_TYPE.API_GET_WASTE then
+                local data = {}
+
+                local fac = db.facility
+                local proc = process.get_control_states().process
+
+                -- unit data
+                for i = 1, #db.units do
+                    local u = db.units[i]
+
+                    data[i] = {
+                        u.waste_mode,
+                        u.waste_product,
+                        u.num_snas,
+                        u.sna_peak_rate,
+                        u.sna_max_rate,
+                        u.sna_out_rate,
+                        u.waste_stats
+                    }
+                end
+
+                local process_rate = 0
+
+                if fac.sps_data_tbl[1].state then
+                    process_rate = fac.sps_data_tbl[1].state.process_rate
+                end
+
+                -- facility data
+                data[#db.units + 1] = {
+                    fac.auto_current_waste_product,
+                    fac.auto_pu_fallback_active,
+                    fac.auto_sps_disabled,
+                    proc.waste_product,
+                    proc.pu_fallback,
+                    proc.sps_low_power,
+                    fac.waste_stats,
+                    fac.sps_ps_tbl[1].get("computed_status") or types.SPS_STATE.OFFLINE,
+                    process_rate
+                }
+
+                _send(CRDN_TYPE.API_GET_WASTE, data)
             else
                 log.debug(log_tag .. "handler received unsupported CRDN packet type " .. pkt.type)
             end

coordinator/startup.lua

@@ -19,7 +19,7 @@ local renderer    = require("coordinator.renderer")
 local sounder     = require("coordinator.sounder")
 local threads     = require("coordinator.threads")
 
-local COORDINATOR_VERSION = "v1.5.13"
+local COORDINATOR_VERSION = "v1.6.4"
 
 local CHUNK_LOAD_DELAY_S = 30.0
 

coordinator/threads.lua

@@ -24,7 +24,8 @@ local MAIN_CLOCK   = 0.5 -- (2Hz,   10 ticks)
 local RENDER_SLEEP = 100 -- (100ms, 2 ticks)
 
 local MQ__RENDER_CMD = {
-    START_MAIN_UI = 1
+    START_MAIN_UI = 1,
+    CLOSE_MAIN_UI = 2
 }
 
 local MQ__RENDER_DATA = {
@@ -81,7 +82,7 @@ function threads.thread__main(smem)
                                 nic.connect(other_modem)
                             else
                                 -- close out main UI
-                                renderer.close_ui()
+                                smem.q.mq_render.push_command(MQ__RENDER_CMD.CLOSE_MAIN_UI)
 
                                 -- alert user to status
                                 log_sys("awaiting comms modem reconnect...")
@@ -167,9 +168,9 @@ function threads.thread__main(smem)
                     -- supervisor watchdog timeout
                     log_comms("supervisor server timeout")
 
-                    -- close connection, main UI, and stop sounder
+                    -- close main UI, connection, and stop sounder
+                    smem.q.mq_render.push_command(MQ__RENDER_CMD.CLOSE_MAIN_UI)
                     coord_comms.close()
-                    renderer.close_ui()
                     sounder.stop()
                 else
                     -- a non-clock/main watchdog timer event
@@ -188,9 +189,9 @@ function threads.thread__main(smem)
                 if coord_comms.handle_packet(packet) then
                     log_comms("supervisor closed connection")
 
-                    -- close connection, main UI, and stop sounder
+                    -- close main UI, connection, and stop sounder
+                    smem.q.mq_render.push_command(MQ__RENDER_CMD.CLOSE_MAIN_UI)
                     coord_comms.close()
-                    renderer.close_ui()
                     sounder.stop()
                 end
             elseif event == "monitor_touch" or event == "mouse_click" or event == "mouse_up" or
@@ -302,6 +303,13 @@ function threads.thread__render(smem)
                             else
                                 log_render("main UI draw took " .. (util.time_ms() - draw_start) .. "ms")
                             end
+                        elseif msg.message == MQ__RENDER_CMD.CLOSE_MAIN_UI then
+                            -- close the main UI if it has been drawn
+                            if renderer.ui_ready() then
+                                log_render("closing main UI...")
+                                renderer.close_ui()
+                                log_render("main UI closed")
+                            end
                         end
                     elseif msg.qtype == mqueue.TYPE.DATA then
                         -- received data

coordinator/ui/components/imatrix.lua

@@ -25,10 +25,9 @@ local ALIGN = core.ALIGN
 ---@param root Container parent
 ---@param x integer top left x
 ---@param y integer top left y
----@param data imatrix_session_db matrix data
 ---@param ps psil ps interface
 ---@param id number? matrix ID
-local function new_view(root, x, y, data, ps, id)
+local function new_view(root, x, y, ps, id)
     local label_fg = style.theme.label_fg
     local text_fg = style.theme.text_fg
     local lu_col = style.lu_colors
@@ -94,6 +93,7 @@ local function new_view(root, x, y, data, ps, id)
     TextBox{parent=rect,text="FILL I/O",x=2,y=20,width=8,fg_bg=label_fg}
 
     local function calc_saturation(val)
+        local data = db.facility.induction_data_tbl[id or 1]
         if (type(data.build) == "table") and (type(data.build.transfer_cap) == "number") and (data.build.transfer_cap > 0) then
             return val / data.build.transfer_cap
         else return 0 end
@@ -105,46 +105,7 @@ local function new_view(root, x, y, data, ps, id)
 
     local eta = TextBox{parent=rect,x=11,y=20,width=20,text="ETA Unknown",alignment=ALIGN.CENTER,fg_bg=style.theme.field_box}
 
-    eta.register(ps, "eta_ms", function (eta_ms)
+    eta.register(ps, "eta_string", eta.set_value)
-        local str, pre = "", util.trinary(eta_ms >= 0, "Full in ", "Empty in ")
-
-        local seconds = math.abs(eta_ms) / 1000
-        local minutes = seconds / 60
-        local hours   = minutes / 60
-        local days    = hours / 24
-
-        if math.abs(eta_ms) < 1000 or (eta_ms ~= eta_ms) then
-            -- really small or NaN
-            str = "No ETA"
-        elseif days < 1000 then
-            days    = math.floor(days)
-            hours   = math.floor(hours % 24)
-            minutes = math.floor(minutes % 60)
-            seconds = math.floor(seconds % 60)
-
-            if days > 0 then
-                str = days .. "d"
-            elseif hours > 0 then
-                str = hours .. "h " .. minutes .. "m"
-            elseif minutes > 0 then
-                str = minutes .. "m " .. seconds .. "s"
-            elseif seconds > 0 then
-                str = seconds .. "s"
-            end
-
-            str = pre .. str
-        else
-            local years = math.floor(days / 365.25)
-
-            if years <= 99999999 then
-                str = pre .. years .. "y"
-            else
-                str = pre .. "eras"
-            end
-        end
-
-        eta.set_value(str)
-    end)
 end
 
 return new_view

coordinator/ui/components/process_ctl.lua

@@ -94,14 +94,14 @@ local function new_view(root, x, y)
     main.line_break()
 
     local auto_scram  = IndicatorLight{parent=main,label="Automatic SCRAM",colors=ind_red,flash=true,period=period.BLINK_250_MS}
-    local matrix_dc   = IndicatorLight{parent=main,label="Matrix Disconnected",colors=ind_yel,flash=true,period=period.BLINK_500_MS}
+    local matrix_flt  = IndicatorLight{parent=main,label="Induction Matrix Fault",colors=ind_yel,flash=true,period=period.BLINK_500_MS}
     local matrix_fill = IndicatorLight{parent=main,label="Matrix Charge High",colors=ind_red,flash=true,period=period.BLINK_500_MS}
     local unit_crit   = IndicatorLight{parent=main,label="Unit Critical Alarm",colors=ind_red,flash=true,period=period.BLINK_250_MS}
     local fac_rad_h   = IndicatorLight{parent=main,label="Facility Radiation High",colors=ind_red,flash=true,period=period.BLINK_250_MS}
     local gen_fault   = IndicatorLight{parent=main,label="Gen. Control Fault",colors=ind_yel,flash=true,period=period.BLINK_500_MS}
 
     auto_scram.register(facility.ps, "auto_scram", auto_scram.update)
-    matrix_dc.register(facility.ps, "as_matrix_dc", matrix_dc.update)
+    matrix_flt.register(facility.ps, "as_matrix_fault", matrix_flt.update)
     matrix_fill.register(facility.ps, "as_matrix_fill", matrix_fill.update)
     unit_crit.register(facility.ps, "as_crit_alarm", unit_crit.update)
     fac_rad_h.register(facility.ps, "as_radiation", fac_rad_h.update)

coordinator/ui/components/unit_flow.lua

@@ -2,8 +2,11 @@
 -- Basic Unit Flow Overview
 --
 
+local types             = require("scada-common.types")
 local util              = require("scada-common.util")
 
+local iocontrol         = require("coordinator.iocontrol")
+
 local style             = require("coordinator.ui.style")
 
 local core              = require("graphics.core")
@@ -19,6 +22,8 @@ local DataIndicator     = require("graphics.elements.indicators.DataIndicator")
 local IndicatorLight    = require("graphics.elements.indicators.IndicatorLight")
 local TriIndicatorLight = require("graphics.elements.indicators.TriIndicatorLight")
 
+local COOLANT_TYPE = types.COOLANT_TYPE
+
 local ALIGN = core.ALIGN
 
 local sprintf = util.sprintf
@@ -35,8 +40,8 @@ local lg_gray = style.lg_gray
 ---@param x integer top left x
 ---@param y integer top left y
 ---@param wide boolean whether to render wide version
----@param unit ioctl_unit unit database entry
+---@param unit_id integer unit index
-local function make(parent, x, y, wide, unit)
+local function make(parent, x, y, wide, unit_id)
     local s_field = style.theme.field_box
 
     local text_c = style.text_colors
@@ -48,6 +53,12 @@ local function make(parent, x, y, wide, unit)
 
     local height = 16
 
+    local facility = iocontrol.get_db().facility
+    local unit = iocontrol.get_db().units[unit_id]
+
+    local tank_conns = facility.tank_conns
+    local tank_types = facility.tank_fluid_types
+
     local v_start = 1 + ((unit.unit_id - 1) * 5)
     local prv_start = 1 + ((unit.unit_id - 1) * 3)
     local v_fields = { "pu", "po", "pl", "am" }
@@ -80,21 +91,22 @@ local function make(parent, x, y, wide, unit)
 
     local rc_pipes = {}
 
-    local emc_x = 42    -- emergency coolant connection x point
-
     if unit.num_boilers > 0 then
         table.insert(rc_pipes, pipe(0, 1, _wide(28, 19), 1, colors.lightBlue, true))
         table.insert(rc_pipes, pipe(0, 3, _wide(28, 19), 3, colors.orange, true))
         table.insert(rc_pipes, pipe(_wide(46 ,39), 1, _wide(72,58), 1, colors.blue, true))
         table.insert(rc_pipes, pipe(_wide(46,39), 3, _wide(72,58), 3, colors.white, true))
     else
-        emc_x = 3
         table.insert(rc_pipes, pipe(0, 1, _wide(72,58), 1, colors.blue, true))
         table.insert(rc_pipes, pipe(0, 3, _wide(72,58), 3, colors.white, true))
     end
 
     if unit.has_tank then
-        table.insert(rc_pipes, pipe(emc_x, 1, emc_x, 0, colors.blue, true, true))
+        local is_water = tank_types[tank_conns[unit_id]] == COOLANT_TYPE.WATER
+        -- emergency coolant connection x point
+        local emc_x = util.trinary(is_water and (unit.num_boilers > 0), 42, 3)
+
+        table.insert(rc_pipes, pipe(emc_x, 1, emc_x, 0, util.trinary(is_water, colors.blue, colors.lightBlue), true, true))
     end
 
     local prv_yo = math.max(3 - unit.num_turbines, 0)

coordinator/ui/layout/flow_view.lua

@@ -24,6 +24,7 @@ local IndicatorLight = require("graphics.elements.indicators.IndicatorLight")
 local StateIndicator = require("graphics.elements.indicators.StateIndicator")
 
 local CONTAINER_MODE = types.CONTAINER_MODE
+local COOLANT_TYPE = types.COOLANT_TYPE
 
 local ALIGN = core.ALIGN
 
@@ -45,8 +46,10 @@ local function init(main)
     local facility = iocontrol.get_db().facility
     local units = iocontrol.get_db().units
 
-    local tank_defs = facility.tank_defs
+    local tank_defs  = facility.tank_defs
-    local tank_list = facility.tank_list
+    local tank_conns = facility.tank_conns
+    local tank_list  = facility.tank_list
+    local tank_types = facility.tank_fluid_types
 
     -- window header message
     local header = TextBox{parent=main,y=1,text="Facility Coolant and Waste Flow Monitor",alignment=ALIGN.CENTER,fg_bg=style.theme.header}
@@ -56,12 +59,16 @@ local function init(main)
     datetime.register(facility.ps, "date_time", datetime.set_value)
 
     local po_pipes = {}
-    local water_pipes = {}
+    local emcool_pipes = {}
 
     -- get the y offset for this unit index
     ---@param idx integer unit index
     local function y_ofs(idx) return ((idx - 1) * 20) end
 
+    -- get the coolant color
+    ---@param idx integer tank index
+    local function c_clr(idx) return util.trinary(tank_types[tank_conns[idx]] == COOLANT_TYPE.WATER, colors.blue, colors.lightBlue) end
+
     -- determinte facility tank start/end from the definitions list
     ---@param start_idx integer start index of table iteration
     ---@param end_idx integer end index of table iteration
@@ -81,11 +88,13 @@ local function init(main)
         for i = 1, facility.num_units do
             if units[i].has_tank then
                 local y = y_ofs(i)
-                table.insert(water_pipes, pipe(2, y, 2, y + 3, colors.blue, true))
+                local color = c_clr(i)
-                table.insert(water_pipes, pipe(2, y, 21, y, colors.blue, true))
 
-                local x = util.trinary(units[i].num_boilers == 0, 45, 84)
+                table.insert(emcool_pipes, pipe(2, y, 2, y + 3, color, true))
-                table.insert(water_pipes, pipe(21, y, x, y + 2, colors.blue, true, true))
+                table.insert(emcool_pipes, pipe(2, y, 21, y, color, true))
+
+                local x = util.trinary((tank_types[tank_conns[i]] == COOLANT_TYPE.SODIUM) or (units[i].num_boilers == 0), 45, 84)
+                table.insert(emcool_pipes, pipe(21, y, x, y + 2, color, true, true))
             end
         end
     else
@@ -93,16 +102,17 @@ local function init(main)
         for i = 1, #tank_defs do
             if tank_defs[i] > 0 then
                 local y = y_ofs(i)
+                local color = c_clr(i)
 
                 if tank_defs[i] == 2 then
-                    table.insert(water_pipes, pipe(1, y, 21, y, colors.blue, true))
+                    table.insert(emcool_pipes, pipe(1, y, 21, y, color, true))
                 else
-                    table.insert(water_pipes, pipe(2, y, 2, y + 3, colors.blue, true))
+                    table.insert(emcool_pipes, pipe(2, y, 2, y + 3, color, true))
-                    table.insert(water_pipes, pipe(2, y, 21, y, colors.blue, true))
+                    table.insert(emcool_pipes, pipe(2, y, 21, y, color, true))
                 end
 
-                local x = util.trinary(units[i].num_boilers == 0, 45, 84)
+                local x = util.trinary((tank_types[tank_conns[i]] == COOLANT_TYPE.SODIUM) or (units[i].num_boilers == 0), 45, 84)
-                table.insert(water_pipes, pipe(21, y, x, y + 2, colors.blue, true, true))
+                table.insert(emcool_pipes, pipe(21, y, x, y + 2, color, true, true))
             end
         end
 
@@ -112,13 +122,14 @@ local function init(main)
 
             for i = 1, #tank_defs do
                 local y = y_ofs(i)
+
                 if i == first_fdef then
-                    table.insert(water_pipes, pipe(0, y, 1, y + 5, colors.blue, true))
+                    table.insert(emcool_pipes, pipe(0, y, 1, y + 5, c_clr(i), true))
                 elseif i > first_fdef then
                     if i == last_fdef then
-                        table.insert(water_pipes, pipe(0, y - 14, 0, y, colors.blue, true))
+                        table.insert(emcool_pipes, pipe(0, y - 14, 0, y, c_clr(first_fdef), true))
                     elseif i < last_fdef then
-                        table.insert(water_pipes, pipe(0, y - 14, 0, y + 5, colors.blue, true))
+                        table.insert(emcool_pipes, pipe(0, y - 14, 0, y + 5, c_clr(first_fdef), true))
                     end
                 end
             end
@@ -128,17 +139,19 @@ local function init(main)
 
             for i = 1, #tank_defs do
                 local y = y_ofs(i)
+                local color = c_clr(first_fdef)
+
                 if i == 4 then
                     if tank_defs[i] == 2 then
-                        table.insert(water_pipes, pipe(0, y, 1, y + 5, colors.blue, true))
+                        table.insert(emcool_pipes, pipe(0, y, 1, y + 5, c_clr(i), true))
                     end
                 elseif i == first_fdef then
-                    table.insert(water_pipes, pipe(0, y, 1, y + 5, colors.blue, true))
+                    table.insert(emcool_pipes, pipe(0, y, 1, y + 5, color, true))
                 elseif i > first_fdef then
                     if i == last_fdef then
-                        table.insert(water_pipes, pipe(0, y - 14, 0, y, colors.blue, true))
+                        table.insert(emcool_pipes, pipe(0, y - 14, 0, y, color, true))
                     elseif i < last_fdef then
-                        table.insert(water_pipes, pipe(0, y - 14, 0, y + 5, colors.blue, true))
+                        table.insert(emcool_pipes, pipe(0, y - 14, 0, y + 5, color, true))
                     end
                 end
             end
@@ -147,12 +160,12 @@ local function init(main)
             for _, a in pairs({ 1, 3 }) do
                 local b = a + 1
                 if tank_defs[a] == 2 then
-                    table.insert(water_pipes, pipe(0, y_ofs(a), 1, y_ofs(a) + 6, colors.blue, true))
+                    table.insert(emcool_pipes, pipe(0, y_ofs(a), 1, y_ofs(a) + 6, c_clr(a), true))
                     if tank_defs[b] == 2 then
-                        table.insert(water_pipes, pipe(0, y_ofs(b) - 13, 1, y_ofs(b), colors.blue, true))
+                        table.insert(emcool_pipes, pipe(0, y_ofs(b) - 13, 1, y_ofs(b), c_clr(a), true))
                     end
                 elseif tank_defs[b] == 2 then
-                    table.insert(water_pipes, pipe(0, y_ofs(b), 1, y_ofs(b) + 6, colors.blue, true))
+                    table.insert(emcool_pipes, pipe(0, y_ofs(b), 1, y_ofs(b) + 6, c_clr(b), true))
                 end
             end
         elseif facility.tank_mode == 4 then
@@ -161,17 +174,19 @@ local function init(main)
 
             for i = 1, #tank_defs do
                 local y = y_ofs(i)
+                local color = c_clr(first_fdef)
+
                 if i == 1 then
                     if tank_defs[i] == 2 then
-                        table.insert(water_pipes, pipe(0, y, 1, y + 5, colors.blue, true))
+                        table.insert(emcool_pipes, pipe(0, y, 1, y + 5, c_clr(i), true))
                     end
                 elseif i == first_fdef then
-                    table.insert(water_pipes, pipe(0, y, 1, y + 5, colors.blue, true))
+                    table.insert(emcool_pipes, pipe(0, y, 1, y + 5, color, true))
                 elseif i > first_fdef then
                     if i == last_fdef then
-                        table.insert(water_pipes, pipe(0, y - 14, 0, y, colors.blue, true))
+                        table.insert(emcool_pipes, pipe(0, y - 14, 0, y, color, true))
                     elseif i < last_fdef then
-                        table.insert(water_pipes, pipe(0, y - 14, 0, y + 5, colors.blue, true))
+                        table.insert(emcool_pipes, pipe(0, y - 14, 0, y + 5, color, true))
                     end
                 end
             end
@@ -181,17 +196,19 @@ local function init(main)
 
             for i = 1, #tank_defs do
                 local y = y_ofs(i)
+                local color = c_clr(first_fdef)
+
                 if i == 3 or i == 4 then
                     if tank_defs[i] == 2 then
-                        table.insert(water_pipes, pipe(0, y, 1, y + 5, colors.blue, true))
+                        table.insert(emcool_pipes, pipe(0, y, 1, y + 5, c_clr(i), true))
                     end
                 elseif i == first_fdef then
-                    table.insert(water_pipes, pipe(0, y, 1, y + 5, colors.blue, true))
+                    table.insert(emcool_pipes, pipe(0, y, 1, y + 5, color, true))
                 elseif i > first_fdef then
                     if i == last_fdef then
-                        table.insert(water_pipes, pipe(0, y - 14, 0, y, colors.blue, true))
+                        table.insert(emcool_pipes, pipe(0, y - 14, 0, y, color, true))
                     elseif i < last_fdef then
-                        table.insert(water_pipes, pipe(0, y - 14, 0, y + 5, colors.blue, true))
+                        table.insert(emcool_pipes, pipe(0, y - 14, 0, y + 5, color, true))
                     end
                 end
             end
@@ -201,17 +218,19 @@ local function init(main)
 
             for i = 1, #tank_defs do
                 local y = y_ofs(i)
+                local color = c_clr(first_fdef)
+
                 if i == 1 or i == 4 then
                     if tank_defs[i] == 2 then
-                        table.insert(water_pipes, pipe(0, y, 1, y + 5, colors.blue, true))
+                        table.insert(emcool_pipes, pipe(0, y, 1, y + 5, c_clr(i), true))
                     end
                 elseif i == first_fdef then
-                    table.insert(water_pipes, pipe(0, y, 1, y + 5, colors.blue, true))
+                    table.insert(emcool_pipes, pipe(0, y, 1, y + 5, color, true))
                 elseif i > first_fdef then
                     if i == last_fdef then
-                        table.insert(water_pipes, pipe(0, y - 14, 0, y, colors.blue, true))
+                        table.insert(emcool_pipes, pipe(0, y - 14, 0, y, color, true))
                     elseif i < last_fdef then
-                        table.insert(water_pipes, pipe(0, y - 14, 0, y + 5, colors.blue, true))
+                        table.insert(emcool_pipes, pipe(0, y - 14, 0, y + 5, color, true))
                     end
                 end
             end
@@ -221,17 +240,19 @@ local function init(main)
 
             for i = 1, #tank_defs do
                 local y = y_ofs(i)
+                local color = c_clr(first_fdef)
+
                 if i == 1 or i == 2 then
                     if tank_defs[i] == 2 then
-                        table.insert(water_pipes, pipe(0, y, 1, y + 5, colors.blue, true))
+                        table.insert(emcool_pipes, pipe(0, y, 1, y + 5, c_clr(i), true))
                     end
                 elseif i == first_fdef then
-                    table.insert(water_pipes, pipe(0, y, 1, y + 5, colors.blue, true))
+                    table.insert(emcool_pipes, pipe(0, y, 1, y + 5, color, true))
                 elseif i > first_fdef then
                     if i == last_fdef then
-                        table.insert(water_pipes, pipe(0, y - 14, 0, y, colors.blue, true))
+                        table.insert(emcool_pipes, pipe(0, y - 14, 0, y, color, true))
                     elseif i < last_fdef then
-                        table.insert(water_pipes, pipe(0, y - 14, 0, y + 5, colors.blue, true))
+                        table.insert(emcool_pipes, pipe(0, y - 14, 0, y + 5, color, true))
                     end
                 end
             end
@@ -239,14 +260,14 @@ local function init(main)
     end
 
     local flow_x = 3
-    if #water_pipes > 0 then
+    if #emcool_pipes > 0 then
         flow_x = 25
-        PipeNetwork{parent=main,x=2,y=3,pipes=water_pipes,bg=style.theme.bg}
+        PipeNetwork{parent=main,x=2,y=3,pipes=emcool_pipes,bg=style.theme.bg}
     end
 
     for i = 1, facility.num_units do
         local y_offset = y_ofs(i)
-        unit_flow(main, flow_x, 5 + y_offset, #water_pipes == 0, units[i])
+        unit_flow(main, flow_x, 5 + y_offset, #emcool_pipes == 0, i)
         table.insert(po_pipes, pipe(0, 3 + y_offset, 4, 0, colors.cyan, true, true))
         util.nop()
     end
@@ -301,8 +322,10 @@ local function init(main)
             local tank_pcnt = DataIndicator{parent=tank_box,x=10,y=3,label="",format="%5.2f",value=100,unit="%",lu_colors=lu_col,width=8,fg_bg=text_col}
             local tank_amnt = DataIndicator{parent=tank_box,x=2,label="",format="%13d",value=0,commas=true,unit="mB",lu_colors=lu_col,width=16,fg_bg=s_field}
 
-            TextBox{parent=tank_box,x=2,y=6,text="Water Level",width=11,fg_bg=style.label}
+            local is_water = tank_types[i] == COOLANT_TYPE.WATER
-            local level = HorizontalBar{parent=tank_box,x=2,y=7,bar_fg_bg=cpair(colors.blue,colors.gray),height=1,width=16}
+
+            TextBox{parent=tank_box,x=2,y=6,text=util.trinary(is_water,"Water","Sodium").." Level",width=12,fg_bg=style.label}
+            local level = HorizontalBar{parent=tank_box,x=2,y=7,bar_fg_bg=cpair(util.trinary(is_water,colors.blue,colors.lightBlue),colors.gray),height=1,width=16}
 
             TextBox{parent=tank_box,x=2,y=9,text="In/Out Mode",width=11,fg_bg=style.label}
             local can_fill = IndicatorLight{parent=tank_box,x=2,y=10,label="FILL",colors=style.ind_wht}

coordinator/ui/layout/main_view.lua

@@ -88,7 +88,7 @@ local function init(main)
 
     util.nop()
 
-    imatrix(main, 131, cnc_bottom_align_start, facility.induction_data_tbl[1], facility.induction_ps_tbl[1])
+    imatrix(main, 131, cnc_bottom_align_start, facility.induction_ps_tbl[1])
 end
 
 return init

coordinator/ui/style.lua

@@ -147,235 +147,102 @@ style.gray_white = cpair(colors.gray, colors.white)
 -- UI COMPONENTS --
 
 style.reactor = {
-    -- reactor states
+    -- reactor states<br>
+    ---@see REACTOR_STATE
     states = {
-        {
+        { color = cpair(colors.black, colors.yellow), text = "PLC OFF-LINE" },
-            color = cpair(colors.black, colors.yellow),
+        { color = cpair(colors.black, colors.orange), text = "NOT FORMED" },
-            text = "PLC OFF-LINE"
+        { color = cpair(colors.black, colors.orange), text = "PLC  FAULT" },
-        },
+        { color = cpair(colors.white, colors.gray),   text = "DISABLED" },
-        {
+        { color = cpair(colors.black, colors.green),  text = "ACTIVE" },
-            color = cpair(colors.black, colors.orange),
+        { color = cpair(colors.black, colors.red),    text = "SCRAMMED" },
-            text = "NOT FORMED"
+        { color = cpair(colors.black, colors.red),    text = "FORCE DISABLED" }
-        },
-        {
-            color = cpair(colors.black, colors.orange),
-            text = "PLC  FAULT"
-        },
-        {
-            color = cpair(colors.white, colors.gray),
-            text = "DISABLED"
-        },
-        {
-            color = cpair(colors.black, colors.green),
-            text = "ACTIVE"
-        },
-        {
-            color = cpair(colors.black, colors.red),
-            text = "SCRAMMED"
-        },
-        {
-            color = cpair(colors.black, colors.red),
-            text = "FORCE DISABLED"
-        }
     }
 }
 
 style.boiler = {
-    -- boiler states
+    -- boiler states<br>
+    ---@see BOILER_STATE
     states = {
-        {
+        { color = cpair(colors.black, colors.yellow), text = "OFF-LINE" },
-            color = cpair(colors.black, colors.yellow),
+        { color = cpair(colors.black, colors.orange), text = "NOT FORMED" },
-            text = "OFF-LINE"
+        { color = cpair(colors.black, colors.orange), text = "RTU  FAULT" },
-        },
+        { color = cpair(colors.white, colors.gray),   text = "IDLE" },
-        {
+        { color = cpair(colors.black, colors.green),  text = "ACTIVE" }
-            color = cpair(colors.black, colors.orange),
-            text = "NOT FORMED"
-        },
-        {
-            color = cpair(colors.black, colors.orange),
-            text = "RTU  FAULT"
-        },
-        {
-            color = cpair(colors.white, colors.gray),
-            text = "IDLE"
-        },
-        {
-            color = cpair(colors.black, colors.green),
-            text = "ACTIVE"
-        }
     }
 }
 
 style.turbine = {
-    -- turbine states
+    -- turbine states<br>
+    ---@see TURBINE_STATE
     states = {
-        {
+        { color = cpair(colors.black, colors.yellow), text = "OFF-LINE" },
-            color = cpair(colors.black, colors.yellow),
+        { color = cpair(colors.black, colors.orange), text = "NOT FORMED" },
-            text = "OFF-LINE"
+        { color = cpair(colors.black, colors.orange), text = "RTU  FAULT" },
-        },
+        { color = cpair(colors.white, colors.gray),   text = "IDLE" },
-        {
+        { color = cpair(colors.black, colors.green),  text = "ACTIVE" },
-            color = cpair(colors.black, colors.orange),
+        { color = cpair(colors.black, colors.red),    text = "TRIP" }
-            text = "NOT FORMED"
-        },
-        {
-            color = cpair(colors.black, colors.orange),
-            text = "RTU  FAULT"
-        },
-        {
-            color = cpair(colors.white, colors.gray),
-            text = "IDLE"
-        },
-        {
-            color = cpair(colors.black, colors.green),
-            text = "ACTIVE"
-        },
-        {
-            color = cpair(colors.black, colors.red),
-            text = "TRIP"
-        }
-    }
-}
-
-style.imatrix = {
-    -- induction matrix states
-    states = {
-        {
-            color = cpair(colors.black, colors.yellow),
-            text = "OFF-LINE"
-        },
-        {
-            color = cpair(colors.black, colors.orange),
-            text = "NOT FORMED"
-        },
-        {
-            color = cpair(colors.black, colors.orange),
-            text = "RTU  FAULT"
-        },
-        {
-            color = cpair(colors.black, colors.green),
-            text = "ONLINE"
-        },
-        {
-            color = cpair(colors.black, colors.yellow),
-            text = "LOW CHARGE"
-        },
-        {
-            color = cpair(colors.black, colors.yellow),
-            text = "HIGH  CHARGE"
-        }
-    }
-}
-
-style.sps = {
-    -- SPS states
-    states = {
-        {
-            color = cpair(colors.black, colors.yellow),
-            text = "OFF-LINE"
-        },
-        {
-            color = cpair(colors.black, colors.orange),
-            text = "NOT FORMED"
-        },
-        {
-            color = cpair(colors.black, colors.orange),
-            text = "RTU  FAULT"
-        },
-        {
-            color = cpair(colors.white, colors.gray),
-            text = "IDLE"
-        },
-        {
-            color = cpair(colors.black, colors.green),
-            text = "ACTIVE"
-        }
     }
 }
 
 style.dtank = {
-    -- dynamic tank states
+    -- dynamic tank states<br>
+    ---@see TANK_STATE
     states = {
-        {
+        { color = cpair(colors.black, colors.yellow), text = "OFF-LINE" },
-            color = cpair(colors.black, colors.yellow),
+        { color = cpair(colors.black, colors.orange), text = "NOT FORMED" },
-            text = "OFF-LINE"
+        { color = cpair(colors.black, colors.orange), text = "RTU  FAULT" },
-        },
+        { color = cpair(colors.black, colors.green),  text = "ONLINE" },
-        {
+        { color = cpair(colors.black, colors.yellow), text = "LOW FILL" },
-            color = cpair(colors.black, colors.orange),
+        { color = cpair(colors.black, colors.green),  text = "FILLED" }
-            text = "NOT FORMED"
+    }
-        },
+}
-        {
+
-            color = cpair(colors.black, colors.orange),
+style.imatrix = {
-            text = "RTU  FAULT"
+    -- induction matrix states<br>
-        },
+    ---@see IMATRIX_STATE
-        {
+    states = {
-            color = cpair(colors.black, colors.green),
+        { color = cpair(colors.black, colors.yellow), text = "OFF-LINE" },
-            text = "ONLINE"
+        { color = cpair(colors.black, colors.orange), text = "NOT FORMED" },
-        },
+        { color = cpair(colors.black, colors.orange), text = "RTU  FAULT" },
-        {
+        { color = cpair(colors.black, colors.green),  text = "ONLINE" },
-            color = cpair(colors.black, colors.yellow),
+        { color = cpair(colors.black, colors.yellow), text = "LOW CHARGE" },
-            text = "LOW FILL"
+        { color = cpair(colors.black, colors.yellow), text = "HIGH  CHARGE" }
-        },
+    }
-        {
+}
-            color = cpair(colors.black, colors.green),
+
-            text = "FILLED"
+style.sps = {
-        },
+    -- SPS states<br>
+    ---@see SPS_STATE
+    states = {
+        { color = cpair(colors.black, colors.yellow), text = "OFF-LINE" },
+        { color = cpair(colors.black, colors.orange), text = "NOT FORMED" },
+        { color = cpair(colors.black, colors.orange), text = "RTU  FAULT" },
+        { color = cpair(colors.white, colors.gray),   text = "IDLE" },
+        { color = cpair(colors.black, colors.green),  text = "ACTIVE" }
     }
 }
 
 style.waste = {
     -- auto waste processing states
     states = {
-        {
+        { color = cpair(colors.black, colors.green),  text = "PLUTONIUM" },
-            color = cpair(colors.black, colors.green),
+        { color = cpair(colors.black, colors.cyan),   text = "POLONIUM" },
-            text = "PLUTONIUM"
+        { color = cpair(colors.black, colors.purple), text = "ANTI MATTER" }
-        },
-        {
-            color = cpair(colors.black, colors.cyan),
-            text = "POLONIUM"
-        },
-        {
-            color = cpair(colors.black, colors.purple),
-            text = "ANTI MATTER"
-        }
     },
     states_abbrv = {
-        {
+        { color = cpair(colors.black, colors.green),  text = "Pu" },
-            color = cpair(colors.black, colors.green),
+        { color = cpair(colors.black, colors.cyan),   text = "Po" },
-            text = "Pu"
+        { color = cpair(colors.black, colors.purple), text = "AM" }
-        },
-        {
-            color = cpair(colors.black, colors.cyan),
-            text = "Po"
-        },
-        {
-            color = cpair(colors.black, colors.purple),
-            text = "AM"
-        }
     },
     -- process radio button options
     options = { "Plutonium", "Polonium", "Antimatter" },
     -- unit waste selection
     unit_opts = {
-        {
+        { text = "Auto", fg_bg = cpair(colors.black, colors.lightGray), active_fg_bg = cpair(colors.white, colors.gray) },
-            text = "Auto",
+        { text = "Pu", fg_bg = cpair(colors.black, colors.lightGray), active_fg_bg = cpair(colors.black, colors.green) },
-            fg_bg = cpair(colors.black, colors.lightGray),
+        { text = "Po", fg_bg = cpair(colors.black, colors.lightGray), active_fg_bg = cpair(colors.black, colors.cyan) },
-            active_fg_bg = cpair(colors.white, colors.gray)
+        { text = "AM", fg_bg = cpair(colors.black, colors.lightGray), active_fg_bg = cpair(colors.black, colors.purple) }
-        },
-        {
-            text = "Pu",
-            fg_bg = cpair(colors.black, colors.lightGray),
-            active_fg_bg = cpair(colors.black, colors.green)
-        },
-        {
-            text = "Po",
-            fg_bg = cpair(colors.black, colors.lightGray),
-            active_fg_bg = cpair(colors.black, colors.cyan)
-        },
-        {
-            text = "AM",
-            fg_bg = cpair(colors.black, colors.lightGray),
-            active_fg_bg = cpair(colors.black, colors.purple)
-        }
     }
 }
 

graphics/core.lua

@@ -7,7 +7,7 @@ local flasher = require("graphics.flasher")
 
 local core = {}
 
-core.version = "2.4.5"
+core.version = "2.4.7"
 
 core.flasher = flasher
 core.events = events

graphics/element.lua

@@ -2,7 +2,6 @@
 -- Generic Graphics Element
 --
 
--- local log  = require("scada-common.log")
 local util = require("scada-common.util")
 
 local core = require("graphics.core")
@@ -476,10 +475,7 @@ function element.new(args, constraint, child_offset_x, child_offset_y)
 
         if args.parent ~= nil then
             -- remove self from parent
-            -- log.debug("removing " .. self.id .. " from parent")
             args.parent.__remove_child(self.id)
-        else
-            -- log.debug("no parent for " .. self.id .. " on delete attempt")
         end
     end
 
@@ -502,9 +498,12 @@ function element.new(args, constraint, child_offset_x, child_offset_y)
             self.next_id = self.next_id + 1
         end
 
-        table.insert(protected.children, child)
+        -- see #539 on GitHub
+        -- using #protected.children after inserting may give the wrong index, since if it inserts in a hole that completes the list then
+        -- the length will jump up to the full length of the list, possibly making two map entries point to the same child
+        protected.child_id_map[id] = #protected.children + 1
 
-        protected.child_id_map[id] = #protected.children
+        table.insert(protected.children, child)
 
         return id
     end

graphics/elements/ListBox.lua

@@ -1,6 +1,5 @@
 -- Scroll-able List Box Display Graphics Element
 
--- local log     = require("scada-common.log")
 local tcd     = require("scada-common.tcd")
 
 local core    = require("graphics.core")
@@ -153,7 +152,6 @@ return function (args)
             next_y = next_y + item.h + item_pad
             item.e.reposition(1, item.y)
             item.e.show()
-            -- log.debug("iterated " .. item.e.get_id())
         end
 
         content_height = next_y
@@ -212,7 +210,6 @@ return function (args)
     ---@param child graphics_element child element
     function e.on_added(id, child)
         table.insert(list, { id = id, e = child, y = 0, h = child.get_height() })
-        -- log.debug("added child " .. id .. " into slot " .. #list)
         update_positions()
     end
 
@@ -222,12 +219,10 @@ return function (args)
         for idx, elem in ipairs(list) do
             if elem.id == id then
                 table.remove(list, idx)
-                -- log.debug("removed child " .. id .. " from slot " .. idx)
                 update_positions()
                 return
             end
         end
-        -- log.debug("failed to remove child " .. id)
     end
 
     -- handle focus

graphics/elements/controls/Checkbox.lua

@@ -6,6 +6,7 @@ local element = require("graphics.element")
 ---@class checkbox_args
 ---@field label string checkbox text
 ---@field box_fg_bg cpair colors for checkbox
+---@field disable_fg_bg? cpair text colors when disabled
 ---@field default? boolean default value
 ---@field callback? function function to call on press
 ---@field parent graphics_element
@@ -35,20 +36,27 @@ return function (args)
     local function draw()
         e.w_set_cur(1, 1)
 
+        local fgd, bkg = args.box_fg_bg.fgd, args.box_fg_bg.bkg
+
+        if (not e.enabled) and type(args.disable_fg_bg) == "table" then
+            fgd = args.disable_fg_bg.bkg
+            bkg = args.disable_fg_bg.fgd
+        end
+
         if e.value then
             -- show as selected
-            e.w_set_fgd(args.box_fg_bg.bkg)
+            e.w_set_fgd(bkg)
-            e.w_set_bkg(args.box_fg_bg.fgd)
+            e.w_set_bkg(fgd)
             e.w_write("\x88")
-            e.w_set_fgd(args.box_fg_bg.fgd)
+            e.w_set_fgd(fgd)
             e.w_set_bkg(e.fg_bg.bkg)
             e.w_write("\x95")
         else
             -- show as unselected
             e.w_set_fgd(e.fg_bg.bkg)
-            e.w_set_bkg(args.box_fg_bg.bkg)
+            e.w_set_bkg(bkg)
             e.w_write("\x88")
-            e.w_set_fgd(args.box_fg_bg.bkg)
+            e.w_set_fgd(bkg)
             e.w_set_bkg(e.fg_bg.bkg)
             e.w_write("\x95")
         end
@@ -57,16 +65,18 @@ return function (args)
     -- write label text
     local function draw_label()
         if e.enabled and e.is_focused() then
-            e.w_set_cur(3, 1)
             e.w_set_fgd(e.fg_bg.bkg)
             e.w_set_bkg(e.fg_bg.fgd)
-            e.w_write(args.label)
+        elseif (not e.enabled) and type(args.disable_fg_bg) == "table" then
+            e.w_set_fgd(args.disable_fg_bg.fgd)
+            e.w_set_bkg(args.disable_fg_bg.bkg)
         else
-            e.w_set_cur(3, 1)
             e.w_set_fgd(e.fg_bg.fgd)
             e.w_set_bkg(e.fg_bg.bkg)
-            e.w_write(args.label)
         end
+
+        e.w_set_cur(3, 1)
+        e.w_write(args.label)
     end
 
     -- handle mouse interaction
@@ -98,20 +108,20 @@ return function (args)
         draw()
     end
 
-    -- handle focus
-    e.on_focused = draw_label
-    e.on_unfocused = draw_label
-
-    -- handle enable
-    e.on_enabled = draw_label
-    e.on_disabled = draw_label
-
     -- element redraw
     function e.redraw()
         draw()
         draw_label()
     end
 
+    -- handle focus
+    e.on_focused = draw_label
+    e.on_unfocused = draw_label
+
+    -- handle enable
+    e.on_enabled = e.redraw
+    e.on_disabled = e.redraw
+
     ---@class Checkbox:graphics_element
     local Checkbox, id = e.complete(true)
 

pocket/configure.lua

@@ -50,6 +50,7 @@ style.btn_dis_fg_bg = cpair(colors.lightGray, colors.white)
 
 ---@class _pkt_cfg_tool_ctl
 local tool_ctl = {
+    launch_startup = false,
     ask_config = false,
     has_config = false,
     viewing_config = false,
@@ -162,8 +163,16 @@ local function config_view(display)
 
     if not tool_ctl.has_config then tool_ctl.view_cfg.disable() end
 
+    local function startup()
+        tool_ctl.launch_startup = true
+        exit()
+    end
+
     PushButton{parent=main_page,x=2,y=18,min_width=6,text="Exit",callback=exit,fg_bg=cpair(colors.black,colors.red),active_fg_bg=btn_act_fg_bg}
-    PushButton{parent=main_page,x=14,y=18,min_width=12,text="Change Log",callback=function()main_pane.set_value(6)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    local start_btn = PushButton{parent=main_page,x=17,y=18,min_width=9,text="Startup",callback=startup,fg_bg=cpair(colors.black,colors.green),active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg}
+    PushButton{parent=main_page,x=2,y=y_start+4,min_width=12,text="Change Log",callback=function()main_pane.set_value(6)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+
+    if tool_ctl.ask_config then start_btn.disable() end
 
     --#endregion
 
@@ -254,7 +263,7 @@ function configurator.configure(ask_config)
         println("configurator error: " .. error)
     end
 
-    return status, error
+    return status, error, tool_ctl.launch_startup
 end
 
 return configurator

pocket/iocontrol.lua

@@ -2,11 +2,11 @@
 -- I/O Control for Pocket Integration with Supervisor & Coordinator
 --
 
-local const   = require("scada-common.constants")
 local psil    = require("scada-common.psil")
 local types   = require("scada-common.types")
 local util    = require("scada-common.util")
 
+local iorx    = require("pocket.iorx")
 local process = require("pocket.process")
 
 local ALARM = types.ALARM
@@ -50,6 +50,8 @@ function iocontrol.init_core(pkt_comms, nav, cfg)
     comms = pkt_comms
     config = cfg
 
+    iocontrol.rx = iorx(io)
+
     io.nav = nav
 
     ---@class pocket_ioctl_diag
@@ -92,9 +94,11 @@ function iocontrol.init_core(pkt_comms, nav, cfg)
     -- API access
     ---@class pocket_ioctl_api
     io.api = {
+        get_fac = function () comms.api__get_facility() end,
         get_unit = function (unit) comms.api__get_unit(unit) end,
         get_ctrl = function () comms.api__get_control() end,
-        get_proc = function () comms.api__get_process() end
+        get_proc = function () comms.api__get_process() end,
+        get_waste = function () comms.api__get_waste() end
     }
 end
 
@@ -135,6 +139,9 @@ function iocontrol.init_fac(conf)
         num_units = conf.num_units,
         tank_mode = conf.cooling.fac_tank_mode,
         tank_defs = conf.cooling.fac_tank_defs,
+        tank_list = conf.cooling.fac_tank_list,
+        tank_conns = conf.cooling.fac_tank_conns,
+        tank_fluid_types = conf.cooling.tank_fluid_types,
         all_sys_ok = false,
         rtu_count = 0,
 
@@ -148,7 +155,7 @@ function iocontrol.init_fac(conf)
         auto_scram = false,
         ---@type ascram_status
         ascram_status = {
-            matrix_dc = false,
+            matrix_fault = false,
             matrix_fill = false,
             crit_alarm = false,
             radiation = false,
@@ -158,6 +165,8 @@ function iocontrol.init_fac(conf)
         ---@type WASTE_PRODUCT
         auto_current_waste_product = types.WASTE_PRODUCT.PLUTONIUM,
         auto_pu_fallback_active = false,
+        auto_sps_disabled = false,
+        waste_stats = { 0, 0, 0, 0, 0, 0 }, -- waste in, pu, po, po pellets, am, spent waste
 
         radiation = types.new_zero_radiation_reading(),
 
@@ -184,6 +193,14 @@ function iocontrol.init_fac(conf)
     table.insert(io.facility.sps_ps_tbl, psil.create())
     table.insert(io.facility.sps_data_tbl, {})
 
+    -- create facility tank tables
+    for i = 1, #io.facility.tank_list do
+        if io.facility.tank_list[i] == 2 then
+            table.insert(io.facility.tank_ps_tbl, psil.create())
+            table.insert(io.facility.tank_data_tbl, {})
+        end
+    end
+
     -- create unit data structures
     io.units = {}   ---@type pioctl_unit[]
     for i = 1, conf.num_units do
@@ -191,8 +208,6 @@ function iocontrol.init_fac(conf)
         local entry = {
             unit_id = i,
             connected = false,
-            ---@type { boilers: { connected: boolean, faulted: boolean }[], turbines: { connected: boolean, faulted: boolean }[] }
-            rtu_hw = {},
 
             num_boilers = 0,
             num_turbines = 0,
@@ -217,6 +232,7 @@ function iocontrol.init_fac(conf)
 
             last_rate_change_ms = 0,
             turbine_flow_stable = false,
+            waste_stats = { 0, 0, 0 },  -- plutonium, polonium, po pellets
 
             -- auto control group
             a_group = types.AUTO_GROUP.MANUAL,
@@ -235,6 +251,7 @@ function iocontrol.init_fac(conf)
             ---@type { [ALARM]: ALARM_STATE }
             alarms = { ALARM_STATE.INACTIVE, ALARM_STATE.INACTIVE, ALARM_STATE.INACTIVE, ALARM_STATE.INACTIVE, ALARM_STATE.INACTIVE, ALARM_STATE.INACTIVE, ALARM_STATE.INACTIVE, ALARM_STATE.INACTIVE, ALARM_STATE.INACTIVE, ALARM_STATE.INACTIVE, ALARM_STATE.INACTIVE, ALARM_STATE.INACTIVE },
 
+---@diagnostic disable-next-line: missing-fields
             annunciator = {},       ---@type annunciator
 
             unit_ps = psil.create(),
@@ -343,583 +360,6 @@ function iocontrol.report_crd_tt(trip_time)
     io.ps.publish("crd_conn_quality", state)
 end
 
--- populate facility data from API_GET_FAC
----@param data table
----@return boolean valid
-function iocontrol.record_facility_data(data)
-    local valid = true
-
-    local fac = io.facility
-
-    fac.all_sys_ok = data[1]
-    fac.rtu_count = data[2]
-    fac.radiation = data[3]
-
-    -- auto control
-    if type(data[4]) == "table" and #data[4] == 4 then
-        fac.auto_ready = data[4][1]
-        fac.auto_active = data[4][2]
-        fac.auto_ramping = data[4][3]
-        fac.auto_saturated = data[4][4]
-    end
-
-    -- waste
-    if type(data[5]) == "table" and #data[5] == 2 then
-        fac.auto_current_waste_product = data[5][1]
-        fac.auto_pu_fallback_active = data[5][2]
-    end
-
-    fac.num_tanks = data[6]
-    fac.has_imatrix = data[7]
-    fac.has_sps = data[8]
-
-    return valid
-end
-
-local function tripped(state) return state == ALARM_STATE.TRIPPED or state == ALARM_STATE.ACKED end
-
-local function _record_multiblock_status(faulted, data, ps)
-    ps.publish("formed", data.formed)
-    ps.publish("faulted", faulted)
-
-    for key, val in pairs(data.state) do ps.publish(key, val) end
-    for key, val in pairs(data.tanks) do ps.publish(key, val) end
-end
-
--- update unit status data from API_GET_UNIT
----@param data table
-function iocontrol.record_unit_data(data)
-    local unit = io.units[data[1]]
-
-    unit.connected = data[2]
-    unit.rtu_hw = data[3]
-    unit.a_group = data[4]
-    unit.alarms = data[5]
-
-    unit.unit_ps.publish("auto_group_id", unit.a_group)
-    unit.unit_ps.publish("auto_group", types.AUTO_GROUP_NAMES[unit.a_group + 1])
-
-    --#region Annunciator
-
-    unit.annunciator = data[6]
-
-    local rcs_disconn, rcs_warn, rcs_hazard = false, false, false
-
-    for key, val in pairs(unit.annunciator) do
-        if key == "BoilerOnline" or key == "TurbineOnline" then
-            local every = true
-
-            -- split up online arrays
-            for id = 1, #val do
-                every = every and val[id]
-
-                if key == "BoilerOnline" then
-                    unit.boiler_ps_tbl[id].publish(key, val[id])
-                else
-                    unit.turbine_ps_tbl[id].publish(key, val[id])
-                end
-            end
-
-            if not every then rcs_disconn = true end
-
-            unit.unit_ps.publish("U_" .. key, every)
-        elseif key == "HeatingRateLow" or key == "WaterLevelLow" then
-            -- split up array for all boilers
-            local any = false
-            for id = 1, #val do
-                any = any or val[id]
-                unit.boiler_ps_tbl[id].publish(key, val[id])
-            end
-
-            if key == "HeatingRateLow" and any then
-                rcs_warn = true
-            elseif key == "WaterLevelLow" and any then
-                rcs_hazard = true
-            end
-
-            unit.unit_ps.publish("U_" .. key, any)
-        elseif key == "SteamDumpOpen" or key == "TurbineOverSpeed" or key == "GeneratorTrip" or key == "TurbineTrip" then
-            -- split up array for all turbines
-            local any = false
-            for id = 1, #val do
-                any = any or val[id]
-                unit.turbine_ps_tbl[id].publish(key, val[id])
-            end
-
-            if key == "GeneratorTrip" and any then
-                rcs_warn = true
-            elseif (key == "TurbineOverSpeed" or key == "TurbineTrip") and any then
-                rcs_hazard = true
-            end
-
-            unit.unit_ps.publish("U_" .. key, any)
-        else
-            -- non-table fields
-            unit.unit_ps.publish(key, val)
-        end
-    end
-
-    local anc = unit.annunciator
-    rcs_hazard = rcs_hazard or anc.RCPTrip
-    rcs_warn = rcs_warn or anc.RCSFlowLow or anc.CoolantLevelLow or anc.RCSFault or anc.MaxWaterReturnFeed or
-                anc.CoolantFeedMismatch or anc.BoilRateMismatch or anc.SteamFeedMismatch
-
-    local rcs_status = 4
-    if rcs_hazard then
-        rcs_status = 2
-    elseif rcs_warn then
-        rcs_status = 3
-    elseif rcs_disconn then
-        rcs_status = 1
-    end
-
-    unit.unit_ps.publish("U_RCS", rcs_status)
-
-    --#endregion
-
-    --#region Reactor Data
-
-    unit.reactor_data = data[7]
-
-    local control_status = 1
-    local reactor_status = 1
-    local reactor_state = 1
-    local rps_status = 1
-
-    if unit.connected then
-        -- update RPS status
-        if unit.reactor_data.rps_tripped then
-            control_status = 2
-
-            if unit.reactor_data.rps_trip_cause == "manual" then
-                reactor_state = 4   -- disabled
-                rps_status = 3
-            else
-                reactor_state = 6   -- SCRAM
-                rps_status = 2
-            end
-        else
-            rps_status = 4
-            reactor_state = 4
-        end
-
-        -- update reactor/control status
-        if unit.reactor_data.mek_status.status then
-            reactor_status = 4
-            reactor_state = 5  -- running
-            control_status = util.trinary(unit.annunciator.AutoControl, 4, 3)
-        else
-            if unit.reactor_data.no_reactor then
-                reactor_status = 2
-                reactor_state = 3   -- faulted
-            elseif not unit.reactor_data.formed then
-                reactor_status = 3
-                reactor_state = 2   -- not formed
-            elseif unit.reactor_data.rps_status.force_dis then
-                reactor_status = 3
-                reactor_state = 7   -- force disabled
-            else
-                reactor_status = 4
-            end
-        end
-
-        for key, val in pairs(unit.reactor_data) do
-            if key ~= "rps_status" and key ~= "mek_struct" and key ~= "mek_status" then
-                unit.unit_ps.publish(key, val)
-            end
-        end
-
-        for key, val in pairs(unit.reactor_data.rps_status) do
-            unit.unit_ps.publish(key, val)
-        end
-
-        for key, val in pairs(unit.reactor_data.mek_struct) do
-            unit.unit_ps.publish(key, val)
-        end
-
-        for key, val in pairs(unit.reactor_data.mek_status) do
-            unit.unit_ps.publish(key, val)
-        end
-    end
-
-    unit.unit_ps.publish("U_ControlStatus", control_status)
-    unit.unit_ps.publish("U_ReactorStatus", reactor_status)
-    unit.unit_ps.publish("U_ReactorStateStatus", reactor_state)
-    unit.unit_ps.publish("U_RPS", rps_status)
-
-    --#endregion
-
-    --#region RTU Devices
-
-    unit.boiler_data_tbl = data[8]
-
-    for id = 1, #unit.boiler_data_tbl do
-        local boiler = unit.boiler_data_tbl[id]
-        local ps     = unit.boiler_ps_tbl[id]
-
-        local boiler_status = 1
-        local computed_status = 1
-
-        if unit.rtu_hw.boilers[id].connected then
-            if unit.rtu_hw.boilers[id].faulted then
-                boiler_status = 3
-                computed_status = 3
-            elseif boiler.formed then
-                boiler_status = 4
-
-                if boiler.state.boil_rate > 0 then
-                    computed_status = 5
-                else
-                    computed_status = 4
-                end
-            else
-                boiler_status = 2
-                computed_status = 2
-            end
-
-            _record_multiblock_status(unit.rtu_hw.boilers[id].faulted, boiler, ps)
-        end
-
-        ps.publish("BoilerStatus", boiler_status)
-        ps.publish("BoilerStateStatus", computed_status)
-    end
-
-    unit.turbine_data_tbl = data[9]
-
-    for id = 1, #unit.turbine_data_tbl do
-        local turbine = unit.turbine_data_tbl[id]
-        local ps      = unit.turbine_ps_tbl[id]
-
-        local turbine_status = 1
-        local computed_status = 1
-
-        if unit.rtu_hw.turbines[id].connected then
-            if unit.rtu_hw.turbines[id].faulted then
-                turbine_status = 3
-                computed_status = 3
-            elseif turbine.formed then
-                turbine_status = 4
-
-                if turbine.tanks.energy_fill >= 0.99 then
-                    computed_status = 6
-                elseif turbine.state.flow_rate < 100 then
-                    computed_status = 4
-                else
-                    computed_status = 5
-                end
-            else
-                turbine_status = 2
-                computed_status = 2
-            end
-
-            _record_multiblock_status(unit.rtu_hw.turbines[id].faulted, turbine, ps)
-        end
-
-        ps.publish("TurbineStatus", turbine_status)
-        ps.publish("TurbineStateStatus", computed_status)
-    end
-
-    unit.tank_data_tbl = data[10]
-
-    unit.last_rate_change_ms = data[11]
-    unit.turbine_flow_stable = data[12]
-
-    --#endregion
-
-    --#region Status Information Display
-
-    local ecam = {} -- aviation reference :)
-
-    -- local function red(text) return { text = text, color = colors.red } end
-    local function white(text) return { text = text, color = colors.white } end
-    local function blue(text) return { text = text, color = colors.blue } end
-
-    -- if unit.reactor_data.rps_status then
-    --     for k, v in pairs(unit.alarms) do
-    --         unit.alarms[k] = ALARM_STATE.TRIPPED
-    --     end
-    -- end
-
-    if tripped(unit.alarms[ALARM.ContainmentBreach]) then
-        local items = { white("REACTOR MELTDOWN"), blue("DON HAZMAT SUIT") }
-        table.insert(ecam, { color = colors.red, text = "CONTAINMENT BREACH", help = "ContainmentBreach", items = items })
-    end
-
-    if tripped(unit.alarms[ALARM.ContainmentRadiation]) then
-        local items = {
-            white("RADIATION DETECTED"),
-            blue("DON HAZMAT SUIT"),
-            blue("RESOLVE LEAK"),
-            blue("AWAIT SAFE LEVELS")
-        }
-
-        table.insert(ecam, { color = colors.red, text = "RADIATION LEAK", help = "ContainmentRadiation", items = items })
-    end
-
-    if tripped(unit.alarms[ALARM.CriticalDamage]) then
-        local items = { white("MELTDOWN IMMINENT"), blue("EVACUATE") }
-        table.insert(ecam, { color = colors.red, text = "RCT DAMAGE CRITICAL", help = "CriticalDamage", items = items })
-    end
-
-    if tripped(unit.alarms[ALARM.ReactorLost]) then
-        local items = { white("REACTOR OFF-LINE"), blue("CHECK PLC") }
-        table.insert(ecam, { color = colors.red, text = "REACTOR CONN LOST", help = "ReactorLost", items = items })
-    end
-
-    if tripped(unit.alarms[ALARM.ReactorDamage]) then
-        local items = { white("REACTOR DAMAGED"), blue("CHECK RCS"), blue("AWAIT DMG REDUCED") }
-        table.insert(ecam, { color = colors.red, text = "REACTOR DAMAGE", help = "ReactorDamage", items = items })
-    end
-
-    if tripped(unit.alarms[ALARM.ReactorOverTemp]) then
-        local items = { white("DAMAGING TEMP"), blue("CHECK RCS"), blue("AWAIT COOLDOWN") }
-        table.insert(ecam, { color = colors.red, text = "REACTOR OVER TEMP", help = "ReactorOverTemp", items = items })
-    end
-
-    if tripped(unit.alarms[ALARM.ReactorHighTemp]) then
-        local items = { white("OVER EXPECTED TEMP"), blue("CHECK RCS") }
-        table.insert(ecam, { color = colors.yellow, text = "REACTOR HIGH TEMP", help = "ReactorHighTemp", items = items})
-    end
-
-    if tripped(unit.alarms[ALARM.ReactorWasteLeak]) then
-        local items = { white("AT WASTE CAPACITY"), blue("CHECK WASTE OUTPUT"), blue("KEEP RCT DISABLED") }
-        table.insert(ecam, { color = colors.red, text = "REACTOR WASTE LEAK", help = "ReactorWasteLeak", items = items})
-    end
-
-    if tripped(unit.alarms[ALARM.ReactorHighWaste]) then
-        local items = { blue("CHECK WASTE OUTPUT") }
-        table.insert(ecam, { color = colors.yellow, text = "REACTOR WASTE HIGH", help = "ReactorHighWaste", items = items})
-    end
-
-    if tripped(unit.alarms[ALARM.RPSTransient]) then
-        local items = {}
-        local stat = unit.reactor_data.rps_status
-
-        -- for k, _ in pairs(stat) do stat[k] = true end
-
-        local function insert(cond, key, text, color) if cond[key] then table.insert(items, { text = text, help = key, color = color }) end end
-
-        table.insert(items, white("REACTOR SCRAMMED"))
-        insert(stat, "high_dmg", "HIGH DAMAGE", colors.red)
-        insert(stat, "high_temp", "HIGH TEMPERATURE", colors.red)
-        insert(stat, "low_cool", "CRIT LOW COOLANT")
-        insert(stat, "ex_waste", "EXCESS WASTE")
-        insert(stat, "ex_hcool", "EXCESS HEATED COOL")
-        insert(stat, "no_fuel", "NO FUEL")
-        insert(stat, "fault", "HARDWARE FAULT")
-        insert(stat, "timeout", "SUPERVISOR DISCONN")
-        insert(stat, "manual", "MANUAL SCRAM", colors.white)
-        insert(stat, "automatic", "AUTOMATIC SCRAM")
-        insert(stat, "sys_fail", "NOT FORMED", colors.red)
-        insert(stat, "force_dis", "FORCE DISABLED", colors.red)
-        table.insert(items, blue("RESOLVE PROBLEM"))
-        table.insert(items, blue("RESET RPS"))
-
-        table.insert(ecam, { color = colors.yellow, text = "RPS TRANSIENT", help = "RPSTransient", items = items})
-    end
-
-    if tripped(unit.alarms[ALARM.RCSTransient]) then
-        local items = {}
-        local annunc = unit.annunciator
-
-        -- for k, v in pairs(annunc) do
-        --     if type(v) == "boolean" then annunc[k] = true end
-        --     if type(v) == "table" then
-        --         for a, _ in pairs(v) do
-        --             v[a] = true
-        --         end
-        --     end
-        -- end
-
-        local function insert(cond, key, text, color)
-            if cond == true or (type(cond) == "table" and cond[key]) then table.insert(items, { text = text, help = key, color = color }) end
-        end
-
-        table.insert(items, white("COOLANT PROBLEM"))
-
-        insert(annunc, "RCPTrip", "RCP TRIP", colors.red)
-        insert(annunc, "CoolantLevelLow", "LOW COOLANT")
-
-        if unit.num_boilers == 0 then
-            if (util.time_ms() - unit.last_rate_change_ms) > const.FLOW_STABILITY_DELAY_MS then
-                insert(annunc, "BoilRateMismatch", "BOIL RATE MISMATCH")
-            end
-
-            if unit.turbine_flow_stable then
-                insert(annunc, "RCSFlowLow", "RCS FLOW LOW")
-                insert(annunc, "CoolantFeedMismatch", "COOL FEED MISMATCH")
-                insert(annunc, "SteamFeedMismatch", "STM FEED MISMATCH")
-            end
-        else
-            if (util.time_ms() - unit.last_rate_change_ms) > const.FLOW_STABILITY_DELAY_MS then
-                insert(annunc, "RCSFlowLow", "RCS FLOW LOW")
-                insert(annunc, "BoilRateMismatch", "BOIL RATE MISMATCH")
-                insert(annunc, "CoolantFeedMismatch", "COOL FEED MISMATCH")
-            end
-
-            if unit.turbine_flow_stable then
-                insert(annunc, "SteamFeedMismatch", "STM FEED MISMATCH")
-            end
-        end
-
-        insert(annunc, "MaxWaterReturnFeed", "MAX WTR RTRN FEED")
-
-        for k, v in ipairs(annunc.WaterLevelLow) do insert(v, "WaterLevelLow", "BOILER " .. k .. " WTR LOW", colors.red) end
-        for k, v in ipairs(annunc.HeatingRateLow) do insert(v, "HeatingRateLow", "BOILER " .. k .. " HEAT RATE") end
-        for k, v in ipairs(annunc.TurbineOverSpeed) do insert(v, "TurbineOverSpeed", "TURBINE " .. k .. " OVERSPD", colors.red) end
-        for k, v in ipairs(annunc.GeneratorTrip) do insert(v, "GeneratorTrip", "TURBINE " .. k .. " GEN TRIP") end
-
-        table.insert(items, blue("CHECK COOLING SYS"))
-
-        table.insert(ecam, { color = colors.yellow, text = "RCS TRANSIENT", help = "RCSTransient", items = items})
-    end
-
-    if tripped(unit.alarms[ALARM.TurbineTrip]) then
-        local items = {}
-
-        for k, v in ipairs(unit.annunciator.TurbineTrip) do
-            if v then table.insert(items, { text = "TURBINE " .. k .. " TRIP", help = "TurbineTrip" }) end
-        end
-
-        table.insert(items, blue("CHECK ENERGY OUT"))
-        table.insert(ecam, { color = colors.red, text = "TURBINE TRIP", help = "TurbineTripAlarm", items = items})
-    end
-
-    if not (tripped(unit.alarms[ALARM.ReactorLost]) or unit.connected) then
-        local items = { blue("CHECK PLC") }
-        table.insert(ecam, { color = colors.yellow, text = "REACTOR OFF-LINE", items = items })
-    end
-
-    for k, v in ipairs(unit.annunciator.BoilerOnline) do
-        if not v then
-            local items = { blue("CHECK RTU") }
-            table.insert(ecam, { color = colors.yellow, text = "BOILER " .. k .. " OFF-LINE", items = items})
-        end
-    end
-
-    for k, v in ipairs(unit.annunciator.TurbineOnline) do
-        if not v then
-            local items = { blue("CHECK RTU") }
-            table.insert(ecam, { color = colors.yellow, text = "TURBINE " .. k .. " OFF-LINE", items = items})
-        end
-    end
-
-    -- if no alarms, put some basic status messages in
-    if #ecam == 0 then
-        table.insert(ecam, { color = colors.green, text = "REACTOR " .. util.trinary(unit.reactor_data.mek_status.status, "NOMINAL", "IDLE"), items = {}})
-
-        local plural = util.trinary(unit.num_turbines > 1, "S", "")
-        table.insert(ecam, { color = colors.green, text = "TURBINE" .. plural .. util.trinary(unit.turbine_flow_stable, " STABLE", " STABILIZING"), items = {}})
-    end
-
-    unit.unit_ps.publish("U_ECAM", textutils.serialize(ecam))
-
-    --#endregion
-end
-
--- update control app with unit data from API_GET_CTRL
----@param data table
-function iocontrol.record_control_data(data)
-    for u_id = 1, #data do
-        local unit = io.units[u_id]
-        local u_data = data[u_id]
-
-        unit.connected = u_data[1]
-
-        unit.reactor_data.rps_tripped = u_data[2]
-        unit.unit_ps.publish("rps_tripped", u_data[2])
-        unit.reactor_data.mek_status.status = u_data[3]
-        unit.unit_ps.publish("status", u_data[3])
-        unit.reactor_data.mek_status.temp = u_data[4]
-        unit.unit_ps.publish("temp", u_data[4])
-        unit.reactor_data.mek_status.burn_rate = u_data[5]
-        unit.unit_ps.publish("burn_rate", u_data[5])
-        unit.reactor_data.mek_status.act_burn_rate = u_data[6]
-        unit.unit_ps.publish("act_burn_rate", u_data[6])
-        unit.reactor_data.mek_struct.max_burn = u_data[7]
-        unit.unit_ps.publish("max_burn", u_data[7])
-
-        unit.annunciator.AutoControl = u_data[8]
-        unit.unit_ps.publish("AutoControl", u_data[8])
-
-        unit.a_group = u_data[9]
-        unit.unit_ps.publish("auto_group_id", unit.a_group)
-        unit.unit_ps.publish("auto_group", types.AUTO_GROUP_NAMES[unit.a_group + 1])
-
-        local control_status = 1
-
-        if unit.connected then
-            if unit.reactor_data.rps_tripped then
-                control_status = 2
-            end
-
-            if unit.reactor_data.mek_status.status then
-                control_status = util.trinary(unit.annunciator.AutoControl, 4, 3)
-            end
-        end
-
-        unit.unit_ps.publish("U_ControlStatus", control_status)
-    end
-end
-
--- update process app with unit data from API_GET_PROC
----@param data table
-function iocontrol.record_process_data(data)
-    -- get unit data
-    for u_id = 1, #io.units do
-        local unit = io.units[u_id]
-        local u_data = data[u_id]
-
-        unit.reactor_data.mek_status.status = u_data[1]
-        unit.reactor_data.mek_struct.max_burn = u_data[2]
-        unit.annunciator.AutoControl = u_data[6]
-        unit.a_group = u_data[7]
-
-        unit.unit_ps.publish("status", u_data[1])
-        unit.unit_ps.publish("max_burn", u_data[2])
-        unit.unit_ps.publish("burn_limit", u_data[3])
-        unit.unit_ps.publish("U_AutoReady", u_data[4])
-        unit.unit_ps.publish("U_AutoDegraded", u_data[5])
-        unit.unit_ps.publish("AutoControl", u_data[6])
-        unit.unit_ps.publish("auto_group_id", unit.a_group)
-        unit.unit_ps.publish("auto_group", types.AUTO_GROUP_NAMES[unit.a_group + 1])
-    end
-
-    -- get facility data
-    local fac = io.facility
-    local f_data = data[#io.units + 1]
-
-    fac.status_lines = f_data[1]
-
-    fac.auto_ready = f_data[2][1]
-    fac.auto_active = f_data[2][2]
-    fac.auto_ramping = f_data[2][3]
-    fac.auto_saturated = f_data[2][4]
-
-    fac.auto_scram = f_data[3]
-    fac.ascram_status = f_data[4]
-
-    fac.ps.publish("status_line_1", fac.status_lines[1])
-    fac.ps.publish("status_line_2", fac.status_lines[2])
-
-    fac.ps.publish("auto_ready", fac.auto_ready)
-    fac.ps.publish("auto_active", fac.auto_active)
-    fac.ps.publish("auto_ramping", fac.auto_ramping)
-    fac.ps.publish("auto_saturated", fac.auto_saturated)
-
-    fac.ps.publish("auto_scram", fac.auto_scram)
-    fac.ps.publish("as_matrix_dc", fac.ascram_status.matrix_dc)
-    fac.ps.publish("as_matrix_fill", fac.ascram_status.matrix_fill)
-    fac.ps.publish("as_crit_alarm", fac.ascram_status.crit_alarm)
-    fac.ps.publish("as_radiation", fac.ascram_status.radiation)
-    fac.ps.publish("as_gen_fault", fac.ascram_status.gen_fault)
-
-    fac.ps.publish("process_mode", f_data[5][1])
-    fac.ps.publish("process_burn_target", f_data[5][2])
-    fac.ps.publish("process_charge_target", f_data[5][3])
-    fac.ps.publish("process_gen_target", f_data[5][4])
-end
-
 -- get the IO controller database
 function iocontrol.get_db() return io end
 

pocket/iorx.lua

@@ -0,0 +1,825 @@
+--
+-- I/O Control's Data Receive (Rx) Handlers
+--
+
+local const = require("scada-common.constants")
+local types = require("scada-common.types")
+local util  = require("scada-common.util")
+
+local ALARM = types.ALARM
+local ALARM_STATE = types.ALARM_STATE
+
+local BLR_STATE = types.BOILER_STATE
+local TRB_STATE = types.TURBINE_STATE
+local TNK_STATE = types.TANK_STATE
+local MTX_STATE = types.IMATRIX_STATE
+local SPS_STATE = types.SPS_STATE
+
+local io        ---@type pocket_ioctl
+local iorx = {} ---@class iorx
+
+-- populate facility data from API_GET_FAC
+---@param data table
+---@return boolean valid
+function iorx.record_facility_data(data)
+    local valid = true
+
+    local fac = io.facility
+
+    fac.all_sys_ok = data[1]
+    fac.rtu_count = data[2]
+    fac.radiation = data[3]
+
+    -- auto control
+    if type(data[4]) == "table" and #data[4] == 4 then
+        fac.auto_ready = data[4][1]
+        fac.auto_active = data[4][2]
+        fac.auto_ramping = data[4][3]
+        fac.auto_saturated = data[4][4]
+    end
+
+    -- waste
+    if type(data[5]) == "table" and #data[5] == 2 then
+        fac.auto_current_waste_product = data[5][1]
+        fac.auto_pu_fallback_active = data[5][2]
+    end
+
+    fac.num_tanks = data[6]
+    fac.has_imatrix = data[7]
+    fac.has_sps = data[8]
+
+    return valid
+end
+
+local function tripped(state) return state == ALARM_STATE.TRIPPED or state == ALARM_STATE.ACKED end
+
+local function _record_multiblock_status(faulted, data, ps)
+    ps.publish("formed", data.formed)
+    ps.publish("faulted", faulted)
+
+    ---@todo revisit this
+    if data.build then
+        for key, val in pairs(data.build) do ps.publish(key, val) end
+    end
+
+    for key, val in pairs(data.state) do ps.publish(key, val) end
+    for key, val in pairs(data.tanks) do ps.publish(key, val) end
+end
+
+-- update unit status data from API_GET_UNIT
+---@param data table
+function iorx.record_unit_data(data)
+    local unit = io.units[data[1]]
+
+    unit.connected = data[2]
+    local comp_statuses = data[3]
+    unit.a_group = data[4]
+    unit.alarms = data[5]
+
+    local next_c_stat = 1
+
+    unit.unit_ps.publish("auto_group_id", unit.a_group)
+    unit.unit_ps.publish("auto_group", types.AUTO_GROUP_NAMES[unit.a_group + 1])
+
+    --#region Annunciator
+
+    unit.annunciator = data[6]
+
+    local rcs_disconn, rcs_warn, rcs_hazard = false, false, false
+
+    for key, val in pairs(unit.annunciator) do
+        if key == "BoilerOnline" or key == "TurbineOnline" then
+            local every = true
+
+            -- split up online arrays
+            for id = 1, #val do
+                every = every and val[id]
+
+                if key == "BoilerOnline" then
+                    unit.boiler_ps_tbl[id].publish(key, val[id])
+                else
+                    unit.turbine_ps_tbl[id].publish(key, val[id])
+                end
+            end
+
+            if not every then rcs_disconn = true end
+
+            unit.unit_ps.publish("U_" .. key, every)
+        elseif key == "HeatingRateLow" or key == "WaterLevelLow" then
+            -- split up array for all boilers
+            local any = false
+            for id = 1, #val do
+                any = any or val[id]
+                unit.boiler_ps_tbl[id].publish(key, val[id])
+            end
+
+            if key == "HeatingRateLow" and any then
+                rcs_warn = true
+            elseif key == "WaterLevelLow" and any then
+                rcs_hazard = true
+            end
+
+            unit.unit_ps.publish("U_" .. key, any)
+        elseif key == "SteamDumpOpen" or key == "TurbineOverSpeed" or key == "GeneratorTrip" or key == "TurbineTrip" then
+            -- split up array for all turbines
+            local any = false
+            for id = 1, #val do
+                any = any or val[id]
+                unit.turbine_ps_tbl[id].publish(key, val[id])
+            end
+
+            if key == "GeneratorTrip" and any then
+                rcs_warn = true
+            elseif (key == "TurbineOverSpeed" or key == "TurbineTrip") and any then
+                rcs_hazard = true
+            end
+
+            unit.unit_ps.publish("U_" .. key, any)
+        else
+            -- non-table fields
+            unit.unit_ps.publish(key, val)
+        end
+    end
+
+    local anc = unit.annunciator
+    rcs_hazard = rcs_hazard or anc.RCPTrip
+    rcs_warn = rcs_warn or anc.RCSFlowLow or anc.CoolantLevelLow or anc.RCSFault or anc.MaxWaterReturnFeed or
+                anc.CoolantFeedMismatch or anc.BoilRateMismatch or anc.SteamFeedMismatch
+
+    local rcs_status = 4
+    if rcs_hazard then
+        rcs_status = 2
+    elseif rcs_warn then
+        rcs_status = 3
+    elseif rcs_disconn then
+        rcs_status = 1
+    end
+
+    unit.unit_ps.publish("U_RCS", rcs_status)
+
+    --#endregion
+
+    --#region Reactor Data
+
+    unit.reactor_data = data[7]
+
+    local control_status = 1
+    local reactor_status = 1
+    local rps_status = 1
+
+    if unit.connected then
+        -- update RPS status
+        if unit.reactor_data.rps_tripped then
+            control_status = 2
+            rps_status = util.trinary(unit.reactor_data.rps_trip_cause == "manual", 3, 2)
+        else
+            rps_status = 4
+        end
+
+        reactor_status = 4  -- ok, until proven otherwise
+
+        -- update reactor/control status
+        if unit.reactor_data.mek_status.status then
+            control_status = util.trinary(unit.annunciator.AutoControl, 4, 3)
+        else
+            if unit.reactor_data.no_reactor then
+                reactor_status = 2
+            elseif (not unit.reactor_data.formed) or unit.reactor_data.rps_status.force_dis then
+                reactor_status = 3
+            end
+        end
+
+        for key, val in pairs(unit.reactor_data) do
+            if key ~= "rps_status" and key ~= "mek_struct" and key ~= "mek_status" then
+                unit.unit_ps.publish(key, val)
+            end
+        end
+
+        for key, val in pairs(unit.reactor_data.rps_status) do
+            unit.unit_ps.publish(key, val)
+        end
+
+        for key, val in pairs(unit.reactor_data.mek_struct) do
+            unit.unit_ps.publish(key, val)
+        end
+
+        for key, val in pairs(unit.reactor_data.mek_status) do
+            unit.unit_ps.publish(key, val)
+        end
+    end
+
+    unit.unit_ps.publish("U_ControlStatus", control_status)
+    unit.unit_ps.publish("U_ReactorStatus", reactor_status)
+    unit.unit_ps.publish("U_ReactorStateStatus", comp_statuses[next_c_stat])
+    unit.unit_ps.publish("U_RPS", rps_status)
+
+    next_c_stat = next_c_stat + 1
+
+    --#endregion
+
+    --#region RTU Devices
+
+    unit.boiler_data_tbl = data[8]
+
+    for id = 1, #unit.boiler_data_tbl do
+        local boiler = unit.boiler_data_tbl[id]
+        local ps     = unit.boiler_ps_tbl[id]
+        local c_stat = comp_statuses[next_c_stat]
+
+        local boiler_status = 1
+
+        if c_stat ~= BLR_STATE.OFFLINE then
+            if c_stat == BLR_STATE.FAULT then
+                boiler_status = 3
+            elseif c_stat ~= BLR_STATE.UNFORMED then
+                boiler_status = 4
+            else
+                boiler_status = 2
+            end
+
+            _record_multiblock_status(c_stat == BLR_STATE.FAULT, boiler, ps)
+        end
+
+        ps.publish("BoilerStatus", boiler_status)
+        ps.publish("BoilerStateStatus", c_stat)
+
+        next_c_stat = next_c_stat + 1
+    end
+
+    unit.turbine_data_tbl = data[9]
+
+    for id = 1, #unit.turbine_data_tbl do
+        local turbine = unit.turbine_data_tbl[id]
+        local ps      = unit.turbine_ps_tbl[id]
+        local c_stat  = comp_statuses[next_c_stat]
+
+        local turbine_status = 1
+
+        if c_stat ~= TRB_STATE.OFFLINE then
+            if c_stat == TRB_STATE.FAULT then
+                turbine_status = 3
+            elseif turbine.formed then
+                turbine_status = 4
+            else
+                turbine_status = 2
+            end
+
+            _record_multiblock_status(c_stat == TRB_STATE.FAULT, turbine, ps)
+        end
+
+        ps.publish("TurbineStatus", turbine_status)
+        ps.publish("TurbineStateStatus", c_stat)
+
+        next_c_stat = next_c_stat + 1
+    end
+
+    unit.tank_data_tbl = data[10]
+
+    for id = 1, #unit.tank_data_tbl do
+        local tank   = unit.tank_data_tbl[id]
+        local ps     = unit.tank_ps_tbl[id]
+        local c_stat = comp_statuses[next_c_stat]
+
+        local tank_status = 1
+
+        if c_stat ~= TNK_STATE.OFFLINE then
+            if c_stat == TNK_STATE.FAULT then
+                tank_status = 3
+            elseif tank.formed then
+                tank_status = 4
+            else
+                tank_status = 2
+            end
+
+            _record_multiblock_status(c_stat == TNK_STATE.FAULT, tank, ps)
+        end
+
+        ps.publish("DynamicTankStatus", tank_status)
+        ps.publish("DynamicTankStateStatus", c_stat)
+
+        next_c_stat = next_c_stat + 1
+    end
+
+    unit.last_rate_change_ms = data[11]
+    unit.turbine_flow_stable = data[12]
+
+    --#endregion
+
+    --#region Status Information Display
+
+    local ecam = {} -- aviation reference :)
+
+    -- local function red(text) return { text = text, color = colors.red } end
+    local function white(text) return { text = text, color = colors.white } end
+    local function blue(text) return { text = text, color = colors.blue } end
+
+    -- if unit.reactor_data.rps_status then
+    --     for k, v in pairs(unit.alarms) do
+    --         unit.alarms[k] = ALARM_STATE.TRIPPED
+    --     end
+    -- end
+
+    if tripped(unit.alarms[ALARM.ContainmentBreach]) then
+        local items = { white("REACTOR MELTDOWN"), blue("DON HAZMAT SUIT") }
+        table.insert(ecam, { color = colors.red, text = "CONTAINMENT BREACH", help = "ContainmentBreach", items = items })
+    end
+
+    if tripped(unit.alarms[ALARM.ContainmentRadiation]) then
+        local items = {
+            white("RADIATION DETECTED"),
+            blue("DON HAZMAT SUIT"),
+            blue("RESOLVE LEAK"),
+            blue("AWAIT SAFE LEVELS")
+        }
+
+        table.insert(ecam, { color = colors.red, text = "RADIATION LEAK", help = "ContainmentRadiation", items = items })
+    end
+
+    if tripped(unit.alarms[ALARM.CriticalDamage]) then
+        local items = { white("MELTDOWN IMMINENT"), blue("EVACUATE") }
+        table.insert(ecam, { color = colors.red, text = "RCT DAMAGE CRITICAL", help = "CriticalDamage", items = items })
+    end
+
+    if tripped(unit.alarms[ALARM.ReactorLost]) then
+        local items = { white("REACTOR OFF-LINE"), blue("CHECK PLC") }
+        table.insert(ecam, { color = colors.red, text = "REACTOR CONN LOST", help = "ReactorLost", items = items })
+    end
+
+    if tripped(unit.alarms[ALARM.ReactorDamage]) then
+        local items = { white("REACTOR DAMAGED"), blue("CHECK RCS"), blue("AWAIT DMG REDUCED") }
+        table.insert(ecam, { color = colors.red, text = "REACTOR DAMAGE", help = "ReactorDamage", items = items })
+    end
+
+    if tripped(unit.alarms[ALARM.ReactorOverTemp]) then
+        local items = { white("DAMAGING TEMP"), blue("CHECK RCS"), blue("AWAIT COOLDOWN") }
+        table.insert(ecam, { color = colors.red, text = "REACTOR OVER TEMP", help = "ReactorOverTemp", items = items })
+    end
+
+    if tripped(unit.alarms[ALARM.ReactorHighTemp]) then
+        local items = { white("OVER EXPECTED TEMP"), blue("CHECK RCS") }
+        table.insert(ecam, { color = colors.yellow, text = "REACTOR HIGH TEMP", help = "ReactorHighTemp", items = items})
+    end
+
+    if tripped(unit.alarms[ALARM.ReactorWasteLeak]) then
+        local items = { white("AT WASTE CAPACITY"), blue("CHECK WASTE OUTPUT"), blue("KEEP RCT DISABLED") }
+        table.insert(ecam, { color = colors.red, text = "REACTOR WASTE LEAK", help = "ReactorWasteLeak", items = items})
+    end
+
+    if tripped(unit.alarms[ALARM.ReactorHighWaste]) then
+        local items = { blue("CHECK WASTE OUTPUT") }
+        table.insert(ecam, { color = colors.yellow, text = "REACTOR WASTE HIGH", help = "ReactorHighWaste", items = items})
+    end
+
+    if tripped(unit.alarms[ALARM.RPSTransient]) then
+        local items = {}
+        local stat = unit.reactor_data.rps_status
+
+        -- for k, _ in pairs(stat) do stat[k] = true end
+
+        local function insert(cond, key, text, color) if cond[key] then table.insert(items, { text = text, help = key, color = color }) end end
+
+        table.insert(items, white("REACTOR SCRAMMED"))
+        insert(stat, "high_dmg", "HIGH DAMAGE", colors.red)
+        insert(stat, "high_temp", "HIGH TEMPERATURE", colors.red)
+        insert(stat, "low_cool", "CRIT LOW COOLANT")
+        insert(stat, "ex_waste", "EXCESS WASTE")
+        insert(stat, "ex_hcool", "EXCESS HEATED COOL")
+        insert(stat, "no_fuel", "NO FUEL")
+        insert(stat, "fault", "HARDWARE FAULT")
+        insert(stat, "timeout", "SUPERVISOR DISCONN")
+        insert(stat, "manual", "MANUAL SCRAM", colors.white)
+        insert(stat, "automatic", "AUTOMATIC SCRAM")
+        insert(stat, "sys_fail", "NOT FORMED", colors.red)
+        insert(stat, "force_dis", "FORCE DISABLED", colors.red)
+        table.insert(items, blue("RESOLVE PROBLEM"))
+        table.insert(items, blue("RESET RPS"))
+
+        table.insert(ecam, { color = colors.yellow, text = "RPS TRANSIENT", help = "RPSTransient", items = items})
+    end
+
+    if tripped(unit.alarms[ALARM.RCSTransient]) then
+        local items = {}
+        local annunc = unit.annunciator
+
+        -- for k, v in pairs(annunc) do
+        --     if type(v) == "boolean" then annunc[k] = true end
+        --     if type(v) == "table" then
+        --         for a, _ in pairs(v) do
+        --             v[a] = true
+        --         end
+        --     end
+        -- end
+
+        local function insert(cond, key, text, color)
+            if cond == true or (type(cond) == "table" and cond[key]) then table.insert(items, { text = text, help = key, color = color }) end
+        end
+
+        table.insert(items, white("COOLANT PROBLEM"))
+
+        insert(annunc, "RCPTrip", "RCP TRIP", colors.red)
+        insert(annunc, "CoolantLevelLow", "LOW COOLANT")
+
+        if unit.num_boilers == 0 then
+            if (util.time_ms() - unit.last_rate_change_ms) > const.FLOW_STABILITY_DELAY_MS then
+                insert(annunc, "BoilRateMismatch", "BOIL RATE MISMATCH")
+            end
+
+            if unit.turbine_flow_stable then
+                insert(annunc, "RCSFlowLow", "RCS FLOW LOW")
+                insert(annunc, "CoolantFeedMismatch", "COOL FEED MISMATCH")
+                insert(annunc, "SteamFeedMismatch", "STM FEED MISMATCH")
+            end
+        else
+            if (util.time_ms() - unit.last_rate_change_ms) > const.FLOW_STABILITY_DELAY_MS then
+                insert(annunc, "RCSFlowLow", "RCS FLOW LOW")
+                insert(annunc, "BoilRateMismatch", "BOIL RATE MISMATCH")
+                insert(annunc, "CoolantFeedMismatch", "COOL FEED MISMATCH")
+            end
+
+            if unit.turbine_flow_stable then
+                insert(annunc, "SteamFeedMismatch", "STM FEED MISMATCH")
+            end
+        end
+
+        insert(annunc, "MaxWaterReturnFeed", "MAX WTR RTRN FEED")
+
+        for k, v in ipairs(annunc.WaterLevelLow) do insert(v, "WaterLevelLow", "BOILER " .. k .. " WTR LOW", colors.red) end
+        for k, v in ipairs(annunc.HeatingRateLow) do insert(v, "HeatingRateLow", "BOILER " .. k .. " HEAT RATE") end
+        for k, v in ipairs(annunc.TurbineOverSpeed) do insert(v, "TurbineOverSpeed", "TURBINE " .. k .. " OVERSPD", colors.red) end
+        for k, v in ipairs(annunc.GeneratorTrip) do insert(v, "GeneratorTrip", "TURBINE " .. k .. " GEN TRIP") end
+
+        table.insert(items, blue("CHECK COOLING SYS"))
+
+        table.insert(ecam, { color = colors.yellow, text = "RCS TRANSIENT", help = "RCSTransient", items = items})
+    end
+
+    if tripped(unit.alarms[ALARM.TurbineTrip]) then
+        local items = {}
+
+        for k, v in ipairs(unit.annunciator.TurbineTrip) do
+            if v then table.insert(items, { text = "TURBINE " .. k .. " TRIP", help = "TurbineTrip" }) end
+        end
+
+        table.insert(items, blue("CHECK ENERGY OUT"))
+        table.insert(ecam, { color = colors.red, text = "TURBINE TRIP", help = "TurbineTripAlarm", items = items})
+    end
+
+    if not (tripped(unit.alarms[ALARM.ReactorLost]) or unit.connected) then
+        local items = { blue("CHECK PLC") }
+        table.insert(ecam, { color = colors.yellow, text = "REACTOR OFF-LINE", items = items })
+    end
+
+    for k, v in ipairs(unit.annunciator.BoilerOnline) do
+        if not v then
+            local items = { blue("CHECK RTU") }
+            table.insert(ecam, { color = colors.yellow, text = "BOILER " .. k .. " OFF-LINE", items = items})
+        end
+    end
+
+    for k, v in ipairs(unit.annunciator.TurbineOnline) do
+        if not v then
+            local items = { blue("CHECK RTU") }
+            table.insert(ecam, { color = colors.yellow, text = "TURBINE " .. k .. " OFF-LINE", items = items})
+        end
+    end
+
+    -- if no alarms, put some basic status messages in
+    if #ecam == 0 then
+        table.insert(ecam, { color = colors.green, text = "REACTOR " .. util.trinary(unit.reactor_data.mek_status.status, "NOMINAL", "IDLE"), items = {}})
+
+        local plural = util.trinary(unit.num_turbines > 1, "S", "")
+        table.insert(ecam, { color = colors.green, text = "TURBINE" .. plural .. util.trinary(unit.turbine_flow_stable, " STABLE", " STABILIZING"), items = {}})
+    end
+
+    unit.unit_ps.publish("U_ECAM", textutils.serialize(ecam))
+
+    --#endregion
+end
+
+-- update control app with unit data from API_GET_CTRL
+---@param data table
+function iorx.record_control_data(data)
+    for u_id = 1, #data do
+        local unit = io.units[u_id]
+        local u_data = data[u_id]
+
+        unit.connected = u_data[1]
+
+        unit.reactor_data.rps_tripped = u_data[2]
+        unit.unit_ps.publish("rps_tripped", u_data[2])
+        unit.reactor_data.mek_status.status = u_data[3]
+        unit.unit_ps.publish("status", u_data[3])
+        unit.reactor_data.mek_status.temp = u_data[4]
+        unit.unit_ps.publish("temp", u_data[4])
+        unit.reactor_data.mek_status.burn_rate = u_data[5]
+        unit.unit_ps.publish("burn_rate", u_data[5])
+        unit.reactor_data.mek_status.act_burn_rate = u_data[6]
+        unit.unit_ps.publish("act_burn_rate", u_data[6])
+        unit.reactor_data.mek_struct.max_burn = u_data[7]
+        unit.unit_ps.publish("max_burn", u_data[7])
+
+        unit.annunciator.AutoControl = u_data[8]
+        unit.unit_ps.publish("AutoControl", u_data[8])
+
+        unit.a_group = u_data[9]
+        unit.unit_ps.publish("auto_group_id", unit.a_group)
+        unit.unit_ps.publish("auto_group", types.AUTO_GROUP_NAMES[unit.a_group + 1])
+
+        local control_status = 1
+
+        if unit.connected then
+            if unit.reactor_data.rps_tripped then
+                control_status = 2
+            end
+
+            if unit.reactor_data.mek_status.status then
+                control_status = util.trinary(unit.annunciator.AutoControl, 4, 3)
+            end
+        end
+
+        unit.unit_ps.publish("U_ControlStatus", control_status)
+    end
+end
+
+-- update process app with unit data from API_GET_PROC
+---@param data table
+function iorx.record_process_data(data)
+    -- get unit data
+    for u_id = 1, #io.units do
+        local unit = io.units[u_id]
+        local u_data = data[u_id]
+
+        unit.reactor_data.mek_status.status = u_data[1]
+        unit.reactor_data.mek_struct.max_burn = u_data[2]
+        unit.annunciator.AutoControl = u_data[6]
+        unit.a_group = u_data[7]
+
+        unit.unit_ps.publish("status", u_data[1])
+        unit.unit_ps.publish("max_burn", u_data[2])
+        unit.unit_ps.publish("burn_limit", u_data[3])
+        unit.unit_ps.publish("U_AutoReady", u_data[4])
+        unit.unit_ps.publish("U_AutoDegraded", u_data[5])
+        unit.unit_ps.publish("AutoControl", u_data[6])
+        unit.unit_ps.publish("auto_group_id", unit.a_group)
+        unit.unit_ps.publish("auto_group", types.AUTO_GROUP_NAMES[unit.a_group + 1])
+    end
+
+    -- get facility data
+    local fac = io.facility
+    local f_data = data[#io.units + 1]
+
+    fac.status_lines = f_data[1]
+
+    fac.auto_ready = f_data[2][1]
+    fac.auto_active = f_data[2][2]
+    fac.auto_ramping = f_data[2][3]
+    fac.auto_saturated = f_data[2][4]
+
+    fac.auto_scram = f_data[3]
+    fac.ascram_status = f_data[4]
+
+    fac.ps.publish("status_line_1", fac.status_lines[1])
+    fac.ps.publish("status_line_2", fac.status_lines[2])
+
+    fac.ps.publish("auto_ready", fac.auto_ready)
+    fac.ps.publish("auto_active", fac.auto_active)
+    fac.ps.publish("auto_ramping", fac.auto_ramping)
+    fac.ps.publish("auto_saturated", fac.auto_saturated)
+
+    fac.ps.publish("auto_scram", fac.auto_scram)
+    fac.ps.publish("as_matrix_fault", fac.ascram_status.matrix_fault)
+    fac.ps.publish("as_matrix_fill", fac.ascram_status.matrix_fill)
+    fac.ps.publish("as_crit_alarm", fac.ascram_status.crit_alarm)
+    fac.ps.publish("as_radiation", fac.ascram_status.radiation)
+    fac.ps.publish("as_gen_fault", fac.ascram_status.gen_fault)
+
+    fac.ps.publish("process_mode", f_data[5][1])
+    fac.ps.publish("process_burn_target", f_data[5][2])
+    fac.ps.publish("process_charge_target", f_data[5][3])
+    fac.ps.publish("process_gen_target", f_data[5][4])
+end
+
+-- update waste app with unit data from API_GET_WASTE
+---@param data table
+function iorx.record_waste_data(data)
+    -- get unit data
+    for u_id = 1, #io.units do
+        local unit = io.units[u_id]
+        local u_data = data[u_id]
+
+        unit.waste_mode = u_data[1]
+        unit.waste_product = u_data[2]
+        unit.num_snas = u_data[3]
+        unit.sna_peak_rate = u_data[4]
+        unit.sna_max_rate = u_data[5]
+        unit.sna_out_rate = u_data[6]
+        unit.waste_stats = u_data[7]
+
+        unit.unit_ps.publish("U_AutoWaste", unit.waste_mode == types.WASTE_MODE.AUTO)
+        unit.unit_ps.publish("U_WasteMode", unit.waste_mode)
+        unit.unit_ps.publish("U_WasteProduct", unit.waste_product)
+
+        unit.unit_ps.publish("sna_count", unit.num_snas)
+        unit.unit_ps.publish("sna_peak_rate", unit.sna_peak_rate)
+        unit.unit_ps.publish("sna_max_rate", unit.sna_max_rate)
+        unit.unit_ps.publish("sna_out_rate", unit.sna_out_rate)
+
+        unit.unit_ps.publish("pu_rate", unit.waste_stats[1])
+        unit.unit_ps.publish("po_rate", unit.waste_stats[2])
+        unit.unit_ps.publish("po_pl_rate", unit.waste_stats[3])
+    end
+
+    -- get facility data
+    local fac = io.facility
+    local f_data = data[#io.units + 1]
+
+    fac.auto_current_waste_product = f_data[1]
+    fac.auto_pu_fallback_active = f_data[2]
+    fac.auto_sps_disabled = f_data[3]
+
+    fac.ps.publish("current_waste_product", fac.auto_current_waste_product)
+    fac.ps.publish("pu_fallback_active", fac.auto_pu_fallback_active)
+    fac.ps.publish("sps_disabled_low_power", fac.auto_sps_disabled)
+
+    fac.ps.publish("process_waste_product", f_data[4])
+    fac.ps.publish("process_pu_fallback", f_data[5])
+    fac.ps.publish("process_sps_low_power", f_data[6])
+
+    fac.waste_stats = f_data[7]
+
+    fac.ps.publish("burn_sum", fac.waste_stats[1])
+    fac.ps.publish("pu_rate", fac.waste_stats[2])
+    fac.ps.publish("po_rate", fac.waste_stats[3])
+    fac.ps.publish("po_pl_rate", fac.waste_stats[4])
+    fac.ps.publish("po_am_rate", fac.waste_stats[5])
+    fac.ps.publish("spent_waste_rate", fac.waste_stats[6])
+
+    fac.sps_ps_tbl[1].publish("SPSStateStatus", f_data[8])
+    fac.ps.publish("sps_process_rate", f_data[9])
+end
+
+
+-- update facility app with facility and unit data from API_GET_FAC_DTL
+---@param data table
+function iorx.record_fac_detail_data(data)
+    local fac = io.facility
+
+    local tank_statuses = data[5]
+    local next_t_stat = 1
+
+    -- annunciator
+
+    fac.all_sys_ok = data[1]
+    fac.rtu_count = data[2]
+    fac.auto_scram = data[3]
+    fac.ascram_status = data[4]
+
+    fac.ps.publish("all_sys_ok", fac.all_sys_ok)
+    fac.ps.publish("rtu_count", fac.rtu_count)
+    fac.ps.publish("auto_scram", fac.auto_scram)
+    fac.ps.publish("as_matrix_fault", fac.ascram_status.matrix_fault)
+    fac.ps.publish("as_matrix_fill", fac.ascram_status.matrix_fill)
+    fac.ps.publish("as_crit_alarm", fac.ascram_status.crit_alarm)
+    fac.ps.publish("as_radiation", fac.ascram_status.radiation)
+    fac.ps.publish("as_gen_fault", fac.ascram_status.gen_fault)
+
+    -- unit data
+
+    local units = data[12]
+
+    for i = 1, io.facility.num_units do
+        local unit = io.units[i]
+        local u_rx = units[i]
+
+        unit.connected    = u_rx[1]
+        unit.annunciator  = u_rx[2]
+        unit.reactor_data = u_rx[3]
+
+        local control_status = 1
+        if unit.connected then
+            if unit.reactor_data.rps_tripped then control_status = 2 end
+            if unit.reactor_data.mek_status.status then
+                control_status = util.trinary(unit.annunciator.AutoControl, 4, 3)
+            end
+        end
+
+        unit.unit_ps.publish("U_ControlStatus", control_status)
+
+        unit.tank_data_tbl = u_rx[4]
+
+        for id = 1, #unit.tank_data_tbl do
+            local tank   = unit.tank_data_tbl[id]
+            local ps     = unit.tank_ps_tbl[id]
+            local c_stat = tank_statuses[next_t_stat]
+
+            local tank_status = 1
+
+            if c_stat ~= TNK_STATE.OFFLINE then
+                if c_stat == TNK_STATE.FAULT then
+                    tank_status = 3
+                elseif tank.formed then
+                    tank_status = 4
+                else
+                    tank_status = 2
+                end
+            end
+
+            ps.publish("DynamicTankStatus", tank_status)
+            ps.publish("DynamicTankStateStatus", c_stat)
+
+            next_t_stat = next_t_stat + 1
+        end
+    end
+
+    -- facility dynamic tank data
+
+    fac.tank_data_tbl = data[6]
+
+    for id = 1, #fac.tank_data_tbl do
+        local tank   = fac.tank_data_tbl[id]
+        local ps     = fac.tank_ps_tbl[id]
+        local c_stat = tank_statuses[next_t_stat]
+
+        local tank_status = 1
+
+        if c_stat ~= TNK_STATE.OFFLINE then
+            if c_stat == TNK_STATE.FAULT then
+                tank_status = 3
+            elseif tank.formed then
+                tank_status = 4
+            else
+                tank_status = 2
+            end
+
+            _record_multiblock_status(c_stat == TNK_STATE.FAULT, tank, ps)
+        end
+
+        ps.publish("DynamicTankStatus", tank_status)
+        ps.publish("DynamicTankStateStatus", c_stat)
+
+        next_t_stat = next_t_stat + 1
+    end
+
+    -- induction matrix data
+
+    fac.induction_data_tbl[1] = data[8]
+
+    local matrix = fac.induction_data_tbl[1]
+    local m_ps   = fac.induction_ps_tbl[1]
+    local m_stat = data[7]
+
+    local mtx_status = 1
+
+    if m_stat ~= MTX_STATE.OFFLINE then
+        if m_stat == MTX_STATE.FAULT then
+            mtx_status = 3
+        elseif matrix.formed then
+            mtx_status = 4
+        else
+            mtx_status = 2
+        end
+
+        _record_multiblock_status(m_stat == MTX_STATE.FAULT, matrix, m_ps)
+    end
+
+    m_ps.publish("InductionMatrixStatus", mtx_status)
+    m_ps.publish("InductionMatrixStateStatus", m_stat)
+
+    m_ps.publish("eta_string", data[9][1])
+    m_ps.publish("avg_charge", data[9][2])
+    m_ps.publish("avg_inflow", data[9][3])
+    m_ps.publish("avg_outflow", data[9][4])
+    m_ps.publish("is_charging", data[9][5])
+    m_ps.publish("is_discharging", data[9][6])
+    m_ps.publish("at_max_io", data[9][7])
+
+    -- sps data
+
+    fac.sps_data_tbl[1] = data[11]
+
+    local sps    = fac.sps_data_tbl[1]
+    local s_ps   = fac.sps_ps_tbl[1]
+    local s_stat = data[10]
+
+    local sps_status = 1
+
+    if s_stat ~= SPS_STATE.OFFLINE then
+        if s_stat == SPS_STATE.FAULT then
+            sps_status = 3
+        elseif sps.formed then
+            sps_status = 4
+        else
+            sps_status = 2
+        end
+
+        _record_multiblock_status(s_stat == SPS_STATE.FAULT, sps, s_ps)
+    end
+
+    s_ps.publish("SPSStatus", sps_status)
+    s_ps.publish("SPSStateStatus", s_stat)
+end
+
+return function (io_obj)
+    io = io_obj
+    return iorx
+end

pocket/pocket.lua

@@ -29,6 +29,7 @@ pocket.MQ__RENDER_CMD = MQ__RENDER_CMD
 pocket.MQ__RENDER_DATA = MQ__RENDER_DATA
 
 ---@type pkt_config
+---@diagnostic disable-next-line: missing-fields
 local config = {}
 
 pocket.config = config
@@ -87,15 +88,17 @@ local APP_ID = {
     LOADER = 2,
     -- main app pages
     UNITS = 3,
-    CONTROL = 4,
+    FACILITY = 4,
-    PROCESS = 5,
+    CONTROL = 5,
-    GUIDE = 6,
+    PROCESS = 6,
-    ABOUT = 7,
+    WASTE = 7,
+    GUIDE = 8,
+    ABOUT = 9,
     -- diagnostic app pages
-    ALARMS = 8,
+    ALARMS = 10,
     -- other
-    DUMMY = 9,
+    DUMMY = 11,
-    NUM_APPS = 9
+    NUM_APPS = 11
 }
 
 pocket.APP_ID = APP_ID
@@ -264,7 +267,8 @@ function pocket.init_nav(smem)
 
     -- open an app
     ---@param app_id POCKET_APP_ID
-    function nav.open_app(app_id)
+    ---@param on_loaded? function
+    function nav.open_app(app_id, on_loaded)
         -- reset help return on navigating out of an app
         if app_id == APP_ID.ROOT then self.help_return = nil end
 
@@ -277,7 +281,7 @@ function pocket.init_nav(smem)
                 app = self.apps[app_id]
             else self.loader_return = nil end
 
-            if not app.loaded then smem.q.mq_render.push_data(MQ__RENDER_DATA.LOAD_APP, app_id) end
+            if not app.loaded then smem.q.mq_render.push_data(MQ__RENDER_DATA.LOAD_APP, { app_id, on_loaded }) end
 
             self.cur_app = app_id
             self.pane.set_value(app_id)
@@ -360,10 +364,10 @@ function pocket.init_nav(smem)
     function nav.open_help(key)
         self.help_return = self.cur_app
 
-        nav.open_app(APP_ID.GUIDE)
+        nav.open_app(APP_ID.GUIDE, function ()
-
+            local show = self.help_map[key]
-        local load = self.help_map[key]
+            if show then show() end
-        if load then load() end
+        end)
     end
 
     -- link the help map from the guide app
@@ -550,6 +554,11 @@ function pocket.comms(version, nic, sv_watchdog, api_watchdog, nav)
         if self.sv.linked then _send_sv(MGMT_TYPE.DIAG_ALARM_SET, { id, state }) end
     end
 
+    -- coordinator get facility app data
+    function public.api__get_facility()
+        if self.api.linked then _send_api(CRDN_TYPE.API_GET_FAC_DTL, {}) end
+    end
+
     -- coordinator get unit data
     function public.api__get_unit(unit)
         if self.api.linked then _send_api(CRDN_TYPE.API_GET_UNIT, { unit }) end
@@ -565,6 +574,11 @@ function pocket.comms(version, nic, sv_watchdog, api_watchdog, nav)
         if self.api.linked then _send_api(CRDN_TYPE.API_GET_PROC, {}) end
     end
 
+    -- coordinator get waste app data
+    function public.api__get_waste()
+        if self.api.linked then _send_api(CRDN_TYPE.API_GET_WASTE, {}) end
+    end
+
     -- send a facility command
     ---@param cmd FAC_COMMAND command
     ---@param option any? optional option options for the optional options (like waste mode)
@@ -719,19 +733,27 @@ function pocket.comms(version, nic, sv_watchdog, api_watchdog, nav)
                             end
                         elseif packet.type == CRDN_TYPE.API_GET_FAC then
                             if _check_length(packet, 11) then
-                                iocontrol.record_facility_data(packet.data)
+                                iocontrol.rx.record_facility_data(packet.data)
+                            end
+                        elseif packet.type == CRDN_TYPE.API_GET_FAC_DTL then
+                            if _check_length(packet, 12) then
+                                iocontrol.rx.record_fac_detail_data(packet.data)
                             end
                         elseif packet.type == CRDN_TYPE.API_GET_UNIT then
                             if _check_length(packet, 12) and type(packet.data[1]) == "number" and iocontrol.get_db().units[packet.data[1]] then
-                                iocontrol.record_unit_data(packet.data)
+                                iocontrol.rx.record_unit_data(packet.data)
                             end
                         elseif packet.type == CRDN_TYPE.API_GET_CTRL then
                             if _check_length(packet, #iocontrol.get_db().units) then
-                                iocontrol.record_control_data(packet.data)
+                                iocontrol.rx.record_control_data(packet.data)
                             end
                         elseif packet.type == CRDN_TYPE.API_GET_PROC then
                             if _check_length(packet, #iocontrol.get_db().units + 1) then
-                                iocontrol.record_process_data(packet.data)
+                                iocontrol.rx.record_process_data(packet.data)
+                            end
+                        elseif packet.type == CRDN_TYPE.API_GET_WASTE then
+                            if _check_length(packet, #iocontrol.get_db().units + 1) then
+                                iocontrol.rx.record_waste_data(packet.data)
                             end
                         else _fail_type(packet) end
                     else
@@ -891,7 +913,7 @@ function pocket.comms(version, nic, sv_watchdog, api_watchdog, nav)
                                 local ready = packet.data[1]
                                 local states = packet.data[2]
 
-                                diag.tone_test.ready_warn.set_value(util.trinary(ready, "", "system not ready"))
+                                diag.tone_test.ready_warn.set_value(util.trinary(ready, "", "system not idle"))
 
                                 for i = 1, #states do
                                     if diag.tone_test.tone_buttons[i] ~= nil then
@@ -910,7 +932,7 @@ function pocket.comms(version, nic, sv_watchdog, api_watchdog, nav)
                                 local ready = packet.data[1]
                                 local states = packet.data[2]
 
-                                diag.tone_test.ready_warn.set_value(util.trinary(ready, "", "system not ready"))
+                                diag.tone_test.ready_warn.set_value(util.trinary(ready, "", "system not idle"))
 
                                 for i = 1, #states do
                                     if diag.tone_test.alarm_buttons[i] ~= nil then

pocket/process.lua

@@ -85,6 +85,14 @@ function process.set_group(unit_id, group_id)
     log.debug(util.c("PROCESS: UNIT[", unit_id, "] SET GROUP ", group_id))
 end
 
+-- set waste mode
+---@param id integer unit ID
+---@param mode integer waste mode
+function process.set_unit_waste(id, mode)
+    self.comms.send_unit_command(U_CMD.SET_WASTE, id, mode)
+    log.debug(util.c("PROCESS: UNIT[", id, "] SET WASTE ", mode))
+end
+
 -- acknowledge all alarms
 ---@param id integer unit ID
 function process.ack_all_alarms(id)
@@ -131,6 +139,27 @@ function process.process_stop()
     log.debug("PROCESS: STOP AUTO CTRL")
 end
 
+-- set automatic process control waste mode
+---@param product WASTE_PRODUCT waste product for auto control
+function process.set_process_waste(product)
+    self.comms.send_fac_command(F_CMD.SET_WASTE_MODE, product)
+    log.debug(util.c("PROCESS: SET WASTE ", product))
+end
+
+-- set automatic process control plutonium fallback
+---@param enabled boolean whether to enable plutonium fallback
+function process.set_pu_fallback(enabled)
+    self.comms.send_fac_command(F_CMD.SET_PU_FB, enabled)
+    log.debug(util.c("PROCESS: SET PU FALLBACK ", enabled))
+end
+
+-- set automatic process control SPS usage at low power
+---@param enabled boolean whether to enable SPS usage at low power
+function process.set_sps_low_power(enabled)
+    self.comms.send_fac_command(F_CMD.SET_SPS_LP, enabled)
+    log.debug(util.c("PROCESS: SET SPS LOW POWER ", enabled))
+end
+
 -- #endregion
 ---------------------------------
 

pocket/startup.lua

@@ -20,7 +20,7 @@ local pocket    = require("pocket.pocket")
 local renderer  = require("pocket.renderer")
 local threads   = require("pocket.threads")
 
-local POCKET_VERSION = "v0.12.7-alpha"
+local POCKET_VERSION = "v0.13.0-beta"
 
 local println = util.println
 local println_ts = util.println_ts

pocket/threads.lua

@@ -165,15 +165,18 @@ function threads.thread__render(smem)
                         local cmd = msg.message ---@type queue_data
 
                         if cmd.key == MQ__RENDER_DATA.LOAD_APP then
-                            log.debug("RENDER: load app " .. cmd.val)
+                            log.debug("RENDER: load app " .. cmd.val[1])
 
                             local draw_start = util.time_ms()
 
-                            pkt_state.ui_ok, pkt_state.ui_error = pcall(function () nav.load_app(cmd.val) end)
+                            pkt_state.ui_ok, pkt_state.ui_error = pcall(function () nav.load_app(cmd.val[1]) end)
                             if not pkt_state.ui_ok then
                                 log.fatal(util.c("RENDER: app load failed with error ", pkt_state.ui_error))
                             else
                                 log.debug("RENDER: app loaded in " .. (util.time_ms() - draw_start) .. "ms")
+
+                                -- call the on loaded function if provided
+                                if type(cmd.val[2]) == "function" then cmd.val[2]() end
                             end
                         end
                     elseif msg.qtype == mqueue.TYPE.PACKET then

pocket/ui/apps/control.lua

@@ -1,5 +1,5 @@
 --
--- Unit Control Page
+-- Facility & Unit Control App
 --
 
 local types         = require("scada-common.types")

pocket/ui/apps/facility.lua

@@ -0,0 +1,258 @@
+--
+-- Facility Overview App
+--
+
+local util          = require("scada-common.util")
+
+local iocontrol     = require("pocket.iocontrol")
+local pocket        = require("pocket.pocket")
+
+local style         = require("pocket.ui.style")
+
+local dyn_tank      = require("pocket.ui.pages.dynamic_tank")
+local facility_sps  = require("pocket.ui.pages.facility_sps")
+local induction_mtx = require("pocket.ui.pages.facility_matrix")
+
+local core          = require("graphics.core")
+
+local Div           = require("graphics.elements.Div")
+local MultiPane     = require("graphics.elements.MultiPane")
+local TextBox       = require("graphics.elements.TextBox")
+
+local WaitingAnim   = require("graphics.elements.animations.Waiting")
+
+local DataIndicator = require("graphics.elements.indicators.DataIndicator")
+local IconIndicator = require("graphics.elements.indicators.IconIndicator")
+
+local ALIGN = core.ALIGN
+local cpair = core.cpair
+
+local APP_ID = pocket.APP_ID
+
+local label_fg_bg  = style.label
+local lu_col       = style.label_unit_pair
+
+local basic_states = style.icon_states.basic_states
+local mode_states  = style.icon_states.mode_states
+local red_ind_s    = style.icon_states.red_ind_s
+local yel_ind_s    = style.icon_states.yel_ind_s
+local grn_ind_s    = style.icon_states.grn_ind_s
+
+-- new unit page view
+---@param root Container parent
+local function new_view(root)
+    local db  = iocontrol.get_db()
+
+    local frame = Div{parent=root,x=1,y=1}
+
+    local app = db.nav.register_app(APP_ID.FACILITY, frame, nil, false, true)
+
+    local load_div = Div{parent=frame,x=1,y=1}
+    local main = Div{parent=frame,x=1,y=1}
+
+    TextBox{parent=load_div,y=12,text="Loading...",alignment=ALIGN.CENTER}
+    WaitingAnim{parent=load_div,x=math.floor(main.get_width()/2)-1,y=8,fg_bg=cpair(colors.orange,colors._INHERIT)}
+
+    local load_pane = MultiPane{parent=main,x=1,y=1,panes={load_div,main}}
+
+    app.set_sidebar({ { label = " # ", tall = true, color = core.cpair(colors.black, colors.green), callback = db.nav.go_home } })
+
+    local tank_page_navs = {}
+    local page_div = nil ---@type Div|nil
+
+    -- load the app (create the elements)
+    local function load()
+        local fac  = db.facility
+        local f_ps = fac.ps
+
+        page_div = Div{parent=main,y=2,width=main.get_width()}
+
+        local panes = {} ---@type Div[]
+
+        -- refresh data callback, every 500ms it will re-send the query
+        local last_update = 0
+        local function update()
+            if util.time_ms() - last_update >= 500 then
+                db.api.get_fac()
+                last_update = util.time_ms()
+            end
+        end
+
+        --#region facility overview
+
+        local main_pane = Div{parent=page_div}
+        local f_div = Div{parent=main_pane,x=2,width=main.get_width()-2}
+        table.insert(panes, main_pane)
+
+        local fac_page = app.new_page(nil, #panes)
+        fac_page.tasks = { update }
+
+        TextBox{parent=f_div,y=1,text="Facility",alignment=ALIGN.CENTER}
+
+        local mtx_state = IconIndicator{parent=f_div,y=3,label="Matrix Status",states=basic_states}
+        local sps_state = IconIndicator{parent=f_div,label="SPS Status",states=basic_states}
+        mtx_state.register(fac.induction_ps_tbl[1], "InductionMatrixStatus", mtx_state.update)
+        sps_state.register(fac.sps_ps_tbl[1], "SPSStatus", sps_state.update)
+
+        TextBox{parent=f_div,y=6,text="RTU Gateways",fg_bg=label_fg_bg}
+        local rtu_count = DataIndicator{parent=f_div,x=19,y=6,label="",format="%3d",value=0,lu_colors=lu_col,width=3}
+        rtu_count.register(f_ps, "rtu_count", rtu_count.update)
+
+        TextBox{parent=f_div,y=8,text="Induction Matrix",alignment=ALIGN.CENTER}
+
+        local eta = TextBox{parent=f_div,x=1,y=10,text="ETA Unknown",alignment=ALIGN.CENTER,fg_bg=cpair(colors.white,colors.gray)}
+        eta.register(fac.induction_ps_tbl[1], "eta_string", eta.set_value)
+
+        TextBox{parent=f_div,y=12,text="Unit Statuses",alignment=ALIGN.CENTER}
+
+        f_div.line_break()
+
+        for i = 1, fac.num_units do
+            local ctrl = IconIndicator{parent=f_div,label="U"..i.." Control State",states=mode_states}
+            ctrl.register(db.units[i].unit_ps, "U_ControlStatus", ctrl.update)
+        end
+
+        --#endregion
+
+        --#region facility annunciator
+
+        local a_pane = Div{parent=page_div}
+        local a_div = Div{parent=a_pane,x=2,width=main.get_width()-2}
+        table.insert(panes, a_pane)
+
+        local annunc_page = app.new_page(nil, #panes)
+        annunc_page.tasks = { update }
+
+        TextBox{parent=a_div,y=1,text="Annunciator",alignment=ALIGN.CENTER}
+
+        local all_ok  = IconIndicator{parent=a_div,y=3,label="Units Online",states=grn_ind_s}
+        local ind_mat = IconIndicator{parent=a_div,label="Induction Matrix",states=grn_ind_s}
+        local sps     = IconIndicator{parent=a_div,label="SPS Connected",states=grn_ind_s}
+
+        all_ok.register(f_ps, "all_sys_ok", all_ok.update)
+        ind_mat.register(fac.induction_ps_tbl[1], "InductionMatrixStateStatus", function (status) ind_mat.update(status > 1) end)
+        sps.register(fac.sps_ps_tbl[1], "SPSStateStatus", function (status) sps.update(status > 1) end)
+
+        a_div.line_break()
+
+        local auto_scram  = IconIndicator{parent=a_div,label="Automatic SCRAM",states=red_ind_s}
+        local matrix_flt  = IconIndicator{parent=a_div,label="Ind. Matrix Fault",states=yel_ind_s}
+        local matrix_fill = IconIndicator{parent=a_div,label="Matrix Charge Hi",states=red_ind_s}
+        local unit_crit   = IconIndicator{parent=a_div,label="Unit Crit. Alarm",states=red_ind_s}
+        local fac_rad_h   = IconIndicator{parent=a_div,label="FAC Radiation Hi",states=red_ind_s}
+        local gen_fault   = IconIndicator{parent=a_div,label="Gen Control Fault",states=yel_ind_s}
+
+        auto_scram.register(f_ps, "auto_scram", auto_scram.update)
+        matrix_flt.register(f_ps, "as_matrix_fault", matrix_flt.update)
+        matrix_fill.register(f_ps, "as_matrix_fill", matrix_fill.update)
+        unit_crit.register(f_ps, "as_crit_alarm", unit_crit.update)
+        fac_rad_h.register(f_ps, "as_radiation", fac_rad_h.update)
+        gen_fault.register(f_ps, "as_gen_fault", gen_fault.update)
+
+        --#endregion
+
+        --#region induction matrix
+
+        local mtx_page_nav = induction_mtx(app, panes, Div{parent=page_div}, fac.induction_ps_tbl[1], update)
+
+        --#endregion
+
+        --#region SPS
+
+        local sps_page_nav = facility_sps(app, panes, Div{parent=page_div}, fac.sps_ps_tbl[1], update)
+
+        --#endregion
+
+        --#region facility tank pages
+
+        local t_pane = Div{parent=page_div}
+        local t_div = Div{parent=t_pane,x=2,width=main.get_width()-2}
+        table.insert(panes, t_pane)
+
+        local tank_page = app.new_page(nil, #panes)
+        tank_page.tasks = { update }
+
+        TextBox{parent=t_div,y=1,text="Facility Tanks",alignment=ALIGN.CENTER}
+
+        local f_tank_id = 1
+        for t = 1, #fac.tank_list do
+            if fac.tank_list[t] == 1 then
+                t_div.line_break()
+
+                local tank = IconIndicator{parent=t_div,x=1,label="Unit Tank "..t.." (U-"..t..")",states=basic_states}
+                tank.register(db.units[t].tank_ps_tbl[1], "DynamicTankStatus", tank.update)
+
+                TextBox{parent=t_div,x=5,text="\x07 Unit "..t,fg_bg=label_fg_bg}
+            elseif fac.tank_list[t] == 2 then
+                tank_page_navs[f_tank_id] = dyn_tank(app, nil, panes, Div{parent=page_div}, t, fac.tank_ps_tbl[f_tank_id], update)
+
+                t_div.line_break()
+
+                local tank = IconIndicator{parent=t_div,x=1,label="Fac. Tank "..f_tank_id.." (F-"..f_tank_id..")",states=basic_states}
+                tank.register(fac.tank_ps_tbl[f_tank_id], "DynamicTankStatus", tank.update)
+
+                local connections = ""
+                for i = 1, #fac.tank_conns do
+                    if fac.tank_conns[i] == t then
+                        if connections ~= "" then
+                            connections = connections .. "\n\x07 Unit " .. i
+                        else
+                            connections = "\x07 Unit " .. i
+                        end
+                    end
+                end
+
+                TextBox{parent=t_div,x=5,text=connections,fg_bg=label_fg_bg}
+
+                f_tank_id = f_tank_id + 1
+            end
+        end
+
+        --#endregion
+
+        -- setup multipane
+        local f_pane = MultiPane{parent=page_div,x=1,y=1,panes=panes}
+        app.set_root_pane(f_pane)
+
+        -- setup sidebar
+
+        local list = {
+            { label = " # ", tall = true, color = core.cpair(colors.black, colors.green), callback = db.nav.go_home },
+            { label = "FAC", tall = true, color = core.cpair(colors.black, colors.orange), callback = fac_page.nav_to },
+            { label = "ANN", color = core.cpair(colors.black, colors.yellow), callback = annunc_page.nav_to },
+            { label = "MTX", color = core.cpair(colors.black, colors.white), callback = mtx_page_nav },
+            { label = "SPS", color = core.cpair(colors.black, colors.purple), callback = sps_page_nav },
+            { label = "TNK", tall = true, color = core.cpair(colors.black, colors.blue), callback = tank_page.nav_to }
+        }
+
+        for i = 1, #fac.tank_data_tbl do
+            table.insert(list, { label = "F-" .. i, color = core.cpair(colors.black, colors.lightGray), callback = tank_page_navs[i] })
+        end
+
+        app.set_sidebar(list)
+
+        -- done, show the app
+        load_pane.set_value(2)
+    end
+
+    -- delete the elements and switch back to the loading screen
+    local function unload()
+        if page_div then
+            page_div.delete()
+            page_div = nil
+        end
+
+        app.set_sidebar({ { label = " # ", tall = true, color = core.cpair(colors.black, colors.green), callback = db.nav.go_home } })
+        app.delete_pages()
+
+        -- show loading screen
+        load_pane.set_value(1)
+    end
+
+    app.set_load(load)
+    app.set_unload(unload)
+
+    return main
+end
+
+return new_view

pocket/ui/apps/process.lua

@@ -1,5 +1,5 @@
 --
--- Process Control Page
+-- Process Control App
 --
 
 local types         = require("scada-common.types")
@@ -269,7 +269,7 @@ local function new_view(root)
         local auto_scram = IconIndicator{parent=a_div,y=3,label="Automatic SCRAM",states=red_ind_s}
 
         TextBox{parent=a_div,y=5,text="Induction Matrix",fg_bg=label_fg_bg}
-        local matrix_dc   = IconIndicator{parent=a_div,label="Disconnected",states=yel_ind_s}
+        local matrix_flt  = IconIndicator{parent=a_div,label="Matrix Fault",states=yel_ind_s}
         local matrix_fill = IconIndicator{parent=a_div,label="Charge High",states=red_ind_s}
 
         TextBox{parent=a_div,y=9,text="Assigned Units",fg_bg=label_fg_bg}
@@ -282,7 +282,7 @@ local function new_view(root)
         local gen_fault = IconIndicator{parent=a_div,label="Control Fault",states=yel_ind_s}
 
         auto_scram.register(f_ps, "auto_scram", auto_scram.update)
-        matrix_dc.register(f_ps, "as_matrix_dc", matrix_dc.update)
+        matrix_flt.register(f_ps, "as_matrix_fault", matrix_flt.update)
         matrix_fill.register(f_ps, "as_matrix_fill", matrix_fill.update)
         unit_crit.register(f_ps, "as_crit_alarm", unit_crit.update)
         fac_rad_h.register(f_ps, "as_radiation", fac_rad_h.update)

pocket/ui/apps/unit.lua

@@ -1,5 +1,5 @@
 --
--- Unit Overview Page
+-- Unit Overview App
 --
 
 local util          = require("scada-common.util")
@@ -9,6 +9,7 @@ local pocket        = require("pocket.pocket")
 
 local style         = require("pocket.ui.style")
 
+local dyn_tank      = require("pocket.ui.pages.dynamic_tank")
 local boiler        = require("pocket.ui.pages.unit_boiler")
 local reactor       = require("pocket.ui.pages.unit_reactor")
 local turbine       = require("pocket.ui.pages.unit_turbine")
@@ -32,9 +33,8 @@ local cpair = core.cpair
 
 local APP_ID = pocket.APP_ID
 
--- local label        = style.label
-local lu_col       = style.label_unit_pair
 local text_fg      = style.text_fg
+local lu_col       = style.label_unit_pair
 local basic_states = style.icon_states.basic_states
 local mode_states  = style.icon_states.mode_states
 local red_ind_s    = style.icon_states.red_ind_s
@@ -92,6 +92,10 @@ local function new_view(root)
             table.insert(list, { label = "T-" .. i, color = core.cpair(colors.black, colors.lightGray), callback = nav_links[id].turbine[i] })
         end
 
+        if #unit.tank_data_tbl > 0 then
+            table.insert(list, { label = "DYN", color = core.cpair(colors.black, colors.lightGray), callback = nav_links[id].d_tank })
+        end
+
         app.set_sidebar(list)
     end
 
@@ -363,6 +367,15 @@ local function new_view(root)
 
             --#endregion
 
+            --#region Dynamic Tank Tab
+
+            if #unit.tank_data_tbl > 0 then
+                local tank_pane = Div{parent=page_div}
+                nav_links[i].d_tank = dyn_tank(app, u_page, panes, tank_pane, i, unit.tank_ps_tbl[1], update)
+            end
+
+            --#endregion
+
             util.nop()
         end
 

pocket/ui/apps/waste.lua

@@ -0,0 +1,308 @@
+--
+-- Waste Control App
+--
+
+local util           = require("scada-common.util")
+
+local iocontrol      = require("pocket.iocontrol")
+local pocket         = require("pocket.pocket")
+local process        = require("pocket.process")
+
+local style          = require("pocket.ui.style")
+
+local core           = require("graphics.core")
+
+local Div            = require("graphics.elements.Div")
+local MultiPane      = require("graphics.elements.MultiPane")
+local TextBox        = require("graphics.elements.TextBox")
+
+local WaitingAnim    = require("graphics.elements.animations.Waiting")
+
+local Checkbox       = require("graphics.elements.controls.Checkbox")
+local PushButton     = require("graphics.elements.controls.PushButton")
+local RadioButton    = require("graphics.elements.controls.RadioButton")
+
+local DataIndicator  = require("graphics.elements.indicators.DataIndicator")
+local IconIndicator  = require("graphics.elements.indicators.IconIndicator")
+local StateIndicator = require("graphics.elements.indicators.StateIndicator")
+
+local ALIGN = core.ALIGN
+local cpair = core.cpair
+
+local APP_ID = pocket.APP_ID
+
+local label_fg_bg = style.label
+local text_fg     = style.text_fg
+local lu_col      = style.label_unit_pair
+local yel_ind_s   = style.icon_states.yel_ind_s
+local wht_ind_s   = style.icon_states.wht_ind_s
+
+-- new waste control page view
+---@param root Container parent
+local function new_view(root)
+    local db = iocontrol.get_db()
+
+    local frame = Div{parent=root,x=1,y=1}
+
+    local app = db.nav.register_app(APP_ID.WASTE, frame, nil, false, true)
+
+    local load_div = Div{parent=frame,x=1,y=1}
+    local main = Div{parent=frame,x=1,y=1}
+
+    TextBox{parent=load_div,y=12,text="Loading...",alignment=ALIGN.CENTER}
+    WaitingAnim{parent=load_div,x=math.floor(main.get_width()/2)-1,y=8,fg_bg=cpair(colors.brown,colors._INHERIT)}
+
+    local load_pane = MultiPane{parent=main,x=1,y=1,panes={load_div,main}}
+
+    app.set_sidebar({ { label = " # ", tall = true, color = core.cpair(colors.black, colors.green), callback = db.nav.go_home } })
+
+    local page_div = nil ---@type Div|nil
+
+    -- load the app (create the elements)
+    local function load()
+        local f_ps = db.facility.ps
+
+        page_div = Div{parent=main,y=2,width=main.get_width()}
+
+        local panes   = {} ---@type Div[]
+        local u_pages = {} ---@type nav_tree_page[]
+
+        local last_update = 0
+        -- refresh data callback, every 500ms it will re-send the query
+        local function update()
+            if util.time_ms() - last_update >= 500 then
+                db.api.get_waste()
+                last_update = util.time_ms()
+            end
+        end
+
+        --#region unit waste options/statistics
+
+        for i = 1, db.facility.num_units do
+            local u_pane = Div{parent=page_div}
+            local u_div = Div{parent=u_pane,x=2,width=main.get_width()-2}
+            local unit = db.units[i]
+            local u_ps = unit.unit_ps
+
+            table.insert(panes, u_div)
+
+            local u_page = app.new_page(nil, #panes)
+            u_page.tasks = { update }
+
+            table.insert(u_pages, u_page)
+
+            TextBox{parent=u_div,y=1,text="Reactor Unit #"..i,alignment=ALIGN.CENTER}
+
+            local function set_waste(mode) process.set_unit_waste(i, mode) end
+
+            local waste_prod = StateIndicator{parent=u_div,x=16,y=3,states=style.waste.states_abbrv,value=1,min_width=6}
+            local waste_mode = RadioButton{parent=u_div,y=3,options=style.waste.unit_opts,callback=set_waste,radio_colors=cpair(colors.lightGray,colors.gray),select_color=colors.white}
+
+            waste_prod.register(u_ps, "U_WasteProduct", waste_prod.update)
+            waste_mode.register(u_ps, "U_WasteMode", waste_mode.set_value)
+
+            TextBox{parent=u_div,y=8,text="Plutonium (Pellets)",fg_bg=label_fg_bg}
+            local pu = DataIndicator{parent=u_div,label="",format="%16.3f",value=0,unit="mB/t",lu_colors=lu_col,width=21,fg_bg=text_fg}
+            TextBox{parent=u_div,y=11,text="Polonium",fg_bg=label_fg_bg}
+            local po = DataIndicator{parent=u_div,label="",format="%16.3f",value=0,unit="mB/t",lu_colors=lu_col,width=21,fg_bg=text_fg}
+            TextBox{parent=u_div,y=14,text="Polonium (Pellets)",fg_bg=label_fg_bg}
+            local popl = DataIndicator{parent=u_div,label="",format="%16.3f",value=0,unit="mB/t",lu_colors=lu_col,width=21,fg_bg=text_fg}
+
+            pu.register(u_ps, "pu_rate", pu.update)
+            po.register(u_ps, "po_rate", po.update)
+            popl.register(u_ps, "po_pl_rate", popl.update)
+
+            local sna_div = Div{parent=u_pane,x=2,width=page_div.get_width()-2}
+            table.insert(panes, sna_div)
+
+            local sps_page = app.new_page(u_page, #panes)
+            sps_page.tasks = { update }
+
+            PushButton{parent=u_div,x=6,y=18,text="SNA DATA",min_width=12,fg_bg=cpair(colors.lightGray,colors.gray),active_fg_bg=cpair(colors.gray,colors.lightGray),callback=sps_page.nav_to}
+            PushButton{parent=sna_div,x=9,y=18,text="BACK",min_width=6,fg_bg=cpair(colors.lightGray,colors.gray),active_fg_bg=cpair(colors.gray,colors.lightGray),callback=u_page.nav_to}
+
+            TextBox{parent=sna_div,y=1,text="Unit "..i.." SNAs",alignment=ALIGN.CENTER}
+            TextBox{parent=sna_div,y=3,text="Connected",fg_bg=label_fg_bg}
+            local count = DataIndicator{parent=sna_div,x=20,y=3,label="",format="%2d",value=0,unit="",lu_colors=lu_col,width=2,fg_bg=text_fg}
+
+            TextBox{parent=sna_div,y=5,text="Peak Possible Rate\n In\n Out",fg_bg=label_fg_bg}
+            local peak_i = DataIndicator{parent=sna_div,x=6,y=6,label="",format="%11.2f",value=0,unit="mB/t",lu_colors=lu_col,width=17,fg_bg=text_fg}
+            local peak_o = DataIndicator{parent=sna_div,x=6,label="",format="%11.2f",value=0,unit="mB/t",lu_colors=lu_col,width=17,fg_bg=text_fg}
+
+            TextBox{parent=sna_div,y=9,text="Current Maximum Rate\n In\n Out",fg_bg=label_fg_bg}
+            local max_i = DataIndicator{parent=sna_div,x=6,y=10,label="",format="%11.2f",value=0,unit="mB/t",lu_colors=lu_col,width=17,fg_bg=text_fg}
+            local max_o = DataIndicator{parent=sna_div,x=6,label="",format="%11.2f",value=0,unit="mB/t",lu_colors=lu_col,width=17,fg_bg=text_fg}
+
+            TextBox{parent=sna_div,y=13,text="Current Rate\n In\n Out",fg_bg=label_fg_bg}
+            local cur_i = DataIndicator{parent=sna_div,x=6,y=14,label="",format="%11.2f",value=0,unit="mB/t",lu_colors=lu_col,width=17,fg_bg=text_fg}
+            local cur_o = DataIndicator{parent=sna_div,x=6,label="",format="%11.2f",value=0,unit="mB/t",lu_colors=lu_col,width=17,fg_bg=text_fg}
+
+            count.register(u_ps, "sna_count", count.update)
+            peak_i.register(u_ps, "sna_peak_rate", function (x) peak_i.update(x * 10) end)
+            peak_o.register(u_ps, "sna_peak_rate", peak_o.update)
+            max_i.register(u_ps, "sna_max_rate", function (x) max_i.update(x * 10) end)
+            max_o.register(u_ps, "sna_max_rate", max_o.update)
+            cur_i.register(u_ps, "sna_out_rate", function (x) cur_i.update(x * 10) end)
+            cur_o.register(u_ps, "sna_out_rate", cur_o.update)
+        end
+
+        --#endregion
+
+        --#region waste control page
+
+        local c_pane = Div{parent=page_div}
+        local c_div = Div{parent=c_pane,x=2,width=main.get_width()-2}
+        table.insert(panes, c_div)
+
+        local wst_ctrl = app.new_page(nil, #panes)
+        wst_ctrl.tasks = { update }
+
+        TextBox{parent=c_div,y=1,text="Waste Control",alignment=ALIGN.CENTER}
+
+        local status = StateIndicator{parent=c_div,x=3,y=3,states=style.waste.states,value=1,min_width=17}
+        local waste_prod = RadioButton{parent=c_div,y=5,options=style.waste.options,callback=process.set_process_waste,radio_colors=cpair(colors.lightGray,colors.gray),select_color=colors.white}
+
+        status.register(f_ps, "current_waste_product", status.update)
+        waste_prod.register(f_ps, "process_waste_product", waste_prod.set_value)
+
+        local fb_active = IconIndicator{parent=c_div,y=9,label="Fallback Active",states=wht_ind_s}
+        local sps_disabled = IconIndicator{parent=c_div,y=10,label="SPS Disabled LC",states=yel_ind_s}
+
+        fb_active.register(f_ps, "pu_fallback_active", fb_active.update)
+        sps_disabled.register(f_ps, "sps_disabled_low_power", sps_disabled.update)
+
+        TextBox{parent=c_div,y=12,text="Nuclear Waste In",fg_bg=label_fg_bg}
+        local sum_raw_waste = DataIndicator{parent=c_div,label="",format="%16.3f",value=0,unit="mB/t",lu_colors=lu_col,width=21,fg_bg=text_fg}
+
+        sum_raw_waste.register(f_ps, "burn_sum", sum_raw_waste.update)
+
+        TextBox{parent=c_div,y=15,text="Spent Waste Out",fg_bg=label_fg_bg}
+        local sum_sp_waste = DataIndicator{parent=c_div,label="",format="%16.3f",value=0,unit="mB/t",lu_colors=lu_col,width=21,fg_bg=text_fg}
+
+        sum_sp_waste.register(f_ps, "spent_waste_rate", sum_sp_waste.update)
+
+        local stats_div = Div{parent=c_pane,x=2,width=page_div.get_width()-2}
+        table.insert(panes, stats_div)
+
+        local stats_page = app.new_page(wst_ctrl, #panes)
+        stats_page.tasks = { update }
+
+        PushButton{parent=c_div,x=6,y=18,text="PROD RATES",min_width=12,fg_bg=cpair(colors.lightGray,colors.gray),active_fg_bg=cpair(colors.gray,colors.lightGray),callback=stats_page.nav_to}
+        PushButton{parent=stats_div,x=9,y=18,text="BACK",min_width=6,fg_bg=cpair(colors.lightGray,colors.gray),active_fg_bg=cpair(colors.gray,colors.lightGray),callback=wst_ctrl.nav_to}
+
+        TextBox{parent=stats_div,y=1,text="Production Rates",alignment=ALIGN.CENTER}
+
+        TextBox{parent=stats_div,y=3,text="Plutonium (Pellets)",fg_bg=label_fg_bg}
+        local pu = DataIndicator{parent=stats_div,label="",format="%16.3f",value=0,unit="mB/t",lu_colors=lu_col,width=21,fg_bg=text_fg}
+        TextBox{parent=stats_div,y=6,text="Polonium",fg_bg=label_fg_bg}
+        local po = DataIndicator{parent=stats_div,label="",format="%16.3f",value=0,unit="mB/t",lu_colors=lu_col,width=21,fg_bg=text_fg}
+        TextBox{parent=stats_div,y=9,text="Polonium (Pellets)",fg_bg=label_fg_bg}
+        local popl = DataIndicator{parent=stats_div,label="",format="%16.3f",value=0,unit="mB/t",lu_colors=lu_col,width=21,fg_bg=text_fg}
+
+        pu.register(f_ps, "pu_rate", pu.update)
+        po.register(f_ps, "po_rate", po.update)
+        popl.register(f_ps, "po_pl_rate", popl.update)
+
+        TextBox{parent=stats_div,y=12,text="Antimatter",fg_bg=label_fg_bg}
+        local am = DataIndicator{parent=stats_div,label="",format="%16d",value=0,unit="\xb5B/t",lu_colors=lu_col,width=21,fg_bg=text_fg}
+
+        am.register(f_ps, "sps_process_rate", function (r) am.update(r * 1000) end)
+
+        --#endregion
+
+        --#region waste options page
+
+        local o_pane = Div{parent=page_div}
+        local o_div = Div{parent=o_pane,x=2,width=main.get_width()-2}
+        table.insert(panes, o_pane)
+
+        local opt_page = app.new_page(nil, #panes)
+        opt_page.tasks = { update }
+
+        TextBox{parent=o_div,y=1,text="Waste Options",alignment=ALIGN.CENTER}
+
+        local pu_fallback = Checkbox{parent=o_div,x=2,y=3,label="Pu Fallback",callback=process.set_pu_fallback,box_fg_bg=cpair(colors.white,colors.gray)}
+
+        TextBox{parent=o_div,x=2,y=5,height=3,text="Switch to Pu when SNAs cannot keep up with waste.",fg_bg=label_fg_bg}
+
+        local lc_sps = Checkbox{parent=o_div,x=2,y=9,label="Low Charge SPS",callback=process.set_sps_low_power,box_fg_bg=cpair(colors.white,colors.gray)}
+
+        TextBox{parent=o_div,x=2,y=11,height=3,text="Use SPS at low charge, otherwise switches to Po.",fg_bg=label_fg_bg}
+
+        pu_fallback.register(f_ps, "process_pu_fallback", pu_fallback.set_value)
+        lc_sps.register(f_ps, "process_sps_low_power", lc_sps.set_value)
+
+        --#endregion
+
+        --#region SPS page
+
+        local s_pane = Div{parent=page_div}
+        local s_div = Div{parent=s_pane,x=2,width=main.get_width()-2}
+        table.insert(panes, s_pane)
+
+        local sps_page = app.new_page(nil, #panes)
+        sps_page.tasks = { update }
+
+        TextBox{parent=s_div,y=1,text="Facility SPS",alignment=ALIGN.CENTER}
+
+        local sps_status = StateIndicator{parent=s_div,x=5,y=3,states=style.sps.states,value=1,min_width=12}
+
+        sps_status.register(db.facility.sps_ps_tbl[1], "SPSStateStatus", sps_status.update)
+
+        TextBox{parent=s_div,y=5,text="Input Rate",width=10,fg_bg=label_fg_bg}
+        local sps_in = DataIndicator{parent=s_div,label="",format="%16.2f",value=0,unit="mB/t",lu_colors=lu_col,width=21,fg_bg=text_fg}
+
+        sps_in.register(f_ps, "po_am_rate", sps_in.update)
+
+        TextBox{parent=s_div,y=8,text="Production Rate",width=15,fg_bg=label_fg_bg}
+        local sps_rate = DataIndicator{parent=s_div,label="",format="%16d",value=0,unit="\xb5B/t",lu_colors=lu_col,width=21,fg_bg=text_fg}
+
+        sps_rate.register(f_ps, "sps_process_rate", function (r) sps_rate.update(r * 1000) end)
+
+        --#endregion
+
+        -- setup multipane
+        local w_pane = MultiPane{parent=page_div,x=1,y=1,panes=panes}
+        app.set_root_pane(w_pane)
+
+        -- setup sidebar
+
+        local list = {
+            { label = " # ", tall = true, color = core.cpair(colors.black, colors.green), callback = db.nav.go_home },
+            { label = "WST", color = core.cpair(colors.black, colors.brown), callback = wst_ctrl.nav_to },
+            { label = "OPT", color = core.cpair(colors.black, colors.white), callback = opt_page.nav_to },
+            { label = "SPS", color = core.cpair(colors.black, colors.purple), callback = sps_page.nav_to }
+        }
+
+        for i = 1, db.facility.num_units do
+            table.insert(list, { label = "U-" .. i, color = core.cpair(colors.black, colors.lightGray), callback = u_pages[i].nav_to })
+        end
+
+        app.set_sidebar(list)
+
+        -- done, show the app
+        wst_ctrl.nav_to()
+        load_pane.set_value(2)
+    end
+
+    -- delete the elements and switch back to the loading screen
+    local function unload()
+        if page_div then
+            page_div.delete()
+            page_div = nil
+        end
+
+        app.set_sidebar({ { label = " # ", tall = true, color = core.cpair(colors.black, colors.green), callback = db.nav.go_home } })
+        app.delete_pages()
+
+        -- show loading screen
+        load_pane.set_value(1)
+    end
+
+    app.set_load(load)
+    app.set_unload(unload)
+
+    return main
+end
+
+return new_view

pocket/ui/docs.lua

@@ -148,7 +148,7 @@ doc("auto_ramping", "Process Ramping", "Automatic process control is performing
 doc("auto_saturated", "Min/Max Burn Rate", "Auto control has either commanded 0 mB/t or the maximum total burn rate available (from assigned units).")
 sect("Automatic SCRAM")
 doc("auto_scram", "Automatic SCRAM", "Automatic control system SCRAM'ed the assigned reactors due to a safety hazard, shown by the below indicators.")
-doc("as_matrix_dc", "Matrix Disconnected", "Automatic SCRAM occurred due to loss of induction matrix connection.")
+doc("as_matrix_fault", "Matrix Fault", "Automatic SCRAM occurred due to the loss of the induction matrix connection, or the matrix being unformed or faulted.")
 doc("as_matrix_fill", "Matrix Charge High", "Automatic SCRAM occurred due to induction matrix charge exceeding acceptable limit.")
 doc("as_crit_alarm", "Unit Critical Alarm", "Automatic SCRAM occurred due to critical level unit alarm(s).")
 doc("as_radiation", "Facility Radiation High", "Automatic SCRAM occurred due to high facility radiation levels.")

pocket/ui/main.lua

@@ -10,11 +10,13 @@ local pocket      = require("pocket.pocket")
 local control_app = require("pocket.ui.apps.control")
 local diag_apps   = require("pocket.ui.apps.diag_apps")
 local dummy_app   = require("pocket.ui.apps.dummy_app")
+local facil_app   = require("pocket.ui.apps.facility")
 local guide_app   = require("pocket.ui.apps.guide")
 local loader_app  = require("pocket.ui.apps.loader")
 local process_app = require("pocket.ui.apps.process")
 local sys_apps    = require("pocket.ui.apps.sys_apps")
 local unit_app    = require("pocket.ui.apps.unit")
+local waste_app   = require("pocket.ui.apps.waste")
 
 local home_page   = require("pocket.ui.pages.home_page")
 
@@ -44,7 +46,7 @@ local function init(main)
     local db = iocontrol.get_db()
 
     -- window header message and connection status
-    TextBox{parent=main,y=1,text="EARLY ACCESS ALPHA S   C  ",fg_bg=style.header}
+    TextBox{parent=main,y=1,text="                   S   C  ",fg_bg=style.header}
     local svr_conn = SignalBar{parent=main,y=1,x=22,compact=true,colors_low_med=cpair(colors.red,colors.yellow),disconnect_color=colors.lightGray,fg_bg=cpair(colors.green,colors.gray)}
     local crd_conn = SignalBar{parent=main,y=1,x=26,compact=true,colors_low_med=cpair(colors.red,colors.yellow),disconnect_color=colors.lightGray,fg_bg=cpair(colors.green,colors.gray)}
 
@@ -64,8 +66,10 @@ local function init(main)
     -- create all the apps & pages
     home_page(page_div)
     unit_app(page_div)
+    facil_app(page_div)
     control_app(page_div)
     process_app(page_div)
+    waste_app(page_div)
     guide_app(page_div)
     loader_app(page_div)
     sys_apps(page_div)

pocket/ui/pages/dynamic_tank.lua

@@ -0,0 +1,97 @@
+local types          = require("scada-common.types")
+local util           = require("scada-common.util")
+
+local iocontrol      = require("pocket.iocontrol")
+
+local style          = require("pocket.ui.style")
+
+local core           = require("graphics.core")
+
+local Div            = require("graphics.elements.Div")
+local TextBox        = require("graphics.elements.TextBox")
+
+local DataIndicator  = require("graphics.elements.indicators.DataIndicator")
+local HorizontalBar  = require("graphics.elements.indicators.HorizontalBar")
+local IconIndicator  = require("graphics.elements.indicators.IconIndicator")
+local StateIndicator = require("graphics.elements.indicators.StateIndicator")
+
+local CONTAINER_MODE = types.CONTAINER_MODE
+local COOLANT_TYPE = types.COOLANT_TYPE
+
+local ALIGN = core.ALIGN
+local cpair = core.cpair
+
+local label   = style.label
+local lu_col  = style.label_unit_pair
+local text_fg = style.text_fg
+
+local mode_ind_s = {
+    { color = cpair(colors.black, colors.lightGray), symbol = "-" },
+    { color = cpair(colors.black, colors.white), symbol = "+" }
+}
+
+-- create a dynamic tank view for the unit or facility app
+---@param app pocket_app
+---@param page nav_tree_page|nil parent page, if applicable
+---@param panes Div[]
+---@param tank_pane Div
+---@param tank_id integer global facility tank ID (as used for tank list, etc)
+---@param ps psil
+---@param update function
+return function (app, page, panes, tank_pane, tank_id, ps, update)
+    local fac = iocontrol.get_db().facility
+
+    local tank_div = Div{parent=tank_pane,x=2,width=tank_pane.get_width()-2}
+    table.insert(panes, tank_div)
+
+    local tank_page = app.new_page(page, #panes)
+    tank_page.tasks = { update }
+
+    local tank_assign = ""
+    local f_tank_count = 0
+
+    for i = 1, #fac.tank_list do
+        local is_fac = fac.tank_list[i] == 2
+        if is_fac then f_tank_count = f_tank_count + 1 end
+
+        if i == tank_id then
+            tank_assign = util.trinary(is_fac, "F-" .. f_tank_count, "U-" .. i)
+            break
+        end
+    end
+
+    TextBox{parent=tank_div,y=1,text="Dynamic Tank "..tank_assign,alignment=ALIGN.CENTER}
+    local status = StateIndicator{parent=tank_div,x=5,y=3,states=style.dtank.states,value=1,min_width=12}
+    status.register(ps, "DynamicTankStateStatus", status.update)
+
+    TextBox{parent=tank_div,y=5,text="Fill",width=10,fg_bg=label}
+    local tank_pcnt = DataIndicator{parent=tank_div,x=14,y=5,label="",format="%5.2f",value=100,unit="%",lu_colors=lu_col,width=8,fg_bg=text_fg}
+    local tank_amnt = DataIndicator{parent=tank_div,label="",format="%18d",value=0,commas=true,unit="mB",lu_colors=lu_col,width=21,fg_bg=text_fg}
+
+    local is_water = fac.tank_fluid_types[tank_id] == COOLANT_TYPE.WATER
+
+    TextBox{parent=tank_div,y=8,text=util.trinary(is_water,"Water","Sodium").." Level",width=12,fg_bg=label}
+    local level = HorizontalBar{parent=tank_div,y=9,bar_fg_bg=cpair(util.trinary(is_water,colors.blue,colors.lightBlue),colors.gray),height=1,width=21}
+
+    TextBox{parent=tank_div,y=11,text="Tank Fill Mode",width=14,fg_bg=label}
+    local can_fill = IconIndicator{parent=tank_div,y=12,label="Fill",states=mode_ind_s}
+    local can_empty = IconIndicator{parent=tank_div,y=13,label="Empty",states=mode_ind_s}
+
+    local function _can_fill(mode)
+        can_fill.update((mode == CONTAINER_MODE.BOTH) or (mode == CONTAINER_MODE.FILL))
+    end
+
+    local function _can_empty(mode)
+        can_empty.update((mode == CONTAINER_MODE.BOTH) or (mode == CONTAINER_MODE.EMPTY))
+    end
+
+    tank_pcnt.register(ps, "fill", function (f) tank_pcnt.update(f * 100) end)
+    tank_amnt.register(ps, "stored", function (sto) tank_amnt.update(sto.amount) end)
+
+    level.register(ps, "fill", level.update)
+
+    can_fill.register(ps, "container_mode", _can_fill)
+    can_empty.register(ps, "container_mode", _can_empty)
+
+    return tank_page.nav_to
+end

pocket/ui/pages/facility_matrix.lua

@@ -0,0 +1,121 @@
+local iocontrol      = require("pocket.iocontrol")
+
+local style          = require("pocket.ui.style")
+
+local core           = require("graphics.core")
+
+local Div            = require("graphics.elements.Div")
+local TextBox        = require("graphics.elements.TextBox")
+
+local PushButton     = require("graphics.elements.controls.PushButton")
+
+local DataIndicator  = require("graphics.elements.indicators.DataIndicator")
+local HorizontalBar  = require("graphics.elements.indicators.HorizontalBar")
+local IconIndicator  = require("graphics.elements.indicators.IconIndicator")
+local PowerIndicator = require("graphics.elements.indicators.PowerIndicator")
+local StateIndicator = require("graphics.elements.indicators.StateIndicator")
+
+local ALIGN = core.ALIGN
+local cpair = core.cpair
+
+local label   = style.label
+local lu_col  = style.label_unit_pair
+local text_fg = style.text_fg
+
+local yel_ind_s = style.icon_states.yel_ind_s
+local wht_ind_s = style.icon_states.wht_ind_s
+
+-- create an induction matrix view for the facility app
+---@param app pocket_app
+---@param panes Div[]
+---@param matrix_pane Div
+---@param ps psil
+---@param update function
+return function (app, panes, matrix_pane, ps, update)
+    local db = iocontrol.get_db()
+    local fac = db.facility
+
+    local mtx_div = Div{parent=matrix_pane,x=2,width=matrix_pane.get_width()-2}
+    table.insert(panes, mtx_div)
+
+    local matrix_page = app.new_page(nil, #panes)
+    matrix_page.tasks = { update }
+
+    TextBox{parent=mtx_div,y=1,text="Induction Matrix",alignment=ALIGN.CENTER}
+    local status = StateIndicator{parent=mtx_div,x=5,y=3,states=style.imatrix.states,value=1,min_width=12}
+    status.register(ps, "InductionMatrixStateStatus", status.update)
+
+    TextBox{parent=mtx_div,text="Chg",y=5,fg_bg=label}
+    local chg_bar = HorizontalBar{parent=mtx_div,x=5,y=5,height=1,fg_bg=cpair(colors.green,colors.gray)}
+    TextBox{parent=mtx_div,text="In",y=7,fg_bg=label}
+    local in_bar = HorizontalBar{parent=mtx_div,x=5,y=7,height=1,fg_bg=cpair(colors.blue,colors.gray)}
+    TextBox{parent=mtx_div,text="Out",y=9,fg_bg=label}
+    local out_bar = HorizontalBar{parent=mtx_div,x=5,y=9,height=1,fg_bg=cpair(colors.red,colors.gray)}
+
+    local function calc_saturation(val)
+        local data = fac.induction_data_tbl[1]
+        if (type(data.build) == "table") and (type(data.build.transfer_cap) == "number") and (data.build.transfer_cap > 0) then
+            return val / data.build.transfer_cap
+        else return 0 end
+    end
+
+    chg_bar.register(ps, "energy_fill", chg_bar.update)
+    in_bar.register(ps, "last_input", function (val) in_bar.update(calc_saturation(val)) end)
+    out_bar.register(ps, "last_output", function (val) out_bar.update(calc_saturation(val)) end)
+
+    local energy  = PowerIndicator{parent=mtx_div,y=11,lu_colors=lu_col,label="Chg:  ",unit=db.energy_label,format="%8.2f",value=0,width=21,fg_bg=text_fg}
+    local avg_chg = PowerIndicator{parent=mtx_div,lu_colors=lu_col,label="\xb7Avg: ",unit=db.energy_label,format="%8.2f",value=0,width=21,fg_bg=text_fg}
+    local input   = PowerIndicator{parent=mtx_div,lu_colors=lu_col,label="In:   ",unit=db.energy_label,format="%8.2f",rate=true,value=0,width=21,fg_bg=text_fg}
+    local avg_in  = PowerIndicator{parent=mtx_div,lu_colors=lu_col,label="\xb7Avg: ",unit=db.energy_label,format="%8.2f",rate=true,value=0,width=21,fg_bg=text_fg}
+    local output  = PowerIndicator{parent=mtx_div,lu_colors=lu_col,label="Out:  ",unit=db.energy_label,format="%8.2f",rate=true,value=0,width=21,fg_bg=text_fg}
+    local avg_out = PowerIndicator{parent=mtx_div,lu_colors=lu_col,label="\xb7Avg: ",unit=db.energy_label,format="%8.2f",rate=true,value=0,width=21,fg_bg=text_fg}
+
+    energy.register(ps, "energy", function (val) energy.update(db.energy_convert(val)) end)
+    avg_chg.register(ps, "avg_charge", avg_chg.update)
+    input.register(ps, "last_input", function (val) input.update(db.energy_convert(val)) end)
+    avg_in.register(ps, "avg_inflow", avg_in.update)
+    output.register(ps, "last_output", function (val) output.update(db.energy_convert(val)) end)
+    avg_out.register(ps, "avg_outflow", avg_out.update)
+
+    local mtx_ext_div = Div{parent=matrix_pane,x=2,width=matrix_pane.get_width()-2}
+    table.insert(panes, mtx_ext_div)
+
+    local mtx_ext_page = app.new_page(matrix_page, #panes)
+    mtx_ext_page.tasks = { update }
+
+    PushButton{parent=mtx_div,x=9,y=18,text="MORE",min_width=6,fg_bg=cpair(colors.lightGray,colors.gray),active_fg_bg=cpair(colors.gray,colors.lightGray),callback=mtx_ext_page.nav_to}
+    PushButton{parent=mtx_ext_div,x=9,y=18,text="BACK",min_width=6,fg_bg=cpair(colors.lightGray,colors.gray),active_fg_bg=cpair(colors.gray,colors.lightGray),callback=matrix_page.nav_to}
+
+    TextBox{parent=mtx_ext_div,y=1,text="More Matrix Info",alignment=ALIGN.CENTER}
+
+    local chging = IconIndicator{parent=mtx_ext_div,y=3,label="Charging",states=wht_ind_s}
+    local dischg = IconIndicator{parent=mtx_ext_div,y=4,label="Discharging",states=wht_ind_s}
+
+    TextBox{parent=mtx_ext_div,text="Energy Fill",x=1,y=6,width=13,fg_bg=label}
+    local fill = DataIndicator{parent=mtx_ext_div,x=14,y=6,lu_colors=lu_col,label="",unit="%",format="%6.2f",value=0,width=8,fg_bg=text_fg}
+
+    chging.register(ps, "is_charging", chging.update)
+    dischg.register(ps, "is_discharging", dischg.update)
+    fill.register(ps, "energy_fill", function (x) fill.update(x * 100) end)
+
+    local max_io = IconIndicator{parent=mtx_ext_div,y=8,label="Max I/O Rate",states=yel_ind_s}
+
+    TextBox{parent=mtx_ext_div,text="Input Util.",x=1,y=10,width=13,fg_bg=label}
+    local in_util = DataIndicator{parent=mtx_ext_div,x=14,y=10,lu_colors=lu_col,label="",unit="%",format="%6.2f",value=0,width=8,fg_bg=text_fg}
+    TextBox{parent=mtx_ext_div,text="Output Util.",x=1,y=11,width=13,fg_bg=label}
+    local out_util = DataIndicator{parent=mtx_ext_div,x=14,y=11,lu_colors=lu_col,label="",unit="%",format="%6.2f",value=0,width=8,fg_bg=text_fg}
+
+    max_io.register(ps, "at_max_io", max_io.update)
+    in_util.register(ps, "last_input", function (x) in_util.update(calc_saturation(x) * 100) end)
+    out_util.register(ps, "last_output", function (x) out_util.update(calc_saturation(x) * 100) end)
+
+    TextBox{parent=mtx_ext_div,text="Capacity ("..db.energy_label..")",x=1,y=13,fg_bg=label}
+    local capacity  = DataIndicator{parent=mtx_ext_div,y=14,lu_colors=lu_col,label="",unit="",format="%21d",value=0,width=21,fg_bg=text_fg}
+    TextBox{parent=mtx_ext_div,text="Max In/Out ("..db.energy_label.."/t)",x=1,y=15,fg_bg=label}
+    local trans_cap = DataIndicator{parent=mtx_ext_div,y=16,lu_colors=lu_col,label="",unit="",format="%21d",rate=true,value=0,width=21,fg_bg=text_fg}
+
+    capacity.register(ps, "max_energy", function (val) capacity.update(db.energy_convert(val)) end)
+    trans_cap.register(ps, "transfer_cap", function (val) trans_cap.update(db.energy_convert(val)) end)
+
+    return matrix_page.nav_to
+end

pocket/ui/pages/facility_sps.lua

@@ -0,0 +1,84 @@
+local iocontrol      = require("pocket.iocontrol")
+
+local style          = require("pocket.ui.style")
+
+local core           = require("graphics.core")
+
+local Div            = require("graphics.elements.Div")
+local TextBox        = require("graphics.elements.TextBox")
+
+local PushButton     = require("graphics.elements.controls.PushButton")
+
+local DataIndicator  = require("graphics.elements.indicators.DataIndicator")
+local HorizontalBar  = require("graphics.elements.indicators.HorizontalBar")
+local StateIndicator = require("graphics.elements.indicators.StateIndicator")
+
+local ALIGN = core.ALIGN
+local cpair = core.cpair
+
+local label   = style.label
+local lu_col  = style.label_unit_pair
+local text_fg = style.text_fg
+
+-- create an SPS view in the facility app
+---@param app pocket_app
+---@param panes Div[]
+---@param sps_pane Div
+---@param ps psil
+---@param update function
+return function (app, panes, sps_pane, ps, update)
+    local db = iocontrol.get_db()
+
+    local sps_div = Div{parent=sps_pane,x=2,width=sps_pane.get_width()-2}
+    table.insert(panes, sps_div)
+
+    local sps_page = app.new_page(nil, #panes)
+    sps_page.tasks = { update }
+
+    TextBox{parent=sps_div,y=1,text="Facility SPS",alignment=ALIGN.CENTER}
+    local status = StateIndicator{parent=sps_div,x=5,y=3,states=style.sps.states,value=1,min_width=12}
+    status.register(ps, "SPSStateStatus", status.update)
+
+    TextBox{parent=sps_div,text="Po",y=5,fg_bg=label}
+    local po_bar = HorizontalBar{parent=sps_div,x=4,y=5,fg_bg=cpair(colors.cyan,colors.gray),height=1}
+    TextBox{parent=sps_div,text="AM",y=7,fg_bg=label}
+    local am_bar = HorizontalBar{parent=sps_div,x=4,y=7,fg_bg=cpair(colors.purple,colors.gray),height=1}
+
+    po_bar.register(ps, "input_fill", po_bar.update)
+    am_bar.register(ps, "output_fill", am_bar.update)
+
+    TextBox{parent=sps_div,y=9,text="Input Rate",width=10,fg_bg=label}
+    local input_rate = DataIndicator{parent=sps_div,label="",format="%16.2f",value=0,unit="mB/t",lu_colors=lu_col,width=21,fg_bg=text_fg}
+    TextBox{parent=sps_div,y=12,text="Production Rate",width=15,fg_bg=label}
+    local proc_rate = DataIndicator{parent=sps_div,label="",format="%16d",value=0,unit="\xb5B/t",lu_colors=lu_col,width=21,fg_bg=text_fg}
+
+    proc_rate.register(ps, "process_rate", function (r) proc_rate.update(r * 1000) end)
+    input_rate.register(db.facility.ps, "po_am_rate", input_rate.update)
+
+    local sps_ext_div = Div{parent=sps_pane,x=2,width=sps_pane.get_width()-2}
+    table.insert(panes, sps_ext_div)
+
+    local sps_ext_page = app.new_page(sps_page, #panes)
+    sps_ext_page.tasks = { update }
+
+    PushButton{parent=sps_div,x=9,y=18,text="MORE",min_width=6,fg_bg=cpair(colors.lightGray,colors.gray),active_fg_bg=cpair(colors.gray,colors.lightGray),callback=sps_ext_page.nav_to}
+    PushButton{parent=sps_ext_div,x=9,y=18,text="BACK",min_width=6,fg_bg=cpair(colors.lightGray,colors.gray),active_fg_bg=cpair(colors.gray,colors.lightGray),callback=sps_page.nav_to}
+
+    TextBox{parent=sps_ext_div,y=1,text="More SPS Info",alignment=ALIGN.CENTER}
+
+    TextBox{parent=sps_ext_div,text="Polonium",x=1,y=3,width=13,fg_bg=label}
+    local input_p = DataIndicator{parent=sps_ext_div,x=14,y=3,lu_colors=lu_col,label="",unit="%",format="%6.2f",value=0,width=8,fg_bg=text_fg}
+    local input_amnt = DataIndicator{parent=sps_ext_div,x=1,y=4,lu_colors=lu_col,label="",unit="mB",format="%18.0f",value=0,commas=true,width=21,fg_bg=text_fg}
+
+    input_p.register(ps, "input_fill", function (x) input_p.update(x * 100) end)
+    input_amnt.register(ps, "input", function (x) input_amnt.update(x.amount) end)
+
+    TextBox{parent=sps_ext_div,text="Antimatter",x=1,y=6,width=15,fg_bg=label}
+    local output_p = DataIndicator{parent=sps_ext_div,x=14,y=6,lu_colors=lu_col,label="",unit="%",format="%6.2f",value=0,width=8,fg_bg=text_fg}
+    local output_amnt = DataIndicator{parent=sps_ext_div,x=1,y=7,lu_colors=lu_col,label="",unit="\xb5B",format="%18.3f",value=0,commas=true,width=21,fg_bg=text_fg}
+
+    output_p.register(ps, "output_fill", function (x) output_p.update(x * 100) end)
+    output_amnt.register(ps, "output", function (x) output_amnt.update(x.amount) end)
+
+    return sps_page.nav_to
+end

pocket/ui/pages/home_page.lua

@@ -46,10 +46,10 @@ local function new_view(root)
     local active_fg_bg = cpair(colors.white,colors.gray)
 
     App{parent=apps_1,x=2,y=2,text="U",title="Units",callback=function()open(APP_ID.UNITS)end,app_fg_bg=cpair(colors.black,colors.yellow),active_fg_bg=active_fg_bg}
-    App{parent=apps_1,x=9,y=2,text="F",title="Facil",callback=function()open(APP_ID.DUMMY)end,app_fg_bg=cpair(colors.black,colors.orange),active_fg_bg=active_fg_bg}
+    App{parent=apps_1,x=9,y=2,text="F",title="Facil",callback=function()open(APP_ID.FACILITY)end,app_fg_bg=cpair(colors.black,colors.orange),active_fg_bg=active_fg_bg}
     App{parent=apps_1,x=16,y=2,text="\x15",title="Control",callback=function()open(APP_ID.CONTROL)end,app_fg_bg=cpair(colors.black,colors.green),active_fg_bg=active_fg_bg}
     App{parent=apps_1,x=2,y=7,text="\x17",title="Process",callback=function()open(APP_ID.PROCESS)end,app_fg_bg=cpair(colors.black,colors.purple),active_fg_bg=active_fg_bg}
-    App{parent=apps_1,x=9,y=7,text="\x7f",title="Waste",callback=function()open(APP_ID.DUMMY)end,app_fg_bg=cpair(colors.black,colors.brown),active_fg_bg=active_fg_bg}
+    App{parent=apps_1,x=9,y=7,text="\x7f",title="Waste",callback=function()open(APP_ID.WASTE)end,app_fg_bg=cpair(colors.black,colors.brown),active_fg_bg=active_fg_bg}
     App{parent=apps_1,x=16,y=7,text="\x08",title="Devices",callback=function()open(APP_ID.DUMMY)end,app_fg_bg=cpair(colors.black,colors.lightGray),active_fg_bg=active_fg_bg}
     App{parent=apps_1,x=2,y=12,text="\xb6",title="Guide",callback=function()open(APP_ID.GUIDE)end,app_fg_bg=cpair(colors.black,colors.cyan),active_fg_bg=active_fg_bg}
     App{parent=apps_1,x=9,y=12,text="?",title="About",callback=function()open(APP_ID.ABOUT)end,app_fg_bg=cpair(colors.black,colors.white),active_fg_bg=active_fg_bg}

pocket/ui/style.lua

@@ -95,123 +95,98 @@ style.icon_states = states
 -- MAIN LAYOUT --
 
 style.reactor = {
-    -- reactor states
+    -- reactor states<br>
+    ---@see REACTOR_STATE
     states = {
-        {
+        { color = cpair(colors.black, colors.yellow), text = "OFF-LINE" },
-            color = cpair(colors.black, colors.yellow),
+        { color = cpair(colors.black, colors.orange), text = "NOT FORMED" },
-            text = "OFF-LINE"
+        { color = cpair(colors.black, colors.orange), text = "PLC  FAULT" },
-        },
+        { color = cpair(colors.white, colors.gray),   text = "DISABLED" },
-        {
+        { color = cpair(colors.black, colors.green),  text = "ACTIVE" },
-            color = cpair(colors.black, colors.orange),
+        { color = cpair(colors.black, colors.red),    text = "SCRAMMED" },
-            text = "NOT FORMED"
+        { color = cpair(colors.black, colors.red),    text = "FORCE DSBL" }
-        },
-        {
-            color = cpair(colors.black, colors.orange),
-            text = "PLC  FAULT"
-        },
-        {
-            color = cpair(colors.white, colors.gray),
-            text = "DISABLED"
-        },
-        {
-            color = cpair(colors.black, colors.green),
-            text = "ACTIVE"
-        },
-        {
-            color = cpair(colors.black, colors.red),
-            text = "SCRAMMED"
-        },
-        {
-            color = cpair(colors.black, colors.red),
-            text = "FORCE DSBL"
-        }
     }
 }
 
 style.boiler = {
-    -- boiler states
+    -- boiler states<br>
+    ---@see BOILER_STATE
     states = {
-        {
+        { color = cpair(colors.black, colors.yellow), text = "OFF-LINE" },
-            color = cpair(colors.black, colors.yellow),
+        { color = cpair(colors.black, colors.orange), text = "NOT FORMED" },
-            text = "OFF-LINE"
+        { color = cpair(colors.black, colors.orange), text = "RTU  FAULT" },
-        },
+        { color = cpair(colors.white, colors.gray),   text = "IDLE" },
-        {
+        { color = cpair(colors.black, colors.green),  text = "ACTIVE" }
-            color = cpair(colors.black, colors.orange),
-            text = "NOT FORMED"
-        },
-        {
-            color = cpair(colors.black, colors.orange),
-            text = "RTU  FAULT"
-        },
-        {
-            color = cpair(colors.white, colors.gray),
-            text = "IDLE"
-        },
-        {
-            color = cpair(colors.black, colors.green),
-            text = "ACTIVE"
-        }
     }
 }
 
 style.turbine = {
-    -- turbine states
+    -- turbine states<br>
+    ---@see TURBINE_STATE
     states = {
-        {
+        { color = cpair(colors.black, colors.yellow), text = "OFF-LINE" },
-            color = cpair(colors.black, colors.yellow),
+        { color = cpair(colors.black, colors.orange), text = "NOT FORMED" },
-            text = "OFF-LINE"
+        { color = cpair(colors.black, colors.orange), text = "RTU  FAULT" },
-        },
+        { color = cpair(colors.white, colors.gray),   text = "IDLE" },
-        {
+        { color = cpair(colors.black, colors.green),  text = "ACTIVE" },
-            color = cpair(colors.black, colors.orange),
+        { color = cpair(colors.black, colors.red),    text = "TRIP" }
-            text = "NOT FORMED"
+    }
-        },
+}
-        {
+
-            color = cpair(colors.black, colors.orange),
+style.dtank = {
-            text = "RTU  FAULT"
+    -- dynamic tank states<br>
-        },
+    ---@see TANK_STATE
-        {
+    states = {
-            color = cpair(colors.white, colors.gray),
+        { color = cpair(colors.black, colors.yellow), text = "OFF-LINE" },
-            text = "IDLE"
+        { color = cpair(colors.black, colors.orange), text = "NOT FORMED" },
-        },
+        { color = cpair(colors.black, colors.orange), text = "RTU  FAULT" },
-        {
+        { color = cpair(colors.black, colors.green),  text = "ONLINE" },
-            color = cpair(colors.black, colors.green),
+        { color = cpair(colors.black, colors.yellow), text = "LOW FILL" },
-            text = "ACTIVE"
+        { color = cpair(colors.black, colors.green),  text = "FILLED" }
-        },
-        {
-            color = cpair(colors.black, colors.red),
-            text = "TRIP"
-        }
     }
 }
 
 style.imatrix = {
-    -- induction matrix states
+    -- induction matrix states<br>
+    ---@see IMATRIX_STATE
     states = {
-        {
+        { color = cpair(colors.black, colors.yellow), text = "OFF-LINE" },
-            color = cpair(colors.black, colors.yellow),
+        { color = cpair(colors.black, colors.orange), text = "NOT FORMED" },
-            text = "OFF-LINE"
+        { color = cpair(colors.black, colors.orange), text = "RTU  FAULT" },
-        },
+        { color = cpair(colors.black, colors.green),  text = "ONLINE" },
-        {
+        { color = cpair(colors.black, colors.yellow), text = "LOW CHARGE" },
-            color = cpair(colors.black, colors.orange),
+        { color = cpair(colors.black, colors.yellow), text = "HIGH  CHARGE" }
-            text = "NOT FORMED"
-        },
-        {
-            color = cpair(colors.black, colors.orange),
-            text = "RTU  FAULT"
-        },
-        {
-            color = cpair(colors.black, colors.green),
-            text = "ONLINE"
-        },
-        {
-            color = cpair(colors.black, colors.yellow),
-            text = "LOW CHARGE"
-        },
-        {
-            color = cpair(colors.black, colors.yellow),
-            text = "HIGH  CHARGE"
-        },
     }
 }
 
+style.sps = {
+    -- SPS states<br>
+    ---@see SPS_STATE
+    states = {
+        { color = cpair(colors.black, colors.yellow), text = "OFF-LINE" },
+        { color = cpair(colors.black, colors.orange), text = "NOT FORMED" },
+        { color = cpair(colors.black, colors.orange), text = "RTU  FAULT" },
+        { color = cpair(colors.white, colors.gray),   text = "IDLE" },
+        { color = cpair(colors.black, colors.green),  text = "ACTIVE" }
+    }
+}
+
+style.waste = {
+    -- auto waste processing states
+    states = {
+        { color = cpair(colors.black, colors.green),  text = "PLUTONIUM" },
+        { color = cpair(colors.black, colors.cyan),   text = "POLONIUM" },
+        { color = cpair(colors.black, colors.purple), text = "ANTI MATTER" }
+    },
+    states_abbrv = {
+        { color = cpair(colors.black, colors.green),  text = "Pu" },
+        { color = cpair(colors.black, colors.cyan),   text = "Po" },
+        { color = cpair(colors.black, colors.purple), text = "AM" }
+    },
+    -- process radio button options
+    options = { "Plutonium", "Polonium", "Antimatter" },
+    -- unit waste selection
+    unit_opts = { "Auto", "Plutonium", "Polonium", "Antimatter" }
+}
+
 return style

reactor-plc/configure.lua

@@ -53,6 +53,7 @@ style.btn_dis_fg_bg = cpair(colors.lightGray, colors.white)
 
 ---@class _plc_cfg_tool_ctl
 local tool_ctl = {
+    launch_startup = false,
     ask_config = false,
     has_config = false,
     viewing_config = false,
@@ -158,7 +159,7 @@ local function config_view(display)
     TextBox{parent=main_page,x=2,y=2,height=2,text="Welcome to the Reactor PLC configurator! Please select one of the following options."}
 
     if tool_ctl.ask_config then
-        TextBox{parent=main_page,x=2,y=y_start,height=4,width=49,text="Notice: This device had no valid config so the configurator has been automatically started. If you previously had a valid config, you may want to check the Change Log to see what changed.",fg_bg=cpair(colors.red,colors.lightGray)}
+        TextBox{parent=main_page,x=2,y=y_start,height=4,width=49,text="Notice: This device is not configured for this version of the reactor PLC. If you previously had a valid config, it's not lost. You may want to check the Change Log to see what changed.",fg_bg=cpair(colors.red,colors.lightGray)}
         y_start = y_start + 5
     end
 
@@ -184,10 +185,18 @@ local function config_view(display)
         main_pane.set_value(5)
     end
 
+    local function startup()
+        tool_ctl.launch_startup = true
+        exit()
+    end
+
     PushButton{parent=main_page,x=2,y=17,min_width=6,text="Exit",callback=exit,fg_bg=cpair(colors.black,colors.red),active_fg_bg=btn_act_fg_bg}
-    PushButton{parent=main_page,x=10,y=17,min_width=12,text="Self-Check",callback=function()main_pane.set_value(8)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg}
+    local start_btn = PushButton{parent=main_page,x=42,y=17,min_width=9,text="Startup",callback=startup,fg_bg=cpair(colors.black,colors.green),active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg}
-    tool_ctl.color_cfg = PushButton{parent=main_page,x=23,y=17,min_width=15,text="Color Options",callback=jump_color,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg}
+    PushButton{parent=main_page,x=39,y=y_start,min_width=12,text="Self-Check",callback=function()main_pane.set_value(8)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg}
-    PushButton{parent=main_page,x=39,y=17,min_width=12,text="Change Log",callback=function()main_pane.set_value(7)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    tool_ctl.color_cfg = PushButton{parent=main_page,x=36,y=y_start+2,min_width=15,text="Color Options",callback=jump_color,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg}
+    PushButton{parent=main_page,x=39,y=y_start+4,min_width=12,text="Change Log",callback=function()main_pane.set_value(7)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+
+    if tool_ctl.ask_config then start_btn.disable() end
 
     if not tool_ctl.has_config then
         tool_ctl.view_cfg.disable()
@@ -293,7 +302,7 @@ function configurator.configure(ask_config)
         println("configurator error: " .. error)
     end
 
-    return status, error
+    return status, error, tool_ctl.launch_startup
 end
 
 return configurator

reactor-plc/plc.lua

@@ -29,6 +29,7 @@ local PCALL_SCRAM_MSG = "Scram requires the reactor to be active."
 local PCALL_START_MSG = "Reactor is already active."
 
 ---@type plc_config
+---@diagnostic disable-next-line: missing-fields
 local config = {}
 
 plc.config = config

reactor-plc/startup.lua

@@ -18,7 +18,7 @@ local plc       = require("reactor-plc.plc")
 local renderer  = require("reactor-plc.renderer")
 local threads   = require("reactor-plc.threads")
 
-local R_PLC_VERSION = "v1.8.12"
+local R_PLC_VERSION = "v1.8.14"
 
 local println = util.println
 local println_ts = util.println_ts

rtu/config/peripherals.lua

@@ -90,6 +90,10 @@ function peripherals.create(tool_ctl, main_pane, cfg_sys, peri_cfg, style)
             load_settings(settings_cfg, true)
             load_settings(ini_cfg)
             peri_pane.set_value(5)
+
+            -- for return to list from saved screen
+            tmp_cfg.Peripherals = tool_ctl.deep_copy_peri(ini_cfg.Peripherals)
+            tool_ctl.gen_peri_summary()
         else
             peri_pane.set_value(6)
         end

rtu/config/redstone.lua

@@ -32,15 +32,16 @@ local IO_MODE = rsio.IO_MODE
 local LEFT = core.ALIGN.LEFT
 
 local self = {
-    rs_cfg_port = 1,          ---@type IO_PORT
+    rs_cfg_port = 1,        ---@type IO_PORT
-    rs_cfg_editing = false,   ---@type integer|false
+    rs_cfg_editing = false, ---@type integer|false
 
-    rs_cfg_selection = nil,   ---@type TextBox
+    rs_cfg_selection = nil, ---@type TextBox
-    rs_cfg_unit_l = nil,      ---@type TextBox
+    rs_cfg_unit_l = nil,    ---@type TextBox
-    rs_cfg_unit = nil,        ---@type NumberField
+    rs_cfg_unit = nil,      ---@type NumberField
-    rs_cfg_side_l = nil,      ---@type TextBox
+    rs_cfg_side_l = nil,    ---@type TextBox
-    rs_cfg_color = nil,       ---@type Radio2D
+    rs_cfg_bundled = nil,   ---@type Checkbox
-    rs_cfg_shortcut = nil     ---@type TextBox
+    rs_cfg_color = nil,     ---@type Radio2D
+    rs_cfg_shortcut = nil   ---@type TextBox
 }
 
 -- rsio port descriptions
@@ -150,6 +151,10 @@ function redstone.create(tool_ctl, main_pane, cfg_sys, rs_cfg, style)
             load_settings(settings_cfg, true)
             load_settings(ini_cfg)
             rs_pane.set_value(4)
+
+            -- for return to list from saved screen
+            tmp_cfg.Redstone = tool_ctl.deep_copy_rs(ini_cfg.Redstone)
+            tool_ctl.gen_rs_summary()
         else
             rs_pane.set_value(5)
         end
@@ -195,6 +200,15 @@ function redstone.create(tool_ctl, main_pane, cfg_sys, rs_cfg, style)
             local io_mode = rsio.get_io_mode(port)
             local inv = tri(rsio.digital_is_active(port, IO_LVL.LOW) == true, "inverted ", "")
 
+            if rsio.is_analog(port) then
+                self.rs_cfg_bundled.set_value(false)
+                self.rs_cfg_bundled.disable()
+                self.rs_cfg_color.disable()
+            else
+                self.rs_cfg_bundled.enable()
+                if self.rs_cfg_bundled.get_value() then self.rs_cfg_color.enable() else self.rs_cfg_color.disable() end
+            end
+
             if io_mode == IO_MODE.DIGITAL_IN then
                 io_type = inv .. "digital input "
             elseif io_mode == IO_MODE.DIGITAL_OUT then
@@ -263,7 +277,7 @@ function redstone.create(tool_ctl, main_pane, cfg_sys, rs_cfg, style)
     self.rs_cfg_shortcut = TextBox{parent=rs_c_3,x=1,y=9,height=4,text="This shortcut will add entries for each of the 4 waste outputs. If you select bundled, 4 colors will be assigned to the selected side. Otherwise, 4 default sides will be used."}
     self.rs_cfg_shortcut.hide(true)
 
-    local bundled = Checkbox{parent=rs_c_3,x=1,y=7,label="Is Bundled?",default=false,box_fg_bg=cpair(colors.red,colors.black),callback=set_bundled}
+    self.rs_cfg_bundled = Checkbox{parent=rs_c_3,x=1,y=7,label="Is Bundled?",default=false,box_fg_bg=cpair(colors.red,colors.black),callback=set_bundled,disable_fg_bg=g_lg_fg_bg}
     self.rs_cfg_color = Radio2D{parent=rs_c_3,x=1,y=9,rows=4,columns=4,default=1,options=color_options,radio_colors=cpair(colors.lightGray,colors.black),color_map=color_options_map,disable_color=colors.gray,disable_fg_bg=g_lg_fg_bg}
     self.rs_cfg_color.disable()
 
@@ -288,7 +302,7 @@ function redstone.create(tool_ctl, main_pane, cfg_sys, rs_cfg, style)
                     unit = tri(PORT_DSGN[port] == 1, u, nil),
                     port = port,
                     side = side_options_map[side.get_value()],
-                    color = tri(bundled.get_value(), color_options_map[self.rs_cfg_color.get_value()], nil)
+                    color = tri(self.rs_cfg_bundled.get_value() and rsio.is_digital(port), color_options_map[self.rs_cfg_color.get_value()], nil)
                 }
 
                 if self.rs_cfg_editing == false then
@@ -304,8 +318,8 @@ function redstone.create(tool_ctl, main_pane, cfg_sys, rs_cfg, style)
                     table.insert(tmp_cfg.Redstone, {
                         unit = tri(PORT_DSGN[IO.WASTE_PU + i] == 1, u, nil),
                         port = IO.WASTE_PU + i,
-                        side = tri(bundled.get_value(), side_options_map[side.get_value()], default_sides[i + 1]),
+                        side = tri(self.rs_cfg_bundled.get_value(), side_options_map[side.get_value()], default_sides[i + 1]),
-                        color = tri(bundled.get_value(), default_colors[i + 1], nil)
+                        color = tri(self.rs_cfg_bundled.get_value(), default_colors[i + 1], nil)
                     })
                 end
             end
@@ -314,7 +328,7 @@ function redstone.create(tool_ctl, main_pane, cfg_sys, rs_cfg, style)
             tool_ctl.gen_rs_summary()
 
             side.set_value(1)
-            bundled.set_value(false)
+            self.rs_cfg_bundled.set_value(false)
             self.rs_cfg_color.set_value(1)
             self.rs_cfg_color.disable()
         else rs_err.show() end
@@ -356,6 +370,14 @@ function redstone.create(tool_ctl, main_pane, cfg_sys, rs_cfg, style)
             text = text .. "the facility)."
         end
 
+        if rsio.is_analog(def.port) then
+            self.rs_cfg_bundled.set_value(false)
+            self.rs_cfg_bundled.disable()
+        else
+            self.rs_cfg_bundled.enable()
+            self.rs_cfg_bundled.set_value(def.color ~= nil)
+        end
+
         local value = 1
         if def.color ~= nil then
             value = color_to_idx(def.color)
@@ -367,7 +389,6 @@ function redstone.create(tool_ctl, main_pane, cfg_sys, rs_cfg, style)
         self.rs_cfg_selection.set_value(text)
         self.rs_cfg_side_l.set_value(tri(rsio.get_io_dir(def.port) == rsio.IO_DIR.IN, "Input Side", "Output Side"))
         side.set_value(side_to_idx(def.side))
-        bundled.set_value(def.color ~= nil)
         self.rs_cfg_color.set_value(value)
         rs_pane.set_value(3)
     end

rtu/configure.lua

@@ -55,6 +55,7 @@ style.btn_dis_fg_bg = cpair(colors.lightGray, colors.white)
 
 ---@class _rtu_cfg_tool_ctl
 local tool_ctl = {
+    launch_startup = false,
     ask_config = false,
     has_config = false,
     viewing_config = false,
@@ -176,7 +177,7 @@ local function config_view(display)
     local y_start = 2
 
     if tool_ctl.ask_config then
-        TextBox{parent=main_page,x=2,y=y_start,height=4,width=49,text="Notice: This device had no valid config so the configurator has been automatically started. If you previously had a valid config, you may want to check the Change Log to see what changed.",fg_bg=cpair(colors.red,colors.lightGray)}
+        TextBox{parent=main_page,x=2,y=y_start,height=4,width=49,text="Notice: This device is not configured for this version of the RTU gateway. If you previously had a valid config, it's not lost. You may want to check the Change Log to see what changed.",fg_bg=cpair(colors.red,colors.lightGray)}
         y_start = y_start + 5
     else
         TextBox{parent=main_page,x=2,y=2,height=2,text="Welcome to the RTU gateway configurator! Please select one of the following options."}
@@ -218,9 +219,17 @@ local function config_view(display)
         main_pane.set_value(5)
     end
 
+    local function startup()
+        tool_ctl.launch_startup = true
+        exit()
+    end
+
     PushButton{parent=main_page,x=2,y=17,min_width=6,text="Exit",callback=exit,fg_bg=cpair(colors.black,colors.red),active_fg_bg=btn_act_fg_bg}
-    tool_ctl.color_cfg = PushButton{parent=main_page,x=23,y=17,min_width=15,text="Color Options",callback=jump_color,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg}
+    local start_btn = PushButton{parent=main_page,x=42,y=17,min_width=9,text="Startup",callback=startup,fg_bg=cpair(colors.black,colors.green),active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg}
-    PushButton{parent=main_page,x=39,y=17,min_width=12,text="Change Log",callback=function()main_pane.set_value(7)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    tool_ctl.color_cfg = PushButton{parent=main_page,x=36,y=y_start,min_width=15,text="Color Options",callback=jump_color,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg}
+    PushButton{parent=main_page,x=39,y=y_start+2,min_width=12,text="Change Log",callback=function()main_pane.set_value(7)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+
+    if tool_ctl.ask_config then start_btn.disable() end
 
     if not tool_ctl.has_config then
         tool_ctl.view_gw_cfg.disable()
@@ -346,7 +355,7 @@ function configurator.configure(ask_config)
         println("configurator error: " .. error)
     end
 
-    return status, error
+    return status, error, tool_ctl.launch_startup
 end
 
 return configurator

rtu/rtu.lua

@@ -19,6 +19,7 @@ local MGMT_TYPE = comms.MGMT_TYPE
 local RTU_UNIT_TYPE = types.RTU_UNIT_TYPE
 
 ---@type rtu_config
+---@diagnostic disable-next-line: missing-fields
 local config = {}
 
 rtu.config = config
@@ -480,16 +481,14 @@ function rtu.comms(version, nic, conn_watchdog)
                             -- check validity then pass off to unit comms thread
                             return_code, reply = unit.modbus_io.check_request(packet)
                             if return_code then
-                                -- check if there are more than 3 active transactions
+                                -- check if there are more than 3 active transactions, which will be treated as busy
-                                -- still queue the packet, but this may indicate a problem
                                 if unit.pkt_queue.length() > 3 then
                                     reply = modbus.reply__srv_device_busy(packet)
-                                    log.debug("queueing new request with " .. unit.pkt_queue.length() ..
+                                    log.warning("device busy, discarding new request" .. unit_dbg_tag)
-                                        " transactions already in the queue" .. unit_dbg_tag)
+                                else
+                                    -- queue the command if not busy
+                                    unit.pkt_queue.push_packet(packet)
                                 end
-
-                                -- always queue the command even if busy
-                                unit.pkt_queue.push_packet(packet)
                             else
                                 log.warning("cannot perform requested MODBUS operation" .. unit_dbg_tag)
                             end

rtu/startup.lua

@@ -31,7 +31,7 @@ local sna_rtu      = require("rtu.dev.sna_rtu")
 local sps_rtu      = require("rtu.dev.sps_rtu")
 local turbinev_rtu = require("rtu.dev.turbinev_rtu")
 
-local RTU_VERSION = "v1.10.14"
+local RTU_VERSION = "v1.11.0"
 
 local RTU_UNIT_TYPE = types.RTU_UNIT_TYPE
 local RTU_HW_STATE = databus.RTU_HW_STATE
@@ -338,9 +338,8 @@ local function main()
                 formed = device.isFormed()
 
                 if formed == ppm.ACCESS_FAULT then
-                    println_ts(util.c("sys_config> failed to check if  '", name, "' is formed"))
+                    println_ts(util.c("sys_config> failed to check if '", name, "' is formed"))
-                    log.fatal(util.c("sys_config> failed to check if  '", name, "' is a formed boiler multiblock"))
+                    log.warning(util.c("sys_config> failed to check if '", name, "' is a formed boiler multiblock"))
-                    return false
                 end
             elseif type == "turbineValve" then
                 -- turbine multiblock
@@ -353,9 +352,8 @@ local function main()
                 formed = device.isFormed()
 
                 if formed == ppm.ACCESS_FAULT then
-                    println_ts(util.c("sys_config> failed to check if  '", name, "' is formed"))
+                    println_ts(util.c("sys_config> failed to check if '", name, "' is formed"))
-                    log.fatal(util.c("sys_config> failed to check if  '", name, "' is a formed turbine multiblock"))
+                    log.warning(util.c("sys_config> failed to check if '", name, "' is a formed turbine multiblock"))
-                    return false
                 end
             elseif type == "dynamicValve" then
                 -- dynamic tank multiblock
@@ -373,9 +371,8 @@ local function main()
                 formed = device.isFormed()
 
                 if formed == ppm.ACCESS_FAULT then
-                    println_ts(util.c("sys_config> failed to check if  '", name, "' is formed"))
+                    println_ts(util.c("sys_config> failed to check if '", name, "' is formed"))
-                    log.fatal(util.c("sys_config> failed to check if  '", name, "' is a formed dynamic tank multiblock"))
+                    log.warning(util.c("sys_config> failed to check if '", name, "' is a formed dynamic tank multiblock"))
-                    return false
                 end
             elseif type == "inductionPort" then
                 -- induction matrix multiblock
@@ -387,9 +384,8 @@ local function main()
                 formed = device.isFormed()
 
                 if formed == ppm.ACCESS_FAULT then
-                    println_ts(util.c("sys_config> failed to check if  '", name, "' is formed"))
+                    println_ts(util.c("sys_config> failed to check if '", name, "' is formed"))
-                    log.fatal(util.c("sys_config> failed to check if  '", name, "' is a formed induction matrix multiblock"))
+                    log.warning(util.c("sys_config> failed to check if '", name, "' is a formed induction matrix multiblock"))
-                    return false
                 end
             elseif type == "spsPort" then
                 -- SPS multiblock
@@ -401,9 +397,8 @@ local function main()
                 formed = device.isFormed()
 
                 if formed == ppm.ACCESS_FAULT then
-                    println_ts(util.c("sys_config> failed to check if  '", name, "' is formed"))
+                    println_ts(util.c("sys_config> failed to check if '", name, "' is formed"))
-                    log.fatal(util.c("sys_config> failed to check if  '", name, "' is a formed SPS multiblock"))
+                    log.warning(util.c("sys_config> failed to check if '", name, "' is a formed SPS multiblock"))
-                    return false
                 end
             elseif type == "solarNeutronActivator" then
                 -- SNA
@@ -431,7 +426,9 @@ local function main()
 
             if is_multiblock then
                 if not formed then
-                    log.info(util.c("sys_config> device '", name, "' is not formed"))
+                    if formed == false then
+                        log.info(util.c("sys_config> device '", name, "' is not formed"))
+                    else formed = false end
                 elseif faulted then
                     -- sometimes there is a race condition on server boot where it reports formed, but
                     -- the other functions are not yet defined (that's the theory at least). mark as unformed to attempt connection later
@@ -461,7 +458,7 @@ local function main()
 
             table.insert(units, rtu_unit)
 
-            local for_message = "facility"
+            local for_message = "the facility"
             if for_reactor > 0 then
                 for_message = util.c("reactor ", for_reactor)
             end

rtu/threads.lua

@@ -466,6 +466,9 @@ end
 ---@param smem rtu_shared_memory
 ---@param unit rtu_registry_entry
 function threads.thread__unit_comms(smem, unit)
+    -- print a log message to the terminal as long as the UI isn't running
+    local function println_ts(message) if not smem.rtu_state.fp_ok then util.println_ts(message) end end
+
     ---@class parallel_thread
     local public = {}
 
@@ -483,7 +486,9 @@ function threads.thread__unit_comms(smem, unit)
 
         local last_f_check = 0
 
-        local detail_name  = util.c(types.rtu_type_to_string(unit.type), " (", unit.name, ") [", unit.index, "] for reactor ", unit.reactor)
+        local detail_name  = util.c(types.rtu_type_to_string(unit.type), " (", unit.name, ") ",
+                                util.trinary(unit.index == false, "", util.c("[", unit.index, "] ")), "for ",
+                                util.trinary(unit.reactor == 0, "the facility", util.c("reactor ", unit.reactor)))
         local short_name   = util.c(types.rtu_type_to_string(unit.type), " (", unit.name, ")")
 
         if packet_queue == nil then
@@ -538,6 +543,15 @@ function threads.thread__unit_comms(smem, unit)
                     rtu_comms.send_remounted(unit.uid)
                 elseif (is_formed == false) and unit.formed then
                     log.warning(util.c(detail_name, " is no longer formed"))
+                elseif (is_formed == nil) and (unit.hw_state ~= RTU_HW_STATE.OFFLINE) then
+                    log.error(util.c(detail_name, " failed to check if formed, attempting remount..."))
+
+                    local type, dev = ppm.remount(unit.name)
+                    if type and dev then
+                        handle_unit_mount(smem, println_ts, unit.name, type, dev, unit)
+                    else
+                        log.error(util.c(detail_name, " failed to remount"))
+                    end
                 end
 
                 unit.formed = is_formed

scada-common/comms.lua

@@ -17,8 +17,8 @@ local max_distance = nil
 local comms = {}
 
 -- protocol/data versions (protocol/data independent changes tracked by util.lua version)
-comms.version = "3.0.1"
+comms.version = "3.0.4"
-comms.api_version = "0.0.6"
+comms.api_version = "0.0.9"
 
 ---@enum PROTOCOL
 local PROTOCOL = {
@@ -66,10 +66,12 @@ local CRDN_TYPE = {
     UNIT_BUILDS = 4,     -- build of each reactor unit (reactor + RTUs)
     UNIT_STATUSES = 5,   -- state of each of the reactor units
     UNIT_CMD = 6,        -- command a reactor unit
-    API_GET_FAC = 7,     -- API: get all the facility data
+    API_GET_FAC = 7,     -- API: get the facility general data
-    API_GET_UNIT = 8,    -- API: get reactor unit data
+    API_GET_FAC_DTL = 8, -- API: get (detailed) data for the facility app
-    API_GET_CTRL = 9,    -- API: get data used for the control app
+    API_GET_UNIT = 9,    -- API: get reactor unit data
-    API_GET_PROC = 10    -- API: get data used for the process app
+    API_GET_CTRL = 10,   -- API: get data for the control app
+    API_GET_PROC = 11,   -- API: get data for the process app
+    API_GET_WASTE = 12   -- API: get data for the waste app
 }
 
 ---@enum ESTABLISH_ACK

scada-common/log.lua

@@ -8,6 +8,10 @@ local util = require("scada-common.util")
 local DBG_TAG, INF_TAG, WRN_TAG, ERR_TAG, FTL_TAG = "[DBG] ", "[INF] ", "[WRN] ", "[ERR] ", "[FTL] "
 local COLON, FUNC, ARROW = ":", "():", " > "
 
+local MIN_SPACE    = 512
+local OUT_OF_SPACE = "Out of space"
+local TIME_FMT     = "%F %T "
+
 ---@class logger
 local log = {}
 
@@ -34,14 +38,20 @@ local free_space = fs.getFreeSpace
 -- PRIVATE FUNCTIONS --
 -----------------------
 
+-- check if the provided error indicates out of space or if insufficient space available
+---@param err_msg string|nil error message
+---@return boolean out_of_space
+local function check_out_of_space(err_msg)
+    return (free_space(logger.path) < MIN_SPACE) or ((err_msg ~= nil) and (string.find(err_msg, OUT_OF_SPACE) ~= nil))
+end
+
 -- private log write function
 ---@param msg_bits any[]
 local function _log(msg_bits)
     if logger.not_ready then return end
 
-    local out_of_space = false
+    local time_stamp = os.date(TIME_FMT)
-    local time_stamp   = os.date("[%c] ")
+    local stamped    = util.c(time_stamp, table.unpack(msg_bits))
-    local stamped      = util.c(time_stamp, table.unpack(msg_bits))
 
     -- attempt to write log
     local status, result = pcall(function ()
@@ -50,18 +60,7 @@ local function _log(msg_bits)
     end)
 
     -- if we don't have space, we need to create a new log file
-
+    if check_out_of_space() then
-    if (not status) and (result ~= nil) then
-        out_of_space = string.find(result, "Out of space") ~= nil
-
-        if out_of_space then
-            -- will delete log file
-        else
-            util.println("unknown error writing to logfile: " .. result)
-        end
-    end
-
-    if out_of_space or (free_space(logger.path) < 512) then
         -- delete the old log file before opening a new one
         logger.file.close()
         fs.delete(logger.path)
@@ -69,10 +68,12 @@ local function _log(msg_bits)
         -- re-init logger and pass dmesg_out so that it doesn't change
         log.init(logger.path, logger.mode, logger.debug, logger.dmesg_out)
 
-        -- leave a message
+        -- log the message and recycle warning
-        logger.file.writeLine(time_stamp .. "recycled log file")
+        logger.file.writeLine(time_stamp .. WRN_TAG .. "recycled log file")
         logger.file.writeLine(stamped)
         logger.file.flush()
+    elseif (not status) and (result ~= nil) then
+        util.println("unexpected error writing to the log file: " .. result)
     end
 end
 
@@ -86,15 +87,12 @@ end
 ---@param include_debug boolean whether or not to include debug logs
 ---@param dmesg_redirect? Redirect terminal/window to direct dmesg to
 function log.init(path, write_mode, include_debug, dmesg_redirect)
+    local err_msg
+
     logger.path = path
     logger.mode = write_mode
     logger.debug = include_debug
-
+    logger.file, err_msg = fs.open(path, util.trinary(logger.mode == MODE.APPEND, "a", "w"))
-    if logger.mode == MODE.APPEND then
-        logger.file = fs.open(path, "a")
-    else
-        logger.file = fs.open(path, "w")
-    end
 
     if dmesg_redirect then
         logger.dmesg_out = dmesg_redirect
@@ -102,6 +100,25 @@ function log.init(path, write_mode, include_debug, dmesg_redirect)
         logger.dmesg_out = term.current()
     end
 
+    -- check for space issues
+    local out_of_space = check_out_of_space(err_msg)
+
+    -- try to handle problems
+    if logger.file == nil or out_of_space then
+        if out_of_space then
+            if fs.exists(logger.path) then
+                fs.delete(logger.path)
+
+                logger.file, err_msg = fs.open(path, util.trinary(logger.mode == MODE.APPEND, "a", "w"))
+
+                if logger.file then
+                    logger.file.writeLine(os.date(TIME_FMT) .. WRN_TAG .. "init recycled log file")
+                    logger.file.flush()
+                else error("failed to setup the log file: " .. err_msg) end
+            else error("failed to make space for the log file, please delete unused files") end
+        else error("unexpected error setting up the log file: " .. err_msg) end
+    end
+
     logger.not_ready = false
 end
 

scada-common/ppm.lua

@@ -242,7 +242,7 @@ function ppm.mount_all()
     end
 end
 
--- mount a particular device
+-- mount a specified device
 ---@nodiscard
 ---@param iface string CC peripheral interface
 ---@return string|nil type, table|nil device
@@ -266,6 +266,33 @@ function ppm.mount(iface)
     return pm_type, pm_dev
 end
 
+-- unmount and remount a specified device
+---@nodiscard
+---@param iface string CC peripheral interface
+---@return string|nil type, table|nil device
+function ppm.remount(iface)
+    local ifaces = peripheral.getNames()
+    local pm_dev = nil
+    local pm_type = nil
+
+    for i = 1, #ifaces do
+        if iface == ifaces[i] then
+            log.info(util.c("PPM: remount(", iface, ") -> is a ", pm_type))
+            ppm.unmount(ppm_sys.mounts[iface].dev)
+
+            ppm_sys.mounts[iface] = peri_init(iface)
+
+            pm_type = ppm_sys.mounts[iface].type
+            pm_dev = ppm_sys.mounts[iface].dev
+
+            log.info(util.c("PPM: remount(", iface, ") -> remounted a ", pm_type))
+            break
+        end
+    end
+
+    return pm_type, pm_dev
+end
+
 -- mount a virtual, placeholder device (specifically designed for RTU startup with missing devices)
 ---@nodiscard
 ---@return string type, table device

scada-common/psil.lua

@@ -74,6 +74,13 @@ function psil.create()
         end
     end
 
+    -- get the currently stored value for a key, or nil if not set
+    ---@param key string data key
+    ---@return any
+    function public.get(key)
+        if ic[key] ~= nil then return ic[key].value else return nil end
+    end
+
     -- clear the contents of the interconnect
     function public.purge() ic = {} end
 

scada-common/types.lua

@@ -253,6 +253,61 @@ types.ENERGY_SCALE_UNITS = {
     "RF"
 }
 
+local GENERIC_STATE = {
+    OFFLINE = 1,
+    UNFORMED = 2,
+    FAULT = 3,
+    IDLE = 4,
+    ACTIVE = 5
+}
+
+---@enum REACTOR_STATE
+types.REACTOR_STATE = {
+    OFFLINE = 1,
+    UNFORMED = 2,
+    FAULT = 3,
+    DISABLED = 4,
+    ACTIVE = 5,
+    SCRAMMED = 6,
+    FORCE_DISABLED = 7
+}
+
+---@enum BOILER_STATE
+types.BOILER_STATE = GENERIC_STATE
+
+---@enum TURBINE_STATE
+types.TURBINE_STATE = {
+    OFFLINE = 1,
+    UNFORMED = 2,
+    FAULT = 3,
+    IDLE = 4,
+    ACTIVE = 5,
+    TRIPPED = 6
+}
+
+---@enum TANK_STATE
+types.TANK_STATE = {
+    OFFLINE = 1,
+    UNFORMED = 2,
+    FAULT = 3,
+    ONLINE = 4,
+    LOW_FILL = 5,
+    HIGH_FILL = 6
+}
+
+---@enum IMATRIX_STATE
+types.IMATRIX_STATE = {
+    OFFLINE = 1,
+    UNFORMED = 2,
+    FAULT = 3,
+    ONLINE = 4,
+    LOW_CHARGE = 5,
+    HIGH_CHARGE = 6
+}
+
+---@enum SPS_STATE
+types.SPS_STATE = GENERIC_STATE
+
 ---@enum PANEL_LINK_STATE
 types.PANEL_LINK_STATE = {
     LINKED = 1,
@@ -363,6 +418,12 @@ types.AUTO_GROUP_NAMES = {
     "Backup"
 }
 
+---@enum COOLANT_TYPE
+types.COOLANT_TYPE = {
+    WATER = 1,
+    SODIUM = 2
+}
+
 ---@enum WASTE_MODE
 types.WASTE_MODE = {
     AUTO = 1,

scada-common/util.lua

@@ -24,7 +24,7 @@ local t_pack   = table.pack
 local util = {}
 
 -- scada-common version
-util.version = "1.4.6"
+util.version = "1.4.10"
 
 util.TICK_TIME_S = 0.05
 util.TICK_TIME_MS = 50

startup.lua

@@ -1,4 +1,4 @@
-local BOOTLOADER_VERSION = "1.1"
+local BOOTLOADER_VERSION = "1.2"
 
 print("SCADA BOOTLOADER V" .. BOOTLOADER_VERSION)
 print("BOOT> SCANNING FOR APPLICATIONS...")

supervisor/config/facility.lua

@@ -18,12 +18,148 @@ local tri = util.trinary
 local cpair = core.cpair
 
 local self = {
-    vis_ftanks = {}, ---@type { line: Div, pipe_conn?: TextBox, pipe_chain?: TextBox, pipe_direct?: TextBox, label?: TextBox }[]
+    tank_fluid_opts = {}, ---@type Radio2D[]
-    vis_utanks = {}  ---@type { line: Div, label: TextBox }[]
+
+    vis_draw = nil,       ---@type function
+    draw_fluid_ops = nil, ---@type function
+
+    vis_ftanks = {},      ---@type { line: Div, pipe_conn?: TextBox, pipe_chain?: TextBox, pipe_direct?: TextBox, label?: TextBox }[]
+    vis_utanks = {}       ---@type { line: Div, label: TextBox }[]
 }
 
 local facility = {}
 
+-- generate the tank list and tank connections tables
+---@param mode integer facility tank mode
+---@param defs table facility tank definitions
+---@return table tank_list, table tank_conns
+function facility.generate_tank_list_and_conns(mode, defs)
+    local tank_mode = mode
+    local tank_defs = defs
+    local tank_list = { table.unpack(tank_defs) }
+    local tank_conns = { table.unpack(tank_defs) }
+
+    local function calc_fdef(start_idx, end_idx)
+        local first = 4
+        for i = start_idx, end_idx do
+            if tank_defs[i] == 2 then
+                if i < first then first = i end
+            end
+        end
+        return first
+    end
+
+    -- set units using their own tanks as connected to their respective unit tank
+    for i = 1, #tank_defs do
+        if tank_defs[i] == 1 then tank_conns[i] = i end
+    end
+
+    if tank_mode == 1 then
+        -- (1) 1 total facility tank (A A A A)
+        local first_fdef = calc_fdef(1, #tank_defs)
+        for i = 1, #tank_defs do
+            if (i >= first_fdef) and (tank_defs[i] == 2) then
+                tank_conns[i] = first_fdef
+
+                if i > first_fdef then tank_list[i] = 0 end
+            end
+        end
+    elseif tank_mode == 2 then
+        -- (2) 2 total facility tanks (A A A B)
+        local first_fdef = calc_fdef(1, math.min(3, #tank_defs))
+        for i = 1, #tank_defs do
+            if (i >= first_fdef) and (tank_defs[i] == 2) then
+                if i == 4 then
+                    tank_conns[i] = 4
+                else
+                    tank_conns[i] = first_fdef
+
+                    if i > first_fdef then tank_list[i] = 0 end
+                end
+            end
+        end
+    elseif tank_mode == 3 then
+        -- (3) 2 total facility tanks (A A B B)
+        for _, a in pairs({ 1, 3 }) do
+            local b = a + 1
+
+            if tank_defs[a] == 2 then
+                tank_conns[a] = a
+            elseif tank_defs[b] == 2 then
+                tank_conns[b] = b
+            end
+
+            if (tank_defs[a] == 2) and (tank_defs[b] == 2) then
+                tank_list[b] = 0
+                tank_conns[b] = a
+            end
+        end
+    elseif tank_mode == 4 then
+        -- (4) 2 total facility tanks (A B B B)
+        local first_fdef = calc_fdef(2, #tank_defs)
+        for i = 1, #tank_defs do
+            if tank_defs[i] == 2 then
+                if i == 1 then
+                    tank_conns[i] = 1
+                elseif i >= first_fdef then
+                    tank_conns[i] = first_fdef
+
+                    if i > first_fdef then tank_list[i] = 0 end
+                end
+            end
+        end
+    elseif tank_mode == 5 then
+        -- (5) 3 total facility tanks (A A B C)
+        local first_fdef = calc_fdef(1, math.min(2, #tank_defs))
+        for i = 1, #tank_defs do
+            if (i >= first_fdef) and (tank_defs[i] == 2) then
+                if i == 3 or i == 4 then
+                    tank_conns[i] = i
+                elseif i >= first_fdef then
+                    tank_conns[i] = first_fdef
+
+                    if i > first_fdef then tank_list[i] = 0 end
+                end
+            end
+        end
+    elseif tank_mode == 6 then
+        -- (6) 3 total facility tanks (A B B C)
+        local first_fdef = calc_fdef(2, math.min(3, #tank_defs))
+        for i = 1, #tank_defs do
+            if tank_defs[i] == 2 then
+                if i == 1 or i == 4 then
+                    tank_conns[i] = i
+                elseif i >= first_fdef then
+                    tank_conns[i] = first_fdef
+
+                    if i > first_fdef then tank_list[i] = 0 end
+                end
+            end
+        end
+    elseif tank_mode == 7 then
+        -- (7) 3 total facility tanks (A B C C)
+        local first_fdef = calc_fdef(3, #tank_defs)
+        for i = 1, #tank_defs do
+            if tank_defs[i] == 2 then
+                if i == 1 or i == 2 then
+                    tank_conns[i] = i
+                elseif i >= first_fdef then
+                    tank_conns[i] = first_fdef
+
+                    if i > first_fdef then tank_list[i] = 0 end
+                end
+            end
+        end
+    elseif tank_mode == 8 then
+        -- (8) 4 total facility tanks (A B C D)
+        for i = 1, #tank_defs do
+            if tank_defs[i] == 2 then tank_conns[i] = i end
+        end
+    end
+
+    return tank_list, tank_conns
+end
+
 -- create the facility configuration view
 ---@param tool_ctl _svr_cfg_tool_ctl
 ---@param main_pane MultiPane
@@ -48,14 +184,18 @@ function facility.create(tool_ctl, main_pane, cfg_sys, fac_cfg, style)
     local fac_c_5 = Div{parent=fac_cfg,x=2,y=4,width=49}
     local fac_c_6 = Div{parent=fac_cfg,x=2,y=4,width=49}
     local fac_c_7 = Div{parent=fac_cfg,x=2,y=4,width=49}
+    local fac_c_8 = Div{parent=fac_cfg,x=2,y=4,width=49}
 
-    local fac_pane = MultiPane{parent=fac_cfg,x=1,y=4,panes={fac_c_1,fac_c_2,fac_c_3,fac_c_4,fac_c_5,fac_c_6,fac_c_7}}
+    local fac_pane = MultiPane{parent=fac_cfg,x=1,y=4,panes={fac_c_1,fac_c_2,fac_c_3,fac_c_4,fac_c_5,fac_c_6,fac_c_7, fac_c_8}}
 
     TextBox{parent=fac_cfg,x=1,y=2,text=" Facility Configuration",fg_bg=cpair(colors.black,colors.yellow)}
 
+    --#region Unit Count
+
     TextBox{parent=fac_c_1,x=1,y=1,height=3,text="Please enter the number of reactors you have, also referred to as reactor units or 'units' for short. A maximum of 4 is currently supported."}
     tool_ctl.num_units = NumberField{parent=fac_c_1,x=1,y=5,width=5,max_chars=2,default=ini_cfg.UnitCount,min=1,max=4,fg_bg=bw_fg_bg}
     TextBox{parent=fac_c_1,x=7,y=5,text="reactors"}
+    TextBox{parent=fac_c_1,x=1,y=7,height=3,text="If you already configured your coordinator, make sure you update the coordinator's configured unit count.",fg_bg=cpair(colors.yellow,colors._INHERIT)}
 
     local nu_error = TextBox{parent=fac_c_1,x=8,y=14,width=35,text="Please set the number of reactors.",fg_bg=cpair(colors.red,colors.lightGray),hidden=true}
 
@@ -77,6 +217,9 @@ function facility.create(tool_ctl, main_pane, cfg_sys, fac_cfg, style)
     PushButton{parent=fac_c_1,x=1,y=14,text="\x1b Back",callback=function()main_pane.set_value(1)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
     PushButton{parent=fac_c_1,x=44,y=14,text="Next \x1a",callback=submit_num_units,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
 
+    --#endregion
+    --#region Cooling Configuration
+
     TextBox{parent=fac_c_2,x=1,y=1,height=4,text="Please provide the reactor cooling configuration below. This includes the number of turbines, boilers, and if that reactor has a connection to a dynamic tank for emergency coolant."}
     TextBox{parent=fac_c_2,x=1,y=6,text="UNIT    TURBINES   BOILERS   HAS TANK CONNECTION?",fg_bg=g_lg_fg_bg}
 
@@ -149,6 +292,9 @@ function facility.create(tool_ctl, main_pane, cfg_sys, fac_cfg, style)
     PushButton{parent=fac_c_2,x=1,y=14,text="\x1b Back",callback=function()fac_pane.set_value(1)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
     PushButton{parent=fac_c_2,x=44,y=14,text="Next \x1a",callback=submit_cooling,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
 
+    --#endregion
+    --#region Facility Tanks Option
+
     TextBox{parent=fac_c_3,x=1,y=1,height=6,text="You have set one or more of your units to use dynamic tanks for emergency coolant. You have two paths for configuration. The first is to assign dynamic tanks to reactor units; one tank per reactor, only connected to that reactor. RTU configurations must also assign it as such."}
     TextBox{parent=fac_c_3,x=1,y=8,height=3,text="Alternatively, you can configure them as facility tanks to connect to multiple reactor units. These can intermingle with unit-specific tanks."}
 
@@ -161,6 +307,16 @@ function facility.create(tool_ctl, main_pane, cfg_sys, fac_cfg, style)
         else
             tmp_cfg.FacilityTankMode = 0
             tmp_cfg.FacilityTankDefs = {}
+
+            -- on facility tank mode 0, setup tank defs to match unit tank option
+            for i = 1, tmp_cfg.UnitCount do
+                tmp_cfg.FacilityTankDefs[i] = tri(tmp_cfg.CoolingConfig[i].TankConnection, 1, 0)
+            end
+
+            tmp_cfg.FacilityTankList, tmp_cfg.FacilityTankConns = facility.generate_tank_list_and_conns(tmp_cfg.FacilityTankMode, tmp_cfg.FacilityTankDefs)
+
+            self.draw_fluid_ops()
+
             fac_pane.set_value(7)
         end
     end
@@ -168,6 +324,9 @@ function facility.create(tool_ctl, main_pane, cfg_sys, fac_cfg, style)
     PushButton{parent=fac_c_3,x=1,y=14,text="\x1b Back",callback=function()fac_pane.set_value(2)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
     PushButton{parent=fac_c_3,x=44,y=14,text="Next \x1a",callback=submit_en_fac_tank,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
 
+    --#endregion
+    --#region Facility Tank Connections
+
     TextBox{parent=fac_c_4,x=1,y=1,height=4,text="Please set unit connections to dynamic tanks, selecting at least one facility tank. The layout for facility tanks will be configured next."}
 
     for i = 1, 4 do
@@ -220,7 +379,7 @@ function facility.create(tool_ctl, main_pane, cfg_sys, fac_cfg, style)
             self.vis_utanks[i].line.hide(true)
         end
 
-        tool_ctl.vis_draw(tmp_cfg.FacilityTankMode)
+        self.vis_draw(tmp_cfg.FacilityTankMode)
 
         if any_fac then
             tank_err.hide(true)
@@ -231,6 +390,9 @@ function facility.create(tool_ctl, main_pane, cfg_sys, fac_cfg, style)
     PushButton{parent=fac_c_4,x=1,y=14,text="\x1b Back",callback=function()fac_pane.set_value(3)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
     PushButton{parent=fac_c_4,x=44,y=14,text="Next \x1a",callback=submit_tank_defs,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
 
+    --#endregion
+    --#region Facility Tank Mode
+
     TextBox{parent=fac_c_5,x=1,y=1,text="Please select your dynamic tank layout."}
     TextBox{parent=fac_c_5,x=12,y=3,text="Facility Tanks             Unit Tanks",fg_bg=g_lg_fg_bg}
 
@@ -269,7 +431,7 @@ function facility.create(tool_ctl, main_pane, cfg_sys, fac_cfg, style)
 
     -- draw the pipe visualization
     ---@param mode integer pipe mode
-    function tool_ctl.vis_draw(mode)
+    function self.vis_draw(mode)
         -- is a facility tank connected to this unit
         ---@param i integer unit 1 - 4
         ---@return boolean connected
@@ -391,7 +553,7 @@ function facility.create(tool_ctl, main_pane, cfg_sys, fac_cfg, style)
 
     local function change_mode(mode)
         tmp_cfg.FacilityTankMode = mode
-        tool_ctl.vis_draw(mode)
+        self.vis_draw(mode)
     end
 
     local tank_modes = { "Mode 1", "Mode 2", "Mode 3", "Mode 4", "Mode 5", "Mode 6", "Mode 7", "Mode 8" }
@@ -399,24 +561,127 @@ function facility.create(tool_ctl, main_pane, cfg_sys, fac_cfg, style)
 
     --#endregion
 
+    local function next_from_tank_mode()
+        -- determine tank list and connections
+        tmp_cfg.FacilityTankList, tmp_cfg.FacilityTankConns = facility.generate_tank_list_and_conns(tmp_cfg.FacilityTankMode, tmp_cfg.FacilityTankDefs)
+
+        self.draw_fluid_ops()
+
+        fac_pane.set_value(7)
+    end
+
     PushButton{parent=fac_c_5,x=1,y=14,text="\x1b Back",callback=function()fac_pane.set_value(4)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
-    PushButton{parent=fac_c_5,x=44,y=14,text="Next \x1a",callback=function()fac_pane.set_value(7)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    PushButton{parent=fac_c_5,x=44,y=14,text="Next \x1a",callback=next_from_tank_mode,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
 
     PushButton{parent=fac_c_5,x=8,y=14,min_width=7,text="About",callback=function()fac_pane.set_value(6)end,fg_bg=cpair(colors.black,colors.lightBlue),active_fg_bg=btn_act_fg_bg}
 
+    --#endregion
+    --#region Facility Tank Mode About
+
     TextBox{parent=fac_c_6,height=3,text="This visualization tool shows the pipe connections required for a particular dynamic tank configuration you have selected."}
     TextBox{parent=fac_c_6,y=5,height=4,text="Examples: A U2 tank should be configured on an RTU as the dynamic tank for unit #2. An F3 tank should be configured on an RTU as the #3 dynamic tank for the facility."}
     TextBox{parent=fac_c_6,y=10,height=3,text="Some modes may look the same if you are not using 4 total reactor units. The wiki has details. Modes that look the same will function the same.",fg_bg=g_lg_fg_bg}
 
     PushButton{parent=fac_c_6,x=1,y=14,text="\x1b Back",callback=function()fac_pane.set_value(5)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
 
-    TextBox{parent=fac_c_7,height=6,text="Charge control provides automatic control to maintain an induction matrix charge level. In order to have smoother control, reactors that were activated will be held on at 0.01 mB/t for a short period before allowing them to turn off. This minimizes overshooting the charge target."}
+    --#endregion
-    TextBox{parent=fac_c_7,y=8,height=3,text="You can extend this to a full minute to minimize reactors flickering on/off, but there may be more overshoot of the target."}
+    --#region Dynamic Tank Fluid Types
 
-    local ext_idling = Checkbox{parent=fac_c_7,x=1,y=12,label="Enable Extended Idling",default=ini_cfg.ExtChargeIdling,box_fg_bg=cpair(colors.yellow,colors.black)}
+    TextBox{parent=fac_c_7,height=3,text="Specify each tank's coolant type, for display use only. Water is the only option if one or more of the connected units is water cooled."}
+
+    local tank_fluid_list = Div{parent=fac_c_7,x=1,y=5,height=8}
+
+    function self.draw_fluid_ops()
+        tank_fluid_list.remove_all()
+
+        local tank_list = tmp_cfg.FacilityTankList
+        local tank_conns = tmp_cfg.FacilityTankConns
+
+        local next_f = 1
+
+        for i = 1, #tank_list do
+            local type = tmp_cfg.TankFluidTypes[i]
+
+            if type == 0 then type = 1 end
+
+            self.tank_fluid_opts[i] = nil
+
+            if tank_list[i] == 1 then
+                local row = Div{parent=tank_fluid_list,height=2}
+
+                TextBox{parent=row,width=11,text="Unit Tank "..i}
+                TextBox{parent=row,text="Connected to: Unit "..i,fg_bg=cpair(colors.gray,colors.lightGray)}
+
+                local tank_fluid = Radio2D{parent=row,x=34,y=1,rows=1,columns=2,default=type,options={"Water","Sodium"},radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.yellow,disable_color=colors.gray,disable_fg_bg=g_lg_fg_bg}
+
+                if tmp_cfg.CoolingConfig[i].BoilerCount == 0 then
+                    tank_fluid.set_value(1)
+                    tank_fluid.disable()
+                end
+
+                self.tank_fluid_opts[i] = tank_fluid
+            elseif tank_list[i] == 2 then
+                local row = Div{parent=tank_fluid_list,height=2}
+
+                TextBox{parent=row,width=15,text="Facility Tank "..next_f}
+
+                local conns = ""
+                local any_bwr = false
+
+                for u = 1, #tank_conns do
+                    if tank_conns[u] == i then
+                        conns = conns .. tri(conns == "", "", ", ") .. "Unit " .. u
+                        any_bwr = any_bwr or (tmp_cfg.CoolingConfig[u].BoilerCount == 0)
+                    end
+                end
+
+                TextBox{parent=row,text="Connected to: "..conns,fg_bg=cpair(colors.gray,colors.lightGray)}
+
+                local tank_fluid = Radio2D{parent=row,x=34,y=1,rows=1,columns=2,default=type,options={"Water","Sodium"},radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.yellow,disable_color=colors.gray,disable_fg_bg=g_lg_fg_bg}
+
+                if any_bwr then
+                    tank_fluid.set_value(1)
+                    tank_fluid.disable()
+                end
+
+                self.tank_fluid_opts[i] = tank_fluid
+
+                next_f = next_f + 1
+            end
+        end
+    end
+
+    local function back_from_fluids()
+        fac_pane.set_value(tri(tmp_cfg.FacilityTankMode == 0, 3, 5))
+    end
+
+    local function submit_tank_fluids()
+        tmp_cfg.TankFluidTypes = {}
+
+        for i = 1, #tmp_cfg.FacilityTankList do
+            if self.tank_fluid_opts[i] ~= nil then
+                tmp_cfg.TankFluidTypes[i] = self.tank_fluid_opts[i].get_value()
+            else
+                tmp_cfg.TankFluidTypes[i] = 0
+            end
+        end
+
+        fac_pane.set_value(8)
+    end
+
+    PushButton{parent=fac_c_7,x=1,y=14,text="\x1b Back",callback=back_from_fluids,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    PushButton{parent=fac_c_7,x=44,y=14,text="Next \x1a",callback=submit_tank_fluids,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+
+    --#endregion
+    --#region Extended Idling
+
+    TextBox{parent=fac_c_8,height=6,text="Charge control provides automatic control to maintain an induction matrix charge level. In order to have smoother control, reactors that were activated will be held on at 0.01 mB/t for a short period before allowing them to turn off. This minimizes overshooting the charge target."}
+    TextBox{parent=fac_c_8,y=8,height=3,text="You can extend this to a full minute to minimize reactors flickering on/off, but there may be more overshoot of the target."}
+
+    local ext_idling = Checkbox{parent=fac_c_8,x=1,y=12,label="Enable Extended Idling",default=ini_cfg.ExtChargeIdling,box_fg_bg=cpair(colors.yellow,colors.black)}
 
     local function back_from_idling()
-        fac_pane.set_value(tri(tmp_cfg.FacilityTankMode == 0, 3, 5))
+        fac_pane.set_value(tri(tmp_cfg.FacilityTankMode == 0, 3, 7))
     end
 
     local function submit_idling()
@@ -424,8 +689,10 @@ function facility.create(tool_ctl, main_pane, cfg_sys, fac_cfg, style)
         main_pane.set_value(3)
     end
 
-    PushButton{parent=fac_c_7,x=1,y=14,text="\x1b Back",callback=back_from_idling,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    PushButton{parent=fac_c_8,x=1,y=14,text="\x1b Back",callback=back_from_idling,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
-    PushButton{parent=fac_c_7,x=44,y=14,text="Next \x1a",callback=submit_idling,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    PushButton{parent=fac_c_8,x=44,y=14,text="Next \x1a",callback=submit_idling,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+
+    --#endregion
 
     --#endregion
 

supervisor/config/system.lua

@@ -1,6 +1,9 @@
 local log         = require("scada-common.log")
+local types       = require("scada-common.types")
 local util        = require("scada-common.util")
 
+local facility    = require("supervisor.config.facility")
+
 local core        = require("graphics.core")
 local themes      = require("graphics.themes")
 
@@ -508,8 +511,15 @@ function system.create(tool_ctl, main_pane, cfg_sys, divs, fac_pane, style, exit
         else
             tmp_cfg.FacilityTankMode = 0
             tmp_cfg.FacilityTankDefs = {}
+
+            -- on facility tank mode 0, setup tank defs to match unit tank option
+            for i = 1, tmp_cfg.UnitCount do
+                tmp_cfg.FacilityTankDefs[i] = tri(tmp_cfg.CoolingConfig[i].TankConnection, 1, 0)
+            end
         end
 
+        tmp_cfg.FacilityTankList, tmp_cfg.FacilityTankConns = facility.generate_tank_list_and_conns(tmp_cfg.FacilityTankMode, tmp_cfg.FacilityTankDefs)
+
         tmp_cfg.SVR_Channel = config.SVR_CHANNEL
         tmp_cfg.PLC_Channel = config.PLC_CHANNEL
         tmp_cfg.RTU_Channel = config.RTU_CHANNEL
@@ -557,6 +567,7 @@ function system.create(tool_ctl, main_pane, cfg_sys, divs, fac_pane, style, exit
             local val_max_w = (inner_width - label_w) + 1
             local raw = cfg[f[1]]
             local val = util.strval(raw)
+            local skip = false
 
             if f[1] == "AuthKey" then val = string.rep("*", string.len(val))
             elseif f[1] == "LogMode" then val = tri(raw == log.MODE.APPEND, "append", "replace")
@@ -579,43 +590,88 @@ function system.create(tool_ctl, main_pane, cfg_sys, divs, fac_pane, style, exit
                 if val == "" then val = "no facility tanks" end
             elseif f[1] == "FacilityTankMode" and raw == 0 then val = "0 (n/a, unit mode)"
             elseif f[1] == "FacilityTankDefs" and type(cfg.FacilityTankDefs) == "table" then
+                local tank_name_list = { table.unpack(cfg.FacilityTankList) } ---@type (string|integer)[]
+                local next_f = 1
+
                 val = ""
 
+                for idx = 1, #tank_name_list do
+                    if tank_name_list[idx] == 1 then
+                        tank_name_list[idx] = "U" .. idx
+                    elseif tank_name_list[idx] == 2 then
+                        tank_name_list[idx] = "F" .. next_f
+                        next_f = next_f + 1
+                    end
+                end
+
                 for idx = 1, #cfg.FacilityTankDefs do
                     local t_mode = "not connected to a tank"
                     if cfg.FacilityTankDefs[idx] == 1 then
-                        t_mode = "connected to its unit tank"
+                        t_mode = "connected to its unit tank (" .. tank_name_list[cfg.FacilityTankConns[idx]] .. ")"
                     elseif cfg.FacilityTankDefs[idx] == 2 then
-                        t_mode = "connected to a facility tank"
+                        t_mode = "connected to facility tank " .. tank_name_list[cfg.FacilityTankConns[idx]]
                     end
 
                     val = val .. tri(idx == 1, "", "\n") .. util.sprintf(" \x07 unit %d - %s", idx, t_mode)
                 end
 
                 if val == "" then val = "no facility tanks" end
+            elseif f[1] == "FacilityTankList" or f[1] == "FacilityTankConns" then
+                -- hide these since this info is available in the FacilityTankDefs list (connections) and TankFluidTypes list (list of tanks)
+                skip = true
+            elseif f[1] == "TankFluidTypes" and type(cfg.TankFluidTypes) == "table" and type(cfg.FacilityTankList) == "table" then
+                local tank_list = cfg.FacilityTankList
+                local next_f = 1
+
+                val = ""
+
+                for idx = 1, #tank_list do
+                    local prefix = "?"
+                    local fluid = "water"
+                    local type = cfg.TankFluidTypes[idx]
+
+                    if tank_list[idx] > 0 then
+                        if tank_list[idx] == 1 then
+                            prefix = "U" .. idx
+                        elseif tank_list[idx] == 2 then
+                            prefix = "F" .. next_f
+                            next_f = next_f + 1
+                        end
+
+                        if type == types.COOLANT_TYPE.SODIUM then
+                            fluid = "sodium"
+                        end
+
+                        val = val .. tri(val == "", "", "\n") .. util.sprintf(" \x07 tank %s - %s", prefix, fluid)
+                    end
+                end
+
+                if val == "" then val = "no emergency coolant tanks" end
             end
 
-            if val == "nil" then val = "<not set>" end
+            if not skip then
+                if val == "nil" then val = "<not set>" end
 
-            local c = tri(alternate, g_lg_fg_bg, cpair(colors.gray,colors.white))
+                local c = tri(alternate, g_lg_fg_bg, cpair(colors.gray,colors.white))
-            alternate = not alternate
+                alternate = not alternate
 
-            if string.len(val) > val_max_w then
+                if string.len(val) > val_max_w then
-                local lines = util.strwrap(val, inner_width)
+                    local lines = util.strwrap(val, inner_width)
-                height = #lines + 1
+                    height = #lines + 1
+                end
+
+                local line = Div{parent=setting_list,height=height,fg_bg=c}
+                TextBox{parent=line,text=f[2],width=string.len(f[2]),fg_bg=cpair(colors.black,line.get_fg_bg().bkg)}
+
+                local textbox
+                if height > 1 then
+                    textbox = TextBox{parent=line,x=1,y=2,text=val,height=height-1}
+                else
+                    textbox = TextBox{parent=line,x=label_w+1,y=1,text=val,alignment=RIGHT}
+                end
+
+                if f[1] == "AuthKey" then self.auth_key_textbox = textbox end
             end
-
-            local line = Div{parent=setting_list,height=height,fg_bg=c}
-            TextBox{parent=line,text=f[2],width=string.len(f[2]),fg_bg=cpair(colors.black,line.get_fg_bg().bkg)}
-
-            local textbox
-            if height > 1 then
-                textbox = TextBox{parent=line,x=1,y=2,text=val,height=height-1}
-            else
-                textbox = TextBox{parent=line,x=label_w+1,y=1,text=val,alignment=RIGHT}
-            end
-
-            if f[1] == "AuthKey" then self.auth_key_textbox = textbox end
         end
     end
 

supervisor/configure.lua

@@ -30,7 +30,8 @@ local CENTER = core.ALIGN.CENTER
 -- changes to the config data/format to let the user know
 local changes = {
     { "v1.2.12", { "Added front panel UI theme", "Added color accessibility modes" } },
-    { "v1.3.2", { "Added standard with black off state color mode", "Added blue indicator color modes" } }
+    { "v1.3.2", { "Added standard with black off state color mode", "Added blue indicator color modes" } },
+    { "v1.6.0", { "Added sodium emergency coolant option" } }
 }
 
 ---@class svr_configurator
@@ -51,6 +52,7 @@ style.btn_dis_fg_bg = cpair(colors.lightGray, colors.white)
 
 ---@class _svr_cfg_tool_ctl
 local tool_ctl = {
+    launch_startup = false,
     ask_config = false,
     has_config = false,
     viewing_config = false,
@@ -77,8 +79,11 @@ local tool_ctl = {
 local tmp_cfg = {
     UnitCount = 1,
     CoolingConfig = {},     ---@type { TurbineCount: integer, BoilerCount: integer, TankConnection: boolean }[]
-    FacilityTankMode = 0,
+    FacilityTankMode = 0,   -- dynamic tank emergency coolant layout
-    FacilityTankDefs = {},  ---@type integer[]
+    FacilityTankDefs = {},  ---@type integer[] each unit's tank connection target (0 = disconnected, 1 = unit, 2 = facility)
+    FacilityTankList = {},  ---@type integer[] list of tanks by slot (0 = none or covered by an above tank, 1 = unit tank, 2 = facility tank)
+    FacilityTankConns = {}, ---@type integer[] map of unit tank connections (indicies are units, values are tank indicies in the tank list)
+    TankFluidTypes = {},    ---@type integer[] which type of fluid each tank in the tank list should be containing
     ExtChargeIdling = false,
     SVR_Channel = nil,      ---@type integer
     PLC_Channel = nil,      ---@type integer
@@ -109,6 +114,9 @@ local fields = {
     { "CoolingConfig", "Cooling Configuration", {} },
     { "FacilityTankMode", "Facility Tank Mode", 0 },
     { "FacilityTankDefs", "Facility Tank Definitions", {} },
+    { "FacilityTankList", "Facility Tank List", {} },         -- hidden
+    { "FacilityTankConns", "Facility Tank Connections", {} }, -- hidden
+    { "TankFluidTypes", "Tank Fluid Types", {} },
     { "ExtChargeIdling", "Extended Charge Idling", false },
     { "SVR_Channel", "SVR Channel", 16240 },
     { "PLC_Channel", "PLC Channel", 16241 },
@@ -175,7 +183,7 @@ local function config_view(display)
     TextBox{parent=main_page,x=2,y=2,height=2,text="Welcome to the Supervisor configurator! Please select one of the following options."}
 
     if tool_ctl.ask_config then
-        TextBox{parent=main_page,x=2,y=y_start,height=4,width=49,text="Notice: This device had no valid config so the configurator has been automatically started. If you previously had a valid config, you may want to check the Change Log to see what changed.",fg_bg=cpair(colors.red,colors.lightGray)}
+        TextBox{parent=main_page,x=2,y=y_start,height=4,width=49,text="Notice: This device is not configured for this version of the supervisor. If you previously had a valid config, it's not lost. You may want to check the Change Log to see what changed.",fg_bg=cpair(colors.red,colors.lightGray)}
         y_start = y_start + 5
     end
 
@@ -201,9 +209,17 @@ local function config_view(display)
         main_pane.set_value(5)
     end
 
+    local function startup()
+        tool_ctl.launch_startup = true
+        exit()
+    end
+
     PushButton{parent=main_page,x=2,y=17,min_width=6,text="Exit",callback=exit,fg_bg=cpair(colors.black,colors.red),active_fg_bg=btn_act_fg_bg}
-    tool_ctl.color_cfg = PushButton{parent=main_page,x=23,y=17,min_width=15,text="Color Options",callback=jump_color,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg}
+    local start_btn = PushButton{parent=main_page,x=42,y=17,min_width=9,text="Startup",callback=startup,fg_bg=cpair(colors.black,colors.green),active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg}
-    PushButton{parent=main_page,x=39,y=17,min_width=12,text="Change Log",callback=function()main_pane.set_value(7)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    tool_ctl.color_cfg = PushButton{parent=main_page,x=36,y=y_start,min_width=15,text="Color Options",callback=jump_color,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg}
+    PushButton{parent=main_page,x=39,y=y_start+2,min_width=12,text="Change Log",callback=function()main_pane.set_value(7)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+
+    if tool_ctl.ask_config then start_btn.disable() end
 
     if not tool_ctl.has_config then
         tool_ctl.view_cfg.disable()
@@ -266,6 +282,10 @@ function configurator.configure(ask_config)
     load_settings(settings_cfg, true)
     tool_ctl.has_config = load_settings(ini_cfg)
 
+    -- these need to be initialized as they are used before being set
+    tmp_cfg.FacilityTankMode = ini_cfg.FacilityTankMode
+    tmp_cfg.TankFluidTypes = { table.unpack(ini_cfg.TankFluidTypes) }
+
     reset_term()
 
     -- set overridden colors
@@ -308,7 +328,7 @@ function configurator.configure(ask_config)
         println("configurator error: " .. error)
     end
 
-    return status, error
+    return status, error, tool_ctl.launch_startup
 end
 
 return configurator

supervisor/facility.lua

@@ -17,7 +17,7 @@ local WASTE         = types.WASTE_PRODUCT
 ---@enum AUTO_SCRAM
 local AUTO_SCRAM = {
     NONE = 0,
-    MATRIX_DC = 1,
+    MATRIX_FAULT = 1,
     MATRIX_FILL = 2,
     CRIT_ALARM = 3,
     RADIATION = 4,
@@ -51,7 +51,9 @@ function facility.new(config)
             r_cool = config.CoolingConfig,
             fac_tank_mode = config.FacilityTankMode,
             fac_tank_defs = config.FacilityTankDefs,
-            fac_tank_list = {}  ---@type integer[]
+            fac_tank_list = config.FacilityTankList,
+            fac_tank_conns = config.FacilityTankConns,
+            tank_fluid_types = config.TankFluidTypes
         },
         -- rtus
         rtu_gw_conn_count = 0,
@@ -81,7 +83,7 @@ function facility.new(config)
         ascram_reason = AUTO_SCRAM.NONE,
         ---@class ascram_status
         ascram_status = {
-            matrix_dc = false,
+            matrix_fault = false,
             matrix_fill = false,
             crit_alarm = false,
             radiation = false,
@@ -91,8 +93,8 @@ function facility.new(config)
         charge_conversion = 1.0,
         time_start = 0.0,
         initial_ramp = true,
-        waiting_on_ramp = false,
+        waiting_on_ramp = false,    -- waiting on auto ramping
-        waiting_on_stable = false,
+        waiting_on_stable = false,  -- waiting on gen rate stabilization
         accumulator = 0.0,
         saturated = false,
         last_update = 0,
@@ -147,99 +149,6 @@ function facility.new(config)
         table.insert(self.test_tone_states, false)
     end
 
-    --#region decode tank configuration
-
-    local cool_conf = self.cooling_conf
-
-    -- determine tank information
-    if cool_conf.fac_tank_mode == 0 then
-        cool_conf.fac_tank_defs = {}
-
-        -- on facility tank mode 0, setup tank defs to match unit tank option
-        for i = 1, config.UnitCount do
-            cool_conf.fac_tank_defs[i] = util.trinary(cool_conf.r_cool[i].TankConnection, 1, 0)
-        end
-
-        cool_conf.fac_tank_list = { table.unpack(cool_conf.fac_tank_defs) }
-    else
-        -- decode the layout of tanks from the connections definitions
-        local tank_mode = cool_conf.fac_tank_mode
-        local tank_defs = cool_conf.fac_tank_defs
-        local tank_list = { table.unpack(tank_defs) }
-
-        local function calc_fdef(start_idx, end_idx)
-            local first = 4
-            for i = start_idx, end_idx do
-                if tank_defs[i] == 2 then
-                    if i < first then first = i end
-                end
-            end
-            return first
-        end
-
-        if tank_mode == 1 then
-            -- (1) 1 total facility tank (A A A A)
-            local first_fdef = calc_fdef(1, #tank_defs)
-            for i = 1, #tank_defs do
-                if i > first_fdef and tank_defs[i] == 2 then
-                    tank_list[i] = 0
-                end
-            end
-        elseif tank_mode == 2 then
-            -- (2) 2 total facility tanks (A A A B)
-            local first_fdef = calc_fdef(1, math.min(3, #tank_defs))
-            for i = 1, #tank_defs do
-                if (i ~= 4) and (i > first_fdef) and (tank_defs[i] == 2) then
-                    tank_list[i] = 0
-                end
-            end
-        elseif tank_mode == 3 then
-            -- (3) 2 total facility tanks (A A B B)
-            for _, a in pairs({ 1, 3 }) do
-                local b = a + 1
-                if (tank_defs[a] == 2) and (tank_defs[b] == 2) then
-                    tank_list[b] = 0
-                end
-            end
-        elseif tank_mode == 4 then
-            -- (4) 2 total facility tanks (A B B B)
-            local first_fdef = calc_fdef(2, #tank_defs)
-            for i = 1, #tank_defs do
-                if (i ~= 1) and (i > first_fdef) and (tank_defs[i] == 2) then
-                    tank_list[i] = 0
-                end
-            end
-        elseif tank_mode == 5 then
-            -- (5) 3 total facility tanks (A A B C)
-            local first_fdef = calc_fdef(1, math.min(2, #tank_defs))
-            for i = 1, #tank_defs do
-                if (not (i == 3 or i == 4)) and (i > first_fdef) and (tank_defs[i] == 2) then
-                    tank_list[i] = 0
-                end
-            end
-        elseif tank_mode == 6 then
-            -- (6) 3 total facility tanks (A B B C)
-            local first_fdef = calc_fdef(2, math.min(3, #tank_defs))
-            for i = 1, #tank_defs do
-                if (not (i == 1 or i == 4)) and (i > first_fdef) and (tank_defs[i] == 2) then
-                    tank_list[i] = 0
-                end
-            end
-        elseif tank_mode == 7 then
-            -- (7) 3 total facility tanks (A B C C)
-            local first_fdef = calc_fdef(3, #tank_defs)
-            for i = 1, #tank_defs do
-                if (not (i == 1 or i == 2)) and (i > first_fdef) and (tank_defs[i] == 2) then
-                    tank_list[i] = 0
-                end
-            end
-        end
-
-        cool_conf.fac_tank_list = tank_list
-    end
-
-    --#endregion
-
     -- PUBLIC FUNCTIONS --
 
     ---@class facility
@@ -599,7 +508,7 @@ function facility.new(config)
             self.waiting_on_ramp or self.waiting_on_stable,
             self.at_max_burn or self.saturated,
             self.ascram,
-            astat.matrix_dc,
+            astat.matrix_fault,
             astat.matrix_fill,
             astat.crit_alarm,
             astat.radiation,

supervisor/facility_update.lua

@@ -341,9 +341,17 @@ function update.auto_control(ExtChargeIdling)
         if state_changed then
             self.time_start = now
             self.saturated = true
+            self.waiting_on_ramp = true
 
-            self.status_text = { "MONITORED MODE", "running reactors at limit" }
+            self.status_text = { "MONITORED MODE", "ramping reactors to limit" }
             log.info("FAC: MAX_BURN process mode started")
+        elseif self.waiting_on_ramp then
+            if all_units_ramped() then
+                self.waiting_on_ramp = false
+
+                self.status_text = { "MONITORED MODE", "running reactors at limit" }
+                log.info("FAC: MAX_BURN process mode initial ramp completed")
+            end
         end
 
         allocate_burn_rate(self.max_burn_combined, true)
@@ -351,8 +359,17 @@ function update.auto_control(ExtChargeIdling)
         -- a total aggregate burn rate
         if state_changed then
             self.time_start = now
-            self.status_text = { "BURN RATE MODE", "running" }
+            self.waiting_on_ramp = true
+
+            self.status_text = { "BURN RATE MODE", "ramping to target" }
             log.info("FAC: BURN_RATE process mode started")
+        elseif self.waiting_on_ramp then
+            if all_units_ramped() then
+                self.waiting_on_ramp = false
+
+                self.status_text = { "BURN RATE MODE", "running" }
+                log.info("FAC: BURN_RATE process mode initial ramp completed")
+            end
         end
 
         local unallocated = allocate_burn_rate(self.burn_target, true)
@@ -511,13 +528,19 @@ function update.auto_safety()
 
     local astatus = self.ascram_status
 
+    -- matrix related checks
     if self.induction[1] ~= nil then
         local db = self.induction[1].get_db()
 
-        -- clear matrix disconnected
+        -- check for unformed or faulted state
-        if astatus.matrix_dc then
+        local i_ok = db.formed and not self.induction[1].is_faulted()
-            astatus.matrix_dc = false
+
-            log.info("FAC: induction matrix reconnected, clearing ASCRAM condition")
+        -- clear matrix fault if ok again
+        if astatus.matrix_fault and i_ok then
+            astatus.matrix_fault = false
+            log.info("FAC: induction matrix OK, clearing ASCRAM condition")
+        else
+            astatus.matrix_fault = not i_ok
         end
 
         -- check matrix fill too high
@@ -528,42 +551,42 @@ function update.auto_safety()
             log.info(util.c("FAC: charge state of induction matrix entered acceptable range <= ", ALARM_LIMS.CHARGE_RE_ENABLE * 100, "%"))
         end
 
-        -- check for critical unit alarms
-        astatus.crit_alarm = false
-        for i = 1, #self.units do
-            local u = self.units[i]
-
-            if u.has_alarm_min_prio(PRIO.CRITICAL) then
-                astatus.crit_alarm = true
-                break
-            end
-        end
-
-        -- check for facility radiation
-        if #self.envd > 0 then
-            local max_rad = 0
-
-            for i = 1, #self.envd do
-                local envd = self.envd[i]
-                local e_db = envd.get_db()
-                if e_db.radiation_raw > max_rad then max_rad = e_db.radiation_raw end
-            end
-
-            astatus.radiation = max_rad >= ALARM_LIMS.FAC_HIGH_RAD
-        else
-            -- don't clear, if it is true then we lost it with high radiation, so just keep alarming
-            -- operator can restart the system or hit the stop/reset button
-        end
-
         -- system not ready, will need to restart GEN_RATE mode
         -- clears when we enter the fault waiting state
         astatus.gen_fault = self.mode == PROCESS.GEN_RATE and not self.units_ready
     else
-        astatus.matrix_dc = true
+        astatus.matrix_fault = true
+    end
+
+    -- check for critical unit alarms
+    astatus.crit_alarm = false
+    for i = 1, #self.units do
+        local u = self.units[i]
+
+        if u.has_alarm_min_prio(PRIO.CRITICAL) then
+            astatus.crit_alarm = true
+            break
+        end
+    end
+
+    -- check for facility radiation
+    if #self.envd > 0 then
+        local max_rad = 0
+
+        for i = 1, #self.envd do
+            local envd = self.envd[i]
+            local e_db = envd.get_db()
+            if e_db.radiation_raw > max_rad then max_rad = e_db.radiation_raw end
+        end
+
+        astatus.radiation = max_rad >= ALARM_LIMS.FAC_HIGH_RAD
+    else
+        -- don't clear, if it is true then we lost it with high radiation, so just keep alarming
+        -- operator can restart the system or hit the stop/reset button
     end
 
     if (self.mode ~= PROCESS.INACTIVE) and (self.mode ~= PROCESS.SYSTEM_ALARM_IDLE) then
-        local scram = astatus.matrix_dc or astatus.matrix_fill or astatus.crit_alarm or astatus.gen_fault
+        local scram = astatus.matrix_fault or astatus.matrix_fill or astatus.crit_alarm or astatus.gen_fault
 
         if scram and not self.ascram then
             -- SCRAM all units
@@ -587,14 +610,14 @@ function update.auto_safety()
                 self.status_text = { "AUTOMATIC SCRAM", "facility radiation high" }
 
                 log.info("FAC: automatic SCRAM due to high facility radiation")
-            elseif astatus.matrix_dc then
+            elseif astatus.matrix_fault then
                 next_mode = PROCESS.MATRIX_FAULT_IDLE
-                self.ascram_reason = AUTO_SCRAM.MATRIX_DC
+                self.ascram_reason = AUTO_SCRAM.MATRIX_FAULT
-                self.status_text = { "AUTOMATIC SCRAM", "induction matrix disconnected" }
+                self.status_text = { "AUTOMATIC SCRAM", "induction matrix fault" }
 
                 if self.mode ~= PROCESS.MATRIX_FAULT_IDLE then self.return_mode = self.mode end
 
-                log.info("FAC: automatic SCRAM due to induction matrix disconnection")
+                log.info("FAC: automatic SCRAM due to induction matrix disconnected, unformed, or faulted")
             elseif astatus.matrix_fill then
                 next_mode = PROCESS.MATRIX_FAULT_IDLE
                 self.ascram_reason = AUTO_SCRAM.MATRIX_FILL

supervisor/session/coordinator.lua

@@ -255,6 +255,7 @@ function coordinator.new_session(id, s_addr, i_seq_num, in_queue, out_queue, tim
                     elseif cmd == FAC_COMMAND.START then
                         if pkt.length == 6 then
                             ---@type sys_auto_config
+---@diagnostic disable-next-line: missing-fields
                             local config = {
                                 mode = pkt.data[2],
                                 burn_target = pkt.data[3],
@@ -278,13 +279,13 @@ function coordinator.new_session(id, s_addr, i_seq_num, in_queue, out_queue, tim
                         end
                     elseif cmd == FAC_COMMAND.SET_PU_FB then
                         if pkt.length == 2 then
-                            _send(CRDN_TYPE.FAC_CMD, { cmd, facility.set_pu_fallback(pkt.data[2]) })
+                            _send(CRDN_TYPE.FAC_CMD, { cmd, facility.set_pu_fallback(pkt.data[2] == true) })
                         else
                             log.debug(log_tag .. "CRDN set pu fallback packet length mismatch")
                         end
                     elseif cmd == FAC_COMMAND.SET_SPS_LP then
                         if pkt.length == 2 then
-                            _send(CRDN_TYPE.FAC_CMD, { cmd, facility.set_sps_low_power(pkt.data[2]) })
+                            _send(CRDN_TYPE.FAC_CMD, { cmd, facility.set_sps_low_power(pkt.data[2] == true) })
                         else
                             log.debug(log_tag .. "CRDN set sps low power packet length mismatch")
                         end

supervisor/session/rtu/boilerv.lua

@@ -105,27 +105,39 @@ function boilerv.new(session_id, unit_id, advert, out_queue)
     -- PRIVATE FUNCTIONS --
 
     -- query if the multiblock is formed
-    local function _request_formed()
+    ---@param time_now integer
+    local function _request_formed(time_now)
         -- read discrete input 1 (start = 1, count = 1)
-        self.session.send_request(TXN_TYPES.FORMED, MODBUS_FCODE.READ_DISCRETE_INPUTS, { 1, 1 })
+        if self.session.send_request(TXN_TYPES.FORMED, MODBUS_FCODE.READ_DISCRETE_INPUTS, { 1, 1 }) ~= false then
+            self.periodics.next_formed_req = time_now + PERIODICS.FORMED
+        end
     end
 
     -- query the build of the device
-    local function _request_build()
+    ---@param time_now integer
+    local function _request_build(time_now)
         -- read input registers 1 through 12 (start = 1, count = 12)
-        self.session.send_request(TXN_TYPES.BUILD, MODBUS_FCODE.READ_INPUT_REGS, { 1, 12 })
+        if self.session.send_request(TXN_TYPES.BUILD, MODBUS_FCODE.READ_INPUT_REGS, { 1, 12 }) ~= false then
+            self.periodics.next_build_req = time_now + PERIODICS.BUILD
+        end
     end
 
     -- query the state of the device
-    local function _request_state()
+    ---@param time_now integer
+    local function _request_state(time_now)
         -- read input registers 13 through 15 (start = 13, count = 3)
-        self.session.send_request(TXN_TYPES.STATE, MODBUS_FCODE.READ_INPUT_REGS, { 13, 3 })
+        if self.session.send_request(TXN_TYPES.STATE, MODBUS_FCODE.READ_INPUT_REGS, { 13, 3 }) ~= false then
+            self.periodics.next_state_req = time_now + PERIODICS.STATE
+        end
     end
 
     -- query the tanks of the device
-    local function _request_tanks()
+    ---@param time_now integer
+    local function _request_tanks(time_now)
         -- read input registers 16 through 27 (start = 16, count = 12)
-        self.session.send_request(TXN_TYPES.TANKS, MODBUS_FCODE.READ_INPUT_REGS, { 16, 12 })
+        if self.session.send_request(TXN_TYPES.TANKS, MODBUS_FCODE.READ_INPUT_REGS, { 16, 12 }) ~= false then
+            self.periodics.next_tanks_req = time_now + PERIODICS.TANKS
+        end
     end
 
     -- PUBLIC FUNCTIONS --
@@ -210,26 +222,12 @@ function boilerv.new(session_id, unit_id, advert, out_queue)
     -- update this runner
     ---@param time_now integer milliseconds
     function public.update(time_now)
-        if self.periodics.next_formed_req <= time_now then
+        if self.periodics.next_formed_req <= time_now then _request_formed(time_now) end
-            _request_formed()
-            self.periodics.next_formed_req = time_now + PERIODICS.FORMED
-        end
 
         if self.db.formed then
-            if not self.has_build and self.periodics.next_build_req <= time_now then
+            if not self.has_build and self.periodics.next_build_req <= time_now then _request_build(time_now) end
-                _request_build()
+            if self.periodics.next_state_req <= time_now then _request_state(time_now) end
-                self.periodics.next_build_req = time_now + PERIODICS.BUILD
+            if self.periodics.next_tanks_req <= time_now then _request_tanks(time_now) end
-            end
-
-            if self.periodics.next_state_req <= time_now then
-                _request_state()
-                self.periodics.next_state_req = time_now + PERIODICS.STATE
-            end
-
-            if self.periodics.next_tanks_req <= time_now then
-                _request_tanks()
-                self.periodics.next_tanks_req = time_now + PERIODICS.TANKS
-            end
         end
 
         self.session.post_update()

supervisor/session/rtu/dynamicv.lua

@@ -42,6 +42,8 @@ local PERIODICS = {
     TANKS = 500
 }
 
+local WRITE_BUSY_WAIT = 1000
+
 -- create a new dynamicv rtu session runner
 ---@nodiscard
 ---@param session_id integer RTU gateway session ID
@@ -63,6 +65,8 @@ function dynamicv.new(session_id, unit_id, advert, out_queue)
     local self = {
         session = unit_session.new(session_id, unit_id, advert, out_queue, log_tag, TXN_TAGS),
         has_build = false,
+        mode_cmd = nil, ---@type container_mode|nil
+        resend_mode = false,
         periodics = {
             next_formed_req = 0,
             next_build_req = 0,
@@ -101,45 +105,77 @@ function dynamicv.new(session_id, unit_id, advert, out_queue)
 
     -- increment the container mode
     local function _inc_cont_mode()
+        -- set mode command
+        if self.mode_cmd == "BOTH" then self.mode_cmd = "FILL"
+        elseif self.mode_cmd == "FILL" then self.mode_cmd = "EMPTY"
+        elseif self.mode_cmd == "EMPTY" then self.mode_cmd = "BOTH"
+        end
+
         -- write coil 1 with unused value 0
-        self.session.send_request(TXN_TYPES.INC_CONT, MODBUS_FCODE.WRITE_SINGLE_COIL, { 1, 0 })
+        if self.session.send_request(TXN_TYPES.INC_CONT, MODBUS_FCODE.WRITE_SINGLE_COIL, { 1, 0 }, WRITE_BUSY_WAIT) == false then
+            self.resend_mode = true
+        end
     end
 
     -- decrement the container mode
     local function _dec_cont_mode()
+        -- set mode command
+        if self.mode_cmd == "BOTH" then self.mode_cmd = "EMPTY"
+        elseif self.mode_cmd == "EMPTY" then self.mode_cmd = "FILL"
+        elseif self.mode_cmd == "FILL" then self.mode_cmd = "BOTH"
+        end
+
         -- write coil 2 with unused value 0
-        self.session.send_request(TXN_TYPES.DEC_CONT, MODBUS_FCODE.WRITE_SINGLE_COIL, { 2, 0 })
+        if self.session.send_request(TXN_TYPES.DEC_CONT, MODBUS_FCODE.WRITE_SINGLE_COIL, { 2, 0 , WRITE_BUSY_WAIT}) == false then
+            self.resend_mode = false
+        end
     end
 
     -- set the container mode
     ---@param mode container_mode
     local function _set_cont_mode(mode)
+        self.mode_cmd = mode
+
         -- write holding register 1
-        self.session.send_request(TXN_TYPES.SET_CONT, MODBUS_FCODE.WRITE_SINGLE_HOLD_REG, { 1, mode })
+        if self.session.send_request(TXN_TYPES.SET_CONT, MODBUS_FCODE.WRITE_SINGLE_HOLD_REG, { 1, mode }, WRITE_BUSY_WAIT) == false then
+            self.resend_mode = false
+        end
     end
 
     -- query if the multiblock is formed
-    local function _request_formed()
+    ---@param time_now integer
+    local function _request_formed(time_now)
         -- read discrete input 1 (start = 1, count = 1)
-        self.session.send_request(TXN_TYPES.FORMED, MODBUS_FCODE.READ_DISCRETE_INPUTS, { 1, 1 })
+        if self.session.send_request(TXN_TYPES.FORMED, MODBUS_FCODE.READ_DISCRETE_INPUTS, { 1, 1 }) ~= false then
+            self.periodics.next_formed_req = time_now + PERIODICS.FORMED
+        end
     end
 
     -- query the build of the device
-    local function _request_build()
+    ---@param time_now integer
+    local function _request_build(time_now)
         -- read input registers 1 through 7 (start = 1, count = 7)
-        self.session.send_request(TXN_TYPES.BUILD, MODBUS_FCODE.READ_INPUT_REGS, { 1, 7 })
+        if self.session.send_request(TXN_TYPES.BUILD, MODBUS_FCODE.READ_INPUT_REGS, { 1, 7 }) ~= false then
+            self.periodics.next_build_req = time_now + PERIODICS.BUILD
+        end
     end
 
     -- query the state of the device
-    local function _request_state()
+    ---@param time_now integer
+    local function _request_state(time_now)
         -- read holding register 1 (start = 1, count = 1)
-        self.session.send_request(TXN_TYPES.STATE, MODBUS_FCODE.READ_MUL_HOLD_REGS, { 1, 1 })
+        if self.session.send_request(TXN_TYPES.STATE, MODBUS_FCODE.READ_MUL_HOLD_REGS, { 1, 1 }) ~= false then
+            self.periodics.next_state_req = time_now + PERIODICS.STATE
+        end
     end
 
     -- query the tanks of the device
-    local function _request_tanks()
+    ---@param time_now integer
+    local function _request_tanks(time_now)
         -- read input registers 8 through 9 (start = 8, count = 2)
-        self.session.send_request(TXN_TYPES.TANKS, MODBUS_FCODE.READ_INPUT_REGS, { 8, 2 })
+        if self.session.send_request(TXN_TYPES.TANKS, MODBUS_FCODE.READ_INPUT_REGS, { 8, 2 }) ~= false then
+            self.periodics.next_tanks_req = time_now + PERIODICS.TANKS
+        end
     end
 
     -- PUBLIC FUNCTIONS --
@@ -182,6 +218,10 @@ function dynamicv.new(session_id, unit_id, advert, out_queue)
             if m_pkt.length == 1 then
                 self.db.state.last_update    = util.time_ms()
                 self.db.state.container_mode = m_pkt.data[1]
+
+                if self.mode_cmd == nil then
+                    self.mode_cmd = self.db.state.container_mode
+                end
             else
                 log.debug(log_tag .. "MODBUS transaction reply length mismatch (" .. TXN_TAGS[txn_type] .. ")")
             end
@@ -247,30 +287,22 @@ function dynamicv.new(session_id, unit_id, advert, out_queue)
             end
         end
 
+        -- try to resend mode if needed
+        if self.resend_mode then
+            self.resend_mode = false
+            _set_cont_mode(self.mode_cmd)
+        end
+
         time_now = util.time()
 
         -- handle periodics
 
-        if self.periodics.next_formed_req <= time_now then
+        if self.periodics.next_formed_req <= time_now then _request_formed(time_now) end
-            _request_formed()
-            self.periodics.next_formed_req = time_now + PERIODICS.FORMED
-        end
 
         if self.db.formed then
-            if not self.has_build and self.periodics.next_build_req <= time_now then
+            if not self.has_build and self.periodics.next_build_req <= time_now then _request_build(time_now) end
-                _request_build()
+            if self.periodics.next_state_req <= time_now then _request_state(time_now) end
-                self.periodics.next_build_req = time_now + PERIODICS.BUILD
+            if self.periodics.next_tanks_req <= time_now then _request_tanks(time_now) end
-            end
-
-            if self.periodics.next_state_req <= time_now then
-                _request_state()
-                self.periodics.next_state_req = time_now + PERIODICS.STATE
-            end
-
-            if self.periodics.next_tanks_req <= time_now then
-                _request_tanks()
-                self.periodics.next_tanks_req = time_now + PERIODICS.TANKS
-            end
         end
 
         self.session.post_update()

supervisor/session/rtu/envd.lua

@@ -58,9 +58,12 @@ function envd.new(session_id, unit_id, advert, out_queue)
     -- PRIVATE FUNCTIONS --
 
     -- query the radiation readings of the device
-    local function _request_radiation()
+    ---@param time_now integer
+    local function _request_radiation(time_now)
         -- read input registers 1 and 2 (start = 1, count = 2)
-        self.session.send_request(TXN_TYPES.RAD, MODBUS_FCODE.READ_INPUT_REGS, { 1, 2 })
+        if self.session.send_request(TXN_TYPES.RAD, MODBUS_FCODE.READ_INPUT_REGS, { 1, 2 }) ~= false then
+            self.periodics.next_rad_req = time_now + PERIODICS.RAD
+        end
     end
 
     -- PUBLIC FUNCTIONS --
@@ -90,10 +93,7 @@ function envd.new(session_id, unit_id, advert, out_queue)
     -- update this runner
     ---@param time_now integer milliseconds
     function public.update(time_now)
-        if self.periodics.next_rad_req <= time_now then
+        if self.periodics.next_rad_req <= time_now then _request_radiation(time_now) end
-            _request_radiation()
-            self.periodics.next_rad_req = time_now + PERIODICS.RAD
-        end
 
         self.session.post_update()
     end

supervisor/session/rtu/imatrix.lua

@@ -89,27 +89,39 @@ function imatrix.new(session_id, unit_id, advert, out_queue)
     -- PRIVATE FUNCTIONS --
 
     -- query if the multiblock is formed
-    local function _request_formed()
+    ---@param time_now integer
+    local function _request_formed(time_now)
         -- read discrete input 1 (start = 1, count = 1)
-        self.session.send_request(TXN_TYPES.FORMED, MODBUS_FCODE.READ_DISCRETE_INPUTS, { 1, 1 })
+        if self.session.send_request(TXN_TYPES.FORMED, MODBUS_FCODE.READ_DISCRETE_INPUTS, { 1, 1 }) ~= false then
+            self.periodics.next_formed_req = time_now + PERIODICS.FORMED
+        end
     end
 
     -- query the build of the device
-    local function _request_build()
+    ---@param time_now integer
+    local function _request_build(time_now)
         -- read input registers 1 through 9 (start = 1, count = 9)
-        self.session.send_request(TXN_TYPES.BUILD, MODBUS_FCODE.READ_INPUT_REGS, { 1, 9 })
+        if self.session.send_request(TXN_TYPES.BUILD, MODBUS_FCODE.READ_INPUT_REGS, { 1, 9 }) ~= false then
+            self.periodics.next_build_req = time_now + PERIODICS.BUILD
+        end
     end
 
     -- query the state of the device
-    local function _request_state()
+    ---@param time_now integer
+    local function _request_state(time_now)
         -- read input register 10 through 11 (start = 10, count = 2)
-        self.session.send_request(TXN_TYPES.STATE, MODBUS_FCODE.READ_INPUT_REGS, { 10, 2 })
+        if self.session.send_request(TXN_TYPES.STATE, MODBUS_FCODE.READ_INPUT_REGS, { 10, 2 }) ~= false then
+            self.periodics.next_state_req = time_now + PERIODICS.STATE
+        end
     end
 
     -- query the tanks of the device
-    local function _request_tanks()
+    ---@param time_now integer
+    local function _request_tanks(time_now)
         -- read input registers 12 through 15 (start = 12, count = 3)
-        self.session.send_request(TXN_TYPES.TANKS, MODBUS_FCODE.READ_INPUT_REGS, { 12, 3 })
+        if self.session.send_request(TXN_TYPES.TANKS, MODBUS_FCODE.READ_INPUT_REGS, { 12, 3 }) ~= false then
+            self.periodics.next_tanks_req = time_now + PERIODICS.TANKS
+        end
     end
 
     -- PUBLIC FUNCTIONS --
@@ -181,26 +193,12 @@ function imatrix.new(session_id, unit_id, advert, out_queue)
     -- update this runner
     ---@param time_now integer milliseconds
     function public.update(time_now)
-        if self.periodics.next_formed_req <= time_now then
+        if self.periodics.next_formed_req <= time_now then _request_formed(time_now) end
-            _request_formed()
-            self.periodics.next_formed_req = time_now + PERIODICS.FORMED
-        end
 
         if self.db.formed then
-            if not self.has_build and self.periodics.next_build_req <= time_now then
+            if not self.has_build and self.periodics.next_build_req <= time_now then _request_build(time_now) end
-                _request_build()
+            if self.periodics.next_state_req <= time_now then _request_state(time_now) end
-                self.periodics.next_build_req = time_now + PERIODICS.BUILD
+            if self.periodics.next_tanks_req <= time_now then _request_tanks(time_now) end
-            end
-
-            if self.periodics.next_state_req <= time_now then
-                _request_state()
-                self.periodics.next_state_req = time_now + PERIODICS.STATE
-            end
-
-            if self.periodics.next_tanks_req <= time_now then
-                _request_tanks()
-                self.periodics.next_tanks_req = time_now + PERIODICS.TANKS
-            end
         end
 
         self.session.post_update()

supervisor/session/rtu/sna.lua

@@ -80,21 +80,30 @@ function sna.new(session_id, unit_id, advert, out_queue)
     -- PRIVATE FUNCTIONS --
 
     -- query the build of the device
-    local function _request_build()
+    ---@param time_now integer
+    local function _request_build(time_now)
         -- read input registers 1 through 2 (start = 1, count = 2)
-        self.session.send_request(TXN_TYPES.BUILD, MODBUS_FCODE.READ_INPUT_REGS, { 1, 2 })
+        if self.session.send_request(TXN_TYPES.BUILD, MODBUS_FCODE.READ_INPUT_REGS, { 1, 2 }) ~= false then
+            self.periodics.next_build_req = time_now + PERIODICS.BUILD
+        end
     end
 
     -- query the state of the device
-    local function _request_state()
+    ---@param time_now integer
+    local function _request_state(time_now)
         -- read input registers 3 through 4 (start = 3, count = 2)
-        self.session.send_request(TXN_TYPES.STATE, MODBUS_FCODE.READ_INPUT_REGS, { 3, 2 })
+        if self.session.send_request(TXN_TYPES.STATE, MODBUS_FCODE.READ_INPUT_REGS, { 3, 2 }) ~= false then
+            self.periodics.next_state_req = time_now + PERIODICS.STATE
+        end
     end
 
     -- query the tanks of the device
-    local function _request_tanks()
+    ---@param time_now integer
+    local function _request_tanks(time_now)
         -- read input registers 5 through 10 (start = 5, count = 6)
-        self.session.send_request(TXN_TYPES.TANKS, MODBUS_FCODE.READ_INPUT_REGS, { 5, 6 })
+        if self.session.send_request(TXN_TYPES.TANKS, MODBUS_FCODE.READ_INPUT_REGS, { 5, 6 }) ~= false then
+            self.periodics.next_tanks_req = time_now + PERIODICS.TANKS
+        end
     end
 
     -- PUBLIC FUNCTIONS --
@@ -152,20 +161,9 @@ function sna.new(session_id, unit_id, advert, out_queue)
     -- update this runner
     ---@param time_now integer milliseconds
     function public.update(time_now)
-        if not self.has_build and self.periodics.next_build_req <= time_now then
+        if not self.has_build and self.periodics.next_build_req <= time_now then _request_build(time_now) end
-            _request_build()
+        if self.periodics.next_state_req <= time_now then _request_state(time_now) end
-            self.periodics.next_build_req = time_now + PERIODICS.BUILD
+        if self.periodics.next_tanks_req <= time_now then _request_tanks(time_now) end
-        end
-
-        if self.periodics.next_state_req <= time_now then
-            _request_state()
-            self.periodics.next_state_req = time_now + PERIODICS.STATE
-        end
-
-        if self.periodics.next_tanks_req <= time_now then
-            _request_tanks()
-            self.periodics.next_tanks_req = time_now + PERIODICS.TANKS
-        end
 
         self.session.post_update()
     end

supervisor/session/rtu/sps.lua

@@ -94,27 +94,39 @@ function sps.new(session_id, unit_id, advert, out_queue)
     -- PRIVATE FUNCTIONS --
 
     -- query if the multiblock is formed
-    local function _request_formed()
+    ---@param time_now integer
+    local function _request_formed(time_now)
         -- read discrete input 1 (start = 1, count = 1)
-        self.session.send_request(TXN_TYPES.FORMED, MODBUS_FCODE.READ_DISCRETE_INPUTS, { 1, 1 })
+        if self.session.send_request(TXN_TYPES.FORMED, MODBUS_FCODE.READ_DISCRETE_INPUTS, { 1, 1 }) ~= false then
+            self.periodics.next_formed_req = time_now + PERIODICS.FORMED
+        end
     end
 
     -- query the build of the device
-    local function _request_build()
+    ---@param time_now integer
+    local function _request_build(time_now)
         -- read input registers 1 through 9 (start = 1, count = 9)
-        self.session.send_request(TXN_TYPES.BUILD, MODBUS_FCODE.READ_INPUT_REGS, { 1, 9 })
+        if self.session.send_request(TXN_TYPES.BUILD, MODBUS_FCODE.READ_INPUT_REGS, { 1, 9 }) ~= false then
+            self.periodics.next_build_req = time_now + PERIODICS.BUILD
+        end
     end
 
     -- query the state of the device
-    local function _request_state()
+    ---@param time_now integer
+    local function _request_state(time_now)
         -- read input register 10 (start = 10, count = 1)
-        self.session.send_request(TXN_TYPES.STATE, MODBUS_FCODE.READ_INPUT_REGS, { 10, 1 })
+        if self.session.send_request(TXN_TYPES.STATE, MODBUS_FCODE.READ_INPUT_REGS, { 10, 1 }) ~= false then
+            self.periodics.next_state_req = time_now + PERIODICS.STATE
+        end
     end
 
     -- query the tanks of the device
-    local function _request_tanks()
+    ---@param time_now integer
+    local function _request_tanks(time_now)
         -- read input registers 11 through 19 (start = 11, count = 9)
-        self.session.send_request(TXN_TYPES.TANKS, MODBUS_FCODE.READ_INPUT_REGS, { 11, 9 })
+        if self.session.send_request(TXN_TYPES.TANKS, MODBUS_FCODE.READ_INPUT_REGS, { 11, 9 }) ~= false then
+            self.periodics.next_tanks_req = time_now + PERIODICS.TANKS
+        end
     end
 
     -- PUBLIC FUNCTIONS --
@@ -191,26 +203,12 @@ function sps.new(session_id, unit_id, advert, out_queue)
     -- update this runner
     ---@param time_now integer milliseconds
     function public.update(time_now)
-        if self.periodics.next_formed_req <= time_now then
+        if self.periodics.next_formed_req <= time_now then _request_formed(time_now) end
-            _request_formed()
-            self.periodics.next_formed_req = time_now + PERIODICS.FORMED
-        end
 
         if self.db.formed then
-            if not self.has_build and self.periodics.next_build_req <= time_now then
+            if not self.has_build and self.periodics.next_build_req <= time_now then _request_build(time_now) end
-                _request_build()
+            if self.periodics.next_state_req <= time_now then _request_state(time_now) end
-                self.periodics.next_build_req = time_now + PERIODICS.BUILD
+            if self.periodics.next_tanks_req <= time_now then _request_tanks(time_now) end
-            end
-
-            if self.periodics.next_state_req <= time_now then
-                _request_state()
-                self.periodics.next_state_req = time_now + PERIODICS.STATE
-            end
-
-            if self.periodics.next_tanks_req <= time_now then
-                _request_tanks()
-                self.periodics.next_tanks_req = time_now + PERIODICS.TANKS
-            end
         end
 
         self.session.post_update()

supervisor/session/rtu/turbinev.lua

@@ -42,6 +42,8 @@ local PERIODICS = {
     TANKS = 1000
 }
 
+local WRITE_BUSY_WAIT = 1000
+
 -- create a new turbinev rtu session runner
 ---@nodiscard
 ---@param session_id integer RTU gateway session ID
@@ -63,6 +65,8 @@ function turbinev.new(session_id, unit_id, advert, out_queue)
     local self = {
         session = unit_session.new(session_id, unit_id, advert, out_queue, log_tag, TXN_TAGS),
         has_build = false,
+        mode_cmd = nil, ---@type dumping_mode|nil
+        resend_mode = false,
         periodics = {
             next_formed_req = 0,
             next_build_req = 0,
@@ -116,45 +120,77 @@ function turbinev.new(session_id, unit_id, advert, out_queue)
 
     -- increment the dumping mode
     local function _inc_dump_mode()
+        -- set mode command
+        if self.mode_cmd == "IDLE" then self.mode_cmd = "DUMPING_EXCESS"
+        elseif self.mode_cmd == "DUMPING_EXCESS" then self.mode_cmd = "DUMPING"
+        elseif self.mode_cmd == "DUMPING" then self.mode_cmd = "IDLE"
+        end
+
         -- write coil 1 with unused value 0
-        self.session.send_request(TXN_TYPES.INC_DUMP, MODBUS_FCODE.WRITE_SINGLE_COIL, { 1, 0 })
+        if self.session.send_request(TXN_TYPES.INC_DUMP, MODBUS_FCODE.WRITE_SINGLE_COIL, { 1, 0 }, WRITE_BUSY_WAIT) == false then
+            self.resend_mode = true
+        end
     end
 
     -- decrement the dumping mode
     local function _dec_dump_mode()
+        -- set mode command
+        if self.mode_cmd == "IDLE" then self.mode_cmd = "DUMPING"
+        elseif self.mode_cmd == "DUMPING_EXCESS" then self.mode_cmd = "IDLE"
+        elseif self.mode_cmd == "DUMPING" then self.mode_cmd = "DUMPING_EXCESS"
+        end
+
         -- write coil 2 with unused value 0
-        self.session.send_request(TXN_TYPES.DEC_DUMP, MODBUS_FCODE.WRITE_SINGLE_COIL, { 2, 0 })
+        if self.session.send_request(TXN_TYPES.DEC_DUMP, MODBUS_FCODE.WRITE_SINGLE_COIL, { 2, 0 }, WRITE_BUSY_WAIT) == false then
+            self.resend_mode = true
+        end
     end
 
     -- set the dumping mode
     ---@param mode dumping_mode
     local function _set_dump_mode(mode)
+        self.mode_cmd = mode
+
         -- write holding register 1
-        self.session.send_request(TXN_TYPES.SET_DUMP, MODBUS_FCODE.WRITE_SINGLE_HOLD_REG, { 1, mode })
+        if self.session.send_request(TXN_TYPES.SET_DUMP, MODBUS_FCODE.WRITE_SINGLE_HOLD_REG, { 1, mode }, WRITE_BUSY_WAIT) == false then
+            self.resend_mode = true
+        end
     end
 
     -- query if the multiblock is formed
-    local function _request_formed()
+    ---@param time_now integer
+    local function _request_formed(time_now)
         -- read discrete input 1 (start = 1, count = 1)
-        self.session.send_request(TXN_TYPES.FORMED, MODBUS_FCODE.READ_DISCRETE_INPUTS, { 1, 1 })
+        if self.session.send_request(TXN_TYPES.FORMED, MODBUS_FCODE.READ_DISCRETE_INPUTS, { 1, 1 }) ~= false then
+            self.periodics.next_formed_req = time_now + PERIODICS.FORMED
+        end
     end
 
     -- query the build of the device
-    local function _request_build()
+    ---@param time_now integer
+    local function _request_build(time_now)
         -- read input registers 1 through 15 (start = 1, count = 15)
-        self.session.send_request(TXN_TYPES.BUILD, MODBUS_FCODE.READ_INPUT_REGS, { 1, 15 })
+        if self.session.send_request(TXN_TYPES.BUILD, MODBUS_FCODE.READ_INPUT_REGS, { 1, 15 }) ~= false then
+            self.periodics.next_build_req = time_now + PERIODICS.BUILD
+        end
     end
 
     -- query the state of the device
-    local function _request_state()
+    ---@param time_now integer
+    local function _request_state(time_now)
         -- read input registers 16 through 19 (start = 16, count = 4)
-        self.session.send_request(TXN_TYPES.STATE, MODBUS_FCODE.READ_INPUT_REGS, { 16, 4 })
+        if self.session.send_request(TXN_TYPES.STATE, MODBUS_FCODE.READ_INPUT_REGS, { 16, 4 }) ~= false then
+            self.periodics.next_state_req = time_now + PERIODICS.STATE
+        end
     end
 
     -- query the tanks of the device
-    local function _request_tanks()
+    ---@param time_now integer
+    local function _request_tanks(time_now)
         -- read input registers 20 through 25 (start = 20, count = 6)
-        self.session.send_request(TXN_TYPES.TANKS, MODBUS_FCODE.READ_INPUT_REGS, { 20, 6 })
+        if self.session.send_request(TXN_TYPES.TANKS, MODBUS_FCODE.READ_INPUT_REGS, { 20, 6 }) ~= false then
+            self.periodics.next_tanks_req = time_now + PERIODICS.TANKS
+        end
     end
 
     -- PUBLIC FUNCTIONS --
@@ -208,6 +244,10 @@ function turbinev.new(session_id, unit_id, advert, out_queue)
                 self.db.state.prod_rate        = m_pkt.data[2]
                 self.db.state.steam_input_rate = m_pkt.data[3]
                 self.db.state.dumping_mode     = m_pkt.data[4]
+
+                if self.mode_cmd == nil then
+                    self.mode_cmd = self.db.state.dumping_mode
+                end
             else
                 log.debug(log_tag .. "MODBUS transaction reply length mismatch (" .. TXN_TAGS[txn_type] .. ")")
             end
@@ -277,30 +317,22 @@ function turbinev.new(session_id, unit_id, advert, out_queue)
             end
         end
 
+        -- try to resend mode if needed
+        if self.resend_mode then
+            self.resend_mode = false
+            _set_dump_mode(self.mode_cmd)
+        end
+
         time_now = util.time()
 
         -- handle periodics
 
-        if self.periodics.next_formed_req <= time_now then
+        if self.periodics.next_formed_req <= time_now then _request_formed(time_now) end
-            _request_formed()
-            self.periodics.next_formed_req = time_now + PERIODICS.FORMED
-        end
 
         if self.db.formed then
-            if not self.has_build and self.periodics.next_build_req <= time_now then
+            if not self.has_build and self.periodics.next_build_req <= time_now then _request_build(time_now) end
-                _request_build()
+            if self.periodics.next_state_req <= time_now then _request_state(time_now) end
-                self.periodics.next_build_req = time_now + PERIODICS.BUILD
+            if self.periodics.next_tanks_req <= time_now then _request_tanks(time_now) end
-            end
-
-            if self.periodics.next_state_req <= time_now then
-                _request_state()
-                self.periodics.next_state_req = time_now + PERIODICS.STATE
-            end
-
-            if self.periodics.next_tanks_req <= time_now then
-                _request_tanks()
-                self.periodics.next_tanks_req = time_now + PERIODICS.TANKS
-            end
         end
 
         self.session.post_update()

supervisor/session/rtu/unit_session.lua

@@ -22,6 +22,8 @@ local RTU_US_DATA = {
 unit_session.RTU_US_CMDS = RTU_US_CMDS
 unit_session.RTU_US_DATA = RTU_US_DATA
 
+local DEFAULT_BUSY_WAIT = 3000
+
 -- create a new unit session runner
 ---@nodiscard
 ---@param session_id integer RTU gateway session ID
@@ -36,7 +38,8 @@ function unit_session.new(session_id, unit_id, advert, out_queue, log_tag, txn_t
         reactor = advert.reactor,
         transaction_controller = txnctrl.new(),
         connected = true,
-        device_fail = false
+        device_fail = false,
+        last_busy = 0
     }
 
     ---@class _unit_session
@@ -53,14 +56,21 @@ function unit_session.new(session_id, unit_id, advert, out_queue, log_tag, txn_t
     ---@param txn_type integer transaction type
     ---@param f_code MODBUS_FCODE function code
     ---@param register_param (number|string)[] register range or register and values
-    ---@return integer txn_id transaction ID of this transaction
+    ---@param busy_wait integer|nil milliseconds to wait (>0), or uses the default
-    function protected.send_request(txn_type, f_code, register_param)
+    ---@return integer|false txn_id transaction ID of this transaction or false if not sent due to being busy
-        local m_pkt = comms.modbus_packet()
+    function protected.send_request(txn_type, f_code, register_param, busy_wait)
-        local txn_id = self.transaction_controller.create(txn_type)
+        local txn_id = false ---@type integer|false
 
-        m_pkt.make(txn_id, unit_id, f_code, register_param)
+        busy_wait = busy_wait or DEFAULT_BUSY_WAIT
 
-        out_queue.push_packet(m_pkt)
+        if (util.time_ms() - self.last_busy) >= busy_wait then
+            local m_pkt = comms.modbus_packet()
+            txn_id = self.transaction_controller.create(txn_type)
+
+            m_pkt.make(txn_id, unit_id, f_code, register_param)
+
+            out_queue.push_packet(m_pkt)
+        end
 
         return txn_id
     end
@@ -99,9 +109,9 @@ function unit_session.new(session_id, unit_id, advert, out_queue, log_tag, txn_t
                         -- will have to wait on reply, renew the transaction
                         self.transaction_controller.renew(m_pkt.txn_id, txn_type)
                     elseif ex == MODBUS_EXCODE.SERVER_DEVICE_BUSY then
-                        -- will have to wait on reply, renew the transaction
+                        -- will have to try again later
-                        self.transaction_controller.renew(m_pkt.txn_id, txn_type)
+                        self.last_busy = util.time_ms()
-                        log.debug(log_tag .. "MODBUS: device busy" .. txn_tag)
+                        log.warning(log_tag .. "MODBUS: device busy" .. txn_tag)
                     elseif ex == MODBUS_EXCODE.NEG_ACKNOWLEDGE then
                         -- general failure
                         log.error(log_tag .. "MODBUS: negative acknowledge (bad request)" .. txn_tag)

supervisor/session/svsessions.lua

@@ -46,12 +46,14 @@ local self = {
     config = nil,           ---@type svr_config
     facility = nil,         ---@type facility|nil
     -- lists of connected sessions
+---@diagnostic disable: missing-fields
     sessions = {
         rtu = {},           ---@type rtu_session_struct
         plc = {},           ---@type plc_session_struct
         crd = {},           ---@type crd_session_struct
         pdg = {}            ---@type pdg_session_struct
     },
+---@diagnostic enable: missing-fields
     -- next session IDs
     next_ids = { rtu = 0, plc = 0, crd = 0, pdg = 0 },
     -- rtu device tracking and invalid assignment detection

supervisor/startup.lua

@@ -22,7 +22,7 @@ local supervisor = require("supervisor.supervisor")
 
 local svsessions = require("supervisor.session.svsessions")
 
-local SUPERVISOR_VERSION = "v1.5.10"
+local SUPERVISOR_VERSION = "v1.6.2"
 
 local println = util.println
 local println_ts = util.println_ts

supervisor/supervisor.lua

@@ -14,6 +14,7 @@ local ESTABLISH_ACK = comms.ESTABLISH_ACK
 local MGMT_TYPE = comms.MGMT_TYPE
 
 ---@type svr_config
+---@diagnostic disable-next-line: missing-fields
 local config = {}
 
 supervisor.config = config
@@ -26,6 +27,9 @@ function supervisor.load_config()
     config.CoolingConfig = settings.get("CoolingConfig")
     config.FacilityTankMode = settings.get("FacilityTankMode")
     config.FacilityTankDefs = settings.get("FacilityTankDefs")
+    config.FacilityTankList = settings.get("FacilityTankList")
+    config.FacilityTankConns = settings.get("FacilityTankConns")
+    config.TankFluidTypes = settings.get("TankFluidTypes")
     config.ExtChargeIdling = settings.get("ExtChargeIdling")
 
     config.SVR_Channel = settings.get("SVR_Channel")
@@ -55,8 +59,11 @@ function supervisor.load_config()
     cfv.assert_range(config.UnitCount, 1, 4)
 
     cfv.assert_type_table(config.CoolingConfig)
-    cfv.assert_type_table(config.FacilityTankDefs)
     cfv.assert_type_int(config.FacilityTankMode)
+    cfv.assert_type_table(config.FacilityTankDefs)
+    cfv.assert_type_table(config.FacilityTankList)
+    cfv.assert_type_table(config.FacilityTankConns)
+    cfv.assert_type_table(config.TankFluidTypes)
     cfv.assert_range(config.FacilityTankMode, 0, 8)
 
     cfv.assert_type_bool(config.ExtChargeIdling)

supervisor/unit.lua

@@ -90,6 +90,7 @@ function unit.new(reactor_id, num_boilers, num_turbines, ext_idle)
         envd = {},      ---@type envd_session[]
         -- redstone control
         io_ctl = nil,   ---@type rs_controller
+---@diagnostic disable-next-line: missing-fields
         valves = {},    ---@type unit_valves
         emcool_opened = false,
         -- auto control
@@ -813,7 +814,7 @@ function unit.new(reactor_id, num_boilers, num_turbines, ext_idle)
         if limit > 0 then
             self.db.control.lim_br100 = math.floor(limit * 100)
 
-            if self.plc_i ~= nil then
+            if (self.plc_i ~= nil) and (type(self.plc_i.get_struct().max_burn) == "number") then
                 if limit > self.plc_i.get_struct().max_burn then
                     self.db.control.lim_br100 = math.floor(self.plc_i.get_struct().max_burn * 100)
                 end
@@ -986,7 +987,8 @@ function unit.new(reactor_id, num_boilers, num_turbines, ext_idle)
             local db = self.snas[i].get_db()
             total_peak = total_peak + db.state.peak_production
             total_avail = total_avail + db.state.production_rate
-            total_out = total_out + math.min(db.tanks.input.amount / 10, db.state.production_rate)
+            local out_from_in = util.trinary(db.tanks.input.amount >= 10, db.tanks.input.amount / 10, 0)
+            total_out = total_out + math.min(out_from_in, db.state.production_rate)
         end
         status.sna = { #self.snas, total_peak, total_avail, total_out }