Merge pull request #466 from MikaylaFischler/devel

2024.03.31 Release

README.md

@@ -4,7 +4,6 @@ Configurable ComputerCraft SCADA system for multi-reactor control of Mekanism fi
 ![GitHub](https://img.shields.io/github/license/MikaylaFischler/cc-mek-scada)
 ![GitHub release (latest by date including pre-releases)](https://img.shields.io/github/v/release/MikaylaFischler/cc-mek-scada?include_prereleases)
 ![GitHub Workflow Status (with branch)](https://img.shields.io/github/actions/workflow/status/MikaylaFischler/cc-mek-scada/check.yml?branch=main&label=main)
-![GitHub Workflow Status (with branch)](https://img.shields.io/github/actions/workflow/status/MikaylaFischler/cc-mek-scada/check.yml?branch=latest&label=latest)
 ![GitHub Workflow Status (with branch)](https://img.shields.io/github/actions/workflow/status/MikaylaFischler/cc-mek-scada/check.yml?branch=devel&label=devel)
 
 ### [Join](https://discord.gg/R9NSCkhcwt) the Discord!
@@ -17,6 +16,7 @@ Configurable ComputerCraft SCADA system for multi-reactor control of Mekanism fi
 
 
 ![Bootloader](https://img.shields.io/endpoint?url=https%3A%2F%2Fmikaylafischler.github.io%2Fcc-mek-scada%2Fbootloader.json)
+![Comms](https://img.shields.io/endpoint?url=https%3A%2F%2Fmikaylafischler.github.io%2Fcc-mek-scada%2Fcommon.json)
 ![Comms](https://img.shields.io/endpoint?url=https%3A%2F%2Fmikaylafischler.github.io%2Fcc-mek-scada%2Fcomms.json)
 ![Graphics](https://img.shields.io/endpoint?url=https%3A%2F%2Fmikaylafischler.github.io%2Fcc-mek-scada%2Fgraphics.json)
 ![Lockbox](https://img.shields.io/endpoint?url=https%3A%2F%2Fmikaylafischler.github.io%2Fcc-mek-scada%2Flockbox.json)

coordinator/configure.lua

@@ -8,6 +8,7 @@ local network     = require("scada-common.network")
 local ppm         = require("scada-common.ppm")
 local tcd         = require("scada-common.tcd")
 local util        = require("scada-common.util")
+local themes      = require("graphics.themes")
 
 local core        = require("graphics.core")
 
@@ -24,6 +25,8 @@ local RadioButton = require("graphics.elements.controls.radio_button")
 local NumberField = require("graphics.elements.form.number_field")
 local TextField   = require("graphics.elements.form.text_field")
 
+local IndLight    = require("graphics.elements.indicators.light")
+
 local println = util.println
 local tri = util.trinary
 
@@ -39,7 +42,11 @@ local CENTER = core.ALIGN.CENTER
 local RIGHT = core.ALIGN.RIGHT
 
 -- changes to the config data/format to let the user know
-local changes = {}
+local changes = {
+    { "v1.2.4", { "Added temperature scale options" } },
+    { "v1.2.12", { "Added main UI theme", "Added front panel UI theme", "Added color accessibility modes" } },
+    { "v1.3.3", { "Added standard with black off state color mode", "Added blue indicator color modes" } }
+}
 
 ---@class crd_configurator
 local configurator = {}
@@ -49,21 +56,7 @@ local style = {}
 style.root = cpair(colors.black, colors.lightGray)
 style.header = cpair(colors.white, colors.gray)
 
-style.colors = {
+style.colors = themes.smooth_stone.colors
-    { c = colors.red,       hex = 0xdf4949 },
-    { c = colors.orange,    hex = 0xffb659 },
-    { c = colors.yellow,    hex = 0xfffc79 },
-    { c = colors.lime,      hex = 0x80ff80 },
-    { c = colors.green,     hex = 0x4aee8a },
-    { c = colors.cyan,      hex = 0x34bac8 },
-    { c = colors.lightBlue, hex = 0x6cc0f2 },
-    { c = colors.blue,      hex = 0x0096ff },
-    { c = colors.purple,    hex = 0xb156ee },
-    { c = colors.pink,      hex = 0xf26ba2 },
-    { c = colors.magenta,   hex = 0xf9488a },
-    { c = colors.lightGray, hex = 0xcacaca },
-    { c = colors.gray,      hex = 0x575757 }
-}
 
 local bw_fg_bg = cpair(colors.black, colors.white)
 local g_lg_fg_bg = cpair(colors.gray, colors.lightGray)
@@ -71,6 +64,7 @@ local nav_fg_bg = bw_fg_bg
 local btn_act_fg_bg = cpair(colors.white, colors.gray)
 local dis_fg_bg = cpair(colors.lightGray,colors.white)
 
+---@class _crd_cfg_tool_ctl
 local tool_ctl = {
     nic = nil,              ---@type nic
     net_listen = false,
@@ -84,8 +78,12 @@ local tool_ctl = {
     has_config = false,
     viewing_config = false,
     importing_legacy = false,
+    jumped_to_color = false,
 
     view_cfg = nil,         ---@type graphics_element
+    color_cfg = nil,        ---@type graphics_element
+    color_next = nil,       ---@type graphics_element
+    color_apply = nil,      ---@type graphics_element
     settings_apply = nil,   ---@type graphics_element
 
     gen_summary = nil,      ---@type function
@@ -119,6 +117,7 @@ local tmp_cfg = {
     UnitCount = 1,
     SpeakerVolume = 1.0,
     Time24Hour = true,
+    TempScale = 1,
     DisableFlowView = false,
     MainDisplay = nil,  ---@type string
     FlowDisplay = nil,  ---@type string
@@ -133,6 +132,9 @@ local tmp_cfg = {
     LogMode = 0,
     LogPath = "",
     LogDebug = false,
+    MainTheme = 1,
+    FrontPanelTheme = 1,
+    ColorMode = 1
 }
 
 ---@class crd_config
@@ -148,6 +150,7 @@ local fields = {
     { "UnitDisplays", "Unit Monitors", {} },
     { "SpeakerVolume", "Speaker Volume", 1.0 },
     { "Time24Hour", "Use 24-hour Time Format", true },
+    { "TempScale", "Temperature Scale", 1 },
     { "DisableFlowView", "Disable Flow Monitor (legacy, discouraged)", false },
     { "SVR_Channel", "SVR Channel", 16240 },
     { "CRD_Channel", "CRD Channel", 16243 },
@@ -158,7 +161,10 @@ local fields = {
     { "AuthKey", "Facility Auth Key" , ""},
     { "LogMode", "Log Mode", log.MODE.APPEND },
     { "LogPath", "Log Path", "/log.txt" },
-    { "LogDebug","Log Debug Messages", false }
+    { "LogDebug", "Log Debug Messages", false },
+    { "MainTheme", "Main UI Theme", themes.UI_THEME.SMOOTH_STONE },
+    { "FrontPanelTheme", "Front Panel Theme", themes.FP_THEME.SANDSTONE },
+    { "ColorMode", "Color Mode", themes.COLOR_MODE.STANDARD }
 }
 
 -- check if a value is an integer within a range (inclusive)
@@ -309,10 +315,11 @@ local function config_view(display)
     local spkr_cfg = Div{parent=root_pane_div,x=1,y=1}
     local crd_cfg = Div{parent=root_pane_div,x=1,y=1}
     local log_cfg = Div{parent=root_pane_div,x=1,y=1}
+    local clr_cfg = Div{parent=root_pane_div,x=1,y=1}
     local summary = Div{parent=root_pane_div,x=1,y=1}
     local changelog = Div{parent=root_pane_div,x=1,y=1}
 
-    local main_pane = MultiPane{parent=root_pane_div,x=1,y=1,panes={main_page,net_cfg,fac_cfg,mon_cfg,spkr_cfg,crd_cfg,log_cfg,summary,changelog}}
+    local main_pane = MultiPane{parent=root_pane_div,x=1,y=1,panes={main_page,net_cfg,fac_cfg,mon_cfg,spkr_cfg,crd_cfg,log_cfg,clr_cfg,summary,changelog}}
 
     -- Main Page
 
@@ -333,7 +340,7 @@ local function config_view(display)
         tool_ctl.viewing_config = true
         tool_ctl.gen_summary(settings_cfg)
         tool_ctl.settings_apply.hide(true)
-        main_pane.set_value(8)
+        main_pane.set_value(9)
     end
 
     if fs.exists("/coordinator/config.lua") then
@@ -344,10 +351,21 @@ local function config_view(display)
     PushButton{parent=main_page,x=2,y=y_start,min_width=18,text="Configure System",callback=function()main_pane.set_value(2)end,fg_bg=cpair(colors.black,colors.blue),active_fg_bg=btn_act_fg_bg}
     tool_ctl.view_cfg = PushButton{parent=main_page,x=2,y=y_start+2,min_width=20,text="View Configuration",callback=view_config,fg_bg=cpair(colors.black,colors.blue),active_fg_bg=btn_act_fg_bg,dis_fg_bg=dis_fg_bg}
 
-    if not tool_ctl.has_config then tool_ctl.view_cfg.disable() end
+    local function jump_color()
+        tool_ctl.jumped_to_color = true
+        tool_ctl.color_next.hide(true)
+        tool_ctl.color_apply.show()
+        main_pane.set_value(8)
+    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=39,y=17,min_width=12,text="Change Log",callback=function()main_pane.set_value(9)end,fg_bg=nav_fg_bg,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)}
+    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}
+
+    if not tool_ctl.has_config then
+        tool_ctl.view_cfg.disable()
+        tool_ctl.color_cfg.disable()
+    end
 
     --#region Network
 
@@ -465,7 +483,7 @@ local function config_view(display)
             key_err.hide(true)
 
             -- init mac for supervisor connection
-            if string.len(v) >= 8 then network.init_mac(tmp_cfg.AuthKey) end
+            if string.len(v) >= 8 then network.init_mac(tmp_cfg.AuthKey) else network.deinit_mac() end
 
             main_pane.set_value(3)
 
@@ -693,7 +711,7 @@ local function config_view(display)
         mon_pane.set_value(1)
     end
 
-    PushButton{parent=mon_c_4,x=1,y=14,text="\x1b Back",callback=back_from_legacy,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    PushButton{parent=mon_c_4,x=44,y=14,min_width=6,text="Done",callback=back_from_legacy,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
 
     --#endregion
 
@@ -730,8 +748,6 @@ local function config_view(display)
 
     local crd_c_1 = Div{parent=crd_cfg,x=2,y=4,width=49}
 
-    local crd_pane = MultiPane{parent=crd_cfg,x=1,y=4,panes={crd_c_1}}
-
     TextBox{parent=crd_cfg,x=1,y=2,height=1,text=" Coordinator UI Configuration",fg_bg=cpair(colors.black,colors.lime)}
 
     TextBox{parent=crd_c_1,x=1,y=1,height=3,text="Configure the UI interface options below if you wish to customize formats."}
@@ -739,8 +755,12 @@ local function config_view(display)
     TextBox{parent=crd_c_1,x=1,y=4,height=1,text="Clock Time Format"}
     local clock_fmt = RadioButton{parent=crd_c_1,x=1,y=5,default=util.trinary(ini_cfg.Time24Hour,1,2),options={"24-Hour","12-Hour"},callback=function()end,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.lime}
 
+    TextBox{parent=crd_c_1,x=1,y=8,height=1,text="Temperature Scale"}
+    local temp_scale = RadioButton{parent=crd_c_1,x=1,y=9,default=ini_cfg.TempScale,options={"Kelvin","Celsius","Fahrenheit","Rankine"},callback=function()end,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.lime}
+
     local function submit_ui_opts()
         tmp_cfg.Time24Hour = clock_fmt.get_value() == 1
+        tmp_cfg.TempScale = temp_scale.get_value()
         main_pane.set_value(7)
     end
 
@@ -774,10 +794,8 @@ local function config_view(display)
             tmp_cfg.LogMode = mode.get_value() - 1
             tmp_cfg.LogPath = path.get_value()
             tmp_cfg.LogDebug = en_dbg.get_value()
-            tool_ctl.gen_summary(tmp_cfg)
+            tool_ctl.color_apply.hide(true)
-            tool_ctl.viewing_config = false
+            tool_ctl.color_next.show()
-            tool_ctl.importing_legacy = false
-            tool_ctl.settings_apply.show()
             main_pane.set_value(8)
         else path_err.show() end
     end
@@ -787,6 +805,121 @@ local function config_view(display)
 
     --#endregion
 
+    --#region Color Options
+
+    local clr_c_1 = Div{parent=clr_cfg,x=2,y=4,width=49}
+    local clr_c_2 = Div{parent=clr_cfg,x=2,y=4,width=49}
+    local clr_c_3 = Div{parent=clr_cfg,x=2,y=4,width=49}
+    local clr_c_4 = Div{parent=clr_cfg,x=2,y=4,width=49}
+
+    local clr_pane = MultiPane{parent=clr_cfg,x=1,y=4,panes={clr_c_1,clr_c_2,clr_c_3,clr_c_4}}
+
+    TextBox{parent=clr_cfg,x=1,y=2,height=1,text=" Color Configuration",fg_bg=cpair(colors.black,colors.magenta)}
+
+    TextBox{parent=clr_c_1,x=1,y=1,height=2,text="Here you can select the color themes for the different UI displays."}
+    TextBox{parent=clr_c_1,x=1,y=4,height=2,text="Click 'Accessibility' below to access colorblind assistive options.",fg_bg=g_lg_fg_bg}
+
+    TextBox{parent=clr_c_1,x=1,y=7,height=1,text="Main UI Theme"}
+    local main_theme = RadioButton{parent=clr_c_1,x=1,y=8,default=ini_cfg.MainTheme,options=themes.UI_THEME_NAMES,callback=function()end,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.magenta}
+
+    TextBox{parent=clr_c_1,x=18,y=7,height=1,text="Front Panel Theme"}
+    local fp_theme = RadioButton{parent=clr_c_1,x=18,y=8,default=ini_cfg.FrontPanelTheme,options=themes.FP_THEME_NAMES,callback=function()end,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.magenta}
+
+    TextBox{parent=clr_c_2,x=1,y=1,height=6,text="This system uses color heavily to distinguish ok and not, with some indicators using many colors. By selecting a mode below, indicators will change as shown. For non-standard modes, indicators with more than two colors will be split up."}
+
+    TextBox{parent=clr_c_2,x=21,y=7,height=1,text="Preview"}
+    local _ = IndLight{parent=clr_c_2,x=21,y=8,label="Good",colors=cpair(colors.black,colors.green)}
+    _ = IndLight{parent=clr_c_2,x=21,y=9,label="Warning",colors=cpair(colors.black,colors.yellow)}
+    _ = IndLight{parent=clr_c_2,x=21,y=10,label="Bad",colors=cpair(colors.black,colors.red)}
+    local b_off = IndLight{parent=clr_c_2,x=21,y=11,label="Off",colors=cpair(colors.black,colors.black),hidden=true}
+    local g_off = IndLight{parent=clr_c_2,x=21,y=11,label="Off",colors=cpair(colors.gray,colors.gray),hidden=true}
+
+    local function recolor(value)
+        local c = themes.smooth_stone.color_modes[value]
+
+        if value == themes.COLOR_MODE.STANDARD or value == themes.COLOR_MODE.BLUE_IND then
+            b_off.hide()
+            g_off.show()
+        else
+            g_off.hide()
+            b_off.show()
+        end
+
+        if #c == 0 then
+            for i = 1, #style.colors do term.setPaletteColor(style.colors[i].c, style.colors[i].hex) end
+        else
+            term.setPaletteColor(colors.green, c[1].hex)
+            term.setPaletteColor(colors.yellow, c[2].hex)
+            term.setPaletteColor(colors.red, c[3].hex)
+        end
+    end
+
+    TextBox{parent=clr_c_2,x=1,y=7,height=1,width=10,text="Color Mode"}
+    local c_mode = RadioButton{parent=clr_c_2,x=1,y=8,default=ini_cfg.ColorMode,options=themes.COLOR_MODE_NAMES,callback=recolor,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.magenta}
+
+    TextBox{parent=clr_c_2,x=21,y=13,height=2,width=18,text="Note: exact color varies by theme.",fg_bg=g_lg_fg_bg}
+
+    PushButton{parent=clr_c_2,x=44,y=14,min_width=6,text="Done",callback=function()clr_pane.set_value(1)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+
+    local function back_from_colors()
+        main_pane.set_value(util.trinary(tool_ctl.jumped_to_color, 1, 7))
+        tool_ctl.jumped_to_color = false
+        recolor(1)
+    end
+
+    local function show_access()
+        clr_pane.set_value(2)
+        recolor(c_mode.get_value())
+    end
+
+    local function submit_colors()
+        tmp_cfg.MainTheme = main_theme.get_value()
+        tmp_cfg.FrontPanelTheme = fp_theme.get_value()
+        tmp_cfg.ColorMode = c_mode.get_value()
+
+        if tool_ctl.jumped_to_color then
+            settings.set("MainTheme", tmp_cfg.MainTheme)
+            settings.set("FrontPanelTheme", tmp_cfg.FrontPanelTheme)
+            settings.set("ColorMode", tmp_cfg.ColorMode)
+
+            if settings.save("/coordinator.settings") then
+                load_settings(settings_cfg, true)
+                load_settings(ini_cfg)
+                clr_pane.set_value(3)
+            else
+                clr_pane.set_value(4)
+            end
+        else
+            tool_ctl.gen_summary(tmp_cfg)
+            tool_ctl.viewing_config = false
+            tool_ctl.importing_legacy = false
+            tool_ctl.settings_apply.show()
+            main_pane.set_value(9)
+        end
+    end
+
+    PushButton{parent=clr_c_1,x=1,y=14,text="\x1b Back",callback=back_from_colors,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    PushButton{parent=clr_c_1,x=8,y=14,min_width=15,text="Accessibility",callback=show_access,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    tool_ctl.color_next = PushButton{parent=clr_c_1,x=44,y=14,text="Next \x1a",callback=submit_colors,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    tool_ctl.color_apply = PushButton{parent=clr_c_1,x=43,y=14,min_width=7,text="Apply",callback=submit_colors,fg_bg=cpair(colors.black,colors.green),active_fg_bg=btn_act_fg_bg}
+
+    tool_ctl.color_apply.hide(true)
+
+    local function c_go_home()
+        main_pane.set_value(1)
+        clr_pane.set_value(1)
+    end
+
+    TextBox{parent=clr_c_3,x=1,y=1,height=1,text="Settings saved!"}
+    PushButton{parent=clr_c_3,x=1,y=14,min_width=6,text="Exit",callback=exit,fg_bg=cpair(colors.black,colors.red),active_fg_bg=cpair(colors.white,colors.gray)}
+    PushButton{parent=clr_c_3,x=44,y=14,min_width=6,text="Home",callback=c_go_home,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+
+    TextBox{parent=clr_c_4,x=1,y=1,height=5,text="Failed to save the settings file.\n\nThere may not be enough space for the modification or server file permissions may be denying writes."}
+    PushButton{parent=clr_c_4,x=1,y=14,min_width=6,text="Exit",callback=exit,fg_bg=cpair(colors.black,colors.red),active_fg_bg=cpair(colors.white,colors.gray)}
+    PushButton{parent=clr_c_4,x=44,y=14,min_width=6,text="Home",callback=c_go_home,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+
+    --#endregion
+
     --#region Summary and Saving
 
     local sum_c_1 = Div{parent=summary,x=2,y=4,width=49}
@@ -807,7 +940,7 @@ local function config_view(display)
             tool_ctl.importing_legacy = false
             tool_ctl.settings_apply.show()
         else
-            main_pane.set_value(7)
+            main_pane.set_value(8)
         end
     end
 
@@ -838,12 +971,16 @@ local function config_view(display)
             try_set(mode, ini_cfg.LogMode)
             try_set(path, ini_cfg.LogPath)
             try_set(en_dbg, ini_cfg.LogDebug)
+            try_set(main_theme, ini_cfg.MainTheme)
+            try_set(fp_theme, ini_cfg.FrontPanelTheme)
+            try_set(c_mode, ini_cfg.ColorMode)
 
             preset_monitor_fields()
 
             tool_ctl.gen_mon_list()
 
             tool_ctl.view_cfg.enable()
+            tool_ctl.color_cfg.enable()
 
             if tool_ctl.importing_legacy then
                 tool_ctl.importing_legacy = false
@@ -867,7 +1004,7 @@ local function config_view(display)
         net_pane.set_value(1)
         fac_pane.set_value(1)
         mon_pane.set_value(1)
-        crd_pane.set_value(1)
+        clr_pane.set_value(1)
         sum_pane.set_value(1)
     end
 
@@ -964,7 +1101,7 @@ local function config_view(display)
 
         tool_ctl.gen_summary(tmp_cfg)
         sum_pane.set_value(1)
-        main_pane.set_value(8)
+        main_pane.set_value(9)
         tool_ctl.importing_legacy = true
     end
 
@@ -1109,6 +1246,10 @@ local function config_view(display)
     function tool_ctl.gen_mon_list()
         mon_list.remove_all()
 
+        local missing = { main = tmp_cfg.MainDisplay ~= nil, flow = tmp_cfg.FlowDisplay ~= nil, unit = {} }
+        for i = 1, tmp_cfg.UnitCount do missing.unit[i] = tmp_cfg.UnitDisplays[i] ~= nil end
+
+        -- list connected monitors
         local monitors = ppm.get_monitor_list()
         for iface, device in pairs(monitors) do
             local dev = device.dev
@@ -1128,11 +1269,14 @@ local function config_view(display)
 
             if tmp_cfg.MainDisplay == iface then
                 assignment = "Main"
+                missing.main = false
             elseif tmp_cfg.FlowDisplay == iface then
                 assignment = "Flow"
+                missing.flow = false
             else
                 for i = 1, tmp_cfg.UnitCount do
                     if tmp_cfg.UnitDisplays[i] == iface then
+                        missing.unit[i] = false
                         assignment = "Unit " .. i
                         break
                     end
@@ -1157,6 +1301,31 @@ local function config_view(display)
 
             if assignment == "Unused" then unset.disable() end
         end
+
+        local dc_list = {} -- disconnected monitor list
+
+        if missing.main then table.insert(dc_list, { "Main", tmp_cfg.MainDisplay }) end
+        if missing.flow then table.insert(dc_list, { "Flow", tmp_cfg.FlowDisplay }) end
+        for i = 1, tmp_cfg.UnitCount do
+            if missing.unit[i] then table.insert(dc_list, { "Unit " .. i, tmp_cfg.UnitDisplays[i] }) end
+        end
+
+        -- add monitors that are assigned but not connected
+        for i = 1, #dc_list do
+            local line = Div{parent=mon_list,x=1,y=1,height=1}
+
+            TextBox{parent=line,x=1,y=1,width=6,height=1,text=dc_list[i][1],fg_bg=cpair(colors.blue,colors.white)}
+            TextBox{parent=line,x=8,y=1,height=1,text="disconnected",fg_bg=cpair(colors.red,colors.white)}
+
+            local function unset_mon()
+                purge_assignments(dc_list[i][2])
+                tool_ctl.gen_mon_list()
+            end
+
+            TextBox{parent=line,x=33,y=1,width=4,height=1,text="?x?",fg_bg=cpair(colors.black,colors.white)}
+            PushButton{parent=line,x=37,y=1,min_width=5,height=1,text="SET",callback=function()end,dis_fg_bg=cpair(colors.black,colors.gray)}.disable()
+            PushButton{parent=line,x=42,y=1,min_width=7,height=1,text="UNSET",callback=unset_mon,fg_bg=cpair(colors.black,colors.red),active_fg_bg=btn_act_fg_bg,dis_fg_bg=cpair(colors.black,colors.gray)}
+        end
     end
 
     -- expose the auth key on the summary page
@@ -1186,6 +1355,14 @@ local function config_view(display)
 
             if f[1] == "AuthKey" then val = string.rep("*", string.len(val))
             elseif f[1] == "LogMode" then val = util.trinary(raw == log.MODE.APPEND, "append", "replace")
+            elseif f[1] == "TempScale" then
+                if raw == 1 then val = "Kelvin" elseif raw == 2 then val = "Celsius" elseif raw == 3 then val = "Fahrenheit" elseif raw == 4 then val = "Rankine" end
+            elseif f[1] == "MainTheme" then
+                val = util.strval(themes.ui_theme_name(raw))
+            elseif f[1] == "FrontPanelTheme" then
+                val = util.strval(themes.fp_theme_name(raw))
+            elseif f[1] == "ColorMode" then
+                val = util.strval(themes.color_mode_name(raw))
             elseif f[1] == "UnitDisplays" and type(cfg.UnitDisplays) == "table" then
                 val = ""
                 for idx = 1, #cfg.UnitDisplays do

coordinator/coordinator.lua

@@ -4,6 +4,8 @@ local ppm         = require("scada-common.ppm")
 local util        = require("scada-common.util")
 local types       = require("scada-common.types")
 
+local themes      = require("graphics.themes")
+
 local iocontrol   = require("coordinator.iocontrol")
 local process     = require("coordinator.process")
 
@@ -35,6 +37,7 @@ function coordinator.load_config()
     config.UnitCount = settings.get("UnitCount")
     config.SpeakerVolume = settings.get("SpeakerVolume")
     config.Time24Hour = settings.get("Time24Hour")
+    config.TempScale = settings.get("TempScale")
 
     config.DisableFlowView = settings.get("DisableFlowView")
     config.MainDisplay = settings.get("MainDisplay")
@@ -53,11 +56,17 @@ function coordinator.load_config()
     config.LogPath = settings.get("LogPath")
     config.LogDebug = settings.get("LogDebug")
 
+    config.MainTheme = settings.get("MainTheme")
+    config.FrontPanelTheme = settings.get("FrontPanelTheme")
+    config.ColorMode = settings.get("ColorMode")
+
     local cfv = util.new_validator()
 
     cfv.assert_type_int(config.UnitCount)
     cfv.assert_range(config.UnitCount, 1, 4)
     cfv.assert_type_bool(config.Time24Hour)
+    cfv.assert_type_int(config.TempScale)
+    cfv.assert_range(config.TempScale, 1, 4)
 
     cfv.assert_type_bool(config.DisableFlowView)
     cfv.assert_type_table(config.UnitDisplays)
@@ -88,13 +97,20 @@ function coordinator.load_config()
     cfv.assert_type_str(config.LogPath)
     cfv.assert_type_bool(config.LogDebug)
 
+    cfv.assert_type_int(config.MainTheme)
+    cfv.assert_range(config.MainTheme, 1, 2)
+    cfv.assert_type_int(config.FrontPanelTheme)
+    cfv.assert_range(config.FrontPanelTheme, 1, 2)
+    cfv.assert_type_int(config.ColorMode)
+    cfv.assert_range(config.ColorMode, 1, themes.COLOR_MODE.NUM_MODES)
+
     -- Monitor Setup
 
     ---@class monitors_struct
     local monitors = {
-        primary = nil,      ---@type table|nil
+        main = nil,     ---@type table|nil
-        primary_name = "",
+        main_name = "",
-        flow = nil,         ---@type table|nil
+        flow = nil,     ---@type table|nil
         flow_name = "",
         unit_displays = {},
         unit_name_map = {}
@@ -118,11 +134,11 @@ function coordinator.load_config()
                 return 2, "Main monitor is not connected."
             end
 
-            monitors.primary = ppm.get_periph(config.MainDisplay)
+            monitors.main = ppm.get_periph(config.MainDisplay)
-            monitors.primary_name = config.MainDisplay
+            monitors.main_name = config.MainDisplay
 
-            monitors.primary.setTextScale(0.5)
+            monitors.main.setTextScale(0.5)
-            w, _ = ppm.monitor_block_size(monitors.primary.getSize())
+            w, _ = ppm.monitor_block_size(monitors.main.getSize())
             if w ~= 8 then
                 return 2, util.c("Main monitor width is incorrect (was ", w, ", must be 8).")
             end
@@ -299,7 +315,7 @@ function coordinator.comms(version, nic, sv_watchdog)
 
         if not self.sv_linked then
             if self.est_tick_waiting == nil then
-                self.est_start = util.time_s()
+                self.est_start = os.clock()
                 self.est_last = self.est_start
 
                 self.est_tick_waiting, self.est_task_done =
@@ -307,10 +323,10 @@ function coordinator.comms(version, nic, sv_watchdog)
 
                 _send_establish()
             else
-                self.est_tick_waiting(math.max(0, LINK_TIMEOUT - (util.time_s() - self.est_start)))
+                self.est_tick_waiting(math.max(0, LINK_TIMEOUT - (os.clock() - self.est_start)))
             end
 
-            if abort or (util.time_s() - self.est_start) >= LINK_TIMEOUT then
+            if abort or (os.clock() - self.est_start) >= LINK_TIMEOUT then
                 self.est_task_done(false)
 
                 if abort then
@@ -333,9 +349,9 @@ function coordinator.comms(version, nic, sv_watchdog)
             elseif self.sv_config_err then
                 coordinator.log_comms("supervisor unit count does not match coordinator unit count, check configs")
                 ok = false
-            elseif (util.time_s() - self.est_last) > 1.0 then
+            elseif (os.clock() - self.est_last) > 1.0 then
                 _send_establish()
-                self.est_last = util.time_s()
+                self.est_last = os.clock()
             end
         elseif self.est_tick_waiting ~= nil then
             self.est_task_done(true)
@@ -676,7 +692,7 @@ function coordinator.comms(version, nic, sv_watchdog)
 
                                     if conf.num_units == config.UnitCount then
                                         -- init io controller
-                                        iocontrol.init(conf, public)
+                                        iocontrol.init(conf, public, config.TempScale)
 
                                         self.sv_addr = src_addr
                                         self.sv_linked = true

coordinator/iocontrol.lua

@@ -47,7 +47,23 @@ end
 -- initialize the coordinator IO controller
 ---@param conf facility_conf configuration
 ---@param comms coord_comms comms reference
-function iocontrol.init(conf, comms)
+---@param temp_scale integer temperature unit (1 = K, 2 = C, 3 = F, 4 = R)
+function iocontrol.init(conf, comms, temp_scale)
+    -- temperature unit label and conversion function (from Kelvin)
+    if temp_scale == 2 then
+        io.temp_label = "\xb0C"
+        io.temp_convert = function (t) return t - 273.15 end
+    elseif temp_scale == 3 then
+        io.temp_label = "\xb0F"
+        io.temp_convert = function (t) return (1.8 * (t - 273.15)) + 32 end
+    elseif temp_scale == 4 then
+        io.temp_label = "\xb0R"
+        io.temp_convert = function (t) return 1.8 * t end
+    else
+        io.temp_label = "K"
+        io.temp_convert = function (t) return t end
+    end
+
     -- facility data structure
     ---@class ioctl_facility
     io.facility = {
@@ -219,7 +235,10 @@ function iocontrol.init(conf, comms)
             control_state = false,
             burn_rate_cmd = 0.0,
             radiation = types.new_zero_radiation_reading(),
-            sna_prod_rate = 0.0,
+
+            sna_peak_rate = 0.0,
+            sna_max_rate = 0.0,
+            sna_out_rate = 0.0,
 
             waste_mode = types.WASTE_MODE.MANUAL_PLUTONIUM,
             waste_product = types.WASTE_PRODUCT.PLUTONIUM,
@@ -384,7 +403,7 @@ function iocontrol.fp_pkt_rtt(session_id, rtt)
     elseif rtt > WARN_RTT then
         io.fp.ps.publish("pkt_" .. session_id .. "_rtt_color", colors.yellow_hc)
     else
-        io.fp.ps.publish("pkt_" .. session_id .. "_rtt_color", colors.green)
+        io.fp.ps.publish("pkt_" .. session_id .. "_rtt_color", colors.green_hc)
     end
 end
 
@@ -923,7 +942,7 @@ function iocontrol.update_unit_statuses(statuses)
                         local boil_sum = 0
 
                         for id = 1, #unit.boiler_ps_tbl do
-                            if rtu_statuses.boilers[i] == nil then
+                            if rtu_statuses.boilers[id] == nil then
                                 -- disconnected
                                 unit.boiler_ps_tbl[id].publish("computed_status", 1)
                             end
@@ -966,7 +985,7 @@ function iocontrol.update_unit_statuses(statuses)
                         local flow_sum = 0
 
                         for id = 1, #unit.turbine_ps_tbl do
-                            if rtu_statuses.turbines[i] == nil then
+                            if rtu_statuses.turbines[id] == nil then
                                 -- disconnected
                                 unit.turbine_ps_tbl[id].publish("computed_status", 1)
                             end
@@ -1009,7 +1028,7 @@ function iocontrol.update_unit_statuses(statuses)
                     -- dynamic tank statuses
                     if type(rtu_statuses.tanks) == "table" then
                         for id = 1, #unit.tank_ps_tbl do
-                            if rtu_statuses.tanks[i] == nil then
+                            if rtu_statuses.tanks[id] == nil then
                                 -- disconnected
                                 unit.tank_ps_tbl[id].publish("computed_status", 1)
                             end
@@ -1048,12 +1067,14 @@ function iocontrol.update_unit_statuses(statuses)
                     -- solar neutron activator status info
                     if type(rtu_statuses.sna) == "table" then
                         unit.num_snas      = rtu_statuses.sna[1] ---@type integer
-                        unit.sna_prod_rate = rtu_statuses.sna[2] ---@type number
+                        unit.sna_peak_rate = rtu_statuses.sna[2] ---@type number
-                        unit.sna_peak_rate = rtu_statuses.sna[3] ---@type number
+                        unit.sna_max_rate  = rtu_statuses.sna[3] ---@type number
+                        unit.sna_out_rate  = rtu_statuses.sna[4] ---@type number
 
                         unit.unit_ps.publish("sna_count", unit.num_snas)
-                        unit.unit_ps.publish("sna_prod_rate", unit.sna_prod_rate)
                         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)
 
                         sna_count_sum = sna_count_sum + unit.num_snas
                     else
@@ -1201,7 +1222,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 = util.trinary(not is_pu, math.min(waste_rate, unit.sna_prod_rate), 0.0)
+                local u_po_rate = unit.sna_out_rate
 
                 unit.unit_ps.publish("pu_rate", u_pu_rate)
                 unit.unit_ps.publish("po_rate", u_po_rate)
@@ -1209,14 +1230,15 @@ function iocontrol.update_unit_statuses(statuses)
                 unit.unit_ps.publish("sna_in", util.trinary(is_pu, 0, burn_rate))
 
                 if unit.waste_product == types.WASTE_PRODUCT.POLONIUM then
+                    u_spent_rate = u_po_rate
                     unit.unit_ps.publish("po_pl_rate", u_po_rate)
                     unit.unit_ps.publish("po_am_rate", 0)
                     po_pl_rate = po_pl_rate + u_po_rate
                 elseif unit.waste_product == types.WASTE_PRODUCT.ANTI_MATTER then
+                    u_spent_rate = 0
                     unit.unit_ps.publish("po_pl_rate", 0)
                     unit.unit_ps.publish("po_am_rate", u_po_rate)
                     po_am_rate = po_am_rate + u_po_rate
-                    u_spent_rate = 0
                 else
                     unit.unit_ps.publish("po_pl_rate", 0)
                     unit.unit_ps.publish("po_am_rate", 0)

coordinator/renderer.lua

@@ -24,6 +24,7 @@ local renderer = {}
 
 -- render engine
 local engine = {
+    color_mode = 1,         ---@type COLOR_MODE
     monitors = nil,         ---@type monitors_struct|nil
     dmesg_window = nil,     ---@type table|nil
     ui_ready = false,
@@ -47,15 +48,34 @@ local function _init_display(monitor)
     monitor.setCursorPos(1, 1)
 
     -- set overridden colors
-    for i = 1, #style.colors do
+    for i = 1, #style.theme.colors do
-        monitor.setPaletteColor(style.colors[i].c, style.colors[i].hex)
+        monitor.setPaletteColor(style.theme.colors[i].c, style.theme.colors[i].hex)
+    end
+
+    -- apply color mode
+    local c_mode_overrides = style.theme.color_modes[engine.color_mode]
+    for i = 1, #c_mode_overrides do
+        monitor.setPaletteColor(c_mode_overrides[i].c, c_mode_overrides[i].hex)
     end
 end
 
--- disable the flow view
+-- print out that the monitor is too small
----@param disable boolean
+---@param monitor table monitor
-function renderer.legacy_disable_flow_view(disable)
+local function _print_too_small(monitor)
-    engine.disable_flow_view = disable
+    monitor.setCursorPos(1, 1)
+    monitor.setBackgroundColor(colors.black)
+    monitor.setTextColor(colors.red)
+    monitor.clear()
+    monitor.write("monitor too small")
+end
+
+-- apply renderer configurations
+---@param config crd_config
+function renderer.configure(config)
+    style.set_themes(config.MainTheme, config.FrontPanelTheme, config.ColorMode)
+
+    engine.color_mode = config.ColorMode
+    engine.disable_flow_view = config.DisableFlowView
 end
 
 -- link to the monitor peripherals
@@ -64,15 +84,15 @@ function renderer.set_displays(monitors)
     engine.monitors = monitors
 
     -- report to front panel as connected
-    iocontrol.fp_monitor_state("main", engine.monitors.primary ~= nil)
+    iocontrol.fp_monitor_state("main", engine.monitors.main ~= nil)
     iocontrol.fp_monitor_state("flow", engine.monitors.flow ~= nil)
     for i = 1, #engine.monitors.unit_displays do iocontrol.fp_monitor_state(i, true) end
 end
 
 -- init all displays in use by the renderer
 function renderer.init_displays()
-    -- init primary and flow monitors
+    -- init main and flow monitors
-    _init_display(engine.monitors.primary)
+    _init_display(engine.monitors.main)
     if not engine.disable_flow_view then _init_display(engine.monitors.flow) end
 
     -- init unit displays
@@ -87,15 +107,21 @@ function renderer.init_displays()
     term.setCursorPos(1, 1)
 
     -- set overridden colors
-    for i = 1, #style.fp.colors do
+    for i = 1, #style.fp_theme.colors do
-        term.setPaletteColor(style.fp.colors[i].c, style.fp.colors[i].hex)
+        term.setPaletteColor(style.fp_theme.colors[i].c, style.fp_theme.colors[i].hex)
+    end
+
+    -- apply color mode
+    local c_mode_overrides = style.fp_theme.color_modes[engine.color_mode]
+    for i = 1, #c_mode_overrides do
+        term.setPaletteColor(c_mode_overrides[i].c, c_mode_overrides[i].hex)
     end
 end
 
 -- initialize the dmesg output window
 function renderer.init_dmesg()
-    local disp_x, disp_y = engine.monitors.primary.getSize()
+    local disp_w, disp_h = engine.monitors.main.getSize()
-    engine.dmesg_window = window.create(engine.monitors.primary, 1, 1, disp_x, disp_y)
+    engine.dmesg_window = window.create(engine.monitors.main, 1, 1, disp_w, disp_h)
     log.direct_dmesg(engine.dmesg_window)
 end
 
@@ -142,9 +168,9 @@ function renderer.close_fp()
         engine.fp_ready = false
 
         -- restore colors
-        for i = 1, #style.colors do
+        for i = 1, #style.fp_theme.colors do
-            local r, g, b = term.nativePaletteColor(style.colors[i].c)
+            local r, g, b = term.nativePaletteColor(style.fp_theme.colors[i].c)
-            term.setPaletteColor(style.colors[i].c, r, g, b)
+            term.setPaletteColor(style.fp_theme.colors[i].c, r, g, b)
         end
 
         -- reset terminal
@@ -166,8 +192,8 @@ function renderer.try_start_ui()
 
         status, msg = pcall(function ()
             -- show main view on main monitor
-            if engine.monitors.primary ~= nil then
+            if engine.monitors.main ~= nil then
-                engine.ui.main_display = DisplayBox{window=engine.monitors.primary,fg_bg=style.root}
+                engine.ui.main_display = DisplayBox{window=engine.monitors.main,fg_bg=style.root}
                 main_view(engine.ui.main_display)
             end
 
@@ -242,43 +268,43 @@ function renderer.ui_ready() return engine.ui_ready end
 function renderer.handle_disconnect(device)
     local is_used = false
 
-    if engine.monitors ~= nil then
+    if not engine.monitors then return false end
-        if engine.monitors.primary == device then
-            if engine.ui.main_display ~= nil then
-                -- delete element tree and clear root UI elements
-                engine.ui.main_display.delete()
-            end
 
-            is_used = true
+    if engine.monitors.main == device then
-            engine.monitors.primary = nil
+        if engine.ui.main_display ~= nil then
-            engine.ui.main_display = nil
+            -- delete element tree and clear root UI elements
+            engine.ui.main_display.delete()
+        end
 
-            iocontrol.fp_monitor_state("main", false)
+        is_used = true
-        elseif engine.monitors.flow == device then
+        engine.monitors.main = nil
-            if engine.ui.flow_display ~= nil then
+        engine.ui.main_display = nil
-                -- delete element tree and clear root UI elements
-                engine.ui.flow_display.delete()
-            end
 
-            is_used = true
+        iocontrol.fp_monitor_state("main", false)
-            engine.monitors.flow = nil
+    elseif engine.monitors.flow == device then
-            engine.ui.flow_display = nil
+        if engine.ui.flow_display ~= nil then
+            -- delete element tree and clear root UI elements
+            engine.ui.flow_display.delete()
+        end
 
-            iocontrol.fp_monitor_state("flow", false)
+        is_used = true
-        else
+        engine.monitors.flow = nil
-            for idx, monitor in pairs(engine.monitors.unit_displays) do
+        engine.ui.flow_display = nil
-                if monitor == device then
-                    if engine.ui.unit_displays[idx] ~= nil then
-                        engine.ui.unit_displays[idx].delete()
-                    end
 
-                    is_used = true
+        iocontrol.fp_monitor_state("flow", false)
-                    engine.monitors.unit_displays[idx] = nil
+    else
-                    engine.ui.unit_displays[idx] = nil
+        for idx, monitor in pairs(engine.monitors.unit_displays) do
-
+            if monitor == device then
-                    iocontrol.fp_monitor_state(idx, false)
+                if engine.ui.unit_displays[idx] ~= nil then
-                    break
+                    engine.ui.unit_displays[idx].delete()
                 end
+
+                is_used = true
+                engine.monitors.unit_displays[idx] = nil
+                engine.ui.unit_displays[idx] = nil
+
+                iocontrol.fp_monitor_state(idx, false)
+                break
             end
         end
     end
@@ -293,52 +319,29 @@ end
 function renderer.handle_reconnect(name, device)
     local is_used = false
 
-    if engine.monitors ~= nil then
+    if not engine.monitors then return false end
-        if engine.monitors.primary_name == name then
-            is_used = true
-            _init_display(device)
-            engine.monitors.primary = device
 
-            local disp_x, disp_y = engine.monitors.primary.getSize()
+    -- note: handle_resize is a more adaptive way of re-initializing a connected monitor
-            engine.dmesg_window.reposition(1, 1, disp_x, disp_y, engine.monitors.primary)
+    --       since it can handle a monitor being reconnected that isn't the right size
 
-            if engine.ui_ready and (engine.ui.main_display == nil) then
+    if engine.monitors.main_name == name then
-                engine.dmesg_window.setVisible(false)
+        is_used = true
+        engine.monitors.main = device
 
-                engine.ui.main_display = DisplayBox{window=device,fg_bg=style.root}
+        renderer.handle_resize(name)
-                main_view(engine.ui.main_display)
+    elseif engine.monitors.flow_name == name then
-            else
+        is_used = true
-                engine.dmesg_window.setVisible(true)
+        engine.monitors.flow = device
-                engine.dmesg_window.redraw()
-            end
 
-            iocontrol.fp_monitor_state("main", true)
+        renderer.handle_resize(name)
-        elseif engine.monitors.flow_name == name then
+    else
-            is_used = true
+        for idx, monitor in ipairs(engine.monitors.unit_name_map) do
-            _init_display(device)
+            if monitor == name then
-            engine.monitors.flow = device
+                is_used = true
+                engine.monitors.unit_displays[idx] = device
 
-            if engine.ui_ready and (engine.ui.flow_display == nil) then
+                renderer.handle_resize(name)
-                engine.ui.flow_display = DisplayBox{window=device,fg_bg=style.root}
+                break
-                flow_view(engine.ui.flow_display)
-            end
-
-            iocontrol.fp_monitor_state("flow", true)
-        else
-            for idx, monitor in ipairs(engine.monitors.unit_name_map) do
-                if monitor == name then
-                    is_used = true
-                    _init_display(device)
-                    engine.monitors.unit_displays[idx] = device
-
-                    if engine.ui_ready and (engine.ui.unit_displays[idx] == nil) then
-                        engine.ui.unit_displays[idx] = DisplayBox{window=device,fg_bg=style.root}
-                        unit_view(engine.ui.unit_displays[idx], idx)
-                    end
-
-                    iocontrol.fp_monitor_state(idx, true)
-                    break
-                end
             end
         end
     end
@@ -346,6 +349,137 @@ function renderer.handle_reconnect(name, device)
     return is_used
 end
 
+-- handle a monitor being resized<br>
+-- returns if this monitor is assigned + if the assigned screen still fits
+---@param name string monitor name
+---@return boolean is_used, boolean is_ok
+function renderer.handle_resize(name)
+    local is_used = false
+    local is_ok = true
+    local ui = engine.ui
+
+    if not engine.monitors then return false, false end
+
+    if engine.monitors.main_name == name and engine.monitors.main then
+        local device = engine.monitors.main  ---@type table
+
+        -- this is necessary if the bottom left block was broken and on reconnect
+        _init_display(device)
+
+        is_used = true
+
+        -- resize dmesg window if needed, but don't make it thinner
+        local disp_w, disp_h = engine.monitors.main.getSize()
+        local dmsg_w, _ = engine.dmesg_window.getSize()
+        engine.dmesg_window.reposition(1, 1, math.max(disp_w, dmsg_w), disp_h, engine.monitors.main)
+
+        if ui.main_display then
+            ui.main_display.delete()
+            ui.main_display = nil
+        end
+
+        iocontrol.fp_monitor_state("main", true)
+
+        engine.dmesg_window.setVisible(not engine.ui_ready)
+
+        if engine.ui_ready then
+            local ok = pcall(function ()
+                ui.main_display = DisplayBox{window=device,fg_bg=style.root}
+                main_view(ui.main_display)
+            end)
+
+            if not ok then
+                if ui.main_display then
+                    ui.main_display.delete()
+                    ui.main_display = nil
+                end
+
+                _print_too_small(device)
+
+                iocontrol.fp_monitor_state("main", false)
+                is_ok = false
+            end
+        else engine.dmesg_window.redraw() end
+    elseif engine.monitors.flow_name == name and engine.monitors.flow then
+        local device = engine.monitors.flow ---@type table
+
+        -- this is necessary if the bottom left block was broken and on reconnect
+        _init_display(device)
+
+        is_used = true
+
+        if ui.flow_display then
+            ui.flow_display.delete()
+            ui.flow_display = nil
+        end
+
+        iocontrol.fp_monitor_state("flow", true)
+
+        if engine.ui_ready then
+            engine.dmesg_window.setVisible(false)
+
+            local ok = pcall(function ()
+                ui.flow_display = DisplayBox{window=device,fg_bg=style.root}
+                flow_view(ui.flow_display)
+            end)
+
+            if not ok then
+                if ui.flow_display then
+                    ui.flow_display.delete()
+                    ui.flow_display = nil
+                end
+
+                _print_too_small(device)
+
+                iocontrol.fp_monitor_state("flow", false)
+                is_ok = false
+            end
+        end
+    else
+        for idx, monitor in ipairs(engine.monitors.unit_name_map) do
+            local device = engine.monitors.unit_displays[idx]
+
+            if monitor == name and device then
+                -- this is necessary if the bottom left block was broken and on reconnect
+                _init_display(device)
+
+                is_used = true
+
+                if ui.unit_displays[idx] then
+                    ui.unit_displays[idx].delete()
+                    ui.unit_displays[idx] = nil
+                end
+
+                iocontrol.fp_monitor_state(idx, true)
+
+                if engine.ui_ready then
+                    engine.dmesg_window.setVisible(false)
+
+                    local ok = pcall(function ()
+                        ui.unit_displays[idx] = DisplayBox{window=device,fg_bg=style.root}
+                        unit_view(ui.unit_displays[idx], idx)
+                    end)
+
+                    if not ok then
+                        if ui.unit_displays[idx] then
+                            ui.unit_displays[idx].delete()
+                            ui.unit_displays[idx] = nil
+                        end
+
+                        _print_too_small(device)
+
+                        iocontrol.fp_monitor_state(idx, false)
+                        is_ok = false
+                    end
+                end
+
+                break
+            end
+        end
+    end
+
+    return is_used, is_ok
+end
 
 -- handle a touch event
 ---@param event mouse_interaction|nil
@@ -354,16 +488,15 @@ function renderer.handle_mouse(event)
         if engine.fp_ready and event.monitor == "terminal" then
             engine.ui.front_panel.handle_mouse(event)
         elseif engine.ui_ready then
-            if event.monitor == engine.monitors.primary_name then
+            if event.monitor == engine.monitors.main_name then
-                engine.ui.main_display.handle_mouse(event)
+                if engine.ui.main_display then engine.ui.main_display.handle_mouse(event) end
             elseif event.monitor == engine.monitors.flow_name then
-                engine.ui.flow_display.handle_mouse(event)
+                if engine.ui.flow_display then engine.ui.flow_display.handle_mouse(event) end
             else
                 for id, monitor in ipairs(engine.monitors.unit_name_map) do
-                    if event.monitor == monitor then
+                    local display = engine.ui.unit_displays[id]
-                        local layout = engine.ui.unit_displays[id]  ---@type graphics_element
+                    if event.monitor == monitor and display then
-                        layout.handle_mouse(event)
+                        if display then display.handle_mouse(event) end
-                        break
                     end
                 end
             end

coordinator/startup.lua

@@ -22,7 +22,9 @@ local sounder     = require("coordinator.sounder")
 
 local apisessions = require("coordinator.session.apisessions")
 
-local COORDINATOR_VERSION = "v1.2.2"
+local COORDINATOR_VERSION = "v1.3.5"
+
+local CHUNK_LOAD_DELAY_S = 30.0
 
 local println = util.println
 local println_ts = util.println_ts
@@ -40,15 +42,47 @@ local log_crypto = coordinator.log_crypto
 -- mount connected devices (required for monitor setup)
 ppm.mount_all()
 
+local wait_on_load = true
 local loaded, monitors = coordinator.load_config()
+
+-- if the computer just started, its chunk may have just loaded (...or the user rebooted)
+-- if monitor config failed, maybe an adjacent chunk containing all or part of a monitor has not loaded yet, so keep trying
+while wait_on_load and loaded == 2 and os.clock() < CHUNK_LOAD_DELAY_S do
+    term.clear()
+    term.setCursorPos(1, 1)
+    println("There was a monitor configuration problem at boot.\n")
+    println("Startup will keep trying every 2s in case of chunk load delays.\n")
+    println(util.sprintf("The configurator will be started in %ds if all attempts fail.\n", math.max(0, CHUNK_LOAD_DELAY_S - os.clock())))
+    println("(click to skip to the configurator)")
+
+    local timer_id = util.start_timer(2)
+
+    while true do
+        local event, param1 = util.pull_event()
+        if event == "timer" and param1 == timer_id then
+            -- remount and re-attempt
+            ppm.mount_all()
+            loaded, monitors = coordinator.load_config()
+            break
+        elseif event == "mouse_click" or event == "terminate" then
+            wait_on_load = false
+            break
+        end
+    end
+end
+
 if loaded ~= 0 then
     -- try to reconfigure (user action)
     local success, error = configure.configure(loaded, monitors)
     if success then
         loaded, monitors = coordinator.load_config()
-        assert(loaded == 0, util.trinary(loaded == 1, "failed to load valid configuration", "monitor configuration invalid"))
+        if loaded ~= 0 then
+            println(util.trinary(loaded == 2, "monitor configuration invalid", "failed to load a valid configuration") .. ", please reconfigure")
+            return
+        end
     else
-        assert(success, "coordinator configuration error: " .. error)
+        println("configuration error: " .. error)
+        return
     end
 end
 
@@ -69,6 +103,7 @@ log.info("========================================")
 println(">> SCADA Coordinator " .. COORDINATOR_VERSION .. " <<")
 
 crash.set_env("coordinator", COORDINATOR_VERSION)
+crash.dbg_log_env()
 
 ----------------------------------------
 -- main application
@@ -79,14 +114,14 @@ local function main()
     -- system startup
     ----------------------------------------
 
-    -- re-mount devices now that logging is ready
+    -- log mounts now since mounting was done before logging was ready
-    ppm.mount_all()
+    ppm.log_mounts()
 
     -- report versions/init fp PSIL
     iocontrol.init_fp(COORDINATOR_VERSION, comms.version)
 
     -- init renderer
-    renderer.legacy_disable_flow_view(config.DisableFlowView)
+    renderer.configure(config)
     renderer.set_displays(monitors)
     renderer.init_displays()
     renderer.init_dmesg()
@@ -269,6 +304,11 @@ local function main()
                     iocontrol.fp_has_speaker(true)
                 end
             end
+        elseif event == "monitor_resize" then
+            local is_used, is_ok = renderer.handle_resize(param1)
+            if is_used then
+                log_sys(util.c("configured monitor ", param1, " resized, ", util.trinary(is_ok, "display still fits", "display no longer fits")))
+            end
         elseif event == "timer" then
             if loop_clock.is_clock(param1) then
                 -- main loop tick

coordinator/ui/components/boiler.lua

@@ -1,5 +1,7 @@
 local style          = require("coordinator.ui.style")
 
+local iocontrol      = require("coordinator.iocontrol")
+
 local core           = require("graphics.core")
 
 local Rectangle      = require("graphics.elements.rectangle")
@@ -12,28 +14,31 @@ local VerticalBar    = require("graphics.elements.indicators.vbar")
 local cpair = core.cpair
 local border = core.border
 
-local text_fg_bg = style.text_colors
-
 -- new boiler view
 ---@param root graphics_element parent
 ---@param x integer top left x
 ---@param y integer top left y
 ---@param ps psil ps interface
 local function new_view(root, x, y, ps)
+    local text_fg = style.theme.text_fg
+    local lu_col = style.lu_colors
+
+    local db = iocontrol.get_db()
+
     local boiler = Rectangle{parent=root,border=border(1,colors.gray,true),width=31,height=7,x=x,y=y}
 
     local status = StateIndicator{parent=boiler,x=9,y=1,states=style.boiler.states,value=1,min_width=12}
-    local temp   = DataIndicator{parent=boiler,x=5,y=3,lu_colors=style.lu_col,label="Temp:",unit="K",format="%10.2f",value=0,width=22,fg_bg=text_fg_bg}
+    local temp   = DataIndicator{parent=boiler,x=5,y=3,lu_colors=lu_col,label="Temp:",unit=db.temp_label,format="%10.2f",value=0,commas=true,width=22,fg_bg=text_fg}
-    local boil_r = DataIndicator{parent=boiler,x=5,y=4,lu_colors=style.lu_col,label="Boil:",unit="mB/t",format="%10.0f",value=0,commas=true,width=22,fg_bg=text_fg_bg}
+    local boil_r = DataIndicator{parent=boiler,x=5,y=4,lu_colors=lu_col,label="Boil:",unit="mB/t",format="%10.0f",value=0,commas=true,width=22,fg_bg=text_fg}
 
     status.register(ps, "computed_status", status.update)
-    temp.register(ps, "temperature", temp.update)
+    temp.register(ps, "temperature", function (t) temp.update(db.temp_convert(t)) end)
     boil_r.register(ps, "boil_rate", boil_r.update)
 
-    TextBox{parent=boiler,text="H",x=2,y=5,height=1,width=1,fg_bg=text_fg_bg}
+    TextBox{parent=boiler,text="H",x=2,y=5,height=1,width=1,fg_bg=text_fg}
-    TextBox{parent=boiler,text="W",x=3,y=5,height=1,width=1,fg_bg=text_fg_bg}
+    TextBox{parent=boiler,text="W",x=3,y=5,height=1,width=1,fg_bg=text_fg}
-    TextBox{parent=boiler,text="S",x=27,y=5,height=1,width=1,fg_bg=text_fg_bg}
+    TextBox{parent=boiler,text="S",x=27,y=5,height=1,width=1,fg_bg=text_fg}
-    TextBox{parent=boiler,text="C",x=28,y=5,height=1,width=1,fg_bg=text_fg_bg}
+    TextBox{parent=boiler,text="C",x=28,y=5,height=1,width=1,fg_bg=text_fg}
 
     local hcool = VerticalBar{parent=boiler,x=2,y=1,fg_bg=cpair(colors.orange,colors.gray),height=4,width=1}
     local water = VerticalBar{parent=boiler,x=3,y=1,fg_bg=cpair(colors.blue,colors.gray),height=4,width=1}

coordinator/ui/components/imatrix.lua

@@ -18,9 +18,6 @@ local border = core.border
 
 local ALIGN = core.ALIGN
 
-local text_fg_bg = style.text_colors
-local lu_col = style.lu_colors
-
 -- new induction matrix view
 ---@param root graphics_element parent
 ---@param x integer top left x
@@ -29,27 +26,31 @@ local lu_col = style.lu_colors
 ---@param ps psil ps interface
 ---@param id number? matrix ID
 local function new_view(root, x, y, data, ps, id)
+    local text_fg = style.theme.text_fg
+    local lu_col = style.lu_colors
+
     local title = "INDUCTION MATRIX"
     if type(id) == "number" then title = title .. id end
 
     local matrix = Div{parent=root,fg_bg=style.root,width=33,height=24,x=x,y=y}
 
-    TextBox{parent=matrix,text=" ",width=33,height=1,x=1,y=1,fg_bg=style.lg_gray}
+    -- black has low contrast with dark gray, so if background is black use white instead
-    TextBox{parent=matrix,text=title,alignment=ALIGN.CENTER,width=33,height=1,x=1,y=2,fg_bg=style.lg_gray}
+    local cutout_fg_bg = cpair(util.trinary(style.theme.bg == colors.black, colors.white, style.theme.bg), colors.gray)
+
+    TextBox{parent=matrix,text=" ",width=33,height=1,x=1,y=1,fg_bg=cutout_fg_bg}
+    TextBox{parent=matrix,text=title,alignment=ALIGN.CENTER,width=33,height=1,x=1,y=2,fg_bg=cutout_fg_bg}
 
     local rect = Rectangle{parent=matrix,border=border(1,colors.gray,true),width=33,height=22,x=1,y=3}
 
-    local label_fg_bg = cpair(colors.gray, colors.lightGray)
-
     local status   = StateIndicator{parent=rect,x=10,y=1,states=style.imatrix.states,value=1,min_width=14}
-    local energy   = PowerIndicator{parent=rect,x=7,y=3,lu_colors=lu_col,label="Energy:  ",format="%8.2f",value=0,width=26,fg_bg=text_fg_bg}
+    local energy   = PowerIndicator{parent=rect,x=7,y=3,lu_colors=lu_col,label="Energy:  ",format="%8.2f",value=0,width=26,fg_bg=text_fg}
-    local capacity = PowerIndicator{parent=rect,x=7,y=4,lu_colors=lu_col,label="Capacity:",format="%8.2f",value=0,width=26,fg_bg=text_fg_bg}
+    local capacity = PowerIndicator{parent=rect,x=7,y=4,lu_colors=lu_col,label="Capacity:",format="%8.2f",value=0,width=26,fg_bg=text_fg}
-    local input    = PowerIndicator{parent=rect,x=7,y=5,lu_colors=lu_col,label="Input:   ",format="%8.2f",rate=true,value=0,width=26,fg_bg=text_fg_bg}
+    local input    = PowerIndicator{parent=rect,x=7,y=5,lu_colors=lu_col,label="Input:   ",format="%8.2f",rate=true,value=0,width=26,fg_bg=text_fg}
-    local output   = PowerIndicator{parent=rect,x=7,y=6,lu_colors=lu_col,label="Output:  ",format="%8.2f",rate=true,value=0,width=26,fg_bg=text_fg_bg}
+    local output   = PowerIndicator{parent=rect,x=7,y=6,lu_colors=lu_col,label="Output:  ",format="%8.2f",rate=true,value=0,width=26,fg_bg=text_fg}
 
-    local avg_chg  = PowerIndicator{parent=rect,x=7,y=8,lu_colors=lu_col,label="Avg. Chg:",format="%8.2f",value=0,width=26,fg_bg=text_fg_bg}
+    local avg_chg  = PowerIndicator{parent=rect,x=7,y=8,lu_colors=lu_col,label="Avg. Chg:",format="%8.2f",value=0,width=26,fg_bg=text_fg}
-    local avg_in   = PowerIndicator{parent=rect,x=7,y=9,lu_colors=lu_col,label="Avg. In: ",format="%8.2f",rate=true,value=0,width=26,fg_bg=text_fg_bg}
+    local avg_in   = PowerIndicator{parent=rect,x=7,y=9,lu_colors=lu_col,label="Avg. In: ",format="%8.2f",rate=true,value=0,width=26,fg_bg=text_fg}
-    local avg_out  = PowerIndicator{parent=rect,x=7,y=10,lu_colors=lu_col,label="Avg. Out:",format="%8.2f",rate=true,value=0,width=26,fg_bg=text_fg_bg}
+    local avg_out  = PowerIndicator{parent=rect,x=7,y=10,lu_colors=lu_col,label="Avg. Out:",format="%8.2f",rate=true,value=0,width=26,fg_bg=text_fg}
 
     status.register(ps, "computed_status", status.update)
     energy.register(ps, "energy", function (val) energy.update(util.joules_to_fe(val)) end)
@@ -61,13 +62,13 @@ local function new_view(root, x, y, data, ps, id)
     avg_in.register(ps, "avg_inflow", avg_in.update)
     avg_out.register(ps, "avg_outflow", avg_out.update)
 
-    local fill      = DataIndicator{parent=rect,x=11,y=12,lu_colors=lu_col,label="Fill:",unit="%",format="%8.2f",value=0,width=18,fg_bg=text_fg_bg}
+    local fill      = DataIndicator{parent=rect,x=11,y=12,lu_colors=lu_col,label="Fill:",unit="%",format="%8.2f",value=0,width=18,fg_bg=text_fg}
 
-    local cells     = DataIndicator{parent=rect,x=11,y=14,lu_colors=lu_col,label="Cells:    ",format="%7d",value=0,width=18,fg_bg=text_fg_bg}
+    local cells     = DataIndicator{parent=rect,x=11,y=14,lu_colors=lu_col,label="Cells:    ",format="%7d",value=0,width=18,fg_bg=text_fg}
-    local providers = DataIndicator{parent=rect,x=11,y=15,lu_colors=lu_col,label="Providers:",format="%7d",value=0,width=18,fg_bg=text_fg_bg}
+    local providers = DataIndicator{parent=rect,x=11,y=15,lu_colors=lu_col,label="Providers:",format="%7d",value=0,width=18,fg_bg=text_fg}
 
-    TextBox{parent=rect,text="Transfer Capacity",x=11,y=17,height=1,width=17,fg_bg=label_fg_bg}
+    TextBox{parent=rect,text="Transfer Capacity",x=11,y=17,height=1,width=17,fg_bg=style.theme.label_fg}
-    local trans_cap = PowerIndicator{parent=rect,x=19,y=18,lu_colors=lu_col,label="",format="%5.2f",rate=true,value=0,width=12,fg_bg=text_fg_bg}
+    local trans_cap = PowerIndicator{parent=rect,x=19,y=18,lu_colors=lu_col,label="",format="%5.2f",rate=true,value=0,width=12,fg_bg=text_fg}
 
     cells.register(ps, "cells", cells.update)
     providers.register(ps, "providers", providers.update)
@@ -78,8 +79,8 @@ local function new_view(root, x, y, data, ps, id)
     local in_cap  = VerticalBar{parent=rect,x=7,y=12,fg_bg=cpair(colors.red,colors.gray),height=7,width=1}
     local out_cap = VerticalBar{parent=rect,x=9,y=12,fg_bg=cpair(colors.blue,colors.gray),height=7,width=1}
 
-    TextBox{parent=rect,text="FILL",x=2,y=20,height=1,width=4,fg_bg=text_fg_bg}
+    TextBox{parent=rect,text="FILL",x=2,y=20,height=1,width=4,fg_bg=text_fg}
-    TextBox{parent=rect,text="I/O",x=7,y=20,height=1,width=3,fg_bg=text_fg_bg}
+    TextBox{parent=rect,text="I/O",x=7,y=20,height=1,width=3,fg_bg=text_fg}
 
     local function calc_saturation(val)
         if (type(data.build) == "table") and (type(data.build.transfer_cap) == "number") and (data.build.transfer_cap > 0) then

coordinator/ui/components/pkt_entry.lua

@@ -17,33 +17,35 @@ local ALIGN = core.ALIGN
 
 local cpair = core.cpair
 
-local text_fg_bg = style.text_colors
-local lg_wh = style.lg_white
-
 -- create a pocket list entry
 ---@param parent graphics_element parent
 ---@param id integer PKT session ID
 local function init(parent, id)
+    local s_hi_box = style.fp_theme.highlight_box
+    local s_hi_bright = style.fp_theme.highlight_box_bright
+
+    local label_fg = style.fp.label_fg
+
     local ps = iocontrol.get_db().fp.ps
 
     -- root div
     local root = Div{parent=parent,x=2,y=2,height=4,width=parent.get_width()-2,hidden=true}
-    local entry = Div{parent=root,x=2,y=1,height=3,fg_bg=style.bw_fg_bg}
+    local entry = Div{parent=root,x=2,y=1,height=3,fg_bg=s_hi_bright}
 
     local ps_prefix = "pkt_" .. id .. "_"
 
-    TextBox{parent=entry,x=1,y=1,text="",width=8,height=1,fg_bg=text_fg_bg}
+    TextBox{parent=entry,x=1,y=1,text="",width=8,height=1,fg_bg=s_hi_box}
-    local pkt_addr = TextBox{parent=entry,x=1,y=2,text="@ C ??",alignment=ALIGN.CENTER,width=8,height=1,fg_bg=text_fg_bg,nav_active=cpair(colors.gray,colors.black)}
+    local pkt_addr = TextBox{parent=entry,x=1,y=2,text="@ C ??",alignment=ALIGN.CENTER,width=8,height=1,fg_bg=s_hi_box,nav_active=cpair(colors.gray,colors.black)}
-    TextBox{parent=entry,x=1,y=3,text="",width=8,height=1,fg_bg=text_fg_bg}
+    TextBox{parent=entry,x=1,y=3,text="",width=8,height=1,fg_bg=s_hi_box}
     pkt_addr.register(ps, ps_prefix .. "addr", pkt_addr.set_value)
 
     TextBox{parent=entry,x=10,y=2,text="FW:",width=3,height=1}
-    local pkt_fw_v = TextBox{parent=entry,x=14,y=2,text=" ------- ",width=20,height=1,fg_bg=lg_wh}
+    local pkt_fw_v = TextBox{parent=entry,x=14,y=2,text=" ------- ",width=20,height=1,fg_bg=label_fg}
     pkt_fw_v.register(ps, ps_prefix .. "fw", pkt_fw_v.set_value)
 
     TextBox{parent=entry,x=35,y=2,text="RTT:",width=4,height=1}
-    local pkt_rtt = DataIndicator{parent=entry,x=40,y=2,label="",unit="",format="%5d",value=0,width=5,fg_bg=lg_wh}
+    local pkt_rtt = DataIndicator{parent=entry,x=40,y=2,label="",unit="",format="%5d",value=0,width=5,fg_bg=label_fg}
-    TextBox{parent=entry,x=46,y=2,text="ms",width=4,height=1,fg_bg=lg_wh}
+    TextBox{parent=entry,x=46,y=2,text="ms",width=4,height=1,fg_bg=label_fg}
     pkt_rtt.register(ps, ps_prefix .. "rtt", pkt_rtt.update)
     pkt_rtt.register(ps, ps_prefix .. "rtt_color", pkt_rtt.recolor)
 

coordinator/ui/components/process_ctl.lua

@@ -29,16 +29,6 @@ local cpair = core.cpair
 local border = core.border
 
 local bw_fg_bg = style.bw_fg_bg
-local lu_cpair = style.lu_colors
-local hzd_fg_bg  = style.hzd_fg_bg
-local dis_colors = style.dis_colors
-
-local gry_wht = style.gray_white
-
-local ind_grn = style.ind_grn
-local ind_yel = style.ind_yel
-local ind_red = style.ind_red
-local ind_wht = style.ind_wht
 
 local period = core.flasher.PERIOD
 
@@ -47,6 +37,19 @@ local period = core.flasher.PERIOD
 ---@param x integer top left x
 ---@param y integer top left y
 local function new_view(root, x, y)
+    local s_hi_box = style.theme.highlight_box
+    local s_field = style.theme.field_box
+
+    local lu_cpair = style.lu_colors
+    local hzd_fg_bg  = style.hzd_fg_bg
+    local dis_colors = style.dis_colors
+    local arrow_fg_bg = cpair(style.theme.label, s_hi_box.bkg)
+
+    local ind_grn = style.ind_grn
+    local ind_yel = style.ind_yel
+    local ind_red = style.ind_red
+    local ind_wht = style.ind_wht
+
     assert(root.get_height() >= (y + 24), "main display not of sufficient vertical resolution (add an additional row of monitors)")
 
     local black = cpair(colors.black, colors.black)
@@ -65,7 +68,7 @@ local function new_view(root, x, y)
     facility.ack_alarms_ack = ack_a.on_response
 
     local all_ok  = IndicatorLight{parent=main,y=5,label="Unit Systems Online",colors=ind_grn}
-    local rad_mon = TriIndicatorLight{parent=main,label="Radiation Monitor",c1=colors.gray,c2=colors.yellow,c3=colors.green}
+    local rad_mon = TriIndicatorLight{parent=main,label="Radiation Monitor",c1=style.ind_bkg,c2=ind_yel.fgd,c3=ind_grn.fgd}
     local ind_mat = IndicatorLight{parent=main,label="Induction Matrix",colors=ind_grn}
     local sps     = IndicatorLight{parent=main,label="SPS Connected",colors=ind_grn}
 
@@ -103,11 +106,11 @@ local function new_view(root, x, y)
     gen_fault.register(facility.ps, "as_gen_fault", gen_fault.update)
 
     TextBox{parent=main,y=23,text="Radiation",height=1,width=13,fg_bg=style.label}
-    local radiation = RadIndicator{parent=main,label="",format="%9.3f",lu_colors=lu_cpair,width=13,fg_bg=bw_fg_bg}
+    local radiation = RadIndicator{parent=main,label="",format="%9.3f",lu_colors=lu_cpair,width=13,fg_bg=s_field}
     radiation.register(facility.ps, "radiation", radiation.update)
 
     TextBox{parent=main,x=15,y=23,text="Linked RTUs",height=1,width=11,fg_bg=style.label}
-    local rtu_count = DataIndicator{parent=main,x=15,y=24,label="",format="%11d",value=0,lu_colors=lu_cpair,width=11,fg_bg=bw_fg_bg}
+    local rtu_count = DataIndicator{parent=main,x=15,y=24,label="",format="%11d",value=0,lu_colors=lu_cpair,width=11,fg_bg=s_field}
     rtu_count.register(facility.ps, "rtu_count", rtu_count.update)
 
     ---------------------
@@ -125,9 +128,9 @@ local function new_view(root, x, y)
     local burn_tag = Div{parent=targets,x=1,y=1,width=8,height=4,fg_bg=blk_pur}
     TextBox{parent=burn_tag,x=2,y=2,text="Burn Target",width=7,height=2}
 
-    local burn_target = Div{parent=targets,x=9,y=1,width=23,height=3,fg_bg=gry_wht}
+    local burn_target = Div{parent=targets,x=9,y=1,width=23,height=3,fg_bg=s_hi_box}
-    local b_target = SpinboxNumeric{parent=burn_target,x=11,y=1,whole_num_precision=4,fractional_precision=1,min=0.1,arrow_fg_bg=gry_wht,fg_bg=bw_fg_bg}
+    local b_target = SpinboxNumeric{parent=burn_target,x=11,y=1,whole_num_precision=4,fractional_precision=1,min=0.1,arrow_fg_bg=arrow_fg_bg,arrow_disable=style.theme.disabled}
-    TextBox{parent=burn_target,x=18,y=2,text="mB/t"}
+    TextBox{parent=burn_target,x=18,y=2,text="mB/t",fg_bg=style.theme.label_fg}
     local burn_sum = DataIndicator{parent=targets,x=9,y=4,label="",format="%18.1f",value=0,unit="mB/t",commas=true,lu_colors=black,width=23,fg_bg=blk_brn}
 
     b_target.register(facility.ps, "process_burn_target", b_target.set_value)
@@ -136,9 +139,9 @@ local function new_view(root, x, y)
     local chg_tag = Div{parent=targets,x=1,y=6,width=8,height=4,fg_bg=blk_pur}
     TextBox{parent=chg_tag,x=2,y=2,text="Charge Target",width=7,height=2}
 
-    local chg_target = Div{parent=targets,x=9,y=6,width=23,height=3,fg_bg=gry_wht}
+    local chg_target = Div{parent=targets,x=9,y=6,width=23,height=3,fg_bg=s_hi_box}
-    local c_target = SpinboxNumeric{parent=chg_target,x=2,y=1,whole_num_precision=15,fractional_precision=0,min=0,arrow_fg_bg=gry_wht,fg_bg=bw_fg_bg}
+    local c_target = SpinboxNumeric{parent=chg_target,x=2,y=1,whole_num_precision=15,fractional_precision=0,min=0,arrow_fg_bg=arrow_fg_bg,arrow_disable=style.theme.disabled}
-    TextBox{parent=chg_target,x=18,y=2,text="MFE"}
+    TextBox{parent=chg_target,x=18,y=2,text="MFE",fg_bg=style.theme.label_fg}
     local cur_charge = DataIndicator{parent=targets,x=9,y=9,label="",format="%19d",value=0,unit="MFE",commas=true,lu_colors=black,width=23,fg_bg=blk_brn}
 
     c_target.register(facility.ps, "process_charge_target", c_target.set_value)
@@ -147,9 +150,9 @@ local function new_view(root, x, y)
     local gen_tag = Div{parent=targets,x=1,y=11,width=8,height=4,fg_bg=blk_pur}
     TextBox{parent=gen_tag,x=2,y=2,text="Gen. Target",width=7,height=2}
 
-    local gen_target = Div{parent=targets,x=9,y=11,width=23,height=3,fg_bg=gry_wht}
+    local gen_target = Div{parent=targets,x=9,y=11,width=23,height=3,fg_bg=s_hi_box}
-    local g_target = SpinboxNumeric{parent=gen_target,x=8,y=1,whole_num_precision=9,fractional_precision=0,min=0,arrow_fg_bg=gry_wht,fg_bg=bw_fg_bg}
+    local g_target = SpinboxNumeric{parent=gen_target,x=8,y=1,whole_num_precision=9,fractional_precision=0,min=0,arrow_fg_bg=arrow_fg_bg,arrow_disable=style.theme.disabled}
-    TextBox{parent=gen_target,x=18,y=2,text="kFE/t"}
+    TextBox{parent=gen_target,x=18,y=2,text="kFE/t",fg_bg=style.theme.label_fg}
     local cur_gen = DataIndicator{parent=targets,x=9,y=14,label="",format="%17d",value=0,unit="kFE/t",commas=true,lu_colors=black,width=23,fg_bg=blk_brn}
 
     g_target.register(facility.ps, "process_gen_target", g_target.set_value)
@@ -165,17 +168,17 @@ local function new_view(root, x, y)
 
     for i = 1, 4 do
         local unit
-        local tag_fg_bg = gry_wht
+        local tag_fg_bg = cpair(style.theme.disabled, s_hi_box.bkg)
-        local lim_fg_bg = style.lg_white
+        local lim_fg_bg = cpair(style.theme.disabled, s_hi_box.bkg)
-        local ctl_fg    = colors.lightGray
+        local label_fg  = style.theme.disabled_fg
-        local cur_fg_bg = style.lg_white
+        local cur_fg_bg = cpair(style.theme.disabled, s_hi_box.bkg)
-        local cur_lu    = colors.lightGray
+        local cur_lu    = style.theme.disabled
 
         if i <= facility.num_units then
             unit = units[i]   ---@type ioctl_unit
-            tag_fg_bg = cpair(colors.black,colors.lightBlue)
+            tag_fg_bg = cpair(colors.black, colors.lightBlue)
-            lim_fg_bg = bw_fg_bg
+            lim_fg_bg = s_hi_box
-            ctl_fg    = colors.gray
+            label_fg  = style.theme.label_fg
             cur_fg_bg = blk_brn
             cur_lu    = colors.black
         end
@@ -185,9 +188,9 @@ local function new_view(root, x, y)
         local unit_tag = Div{parent=limit_div,x=1,y=_y,width=8,height=4,fg_bg=tag_fg_bg}
         TextBox{parent=unit_tag,x=2,y=2,text="Unit "..i.." Limit",width=7,height=2}
 
-        local lim_ctl = Div{parent=limit_div,x=9,y=_y,width=14,height=3,fg_bg=cpair(ctl_fg,colors.white)}
+        local lim_ctl = Div{parent=limit_div,x=9,y=_y,width=14,height=3,fg_bg=s_hi_box}
-        local lim = SpinboxNumeric{parent=lim_ctl,x=2,y=1,whole_num_precision=4,fractional_precision=1,min=0.1,arrow_fg_bg=gry_wht,fg_bg=lim_fg_bg}
+        local lim = SpinboxNumeric{parent=lim_ctl,x=2,y=1,whole_num_precision=4,fractional_precision=1,min=0.1,arrow_fg_bg=arrow_fg_bg,arrow_disable=style.theme.disabled,fg_bg=lim_fg_bg}
-        TextBox{parent=lim_ctl,x=9,y=2,text="mB/t",width=4,height=1}
+        TextBox{parent=lim_ctl,x=9,y=2,text="mB/t",width=4,height=1,fg_bg=label_fg}
 
         local cur_burn = DataIndicator{parent=limit_div,x=9,y=_y+3,label="",format="%7.1f",value=0,unit="mB/t",commas=false,lu_colors=cpair(cur_lu,cur_lu),width=14,fg_bg=cur_fg_bg}
 
@@ -209,14 +212,14 @@ local function new_view(root, x, y)
     local stat_div = Div{parent=proc,width=22,height=24,x=57,y=6}
 
     for i = 1, 4 do
-        local tag_fg_bg = gry_wht
+        local tag_fg_bg = cpair(style.theme.disabled, s_hi_box.bkg)
-        local ind_fg_bg = style.lg_white
+        local ind_fg_bg = cpair(style.theme.disabled, s_hi_box.bkg)
-        local ind_off = colors.lightGray
+        local ind_off = style.theme.disabled
 
         if i <= facility.num_units then
             tag_fg_bg = cpair(colors.black, colors.cyan)
-            ind_fg_bg = bw_fg_bg
+            ind_fg_bg = cpair(style.theme.text, s_hi_box.bkg)
-            ind_off = colors.gray
+            ind_off = style.ind_hi_box_bg
         end
 
         local _y = ((i - 1) * 5) + 1
@@ -225,8 +228,8 @@ local function new_view(root, x, y)
         TextBox{parent=unit_tag,x=2,y=2,text="Unit "..i.." Status",width=7,height=2}
 
         local lights   = Div{parent=stat_div,x=9,y=_y,width=14,height=4,fg_bg=ind_fg_bg}
-        local ready    = IndicatorLight{parent=lights,x=2,y=2,label="Ready",colors=cpair(colors.green,ind_off)}
+        local ready    = IndicatorLight{parent=lights,x=2,y=2,label="Ready",colors=cpair(ind_grn.fgd,ind_off)}
-        local degraded = IndicatorLight{parent=lights,x=2,y=3,label="Degraded",colors=cpair(colors.red,ind_off),flash=true,period=period.BLINK_250_MS}
+        local degraded = IndicatorLight{parent=lights,x=2,y=3,label="Degraded",colors=cpair(ind_red.fgd,ind_off),flash=true,period=period.BLINK_250_MS}
 
         if i <= facility.num_units then
             local unit = units[i]   ---@type ioctl_unit
@@ -241,18 +244,18 @@ local function new_view(root, x, y)
     -------------------------
 
     local ctl_opts = { "Monitored Max Burn", "Combined Burn Rate", "Charge Level", "Generation Rate" }
-    local mode = RadioButton{parent=proc,x=34,y=1,options=ctl_opts,callback=function()end,radio_colors=cpair(colors.gray,colors.white),select_color=colors.purple}
+    local mode = RadioButton{parent=proc,x=34,y=1,options=ctl_opts,callback=function()end,radio_colors=cpair(style.theme.accent_dark,style.theme.accent_light),select_color=colors.purple}
 
     mode.register(facility.ps, "process_mode", mode.set_value)
 
     local u_stat = Rectangle{parent=proc,border=border(1,colors.gray,true),thin=true,width=31,height=4,x=1,y=16,fg_bg=bw_fg_bg}
     local stat_line_1 = TextBox{parent=u_stat,x=1,y=1,text="UNKNOWN",width=31,height=1,alignment=ALIGN.CENTER,fg_bg=bw_fg_bg}
-    local stat_line_2 = TextBox{parent=u_stat,x=1,y=2,text="awaiting data...",width=31,height=1,alignment=ALIGN.CENTER,fg_bg=gry_wht}
+    local stat_line_2 = TextBox{parent=u_stat,x=1,y=2,text="awaiting data...",width=31,height=1,alignment=ALIGN.CENTER,fg_bg=cpair(colors.gray,colors.white)}
 
     stat_line_1.register(facility.ps, "status_line_1", stat_line_1.set_value)
     stat_line_2.register(facility.ps, "status_line_2", stat_line_2.set_value)
 
-    local auto_controls = Div{parent=proc,x=1,y=20,width=31,height=5,fg_bg=gry_wht}
+    local auto_controls = Div{parent=proc,x=1,y=20,width=31,height=5,fg_bg=s_hi_box}
 
     -- save the automatic process control configuration without starting
     local function _save_cfg()
@@ -327,16 +330,18 @@ local function new_view(root, x, y)
 
     local waste_sel = Div{parent=proc,width=21,height=24,x=81,y=1}
 
-    TextBox{parent=waste_sel,text=" ",width=21,height=1,x=1,y=1,fg_bg=blk_brn}
+    local cutout_fg_bg = cpair(style.theme.bg, colors.brown)
-    TextBox{parent=waste_sel,text="WASTE PRODUCTION",alignment=ALIGN.CENTER,width=21,height=1,x=1,y=2,fg_bg=cpair(colors.lightGray,colors.brown)}
+
+    TextBox{parent=waste_sel,text=" ",width=21,height=1,x=1,y=1,fg_bg=cutout_fg_bg}
+    TextBox{parent=waste_sel,text="WASTE PRODUCTION",alignment=ALIGN.CENTER,width=21,height=1,x=1,y=2,fg_bg=cutout_fg_bg}
 
     local rect   = Rectangle{parent=waste_sel,border=border(1,colors.brown,true),width=21,height=22,x=1,y=3}
     local status = StateIndicator{parent=rect,x=2,y=1,states=style.waste.states,value=1,min_width=17}
 
     status.register(facility.ps, "current_waste_product", status.update)
 
-    local waste_prod = RadioButton{parent=rect,x=2,y=3,options=style.waste.options,callback=process.set_process_waste,radio_colors=cpair(colors.gray,colors.white),select_color=colors.brown}
+    local waste_prod = RadioButton{parent=rect,x=2,y=3,options=style.waste.options,callback=process.set_process_waste,radio_colors=cpair(style.theme.accent_dark,style.theme.accent_light),select_color=colors.brown}
-    local pu_fallback = Checkbox{parent=rect,x=2,y=7,label="Pu Fallback",callback=process.set_pu_fallback,box_fg_bg=cpair(colors.green,colors.black)}
+    local pu_fallback = Checkbox{parent=rect,x=2,y=7,label="Pu Fallback",callback=process.set_pu_fallback,box_fg_bg=cpair(colors.green,style.theme.checkbox_bg)}
 
     waste_prod.register(facility.ps, "process_waste_product", waste_prod.set_value)
     pu_fallback.register(facility.ps, "process_pu_fallback", pu_fallback.set_value)
@@ -346,13 +351,13 @@ local function new_view(root, x, y)
     fb_active.register(facility.ps, "pu_fallback_active", fb_active.update)
 
     TextBox{parent=rect,x=2,y=11,text="Plutonium Rate",height=1,width=17,fg_bg=style.label}
-    local pu_rate = DataIndicator{parent=rect,x=2,label="",unit="mB/t",format="%12.2f",value=0,lu_colors=lu_cpair,fg_bg=bw_fg_bg,width=17}
+    local pu_rate = DataIndicator{parent=rect,x=2,label="",unit="mB/t",format="%12.2f",value=0,lu_colors=lu_cpair,fg_bg=s_field,width=17}
 
     TextBox{parent=rect,x=2,y=14,text="Polonium Rate",height=1,width=17,fg_bg=style.label}
-    local po_rate = DataIndicator{parent=rect,x=2,label="",unit="mB/t",format="%12.2f",value=0,lu_colors=lu_cpair,fg_bg=bw_fg_bg,width=17}
+    local po_rate = DataIndicator{parent=rect,x=2,label="",unit="mB/t",format="%12.2f",value=0,lu_colors=lu_cpair,fg_bg=s_field,width=17}
 
     TextBox{parent=rect,x=2,y=17,text="Antimatter Rate",height=1,width=17,fg_bg=style.label}
-    local am_rate = DataIndicator{parent=rect,x=2,label="",unit="\xb5B/t",format="%12d",value=0,lu_colors=lu_cpair,fg_bg=bw_fg_bg,width=17}
+    local am_rate = DataIndicator{parent=rect,x=2,label="",unit="\xb5B/t",format="%12d",value=0,lu_colors=lu_cpair,fg_bg=s_field,width=17}
 
     pu_rate.register(facility.ps, "pu_rate", pu_rate.update)
     po_rate.register(facility.ps, "po_rate", po_rate.update)

coordinator/ui/components/reactor.lua

@@ -1,5 +1,7 @@
 local types          = require("scada-common.types")
 
+local iocontrol      = require("coordinator.iocontrol")
+
 local style          = require("coordinator.ui.style")
 
 local core           = require("graphics.core")
@@ -14,35 +16,37 @@ local StateIndicator = require("graphics.elements.indicators.state")
 local cpair = core.cpair
 local border = core.border
 
-local text_fg_bg = style.text_colors
-local lu_col = style.lu_colors
-
 -- create new reactor view
 ---@param root graphics_element parent
 ---@param x integer top left x
 ---@param y integer top left y
 ---@param ps psil ps interface
 local function new_view(root, x, y, ps)
-    local reactor = Rectangle{parent=root,border=border(1, colors.gray, true),width=30,height=7,x=x,y=y}
+    local text_fg = style.theme.text_fg
+    local lu_col = style.lu_colors
+
+    local db = iocontrol.get_db()
+
+    local reactor = Rectangle{parent=root,border=border(1,colors.gray,true),width=30,height=7,x=x,y=y}
 
     local status    = StateIndicator{parent=reactor,x=6,y=1,states=style.reactor.states,value=1,min_width=16}
-    local core_temp = DataIndicator{parent=reactor,x=2,y=3,lu_colors=lu_col,label="Core Temp:",unit="K",format="%10.2f",value=0,width=26,fg_bg=text_fg_bg}
+    local core_temp = DataIndicator{parent=reactor,x=2,y=3,lu_colors=lu_col,label="Core Temp:",unit=db.temp_label,format="%10.2f",value=0,commas=true,width=26,fg_bg=text_fg}
-    local burn_r    = DataIndicator{parent=reactor,x=2,y=4,lu_colors=lu_col,label="Burn Rate:",unit="mB/t",format="%10.2f",value=0,width=26,fg_bg=text_fg_bg}
+    local burn_r    = DataIndicator{parent=reactor,x=2,y=4,lu_colors=lu_col,label="Burn Rate:",unit="mB/t",format="%10.2f",value=0,width=26,fg_bg=text_fg}
-    local heating_r = DataIndicator{parent=reactor,x=2,y=5,lu_colors=lu_col,label="Heating:",unit="mB/t",format="%12.0f",value=0,commas=true,width=26,fg_bg=text_fg_bg}
+    local heating_r = DataIndicator{parent=reactor,x=2,y=5,lu_colors=lu_col,label="Heating:",unit="mB/t",format="%12.0f",value=0,commas=true,width=26,fg_bg=text_fg}
 
     status.register(ps, "computed_status", status.update)
-    core_temp.register(ps, "temp", core_temp.update)
+    core_temp.register(ps, "temp", function (t) core_temp.update(db.temp_convert(t)) end)
     burn_r.register(ps, "act_burn_rate", burn_r.update)
     heating_r.register(ps, "heating_rate", heating_r.update)
 
     local reactor_fills = Rectangle{parent=root,border=border(1, colors.gray, true),width=24,height=7,x=(x + 29),y=y}
 
-    TextBox{parent=reactor_fills,text="FUEL",x=2,y=1,height=1,fg_bg=text_fg_bg}
+    TextBox{parent=reactor_fills,text="FUEL",x=2,y=1,height=1,fg_bg=text_fg}
-    TextBox{parent=reactor_fills,text="COOL",x=2,y=2,height=1,fg_bg=text_fg_bg}
+    TextBox{parent=reactor_fills,text="COOL",x=2,y=2,height=1,fg_bg=text_fg}
-    TextBox{parent=reactor_fills,text="HCOOL",x=2,y=4,height=1,fg_bg=text_fg_bg}
+    TextBox{parent=reactor_fills,text="HCOOL",x=2,y=4,height=1,fg_bg=text_fg}
-    TextBox{parent=reactor_fills,text="WASTE",x=2,y=5,height=1,fg_bg=text_fg_bg}
+    TextBox{parent=reactor_fills,text="WASTE",x=2,y=5,height=1,fg_bg=text_fg}
 
-    local fuel  = HorizontalBar{parent=reactor_fills,x=8,y=1,show_percent=true,bar_fg_bg=cpair(colors.black,colors.gray),height=1,width=14}
+    local fuel  = HorizontalBar{parent=reactor_fills,x=8,y=1,show_percent=true,bar_fg_bg=cpair(style.theme.fuel_color,colors.gray),height=1,width=14}
     local ccool = HorizontalBar{parent=reactor_fills,x=8,y=2,show_percent=true,bar_fg_bg=cpair(colors.blue,colors.gray),height=1,width=14}
     local hcool = HorizontalBar{parent=reactor_fills,x=8,y=4,show_percent=true,bar_fg_bg=cpair(colors.white,colors.gray),height=1,width=14}
     local waste = HorizontalBar{parent=reactor_fills,x=8,y=5,show_percent=true,bar_fg_bg=cpair(colors.brown,colors.gray),height=1,width=14}

coordinator/ui/components/turbine.lua

@@ -15,20 +15,20 @@ local VerticalBar    = require("graphics.elements.indicators.vbar")
 local cpair = core.cpair
 local border = core.border
 
-local text_fg_bg = style.text_colors
-local lu_col = style.lu_colors
-
 -- new turbine view
 ---@param root graphics_element parent
 ---@param x integer top left x
 ---@param y integer top left y
 ---@param ps psil ps interface
 local function new_view(root, x, y, ps)
+    local text_fg = style.theme.text_fg
+    local lu_col = style.lu_colors
+
     local turbine = Rectangle{parent=root,border=border(1,colors.gray,true),width=23,height=7,x=x,y=y}
 
     local status    = StateIndicator{parent=turbine,x=7,y=1,states=style.turbine.states,value=1,min_width=12}
-    local prod_rate = PowerIndicator{parent=turbine,x=5,y=3,lu_colors=lu_col,label="",format="%10.2f",value=0,rate=true,width=16,fg_bg=text_fg_bg}
+    local prod_rate = PowerIndicator{parent=turbine,x=5,y=3,lu_colors=lu_col,label="",format="%10.2f",value=0,rate=true,width=16,fg_bg=text_fg}
-    local flow_rate = DataIndicator{parent=turbine,x=5,y=4,lu_colors=lu_col,label="",unit="mB/t",format="%10.0f",value=0,commas=true,width=16,fg_bg=text_fg_bg}
+    local flow_rate = DataIndicator{parent=turbine,x=5,y=4,lu_colors=lu_col,label="",unit="mB/t",format="%10.0f",value=0,commas=true,width=16,fg_bg=text_fg}
 
     status.register(ps, "computed_status", status.update)
     prod_rate.register(ps, "prod_rate", function (val) prod_rate.update(util.joules_to_fe(val)) end)
@@ -37,8 +37,8 @@ local function new_view(root, x, y, ps)
     local steam  = VerticalBar{parent=turbine,x=2,y=1,fg_bg=cpair(colors.white,colors.gray),height=4,width=1}
     local energy = VerticalBar{parent=turbine,x=3,y=1,fg_bg=cpair(colors.green,colors.gray),height=4,width=1}
 
-    TextBox{parent=turbine,text="S",x=2,y=5,height=1,width=1,fg_bg=text_fg_bg}
+    TextBox{parent=turbine,text="S",x=2,y=5,height=1,width=1,fg_bg=text_fg}
-    TextBox{parent=turbine,text="E",x=3,y=5,height=1,width=1,fg_bg=text_fg_bg}
+    TextBox{parent=turbine,text="E",x=3,y=5,height=1,width=1,fg_bg=text_fg}
 
     steam.register(ps, "steam_fill", steam.update)
     energy.register(ps, "energy_fill", energy.update)

coordinator/ui/components/unit_detail.lua

@@ -3,6 +3,7 @@
 --
 
 local types             = require("scada-common.types")
+local util              = require("scada-common.util")
 
 local iocontrol         = require("coordinator.iocontrol")
 
@@ -34,25 +35,33 @@ local cpair = core.cpair
 local border = core.border
 
 local bw_fg_bg = style.bw_fg_bg
-local lu_cpair = style.lu_colors
-local hzd_fg_bg = style.hzd_fg_bg
-local dis_colors = style.dis_colors
-
 local gry_wht = style.gray_white
 
-local ind_grn = style.ind_grn
-local ind_yel = style.ind_yel
-local ind_red = style.ind_red
-local ind_wht = style.ind_wht
-
 local period = core.flasher.PERIOD
 
 -- create a unit view
 ---@param parent graphics_element parent
 ---@param id integer
 local function init(parent, id)
-    local unit = iocontrol.get_db().units[id]   ---@type ioctl_unit
+    local s_hi_box = style.theme.highlight_box
-    local f_ps = iocontrol.get_db().facility.ps
+    local s_hi_bright = style.theme.highlight_box_bright
+    local s_field = style.theme.field_box
+
+    local hc_text = style.hc_text
+    local lu_cpair = style.lu_colors
+    local hzd_fg_bg = style.hzd_fg_bg
+    local dis_colors = style.dis_colors
+    local arrow_fg_bg = cpair(style.theme.label, s_hi_box.bkg)
+
+    local ind_bkg = style.ind_bkg
+    local ind_grn = style.ind_grn
+    local ind_yel = style.ind_yel
+    local ind_red = style.ind_red
+    local ind_wht = style.ind_wht
+
+    local db = iocontrol.get_db()
+    local unit = db.units[id]   ---@type ioctl_unit
+    local f_ps = db.facility.ps
 
     local main = Div{parent=parent,x=1,y=1}
 
@@ -62,7 +71,7 @@ local function init(parent, id)
     local b_ps = unit.boiler_ps_tbl
     local t_ps = unit.turbine_ps_tbl
 
-    TextBox{parent=main,text="Reactor Unit #" .. id,alignment=ALIGN.CENTER,height=1,fg_bg=style.header}
+    TextBox{parent=main,text="Reactor Unit #" .. id,alignment=ALIGN.CENTER,height=1,fg_bg=style.theme.header}
 
     -----------------------------
     -- main stats and core map --
@@ -73,11 +82,11 @@ local function init(parent, id)
     core_map.register(u_ps, "size", function (s) core_map.resize(s[1], s[2]) end)
 
     TextBox{parent=main,x=12,y=22,text="Heating Rate",height=1,width=12,fg_bg=style.label}
-    local heating_r = DataIndicator{parent=main,x=12,label="",format="%14.0f",value=0,unit="mB/t",commas=true,lu_colors=lu_cpair,width=19,fg_bg=bw_fg_bg}
+    local heating_r = DataIndicator{parent=main,x=12,label="",format="%14.0f",value=0,unit="mB/t",commas=true,lu_colors=lu_cpair,width=19,fg_bg=s_field}
     heating_r.register(u_ps, "heating_rate", heating_r.update)
 
     TextBox{parent=main,x=12,y=25,text="Commanded Burn Rate",height=1,width=19,fg_bg=style.label}
-    local burn_r = DataIndicator{parent=main,x=12,label="",format="%14.2f",value=0,unit="mB/t",lu_colors=lu_cpair,width=19,fg_bg=bw_fg_bg}
+    local burn_r = DataIndicator{parent=main,x=12,label="",format="%14.2f",value=0,unit="mB/t",lu_colors=lu_cpair,width=19,fg_bg=s_field}
     burn_r.register(u_ps, "burn_rate", burn_r.update)
 
     TextBox{parent=main,text="F",x=2,y=22,width=1,height=1,fg_bg=style.label}
@@ -87,7 +96,7 @@ local function init(parent, id)
     TextBox{parent=main,text="H",x=8,y=22,width=1,height=1,fg_bg=style.label}
     TextBox{parent=main,text="W",x=10,y=22,width=1,height=1,fg_bg=style.label}
 
-    local fuel  = VerticalBar{parent=main,x=2,y=23,fg_bg=cpair(colors.black,colors.gray),height=4,width=1}
+    local fuel  = VerticalBar{parent=main,x=2,y=23,fg_bg=cpair(style.theme.fuel_color,colors.gray),height=4,width=1}
     local ccool = VerticalBar{parent=main,x=4,y=23,fg_bg=cpair(colors.blue,colors.gray),height=4,width=1}
     local hcool = VerticalBar{parent=main,x=8,y=23,fg_bg=cpair(colors.white,colors.gray),height=4,width=1}
     local waste = VerticalBar{parent=main,x=10,y=23,fg_bg=cpair(colors.brown,colors.gray),height=4,width=1}
@@ -114,19 +123,20 @@ local function init(parent, id)
     end)
 
     TextBox{parent=main,x=32,y=22,text="Core Temp",height=1,width=9,fg_bg=style.label}
-    local core_temp = DataIndicator{parent=main,x=32,label="",format="%11.2f",value=0,unit="K",lu_colors=lu_cpair,width=13,fg_bg=bw_fg_bg}
+    local fmt = util.trinary(string.len(db.temp_label) == 2, "%10.2f", "%11.2f")
-    core_temp.register(u_ps, "temp", core_temp.update)
+    local core_temp = DataIndicator{parent=main,x=32,label="",format=fmt,value=0,commas=true,unit=db.temp_label,lu_colors=lu_cpair,width=13,fg_bg=s_field}
+    core_temp.register(u_ps, "temp", function (t) core_temp.update(db.temp_convert(t)) end)
 
     TextBox{parent=main,x=32,y=25,text="Burn Rate",height=1,width=9,fg_bg=style.label}
-    local act_burn_r = DataIndicator{parent=main,x=32,label="",format="%8.2f",value=0,unit="mB/t",lu_colors=lu_cpair,width=13,fg_bg=bw_fg_bg}
+    local act_burn_r = DataIndicator{parent=main,x=32,label="",format="%8.2f",value=0,unit="mB/t",lu_colors=lu_cpair,width=13,fg_bg=s_field}
     act_burn_r.register(u_ps, "act_burn_rate", act_burn_r.update)
 
     TextBox{parent=main,x=32,y=28,text="Damage",height=1,width=6,fg_bg=style.label}
-    local damage_p = DataIndicator{parent=main,x=32,label="",format="%11.0f",value=0,unit="%",lu_colors=lu_cpair,width=13,fg_bg=bw_fg_bg}
+    local damage_p = DataIndicator{parent=main,x=32,label="",format="%11.0f",value=0,unit="%",lu_colors=lu_cpair,width=13,fg_bg=s_field}
     damage_p.register(u_ps, "damage", damage_p.update)
 
     TextBox{parent=main,x=32,y=31,text="Radiation",height=1,width=21,fg_bg=style.label}
-    local radiation = RadIndicator{parent=main,x=32,label="",format="%9.3f",lu_colors=lu_cpair,width=13,fg_bg=bw_fg_bg}
+    local radiation = RadIndicator{parent=main,x=32,label="",format="%9.3f",lu_colors=lu_cpair,width=13,fg_bg=s_field}
     radiation.register(u_ps, "radiation", radiation.update)
 
     -------------------
@@ -149,9 +159,9 @@ local function init(parent, id)
     local annunciator = Div{parent=main,width=23,height=18,x=22,y=3}
 
     -- connectivity
-    local plc_online = IndicatorLight{parent=annunciator,label="PLC Online",colors=cpair(colors.green,colors.red)}
+    local plc_online = IndicatorLight{parent=annunciator,label="PLC Online",colors=cpair(ind_grn.fgd,ind_red.fgd)}
     local plc_hbeat  = IndicatorLight{parent=annunciator,label="PLC Heartbeat",colors=ind_wht}
-    local rad_mon    = TriIndicatorLight{parent=annunciator,label="Radiation Monitor",c1=colors.gray,c2=colors.yellow,c3=colors.green}
+    local rad_mon    = TriIndicatorLight{parent=annunciator,label="Radiation Monitor",c1=ind_bkg,c2=ind_yel.fgd,c3=ind_grn.fgd}
 
     plc_online.register(u_ps, "PLCOnline", plc_online.update)
     plc_hbeat.register(u_ps, "PLCHeartbeat", plc_hbeat.update)
@@ -208,7 +218,7 @@ local function init(parent, id)
     local rps_loc = IndicatorLight{parent=rps_annunc,label="Coolant Level Low Low",colors=ind_yel}
     local rps_flt = IndicatorLight{parent=rps_annunc,label="PPM Fault",colors=ind_yel,flash=true,period=period.BLINK_500_MS}
     local rps_tmo = IndicatorLight{parent=rps_annunc,label="Connection Timeout",colors=ind_yel,flash=true,period=period.BLINK_500_MS}
-    local rps_sfl = IndicatorLight{parent=rps_annunc,label="System Failure",colors=cpair(colors.orange,colors.gray),flash=true,period=period.BLINK_500_MS}
+    local rps_sfl = IndicatorLight{parent=rps_annunc,label="System Failure",colors=ind_red,flash=true,period=period.BLINK_500_MS}
 
     rps_trp.register(u_ps, "rps_tripped", rps_trp.update)
     rps_dmg.register(u_ps, "high_dmg", rps_dmg.update)
@@ -229,7 +239,7 @@ local function init(parent, id)
     local rcs_tags = Div{parent=rcs,width=2,height=16,x=1,y=7}
 
     local c_flt  = IndicatorLight{parent=rcs_annunc,label="RCS Hardware Fault",colors=ind_yel}
-    local c_emg  = TriIndicatorLight{parent=rcs_annunc,label="Emergency Coolant",c1=colors.gray,c2=colors.white,c3=colors.green}
+    local c_emg  = TriIndicatorLight{parent=rcs_annunc,label="Emergency Coolant",c1=ind_bkg,c2=ind_wht.fgd,c3=ind_grn.fgd}
     local c_cfm  = IndicatorLight{parent=rcs_annunc,label="Coolant Feed Mismatch",colors=ind_yel}
     local c_brm  = IndicatorLight{parent=rcs_annunc,label="Boil Rate Mismatch",colors=ind_yel}
     local c_sfm  = IndicatorLight{parent=rcs_annunc,label="Steam Feed Mismatch",colors=ind_yel}
@@ -252,14 +262,14 @@ local function init(parent, id)
 
     -- boiler annunciator panel(s)
 
-    if available_space > 0 then _add_space() end
-
     if unit.num_boilers > 0 then
-        TextBox{parent=rcs_tags,x=1,text="B1",width=2,height=1,fg_bg=bw_fg_bg}
+        if available_space > 0 then _add_space() end
+
+        TextBox{parent=rcs_tags,x=1,text="B1",width=2,height=1,fg_bg=hc_text}
         local b1_wll = IndicatorLight{parent=rcs_annunc,label="Water Level Low",colors=ind_red}
         b1_wll.register(b_ps[1], "WaterLevelLow", b1_wll.update)
 
-        TextBox{parent=rcs_tags,text="B1",width=2,height=1,fg_bg=bw_fg_bg}
+        TextBox{parent=rcs_tags,text="B1",width=2,height=1,fg_bg=hc_text}
         local b1_hr = IndicatorLight{parent=rcs_annunc,label="Heating Rate Low",colors=ind_yel}
         b1_hr.register(b_ps[1], "HeatingRateLow", b1_hr.update)
     end
@@ -271,11 +281,11 @@ local function init(parent, id)
             _add_space()
         end
 
-        TextBox{parent=rcs_tags,text="B2",width=2,height=1,fg_bg=bw_fg_bg}
+        TextBox{parent=rcs_tags,text="B2",width=2,height=1,fg_bg=hc_text}
         local b2_wll = IndicatorLight{parent=rcs_annunc,label="Water Level Low",colors=ind_red}
         b2_wll.register(b_ps[2], "WaterLevelLow", b2_wll.update)
 
-        TextBox{parent=rcs_tags,text="B2",width=2,height=1,fg_bg=bw_fg_bg}
+        TextBox{parent=rcs_tags,text="B2",width=2,height=1,fg_bg=hc_text}
         local b2_hr = IndicatorLight{parent=rcs_annunc,label="Heating Rate Low",colors=ind_yel}
         b2_hr.register(b_ps[2], "HeatingRateLow", b2_hr.update)
     end
@@ -284,19 +294,19 @@ local function init(parent, id)
 
     if available_space > 1 then _add_space() end
 
-    TextBox{parent=rcs_tags,text="T1",width=2,height=1,fg_bg=bw_fg_bg}
+    TextBox{parent=rcs_tags,text="T1",width=2,height=1,fg_bg=hc_text}
-    local t1_sdo = TriIndicatorLight{parent=rcs_annunc,label="Steam Relief Valve Open",c1=colors.gray,c2=colors.yellow,c3=colors.red}
+    local t1_sdo = TriIndicatorLight{parent=rcs_annunc,label="Steam Relief Valve Open",c1=ind_bkg,c2=ind_yel.fgd,c3=ind_red.fgd}
     t1_sdo.register(t_ps[1], "SteamDumpOpen", t1_sdo.update)
 
-    TextBox{parent=rcs_tags,text="T1",width=2,height=1,fg_bg=bw_fg_bg}
+    TextBox{parent=rcs_tags,text="T1",width=2,height=1,fg_bg=hc_text}
     local t1_tos = IndicatorLight{parent=rcs_annunc,label="Turbine Over Speed",colors=ind_red}
     t1_tos.register(t_ps[1], "TurbineOverSpeed", t1_tos.update)
 
-    TextBox{parent=rcs_tags,text="T1",width=2,height=1,fg_bg=bw_fg_bg}
+    TextBox{parent=rcs_tags,text="T1",width=2,height=1,fg_bg=hc_text}
     local t1_gtrp = IndicatorLight{parent=rcs_annunc,label="Generator Trip",colors=ind_yel,flash=true,period=period.BLINK_250_MS}
     t1_gtrp.register(t_ps[1], "GeneratorTrip", t1_gtrp.update)
 
-    TextBox{parent=rcs_tags,text="T1",width=2,height=1,fg_bg=bw_fg_bg}
+    TextBox{parent=rcs_tags,text="T1",width=2,height=1,fg_bg=hc_text}
     local t1_trp = IndicatorLight{parent=rcs_annunc,label="Turbine Trip",colors=ind_red,flash=true,period=period.BLINK_250_MS}
     t1_trp.register(t_ps[1], "TurbineTrip", t1_trp.update)
 
@@ -305,19 +315,19 @@ local function init(parent, id)
             _add_space()
         end
 
-        TextBox{parent=rcs_tags,text="T2",width=2,height=1,fg_bg=bw_fg_bg}
+        TextBox{parent=rcs_tags,text="T2",width=2,height=1,fg_bg=hc_text}
-        local t2_sdo = TriIndicatorLight{parent=rcs_annunc,label="Steam Relief Valve Open",c1=colors.gray,c2=colors.yellow,c3=colors.red}
+        local t2_sdo = TriIndicatorLight{parent=rcs_annunc,label="Steam Relief Valve Open",c1=ind_bkg,c2=ind_yel.fgd,c3=ind_red.fgd}
         t2_sdo.register(t_ps[2], "SteamDumpOpen", t2_sdo.update)
 
-        TextBox{parent=rcs_tags,text="T2",width=2,height=1,fg_bg=bw_fg_bg}
+        TextBox{parent=rcs_tags,text="T2",width=2,height=1,fg_bg=hc_text}
         local t2_tos = IndicatorLight{parent=rcs_annunc,label="Turbine Over Speed",colors=ind_red}
         t2_tos.register(t_ps[2], "TurbineOverSpeed", t2_tos.update)
 
-        TextBox{parent=rcs_tags,text="T2",width=2,height=1,fg_bg=bw_fg_bg}
+        TextBox{parent=rcs_tags,text="T2",width=2,height=1,fg_bg=hc_text}
         local t2_gtrp = IndicatorLight{parent=rcs_annunc,label="Generator Trip",colors=ind_yel,flash=true,period=period.BLINK_250_MS}
         t2_gtrp.register(t_ps[2], "GeneratorTrip", t2_gtrp.update)
 
-        TextBox{parent=rcs_tags,text="T2",width=2,height=1,fg_bg=bw_fg_bg}
+        TextBox{parent=rcs_tags,text="T2",width=2,height=1,fg_bg=hc_text}
         local t2_trp = IndicatorLight{parent=rcs_annunc,label="Turbine Trip",colors=ind_red,flash=true,period=period.BLINK_250_MS}
         t2_trp.register(t_ps[2], "TurbineTrip", t2_trp.update)
     end
@@ -325,19 +335,19 @@ local function init(parent, id)
     if unit.num_turbines > 2 then
         if available_space > 3 then _add_space() end
 
-        TextBox{parent=rcs_tags,text="T3",width=2,height=1,fg_bg=bw_fg_bg}
+        TextBox{parent=rcs_tags,text="T3",width=2,height=1,fg_bg=hc_text}
-        local t3_sdo = TriIndicatorLight{parent=rcs_annunc,label="Steam Relief Valve Open",c1=colors.gray,c2=colors.yellow,c3=colors.red}
+        local t3_sdo = TriIndicatorLight{parent=rcs_annunc,label="Steam Relief Valve Open",c1=ind_bkg,c2=ind_yel.fgd,c3=ind_red.fgd}
         t3_sdo.register(t_ps[3], "SteamDumpOpen", t3_sdo.update)
 
-        TextBox{parent=rcs_tags,text="T3",width=2,height=1,fg_bg=bw_fg_bg}
+        TextBox{parent=rcs_tags,text="T3",width=2,height=1,fg_bg=hc_text}
         local t3_tos = IndicatorLight{parent=rcs_annunc,label="Turbine Over Speed",colors=ind_red}
         t3_tos.register(t_ps[3], "TurbineOverSpeed", t3_tos.update)
 
-        TextBox{parent=rcs_tags,text="T3",width=2,height=1,fg_bg=bw_fg_bg}
+        TextBox{parent=rcs_tags,text="T3",width=2,height=1,fg_bg=hc_text}
         local t3_gtrp = IndicatorLight{parent=rcs_annunc,label="Generator Trip",colors=ind_yel,flash=true,period=period.BLINK_250_MS}
         t3_gtrp.register(t_ps[3], "GeneratorTrip", t3_gtrp.update)
 
-        TextBox{parent=rcs_tags,text="T3",width=2,height=1,fg_bg=bw_fg_bg}
+        TextBox{parent=rcs_tags,text="T3",width=2,height=1,fg_bg=hc_text}
         local t3_trp = IndicatorLight{parent=rcs_annunc,label="Turbine Trip",colors=ind_red,flash=true,period=period.BLINK_250_MS}
         t3_trp.register(t_ps[3], "TurbineTrip", t3_trp.update)
     end
@@ -346,9 +356,9 @@ local function init(parent, id)
     -- reactor controls --
     ----------------------
 
-    local burn_control = Div{parent=main,x=12,y=28,width=19,height=3,fg_bg=gry_wht}
+    local burn_control = Div{parent=main,x=12,y=28,width=19,height=3,fg_bg=s_hi_box}
-    local burn_rate = SpinboxNumeric{parent=burn_control,x=2,y=1,whole_num_precision=4,fractional_precision=1,min=0.1,arrow_fg_bg=gry_wht,fg_bg=bw_fg_bg}
+    local burn_rate = SpinboxNumeric{parent=burn_control,x=2,y=1,whole_num_precision=4,fractional_precision=1,min=0.1,arrow_fg_bg=arrow_fg_bg,arrow_disable=style.theme.disabled}
-    TextBox{parent=burn_control,x=9,y=2,text="mB/t"}
+    TextBox{parent=burn_control,x=9,y=2,text="mB/t",fg_bg=style.theme.label_fg}
 
     local set_burn = function () unit.set_burn(burn_rate.get_value()) end
     local set_burn_btn = PushButton{parent=burn_control,x=14,y=2,text="SET",min_width=5,fg_bg=cpair(colors.black,colors.yellow),active_fg_bg=style.wh_gray,dis_fg_bg=dis_colors,callback=set_burn}
@@ -394,22 +404,22 @@ local function init(parent, id)
     -- alarm management --
     ----------------------
 
-    local alarm_panel = Div{parent=main,x=2,y=36,width=29,height=16,fg_bg=bw_fg_bg}
+    local alarm_panel = Div{parent=main,x=2,y=36,width=29,height=16,fg_bg=s_hi_bright}
 
-    local a_brc = AlarmLight{parent=alarm_panel,x=6,y=2,label="Containment Breach",c1=colors.gray,c2=colors.red,c3=colors.green,flash=true,period=period.BLINK_250_MS}
+    local a_brc = AlarmLight{parent=alarm_panel,x=6,y=2,label="Containment Breach",c1=ind_bkg,c2=ind_red.fgd,c3=ind_grn.fgd,flash=true,period=period.BLINK_250_MS}
-    local a_rad = AlarmLight{parent=alarm_panel,x=6,label="Containment Radiation",c1=colors.gray,c2=colors.red,c3=colors.green,flash=true,period=period.BLINK_250_MS}
+    local a_rad = AlarmLight{parent=alarm_panel,x=6,label="Containment Radiation",c1=ind_bkg,c2=ind_red.fgd,c3=ind_grn.fgd,flash=true,period=period.BLINK_250_MS}
-    local a_dmg = AlarmLight{parent=alarm_panel,x=6,label="Critical Damage",c1=colors.gray,c2=colors.red,c3=colors.green,flash=true,period=period.BLINK_250_MS}
+    local a_dmg = AlarmLight{parent=alarm_panel,x=6,label="Critical Damage",c1=ind_bkg,c2=ind_red.fgd,c3=ind_grn.fgd,flash=true,period=period.BLINK_250_MS}
     alarm_panel.line_break()
-    local a_rcl = AlarmLight{parent=alarm_panel,x=6,label="Reactor Lost",c1=colors.gray,c2=colors.red,c3=colors.green,flash=true,period=period.BLINK_250_MS}
+    local a_rcl = AlarmLight{parent=alarm_panel,x=6,label="Reactor Lost",c1=ind_bkg,c2=ind_red.fgd,c3=ind_grn.fgd,flash=true,period=period.BLINK_250_MS}
-    local a_rcd = AlarmLight{parent=alarm_panel,x=6,label="Reactor Damage",c1=colors.gray,c2=colors.red,c3=colors.green,flash=true,period=period.BLINK_250_MS}
+    local a_rcd = AlarmLight{parent=alarm_panel,x=6,label="Reactor Damage",c1=ind_bkg,c2=ind_red.fgd,c3=ind_grn.fgd,flash=true,period=period.BLINK_250_MS}
-    local a_rot = AlarmLight{parent=alarm_panel,x=6,label="Reactor Over Temp",c1=colors.gray,c2=colors.red,c3=colors.green,flash=true,period=period.BLINK_250_MS}
+    local a_rot = AlarmLight{parent=alarm_panel,x=6,label="Reactor Over Temp",c1=ind_bkg,c2=ind_red.fgd,c3=ind_grn.fgd,flash=true,period=period.BLINK_250_MS}
-    local a_rht = AlarmLight{parent=alarm_panel,x=6,label="Reactor High Temp",c1=colors.gray,c2=colors.yellow,c3=colors.green,flash=true,period=period.BLINK_500_MS}
+    local a_rht = AlarmLight{parent=alarm_panel,x=6,label="Reactor High Temp",c1=ind_bkg,c2=ind_yel.fgd,c3=ind_grn.fgd,flash=true,period=period.BLINK_500_MS}
-    local a_rwl = AlarmLight{parent=alarm_panel,x=6,label="Reactor Waste Leak",c1=colors.gray,c2=colors.red,c3=colors.green,flash=true,period=period.BLINK_250_MS}
+    local a_rwl = AlarmLight{parent=alarm_panel,x=6,label="Reactor Waste Leak",c1=ind_bkg,c2=ind_red.fgd,c3=ind_grn.fgd,flash=true,period=period.BLINK_250_MS}
-    local a_rwh = AlarmLight{parent=alarm_panel,x=6,label="Reactor Waste High",c1=colors.gray,c2=colors.yellow,c3=colors.green,flash=true,period=period.BLINK_500_MS}
+    local a_rwh = AlarmLight{parent=alarm_panel,x=6,label="Reactor Waste High",c1=ind_bkg,c2=ind_yel.fgd,c3=ind_grn.fgd,flash=true,period=period.BLINK_500_MS}
     alarm_panel.line_break()
-    local a_rps = AlarmLight{parent=alarm_panel,x=6,label="RPS Transient",c1=colors.gray,c2=colors.yellow,c3=colors.green,flash=true,period=period.BLINK_500_MS}
+    local a_rps = AlarmLight{parent=alarm_panel,x=6,label="RPS Transient",c1=ind_bkg,c2=ind_yel.fgd,c3=ind_grn.fgd,flash=true,period=period.BLINK_500_MS}
-    local a_clt = AlarmLight{parent=alarm_panel,x=6,label="RCS Transient",c1=colors.gray,c2=colors.yellow,c3=colors.green,flash=true,period=period.BLINK_500_MS}
+    local a_clt = AlarmLight{parent=alarm_panel,x=6,label="RCS Transient",c1=ind_bkg,c2=ind_yel.fgd,c3=ind_grn.fgd,flash=true,period=period.BLINK_500_MS}
-    local a_tbt = AlarmLight{parent=alarm_panel,x=6,label="Turbine Trip",c1=colors.gray,c2=colors.red,c3=colors.green,flash=true,period=period.BLINK_250_MS}
+    local a_tbt = AlarmLight{parent=alarm_panel,x=6,label="Turbine Trip",c1=ind_bkg,c2=ind_red.fgd,c3=ind_grn.fgd,flash=true,period=period.BLINK_250_MS}
 
     a_brc.register(u_ps, "Alarm_1", a_brc.update)
     a_rad.register(u_ps, "Alarm_2", a_rad.update)
@@ -462,9 +472,9 @@ local function init(parent, id)
 
     -- color tags
 
-    TextBox{parent=alarm_panel,x=5,y=13,text="\x95",width=1,height=1,fg_bg=cpair(colors.white,colors.cyan)}
+    TextBox{parent=alarm_panel,x=5,y=13,text="\x95",width=1,height=1,fg_bg=cpair(s_hi_bright.bkg,colors.cyan)}
-    TextBox{parent=alarm_panel,x=5,text="\x95",width=1,height=1,fg_bg=cpair(colors.white,colors.blue)}
+    TextBox{parent=alarm_panel,x=5,text="\x95",width=1,height=1,fg_bg=cpair(s_hi_bright.bkg,colors.blue)}
-    TextBox{parent=alarm_panel,x=5,text="\x95",width=1,height=1,fg_bg=cpair(colors.white,colors.blue)}
+    TextBox{parent=alarm_panel,x=5,text="\x95",width=1,height=1,fg_bg=cpair(s_hi_bright.bkg,colors.blue)}
 
     --------------------------------
     -- automatic control settings --
@@ -476,7 +486,7 @@ local function init(parent, id)
 
     local ctl_opts = { "Manual", "Primary", "Secondary", "Tertiary", "Backup" }
 
-    local group = RadioButton{parent=auto_div,options=ctl_opts,callback=function()end,radio_colors=cpair(colors.gray,colors.white),select_color=colors.purple}
+    local group = RadioButton{parent=auto_div,options=ctl_opts,callback=function()end,radio_colors=cpair(style.theme.accent_dark,style.theme.accent_light),select_color=colors.purple}
 
     group.register(u_ps, "auto_group_id", function (gid) group.set_value(gid + 1) end)
 
@@ -488,7 +498,7 @@ local function init(parent, id)
     auto_div.line_break()
 
     TextBox{parent=auto_div,text="Prio. Group",height=1,width=11,fg_bg=style.label}
-    local auto_grp = TextBox{parent=auto_div,text="Manual",height=1,width=11,fg_bg=bw_fg_bg}
+    local auto_grp = TextBox{parent=auto_div,text="Manual",height=1,width=11,fg_bg=s_field}
 
     auto_grp.register(u_ps, "auto_group", auto_grp.set_value)
 

coordinator/ui/components/unit_flow.lua

@@ -24,17 +24,12 @@ local ALIGN = core.ALIGN
 local sprintf = util.sprintf
 
 local border = core.border
+local cpair = core.cpair
 local pipe = core.pipe
 
 local wh_gray = style.wh_gray
-local bw_fg_bg = style.bw_fg_bg
-local text_c = style.text_colors
-local lu_c = style.lu_colors
 local lg_gray = style.lg_gray
 
-local ind_grn = style.ind_grn
-local ind_wht = style.ind_wht
-
 -- make a new unit flow window
 ---@param parent graphics_element parent
 ---@param x integer top left x
@@ -42,6 +37,15 @@ local ind_wht = style.ind_wht
 ---@param wide boolean whether to render wide version
 ---@param unit ioctl_unit unit database entry
 local function make(parent, x, y, wide, unit)
+    local s_field = style.theme.field_box
+
+    local text_c = style.text_colors
+    local lu_c = style.lu_colors
+    local lu_c_d = style.lu_colors_dark
+
+    local ind_grn = style.ind_grn
+    local ind_wht = style.ind_wht
+
     local height = 16
 
     local v_start = 1 + ((unit.unit_id - 1) * 5)
@@ -99,35 +103,35 @@ local function make(parent, x, y, wide, unit)
         table.insert(rc_pipes, pipe(_wide(92, 78), py, _wide(104, 83), py, colors.white, true))
     end
 
-    PipeNetwork{parent=root,x=20,y=1,pipes=rc_pipes,bg=colors.lightGray}
+    PipeNetwork{parent=root,x=20,y=1,pipes=rc_pipes,bg=style.theme.bg}
 
     if unit.num_boilers > 0 then
-        local cc_rate = DataIndicator{parent=root,x=_wide(25,22),y=3,lu_colors=lu_c,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=bw_fg_bg}
+        local cc_rate = DataIndicator{parent=root,x=_wide(25,22),y=3,lu_colors=lu_c,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=s_field}
-        local hc_rate = DataIndicator{parent=root,x=_wide(25,22),y=5,lu_colors=lu_c,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=bw_fg_bg}
+        local hc_rate = DataIndicator{parent=root,x=_wide(25,22),y=5,lu_colors=lu_c,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=s_field}
 
         cc_rate.register(unit.unit_ps, "boiler_boil_sum", function (sum) cc_rate.update(sum * 10) end)
         hc_rate.register(unit.unit_ps, "heating_rate", hc_rate.update)
 
-        local boiler = Rectangle{parent=root,x=_wide(47,40),y=1,border=border(1, colors.gray, true),width=19,height=5,fg_bg=wh_gray}
+        local boiler = Rectangle{parent=root,x=_wide(47,40),y=1,border=border(1,colors.gray,true),width=19,height=5,fg_bg=wh_gray}
         TextBox{parent=boiler,y=1,text="THERMO-ELECTRIC",alignment=ALIGN.CENTER,height=1}
         TextBox{parent=boiler,y=3,text=util.trinary(unit.num_boilers>1,"BOILERS","BOILER"),alignment=ALIGN.CENTER,height=1}
         TextBox{parent=root,x=_wide(47,40),y=2,text="\x1b \x80 \x1a",width=1,height=3,fg_bg=lg_gray}
         TextBox{parent=root,x=_wide(65,58),y=2,text="\x1b \x80 \x1a",width=1,height=3,fg_bg=lg_gray}
 
-        local wt_rate = DataIndicator{parent=root,x=_wide(71,61),y=3,lu_colors=lu_c,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=bw_fg_bg}
+        local wt_rate = DataIndicator{parent=root,x=_wide(71,61),y=3,lu_colors=lu_c,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=s_field}
-        local st_rate = DataIndicator{parent=root,x=_wide(71,61),y=5,lu_colors=lu_c,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=bw_fg_bg}
+        local st_rate = DataIndicator{parent=root,x=_wide(71,61),y=5,lu_colors=lu_c,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=s_field}
 
         wt_rate.register(unit.unit_ps, "turbine_flow_sum", wt_rate.update)
         st_rate.register(unit.unit_ps, "boiler_boil_sum", st_rate.update)
     else
-        local wt_rate = DataIndicator{parent=root,x=28,y=3,lu_colors=lu_c,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=bw_fg_bg}
+        local wt_rate = DataIndicator{parent=root,x=28,y=3,lu_colors=lu_c,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=s_field}
-        local st_rate = DataIndicator{parent=root,x=28,y=5,lu_colors=lu_c,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=bw_fg_bg}
+        local st_rate = DataIndicator{parent=root,x=28,y=5,lu_colors=lu_c,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=s_field}
 
         wt_rate.register(unit.unit_ps, "turbine_flow_sum", wt_rate.update)
         st_rate.register(unit.unit_ps, "heating_rate", st_rate.update)
     end
 
-    local turbine = Rectangle{parent=root,x=_wide(93,79),y=1,border=border(1, colors.gray, true),width=19,height=5,fg_bg=wh_gray}
+    local turbine = Rectangle{parent=root,x=_wide(93,79),y=1,border=border(1,colors.gray,true),width=19,height=5,fg_bg=wh_gray}
     TextBox{parent=turbine,y=1,text="STEAM TURBINE",alignment=ALIGN.CENTER,height=1}
     TextBox{parent=turbine,y=3,text=util.trinary(unit.num_turbines>1,"GENERATORS","GENERATOR"),alignment=ALIGN.CENTER,height=1}
     TextBox{parent=root,x=_wide(93,79),y=2,text="\x1b \x80 \x1a",width=1,height=3,fg_bg=lg_gray}
@@ -135,7 +139,7 @@ local function make(parent, x, y, wide, unit)
     for i = 1, unit.num_turbines do
         local ry = 1 + (2 * (i - 1)) + prv_yo
         TextBox{parent=root,x=_wide(125,103),y=ry,text="\x10\x11\x7f",fg_bg=text_c,width=3,height=1}
-        local state = TriIndicatorLight{parent=root,x=_wide(129,107),y=ry,label=v_names[i+4],c1=colors.gray,c2=colors.yellow,c3=colors.red}
+        local state = TriIndicatorLight{parent=root,x=_wide(129,107),y=ry,label=v_names[i+4],c1=style.ind_bkg,c2=style.ind_yel.fgd,c3=style.ind_red.fgd}
         state.register(unit.turbine_ps_tbl[i], "SteamDumpOpen", state.update)
     end
 
@@ -145,6 +149,8 @@ local function make(parent, x, y, wide, unit)
 
     local waste = Div{parent=root,x=3,y=6}
 
+    local waste_c = style.theme.fuel_color
+
     local waste_pipes = {
         pipe(0, 0, _wide(19, 16), 1, colors.brown, true),
         pipe(_wide(14, 13), 1, _wide(19, 17), 5, colors.brown, true),
@@ -158,12 +164,12 @@ local function make(parent, x, y, wide, unit)
         pipe(_wide(74, 63), 4, _wide(95, 81), 4, colors.cyan, true),
         pipe(_wide(74, 63), 8, _wide(133, 111), 8, colors.cyan, true),
 
-        pipe(_wide(108, 94), 1, _wide(132, 110), 6, colors.black, true, true),
+        pipe(_wide(108, 94), 1, _wide(132, 110), 6, waste_c, true, true),
-        pipe(_wide(108, 94), 4, _wide(111, 95), 1, colors.black, true, true),
+        pipe(_wide(108, 94), 4, _wide(111, 95), 1, waste_c, true, true),
-        pipe(_wide(132, 110), 6, _wide(130, 108), 6, colors.black, true, true)
+        pipe(_wide(132, 110), 6, _wide(130, 108), 6, waste_c, true, true)
     }
 
-    PipeNetwork{parent=waste,x=1,y=1,pipes=waste_pipes,bg=colors.lightGray}
+    PipeNetwork{parent=waste,x=1,y=1,pipes=waste_pipes,bg=style.theme.bg}
 
     local function _valve(vx, vy, n)
         TextBox{parent=waste,x=vx,y=vy,text="\x10\x11",fg_bg=text_c,width=2,height=1}
@@ -175,16 +181,16 @@ local function make(parent, x, y, wide, unit)
 
     local function _machine(mx, my, name)
         local l = string.len(name) + 2
-        TextBox{parent=waste,x=mx,y=my,text=string.rep("\x8f",l),alignment=ALIGN.CENTER,fg_bg=lg_gray,width=l,height=1}
+        TextBox{parent=waste,x=mx,y=my,text=string.rep("\x8f",l),alignment=ALIGN.CENTER,fg_bg=cpair(style.theme.bg,style.theme.header.bkg),width=l,height=1}
-        TextBox{parent=waste,x=mx,y=my+1,text=name,alignment=ALIGN.CENTER,fg_bg=wh_gray,width=l,height=1}
+        TextBox{parent=waste,x=mx,y=my+1,text=name,alignment=ALIGN.CENTER,fg_bg=style.theme.header,width=l,height=1}
     end
 
-    local waste_rate = DataIndicator{parent=waste,x=1,y=3,lu_colors=lu_c,label="",unit="mB/t",format="%7.2f",value=0,width=12,fg_bg=bw_fg_bg}
+    local waste_rate = DataIndicator{parent=waste,x=1,y=3,lu_colors=lu_c,label="",unit="mB/t",format="%7.2f",value=0,width=12,fg_bg=s_field}
-    local pu_rate = DataIndicator{parent=waste,x=_wide(82,70),y=3,lu_colors=lu_c,label="",unit="mB/t",format="%7.3f",value=0,width=12,fg_bg=bw_fg_bg}
+    local pu_rate = DataIndicator{parent=waste,x=_wide(82,70),y=3,lu_colors=lu_c,label="",unit="mB/t",format="%7.3f",value=0,width=12,fg_bg=s_field}
-    local po_rate = DataIndicator{parent=waste,x=_wide(52,45),y=6,lu_colors=lu_c,label="",unit="mB/t",format="%7.3f",value=0,width=12,fg_bg=bw_fg_bg}
+    local po_rate = DataIndicator{parent=waste,x=_wide(52,45),y=6,lu_colors=lu_c,label="",unit="mB/t",format="%7.2f",value=0,width=12,fg_bg=s_field}
-    local popl_rate = DataIndicator{parent=waste,x=_wide(82,70),y=6,lu_colors=lu_c,label="",unit="mB/t",format="%7.3f",value=0,width=12,fg_bg=bw_fg_bg}
+    local popl_rate = DataIndicator{parent=waste,x=_wide(82,70),y=6,lu_colors=lu_c,label="",unit="mB/t",format="%7.2f",value=0,width=12,fg_bg=s_field}
-    local poam_rate = DataIndicator{parent=waste,x=_wide(82,70),y=10,lu_colors=lu_c,label="",unit="mB/t",format="%7.3f",value=0,width=12,fg_bg=bw_fg_bg}
+    local poam_rate = DataIndicator{parent=waste,x=_wide(82,70),y=10,lu_colors=lu_c,label="",unit="mB/t",format="%7.2f",value=0,width=12,fg_bg=s_field}
-    local spent_rate = DataIndicator{parent=waste,x=_wide(117,99),y=3,lu_colors=lu_c,label="",unit="mB/t",format="%7.3f",value=0,width=12,fg_bg=bw_fg_bg}
+    local spent_rate = DataIndicator{parent=waste,x=_wide(117,98),y=3,lu_colors=lu_c,label="",unit="mB/t",format="%8.3f",value=0,width=13,fg_bg=s_field}
 
     waste_rate.register(unit.unit_ps, "act_burn_rate", waste_rate.update)
     pu_rate.register(unit.unit_ps, "pu_rate", pu_rate.update)
@@ -204,17 +210,17 @@ local function make(parent, x, y, wide, unit)
     _machine(_wide(116, 94), 6, "SPENT WASTE \x1b")
 
     TextBox{parent=waste,x=_wide(30,25),y=3,text="SNAs [Po]",alignment=ALIGN.CENTER,width=19,height=1,fg_bg=wh_gray}
-    local sna_po  = Rectangle{parent=waste,x=_wide(30,25),y=4,border=border(1,colors.gray,true),width=19,height=7,thin=true,fg_bg=bw_fg_bg}
+    local sna_po  = Rectangle{parent=waste,x=_wide(30,25),y=4,border=border(1,colors.gray,true),width=19,height=7,thin=true,fg_bg=style.theme.highlight_box_bright}
     local sna_act = IndicatorLight{parent=sna_po,label="ACTIVE",colors=ind_grn}
-    local sna_cnt = DataIndicator{parent=sna_po,x=12,y=1,lu_colors=lu_c,label="CNT",unit="",format="%2d",value=0,width=7}
+    local sna_cnt = DataIndicator{parent=sna_po,x=12,y=1,lu_colors=lu_c_d,label="CNT",unit="",format="%2d",value=0,width=7}
-    local sna_pk = DataIndicator{parent=sna_po,y=3,lu_colors=lu_c,label="PEAK",unit="mB/t",format="%7.2f",value=0,width=17}
+    local sna_pk = DataIndicator{parent=sna_po,y=3,lu_colors=lu_c_d,label="PEAK",unit="mB/t",format="%7.2f",value=0,width=17}
-    local sna_max = DataIndicator{parent=sna_po,lu_colors=lu_c,label="MAX",unit="mB/t",format="%8.2f",value=0,width=17}
+    local sna_max = DataIndicator{parent=sna_po,lu_colors=lu_c_d,label="MAX",unit="mB/t",format="%8.2f",value=0,width=17}
-    local sna_in = DataIndicator{parent=sna_po,lu_colors=lu_c,label="IN",unit="mB/t",format="%9.2f",value=0,width=17}
+    local sna_in = DataIndicator{parent=sna_po,lu_colors=lu_c_d,label="IN",unit="mB/t",format="%9.2f",value=0,width=17}
 
     sna_act.register(unit.unit_ps, "po_rate", function (r) sna_act.update(r > 0) end)
     sna_cnt.register(unit.unit_ps, "sna_count", sna_cnt.update)
     sna_pk.register(unit.unit_ps, "sna_peak_rate", sna_pk.update)
-    sna_max.register(unit.unit_ps, "sna_prod_rate", sna_max.update)
+    sna_max.register(unit.unit_ps, "sna_max_rate", sna_max.update)
     sna_in.register(unit.unit_ps, "sna_in", sna_in.update)
 
     return root

coordinator/ui/components/unit_overview.lua

@@ -44,7 +44,7 @@ local function make(parent, x, y, unit)
     local root = Div{parent=parent,x=x,y=y,width=80,height=height}
 
     -- unit header message
-    TextBox{parent=root,text="Unit #"..unit.unit_id,alignment=ALIGN.CENTER,height=1,fg_bg=style.header}
+    TextBox{parent=root,text="Unit #"..unit.unit_id,alignment=ALIGN.CENTER,height=1,fg_bg=style.theme.header}
 
     -------------
     -- REACTOR --
@@ -66,7 +66,7 @@ local function make(parent, x, y, unit)
             table.insert(coolant_pipes, pipe(2, 0, 11, 11, colors.orange))
         end
 
-        PipeNetwork{parent=root,x=4,y=10,pipes=coolant_pipes,bg=colors.lightGray}
+        PipeNetwork{parent=root,x=4,y=10,pipes=coolant_pipes,bg=style.theme.bg}
     end
 
     -------------
@@ -164,10 +164,10 @@ local function make(parent, x, y, unit)
             table.insert(steam_pipes_b, pipe(0, 18, 2, 18, colors.blue, false, true))       -- water boiler 2 to turbine 2 junction
         end
 
-        PipeNetwork{parent=root,x=47,y=11,pipes=steam_pipes_a,bg=colors.lightGray}
+        PipeNetwork{parent=root,x=47,y=11,pipes=steam_pipes_a,bg=style.theme.bg}
     end
 
-    PipeNetwork{parent=root,x=54,y=3,pipes=steam_pipes_b,bg=colors.lightGray}
+    PipeNetwork{parent=root,x=54,y=3,pipes=steam_pipes_b,bg=style.theme.bg}
 
     return root
 end

coordinator/ui/layout/flow_view.lua

@@ -32,13 +32,16 @@ local border = core.border
 local pipe = core.pipe
 
 local wh_gray = style.wh_gray
-local bw_fg_bg = style.bw_fg_bg
-local text_col = style.text_colors
-local lu_col = style.lu_colors
 
 -- create new flow view
 ---@param main graphics_element main displaybox
 local function init(main)
+    local s_hi_bright = style.theme.highlight_box_bright
+    local s_field = style.theme.field_box
+    local text_col = style.text_colors
+    local lu_col = style.lu_colors
+    local lu_c_d = style.lu_colors_dark
+
     local facility = iocontrol.get_db().facility
     local units = iocontrol.get_db().units
 
@@ -46,9 +49,9 @@ local function init(main)
     local tank_list = facility.tank_list
 
     -- window header message
-    local header = TextBox{parent=main,y=1,text="Facility Coolant and Waste Flow Monitor",alignment=ALIGN.CENTER,height=1,fg_bg=style.header}
+    local header = TextBox{parent=main,y=1,text="Facility Coolant and Waste Flow Monitor",alignment=ALIGN.CENTER,height=1,fg_bg=style.theme.header}
     -- max length example: "01:23:45 AM - Wednesday, September 28 2022"
-    local datetime = TextBox{parent=main,x=(header.get_width()-42),y=1,text="",alignment=ALIGN.RIGHT,width=42,height=1,fg_bg=style.header}
+    local datetime = TextBox{parent=main,x=(header.get_width()-42),y=1,text="",alignment=ALIGN.RIGHT,width=42,height=1,fg_bg=style.theme.header}
 
     datetime.register(facility.ps, "date_time", datetime.set_value)
 
@@ -240,7 +243,7 @@ local function init(main)
     local flow_x = 3
     if #water_pipes > 0 then
         flow_x = 25
-        PipeNetwork{parent=main,x=2,y=3,pipes=water_pipes,bg=colors.lightGray}
+        PipeNetwork{parent=main,x=2,y=3,pipes=water_pipes,bg=style.theme.bg}
     end
 
     for i = 1, facility.num_units do
@@ -249,7 +252,7 @@ local function init(main)
         table.insert(po_pipes, pipe(0, 3 + y_offset, 4, 0, colors.cyan, true, true))
     end
 
-    PipeNetwork{parent=main,x=139,y=15,pipes=po_pipes,bg=colors.lightGray}
+    PipeNetwork{parent=main,x=139,y=15,pipes=po_pipes,bg=style.theme.bg}
 
     -----------------
     -- tank valves --
@@ -297,7 +300,7 @@ local function init(main)
 
             TextBox{parent=tank_box,x=2,y=3,text="Fill",height=1,width=10,fg_bg=style.label}
             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=bw_fg_bg}
+            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",height=1,width=11,fg_bg=style.label}
             local level = HorizontalBar{parent=tank_box,x=2,y=7,bar_fg_bg=cpair(colors.blue,colors.gray),height=1,width=16}
@@ -348,12 +351,12 @@ local function init(main)
     status.register(facility.sps_ps_tbl[1], "computed_status", status.update)
 
     TextBox{parent=sps_box,x=2,y=3,text="Input Rate",height=1,width=10,fg_bg=style.label}
-    local sps_in = DataIndicator{parent=sps_box,x=2,label="",format="%15.3f",value=0,unit="mB/t",lu_colors=lu_col,width=20,fg_bg=bw_fg_bg}
+    local sps_in = DataIndicator{parent=sps_box,x=2,label="",format="%15.2f",value=0,unit="mB/t",lu_colors=lu_col,width=20,fg_bg=s_field}
 
     sps_in.register(facility.ps, "po_am_rate", sps_in.update)
 
     TextBox{parent=sps_box,x=2,y=6,text="Production Rate",height=1,width=15,fg_bg=style.label}
-    local sps_rate = DataIndicator{parent=sps_box,x=2,label="",format="%15d",value=0,unit="\xb5B/t",lu_colors=lu_col,width=20,fg_bg=bw_fg_bg}
+    local sps_rate = DataIndicator{parent=sps_box,x=2,label="",format="%15d",value=0,unit="\xb5B/t",lu_colors=lu_col,width=20,fg_bg=s_field}
 
     sps_rate.register(facility.sps_ps_tbl[1], "process_rate", function (r) sps_rate.update(r * 1000) end)
 
@@ -362,24 +365,24 @@ local function init(main)
     ----------------
 
     TextBox{parent=main,x=145,y=16,text="RAW WASTE",alignment=ALIGN.CENTER,width=19,height=1,fg_bg=wh_gray}
-    local raw_waste  = Rectangle{parent=main,x=145,y=17,border=border(1,colors.gray,true),width=19,height=3,thin=true,fg_bg=bw_fg_bg}
+    local raw_waste  = Rectangle{parent=main,x=145,y=17,border=border(1,colors.gray,true),width=19,height=3,thin=true,fg_bg=s_hi_bright}
-    local sum_raw_waste = DataIndicator{parent=raw_waste,lu_colors=lu_col,label="SUM",unit="mB/t",format="%8.2f",value=0,width=17}
+    local sum_raw_waste = DataIndicator{parent=raw_waste,lu_colors=lu_c_d,label="SUM",unit="mB/t",format="%8.2f",value=0,width=17}
 
     sum_raw_waste.register(facility.ps, "burn_sum", sum_raw_waste.update)
 
     TextBox{parent=main,x=145,y=21,text="PROC. WASTE",alignment=ALIGN.CENTER,width=19,height=1,fg_bg=wh_gray}
-    local pr_waste  = Rectangle{parent=main,x=145,y=22,border=border(1,colors.gray,true),width=19,height=5,thin=true,fg_bg=bw_fg_bg}
+    local pr_waste  = Rectangle{parent=main,x=145,y=22,border=border(1,colors.gray,true),width=19,height=5,thin=true,fg_bg=s_hi_bright}
-    local pu = DataIndicator{parent=pr_waste,lu_colors=lu_col,label="Pu",unit="mB/t",format="%9.3f",value=0,width=17}
+    local pu = DataIndicator{parent=pr_waste,lu_colors=lu_c_d,label="Pu",unit="mB/t",format="%9.3f",value=0,width=17}
-    local po = DataIndicator{parent=pr_waste,lu_colors=lu_col,label="Po",unit="mB/t",format="%9.3f",value=0,width=17}
+    local po = DataIndicator{parent=pr_waste,lu_colors=lu_c_d,label="Po",unit="mB/t",format="%9.2f",value=0,width=17}
-    local popl = DataIndicator{parent=pr_waste,lu_colors=lu_col,label="PoPl",unit="mB/t",format="%7.3f",value=0,width=17}
+    local popl = DataIndicator{parent=pr_waste,lu_colors=lu_c_d,label="PoPl",unit="mB/t",format="%7.2f",value=0,width=17}
 
     pu.register(facility.ps, "pu_rate", pu.update)
     po.register(facility.ps, "po_rate", po.update)
     popl.register(facility.ps, "po_pl_rate", popl.update)
 
     TextBox{parent=main,x=145,y=28,text="SPENT WASTE",alignment=ALIGN.CENTER,width=19,height=1,fg_bg=wh_gray}
-    local sp_waste  = Rectangle{parent=main,x=145,y=29,border=border(1,colors.gray,true),width=19,height=3,thin=true,fg_bg=bw_fg_bg}
+    local sp_waste  = Rectangle{parent=main,x=145,y=29,border=border(1,colors.gray,true),width=19,height=3,thin=true,fg_bg=s_hi_bright}
-    local sum_sp_waste = DataIndicator{parent=sp_waste,lu_colors=lu_col,label="SUM",unit="mB/t",format="%8.3f",value=0,width=17}
+    local sum_sp_waste = DataIndicator{parent=sp_waste,lu_colors=lu_c_d,label="SUM",unit="mB/t",format="%8.3f",value=0,width=17}
 
     sum_sp_waste.register(facility.ps, "spent_waste_rate", sum_sp_waste.update)
 end

coordinator/ui/layout/front_panel.lua

@@ -22,8 +22,11 @@ local TextBox   = require("graphics.elements.textbox")
 local TabBar    = require("graphics.elements.controls.tabbar")
 
 local LED       = require("graphics.elements.indicators.led")
+local LEDPair   = require("graphics.elements.indicators.ledpair")
 local RGBLED    = require("graphics.elements.indicators.ledrgb")
 
+local LINK_STATE = types.PANEL_LINK_STATE
+
 local ALIGN = core.ALIGN
 
 local cpair = core.cpair
@@ -36,7 +39,7 @@ local led_grn = style.led_grn
 local function init(panel, num_units)
     local ps = iocontrol.get_db().fp.ps
 
-    TextBox{parent=panel,y=1,text="SCADA COORDINATOR",alignment=ALIGN.CENTER,height=1,fg_bg=style.fp.header}
+    TextBox{parent=panel,y=1,text="SCADA COORDINATOR",alignment=ALIGN.CENTER,height=1,fg_bg=style.fp_theme.header}
 
     local page_div = Div{parent=panel,x=1,y=3}
 
@@ -56,19 +59,50 @@ local function init(panel, num_units)
     heartbeat.register(ps, "heartbeat", heartbeat.update)
 
     local modem = LED{parent=system,label="MODEM",colors=led_grn}
-    local network = RGBLED{parent=system,label="NETWORK",colors={colors.green,colors.red,colors.orange,colors.yellow,colors.gray}}
+
-    network.update(types.PANEL_LINK_STATE.DISCONNECTED)
+    if not style.colorblind then
+        local network = RGBLED{parent=system,label="NETWORK",colors={colors.green,colors.red,colors.orange,colors.yellow,style.fp_ind_bkg}}
+        network.update(types.PANEL_LINK_STATE.DISCONNECTED)
+        network.register(ps, "link_state", network.update)
+    else
+        local nt_lnk = LEDPair{parent=system,label="NT LINKED",off=style.fp_ind_bkg,c1=colors.red,c2=colors.green}
+        local nt_ver = LEDPair{parent=system,label="NT VERSION",off=style.fp_ind_bkg,c1=colors.red,c2=colors.green}
+
+        nt_lnk.register(ps, "link_state", function (state)
+            local value = 2
+
+            if state == LINK_STATE.DISCONNECTED then
+                value = 1
+            elseif state == LINK_STATE.LINKED then
+                value = 3
+            end
+
+            nt_lnk.update(value)
+        end)
+
+        nt_ver.register(ps, "link_state", function (state)
+            local value = 3
+
+            if state == LINK_STATE.BAD_VERSION then
+                value = 2
+            elseif state == LINK_STATE.DISCONNECTED then
+                value = 1
+            end
+
+            nt_ver.update(value)
+        end)
+    end
+
     system.line_break()
 
     modem.register(ps, "has_modem", modem.update)
-    network.register(ps, "link_state", network.update)
 
     local speaker = LED{parent=system,label="SPEAKER",colors=led_grn}
     speaker.register(ps, "has_speaker", speaker.update)
 
 ---@diagnostic disable-next-line: undefined-field
     local comp_id = util.sprintf("(%d)", os.getComputerID())
-    TextBox{parent=system,x=9,y=4,width=6,height=1,text=comp_id,fg_bg=style.fp_label}
+    TextBox{parent=system,x=9,y=4,width=6,height=1,text=comp_id,fg_bg=style.fp.disabled_fg}
 
     local monitors = Div{parent=main_page,width=16,height=17,x=18,y=2}
 
@@ -89,7 +123,7 @@ local function init(panel, num_units)
     -- about footer
     --
 
-    local about   = Div{parent=main_page,width=15,height=3,x=1,y=16,fg_bg=style.fp_label}
+    local about   = Div{parent=main_page,width=15,height=3,x=1,y=16,fg_bg=style.fp.disabled_fg}
     local fw_v    = TextBox{parent=about,x=1,y=1,text="FW: v00.00.00",alignment=ALIGN.LEFT,height=1}
     local comms_v = TextBox{parent=about,x=1,y=2,text="NT: v00.00.00",alignment=ALIGN.LEFT,height=1}
 
@@ -103,7 +137,7 @@ local function init(panel, num_units)
     -- API page
 
     local api_page = Div{parent=page_div,x=1,y=1,hidden=true}
-    local api_list = ListBox{parent=api_page,x=1,y=1,height=17,width=51,scroll_height=1000,fg_bg=style.fp_text,nav_fg_bg=cpair(colors.gray,colors.lightGray),nav_active=cpair(colors.black,colors.gray)}
+    local api_list = ListBox{parent=api_page,x=1,y=1,height=17,width=51,scroll_height=1000,fg_bg=style.fp.text_fg,nav_fg_bg=cpair(colors.gray,colors.lightGray),nav_active=cpair(colors.black,colors.gray)}
     local _ = Div{parent=api_list,height=1,hidden=true} -- padding
 
     -- assemble page panes
@@ -113,11 +147,11 @@ local function init(panel, num_units)
     local page_pane = MultiPane{parent=page_div,x=1,y=1,panes=panes}
 
     local tabs = {
-        { name = "CRD", color = style.fp_text },
+        { name = "CRD", color = style.fp.text },
-        { name = "API", color = style.fp_text },
+        { name = "API", color = style.fp.text },
     }
 
-    TabBar{parent=panel,y=2,tabs=tabs,min_width=9,callback=page_pane.set_value,fg_bg=style.bw_fg_bg}
+    TabBar{parent=panel,y=2,tabs=tabs,min_width=9,callback=page_pane.set_value,fg_bg=style.fp_theme.highlight_box_bright}
 
     -- link pocket API list management to PGI
     pgi.link_elements(api_list, pkt_entry)

coordinator/ui/layout/main_view.lua

@@ -21,14 +21,16 @@ local ALIGN = core.ALIGN
 -- create new main view
 ---@param main graphics_element main displaybox
 local function init(main)
+    local s_header = style.theme.header
+
     local facility = iocontrol.get_db().facility
     local units = iocontrol.get_db().units
 
     -- window header message
-    local header = TextBox{parent=main,y=1,text="Nuclear Generation Facility SCADA Coordinator",alignment=ALIGN.CENTER,height=1,fg_bg=style.header}
+    local header = TextBox{parent=main,y=1,text="Nuclear Generation Facility SCADA Coordinator",alignment=ALIGN.CENTER,height=1,fg_bg=s_header}
-    local ping = DataIndicator{parent=main,x=1,y=1,label="SVTT",format="%d",value=0,unit="ms",lu_colors=style.lg_white,width=12,fg_bg=style.header}
+    local ping = DataIndicator{parent=main,x=1,y=1,label="SVTT",format="%d",value=0,unit="ms",lu_colors=style.lg_white,width=12,fg_bg=s_header}
     -- max length example: "01:23:45 AM - Wednesday, September 28 2022"
-    local datetime = TextBox{parent=main,x=(header.get_width()-42),y=1,text="",alignment=ALIGN.RIGHT,width=42,height=1,fg_bg=style.header}
+    local datetime = TextBox{parent=main,x=(header.get_width()-42),y=1,text="",alignment=ALIGN.RIGHT,width=42,height=1,fg_bg=s_header}
 
     ping.register(facility.ps, "sv_ping", ping.update)
     datetime.register(facility.ps, "date_time", datetime.set_value)
@@ -66,8 +68,6 @@ local function init(main)
 
     -- command & control
 
-    cnc_y_start = cnc_y_start
-
     -- induction matrix and process control interfaces are 24 tall + space needed for divider
     local cnc_bottom_align_start = main.get_height() - 26
 

coordinator/ui/style.lua

@@ -2,79 +2,141 @@
 -- Graphics Style Options
 --
 
-local core = require("graphics.core")
+local util   = require("scada-common.util")
 
+local core   = require("graphics.core")
+local themes = require("graphics.themes")
+
+---@class crd_style
 local style = {}
 
 local cpair = core.cpair
 
--- GLOBAL --
-
--- add color mappings for front panel
-colors.ivory = colors.pink
-colors.yellow_hc = colors.purple
-colors.red_off = colors.brown
-colors.yellow_off = colors.magenta
-colors.green_off = colors.lime
-
 -- front panel styling
 
-style.fp = {}
+style.fp_theme = themes.sandstone
+style.fp = themes.get_fp_style(style.fp_theme)
 
-style.fp.root = cpair(colors.black, colors.ivory)
+style.led_grn = cpair(colors.green, colors.green_off)
-style.fp.header = cpair(colors.black, colors.lightGray)
-
-style.fp.colors = {
-    { c = colors.red,       hex = 0xdf4949 },   -- RED ON
-    { c = colors.orange,    hex = 0xffb659 },
-    { c = colors.yellow,    hex = 0xf9fb53 },   -- YELLOW ON
-    { c = colors.lime,      hex = 0x16665a },   -- GREEN OFF
-    { c = colors.green,     hex = 0x6be551 },   -- GREEN ON
-    { c = colors.cyan,      hex = 0x34bac8 },
-    { c = colors.lightBlue, hex = 0x6cc0f2 },
-    { c = colors.blue,      hex = 0x0096ff },
-    { c = colors.purple,    hex = 0xb156ee },   -- YELLOW HIGH CONTRAST
-    { c = colors.pink,      hex = 0xdcd9ca },   -- IVORY
-    { c = colors.magenta,   hex = 0x85862c },   -- YELLOW OFF
-    -- { c = colors.white,     hex = 0xdcd9ca },
-    { c = colors.lightGray, hex = 0xb1b8b3 },
-    { c = colors.gray,      hex = 0x575757 },
-    -- { c = colors.black,     hex = 0x191919 },
-    { c = colors.brown,     hex = 0x672223 }    -- RED OFF
-}
 
 -- main GUI styling
 
-style.root = cpair(colors.black, colors.lightGray)
+---@class theme
-style.header = cpair(colors.white, colors.gray)
+local smooth_stone = {
-style.label = cpair(colors.gray, colors.lightGray)
+    text = colors.black,
+    text_inv = colors.white,
+    label = colors.gray,
+    label_dark = colors.gray,
+    disabled = colors.lightGray,
+    bg = colors.lightGray,
+    checkbox_bg = colors.black,
+    accent_light = colors.white,
+    accent_dark = colors.gray,
 
-style.colors = {
+    fuel_color = colors.black,
-    { c = colors.red,       hex = 0xdf4949 },
+
-    { c = colors.orange,    hex = 0xffb659 },
+    header = cpair(colors.white, colors.gray),
-    { c = colors.yellow,    hex = 0xfffc79 },
+
-    { c = colors.lime,      hex = 0x80ff80 },
+    text_fg = cpair(colors.black, colors._INHERIT),
-    { c = colors.green,     hex = 0x4aee8a },
+    label_fg = cpair(colors.gray, colors._INHERIT),
-    { c = colors.cyan,      hex = 0x34bac8 },
+    disabled_fg = cpair(colors.lightGray, colors._INHERIT),
-    { c = colors.lightBlue, hex = 0x6cc0f2 },
+
-    { c = colors.blue,      hex = 0x0096ff },
+    highlight_box = cpair(colors.black, colors.white),
-    { c = colors.purple,    hex = 0xb156ee },
+    highlight_box_bright = cpair(colors.black, colors.white),
-    { c = colors.pink,      hex = 0xf26ba2 },
+    field_box = cpair(colors.black, colors.white),
-    { c = colors.magenta,   hex = 0xf9488a },
+
-    -- { c = colors.white,     hex = 0xf0f0f0 },
+    colors = themes.smooth_stone.colors,
-    { c = colors.lightGray, hex = 0xcacaca },
+
-    { c = colors.gray,      hex = 0x575757 },
+    -- color re-mappings for assistive modes
-    -- { c = colors.black,     hex = 0x191919 },
+    color_modes = themes.smooth_stone.color_modes
-    -- { c = colors.brown,     hex = 0x7f664c }
 }
 
+---@type theme
+local deepslate = {
+    text = colors.white,
+    text_inv = colors.black,
+    label = colors.lightGray,
+    label_dark = colors.gray,
+    disabled = colors.gray,
+    bg = colors.black,
+    checkbox_bg = colors.gray,
+    accent_light = colors.gray,
+    accent_dark = colors.lightGray,
+
+    fuel_color = colors.lightGray,
+
+    header = cpair(colors.white, colors.gray),
+
+    text_fg = cpair(colors.white, colors._INHERIT),
+    label_fg = cpair(colors.lightGray, colors._INHERIT),
+    disabled_fg = cpair(colors.gray, colors._INHERIT),
+
+    highlight_box = cpair(colors.white, colors.gray),
+    highlight_box_bright = cpair(colors.black, colors.lightGray),
+    field_box = cpair(colors.white, colors.gray),
+
+    colors = themes.deepslate.colors,
+
+    -- color re-mappings for assistive modes
+    color_modes = themes.deepslate.color_modes
+}
+
+style.theme = smooth_stone
+
+-- set themes per configurations
+---@param main UI_THEME main UI theme
+---@param fp FP_THEME front panel theme
+---@param color_mode COLOR_MODE the color mode to use
+function style.set_themes(main, fp, color_mode)
+    local colorblind = color_mode ~= themes.COLOR_MODE.STANDARD and color_mode ~= themes.COLOR_MODE.STD_ON_BLACK
+    local gray_ind_off = color_mode == themes.COLOR_MODE.STANDARD or color_mode == themes.COLOR_MODE.BLUE_IND
+
+    style.ind_bkg = colors.gray
+    style.fp_ind_bkg = util.trinary(gray_ind_off, colors.gray, colors.black)
+    style.ind_hi_box_bg = util.trinary(gray_ind_off, colors.gray, colors.black)
+
+    if main == themes.UI_THEME.SMOOTH_STONE then
+        style.theme = smooth_stone
+        style.ind_bkg = util.trinary(gray_ind_off, colors.gray, colors.black)
+    elseif main == themes.UI_THEME.DEEPSLATE then
+        style.theme = deepslate
+        style.ind_hi_box_bg = util.trinary(gray_ind_off, colors.lightGray, colors.black)
+    end
+
+    style.colorblind = colorblind
+
+    style.root = cpair(style.theme.text, style.theme.bg)
+    style.label = cpair(style.theme.label, style.theme.bg)
+
+    -- high contrast text (also tags)
+    style.hc_text = cpair(style.theme.text, style.theme.text_inv)
+    -- text on default background
+    style.text_colors = cpair(style.theme.text, style.theme.bg)
+    -- label & unit colors
+    style.lu_colors = cpair(style.theme.label, style.theme.label)
+    -- label & unit colors (darker if set)
+    style.lu_colors_dark = cpair(style.theme.label_dark, style.theme.label_dark)
+
+    style.ind_grn = cpair(util.trinary(colorblind, colors.blue, colors.green), style.ind_bkg)
+    style.ind_yel = cpair(colors.yellow, style.ind_bkg)
+    style.ind_red = cpair(colors.red, style.ind_bkg)
+    style.ind_wht = cpair(colors.white, style.ind_bkg)
+
+    if fp == themes.FP_THEME.SANDSTONE then
+        style.fp_theme = themes.sandstone
+    elseif fp == themes.FP_THEME.BASALT then
+        style.fp_theme = themes.basalt
+    end
+
+    style.fp = themes.get_fp_style(style.fp_theme)
+end
+
 -- COMMON COLOR PAIRS --
 
 style.wh_gray = cpair(colors.white, colors.gray)
 
 style.bw_fg_bg = cpair(colors.black, colors.white)
-style.text_colors = cpair(colors.black, colors.lightGray)
+
-style.lu_colors = cpair(colors.gray, colors.gray)
 style.hzd_fg_bg  = style.wh_gray
 style.dis_colors = cpair(colors.white, colors.lightGray)
 
@@ -82,15 +144,6 @@ style.lg_gray = cpair(colors.lightGray, colors.gray)
 style.lg_white = cpair(colors.lightGray, colors.white)
 style.gray_white = cpair(colors.gray, colors.white)
 
-style.ind_grn = cpair(colors.green, colors.gray)
-style.ind_yel = cpair(colors.yellow, colors.gray)
-style.ind_red = cpair(colors.red, colors.gray)
-style.ind_wht = style.wh_gray
-
-style.fp_text = cpair(colors.black, colors.ivory)
-style.fp_label = cpair(colors.lightGray, colors.ivory)
-style.led_grn = cpair(colors.green, colors.green_off)
-
 -- UI COMPONENTS --
 
 style.reactor = {

graphics/core.lua

@@ -7,7 +7,7 @@ local flasher = require("graphics.flasher")
 
 local core = {}
 
-core.version = "2.1.1"
+core.version = "2.2.2"
 
 core.flasher = flasher
 core.events = events
@@ -61,6 +61,9 @@ end
 ---@field blit_fgd string
 ---@field blit_bkg string
 
+-- add inherited flag, 3 isn't a pure color so it wouldn't be used
+colors._INHERIT = 3
+
 -- create a new color pair definition
 ---@nodiscard
 ---@param a color

graphics/element.lua

@@ -234,11 +234,24 @@ function element.new(args, child_offset_x, child_offset_y)
 
         -- init colors
         if args.fg_bg ~= nil then
-            protected.fg_bg = args.fg_bg
+            protected.fg_bg = core.cpair(args.fg_bg.fgd, args.fg_bg.bkg)
-        elseif args.parent ~= nil then
-            protected.fg_bg = args.parent.get_fg_bg()
         end
 
+        if args.parent ~= nil then
+            local p_fg_bg = args.parent.get_fg_bg()
+
+            if args.fg_bg == nil then
+                protected.fg_bg = core.cpair(p_fg_bg.fgd, p_fg_bg.bkg)
+            else
+                if protected.fg_bg.fgd == colors._INHERIT then protected.fg_bg = core.cpair(p_fg_bg.fgd, protected.fg_bg.bkg) end
+                if protected.fg_bg.bkg == colors._INHERIT then protected.fg_bg = core.cpair(protected.fg_bg.fgd, p_fg_bg.bkg) end
+            end
+        end
+
+        -- check colors
+        element.assert(protected.fg_bg.fgd ~= colors._INHERIT, "could not determine foreground color to inherit")
+        element.assert(protected.fg_bg.bkg ~= colors._INHERIT, "could not determine background color to inherit")
+
         -- set colors
         protected.window.setBackgroundColor(protected.fg_bg.bkg)
         protected.window.setTextColor(protected.fg_bg.fgd)

graphics/elements/controls/hazard_button.lua

@@ -138,23 +138,21 @@ local function hazard_button(args)
     -- handle mouse interaction
     ---@param event mouse_interaction mouse event
     function e.handle_mouse(event)
-        if e.enabled then
+        if e.enabled and core.events.was_clicked(event.type) and e.in_frame_bounds(event.current.x, event.current.y) then
-            if core.events.was_clicked(event.type) then
+            -- change text color to indicate clicked
-                -- change text color to indicate clicked
+            e.w_set_fgd(args.accent)
-                e.w_set_fgd(args.accent)
+            e.w_set_cur(3, 2)
-                e.w_set_cur(3, 2)
+            e.w_write(args.text)
-                e.w_write(args.text)
 
-                -- abort any other callbacks
+            -- abort any other callbacks
-                tcd.abort(on_timeout)
+            tcd.abort(on_timeout)
-                tcd.abort(on_success)
+            tcd.abort(on_success)
-                tcd.abort(on_failure)
+            tcd.abort(on_failure)
 
-                -- 1.5 second timeout
+            -- 1.5 second timeout
-                tcd.dispatch(1.5, on_timeout)
+            tcd.dispatch(1.5, on_timeout)
 
-                args.callback()
+            args.callback()
-            end
         end
     end
 

graphics/elements/controls/radio_button.lua

@@ -90,7 +90,8 @@ local function radio_button(args)
     -- handle mouse interaction
     ---@param event mouse_interaction mouse event
     function e.handle_mouse(event)
-        if e.enabled and core.events.was_clicked(event.type) and (event.initial.y == event.current.y) then
+        if e.enabled and core.events.was_clicked(event.type) and
+           (event.initial.y == event.current.y) and e.in_frame_bounds(event.current.x, event.current.y) then
             -- determine what was pressed
             if args.options[event.current.y] ~= nil then
                 e.value = event.current.y

graphics/elements/controls/spinbox_numeric.lua

@@ -127,20 +127,19 @@ local function spinbox(args)
     ---@param event mouse_interaction mouse event
     function e.handle_mouse(event)
         -- only handle if on an increment or decrement arrow
-        if e.enabled and core.events.was_clicked(event.type) and
+        if e.enabled and core.events.was_clicked(event.type) and e.in_frame_bounds(event.current.x, event.current.y) and
-                (event.current.x ~= dec_point_x) and (event.current.y ~= 2) then
+           (event.current.x ~= dec_point_x) and (event.current.y ~= 2) and
-            if event.current.x == event.initial.x and event.current.y == event.initial.y then
+           (event.current.x == event.initial.x) and (event.current.y == event.initial.y) then
-                local idx = util.trinary(event.current.x > dec_point_x, event.current.x - 1, event.current.x)
+            local idx = util.trinary(event.current.x > dec_point_x, event.current.x - 1, event.current.x)
-                if digits[idx] ~= nil then
+            if digits[idx] ~= nil then
-                    if event.current.y == 1 then
+                if event.current.y == 1 then
-                        digits[idx] = digits[idx] + 1
+                    digits[idx] = digits[idx] + 1
-                    elseif event.current.y == 3 then
+                elseif event.current.y == 3 then
-                        digits[idx] = digits[idx] - 1
+                    digits[idx] = digits[idx] - 1
-                    end
-
-                    update_value()
-                    show_num()
                 end
+
+                update_value()
+                show_num()
             end
         end
     end

graphics/elements/controls/switch_button.lua

@@ -58,7 +58,7 @@ local function switch_button(args)
     -- handle mouse interaction
     ---@param event mouse_interaction mouse event
     function e.handle_mouse(event)
-        if e.enabled and core.events.was_clicked(event.type) then
+        if e.enabled and core.events.was_clicked(event.type) and e.in_frame_bounds(event.current.x, event.current.y) then
             e.value = not e.value
             e.redraw()
             args.callback(e.value)

graphics/elements/controls/tabbar.lua

@@ -98,7 +98,7 @@ local function tabbar(args)
     ---@param event mouse_interaction mouse event
     function e.handle_mouse(event)
         -- determine what was pressed
-        if e.enabled and core.events.was_clicked(event.type) then
+        if e.enabled and core.events.was_clicked(event.type) and e.in_frame_bounds(event.current.x, event.current.y) then
             -- a button may have been pressed, which one was it?
             local tab_ini = which_tab(event.initial.x)
             local tab_cur = which_tab(event.current.x)

graphics/elements/form/number_field.lua

@@ -53,11 +53,11 @@ local function number_field(args)
     ---@param event mouse_interaction mouse event
     function e.handle_mouse(event)
         -- only handle if on an increment or decrement arrow
-        if e.enabled then
+        if e.enabled and e.in_frame_bounds(event.current.x, event.current.y) then
             if core.events.was_clicked(event.type) then
                 e.take_focus()
 
-                if event.type == MOUSE_CLICK.UP and e.in_frame_bounds(event.current.x, event.current.y) then
+                if event.type == MOUSE_CLICK.UP then
                     ifield.move_cursor(event.current.x)
                 end
             elseif event.type == MOUSE_CLICK.DOUBLE_CLICK then

graphics/elements/form/text_field.lua

@@ -41,11 +41,11 @@ local function text_field(args)
     ---@param event mouse_interaction mouse event
     function e.handle_mouse(event)
         -- only handle if on an increment or decrement arrow
-        if e.enabled then
+        if e.enabled and e.in_frame_bounds(event.current.x, event.current.y) then
             if core.events.was_clicked(event.type) then
                 e.take_focus()
 
-                if event.type == MOUSE_CLICK.UP and e.in_frame_bounds(event.current.x, event.current.y) then
+                if event.type == MOUSE_CLICK.UP then
                     ifield.move_cursor(event.current.x)
                 end
             elseif event.type == MOUSE_CLICK.DOUBLE_CLICK then

graphics/themes.lua

@@ -0,0 +1,418 @@
+--
+-- Graphics Themes
+--
+
+local core = require("graphics.core")
+
+local cpair = core.cpair
+
+---@class graphics_themes
+local themes = {}
+
+-- add color mappings for front panels
+colors.ivory      = colors.pink
+colors.green_hc   = colors.cyan
+colors.yellow_hc  = colors.purple
+colors.red_off    = colors.brown
+colors.yellow_off = colors.magenta
+colors.green_off  = colors.lime
+
+--#region Types
+
+---@enum UI_THEME
+themes.UI_THEME = { SMOOTH_STONE = 1, DEEPSLATE = 2 }
+themes.UI_THEME_NAMES = { "Smooth Stone", "Deepslate" }
+
+-- attempts to get the string name of a main ui theme
+---@nodiscard
+---@param id any
+---@return string|nil
+function themes.ui_theme_name(id)
+    if id == themes.UI_THEME.SMOOTH_STONE or
+       id == themes.UI_THEME.DEEPSLATE then
+        return themes.UI_THEME_NAMES[id]
+    else return nil end
+end
+
+---@enum FP_THEME
+themes.FP_THEME = { SANDSTONE = 1, BASALT = 2 }
+themes.FP_THEME_NAMES = { "Sandstone", "Basalt" }
+
+-- attempts to get the string name of a front panel theme
+---@nodiscard
+---@param id any
+---@return string|nil
+function themes.fp_theme_name(id)
+    if id == themes.FP_THEME.SANDSTONE or
+       id == themes.FP_THEME.BASALT then
+        return themes.FP_THEME_NAMES[id]
+    else return nil end
+end
+
+---@enum COLOR_MODE
+themes.COLOR_MODE = {
+    STANDARD = 1,
+    DEUTERANOPIA = 2,
+    PROTANOPIA = 3,
+    TRITANOPIA = 4,
+    BLUE_IND = 5,
+    STD_ON_BLACK = 6,
+    BLUE_ON_BLACK = 7,
+    NUM_MODES = 8
+}
+
+themes.COLOR_MODE_NAMES = {
+    "Standard",
+    "Deuteranopia",
+    "Protanopia",
+    "Tritanopia",
+    "Blue for 'Good'",
+    "Standard + Black",
+    "Blue + Black"
+}
+
+-- attempts to get the string name of a color mode
+---@nodiscard
+---@param id any
+---@return string|nil
+function themes.color_mode_name(id)
+    if id == themes.COLOR_MODE.STANDARD or
+       id == themes.COLOR_MODE.DEUTERANOPIA or
+       id == themes.COLOR_MODE.PROTANOPIA or
+       id == themes.COLOR_MODE.TRITANOPIA or
+       id == themes.COLOR_MODE.BLUE_IND or
+       id == themes.COLOR_MODE.STD_ON_BLACK or
+       id == themes.COLOR_MODE.BLUE_ON_BLACK then
+        return themes.COLOR_MODE_NAMES[id]
+    else return nil end
+end
+
+--#endregion
+
+--#region Front Panel Themes
+
+---@class fp_theme
+themes.sandstone = {
+    text = colors.black,
+    label = colors.lightGray,
+    label_dark = colors.gray,
+    disabled = colors.lightGray,
+    bg = colors.ivory,
+
+    header = cpair(colors.black, colors.lightGray),
+
+    highlight_box = cpair(colors.black, colors.lightGray),
+    highlight_box_bright = cpair(colors.black, colors.white),
+    field_box = cpair(colors.gray, colors.white),
+
+    colors = {
+        { c = colors.red,        hex = 0xdf4949 },
+        { c = colors.orange,     hex = 0xffb659 },
+        { c = colors.yellow,     hex = 0xf9fb53 },
+        { c = colors.green_off,  hex = 0x16665a },
+        { c = colors.green,      hex = 0x6be551 },
+        { c = colors.green_hc,   hex = 0x6be551 },
+        { c = colors.lightBlue,  hex = 0x6cc0f2 },
+        { c = colors.blue,       hex = 0x0096ff },
+        { c = colors.yellow_hc,  hex = 0xe3bc2a },
+        { c = colors.ivory,      hex = 0xdcd9ca },
+        { c = colors.yellow_off, hex = 0x85862c },
+        { c = colors.white,      hex = 0xf0f0f0 },
+        { c = colors.lightGray,  hex = 0xb1b8b3 },
+        { c = colors.gray,       hex = 0x575757 },
+        { c = colors.black,      hex = 0x191919 },
+        { c = colors.red_off,    hex = 0x672223 }
+    },
+
+    -- color re-mappings for assistive modes
+    color_modes = {
+        -- standard
+        {},
+        -- deuteranopia
+        {
+            { c = colors.green,      hex = 0x1081ff },
+            { c = colors.green_hc,   hex = 0x1081ff },
+            { c = colors.green_off,  hex = 0x141414 },
+            { c = colors.yellow,     hex = 0xf7c311 },
+            { c = colors.yellow_off, hex = 0x141414 },
+            { c = colors.red,        hex = 0xfb5615 },
+            { c = colors.red_off,    hex = 0x141414 }
+        },
+        -- protanopia
+        {
+            { c = colors.green,      hex = 0x1081ff },
+            { c = colors.green_hc,   hex = 0x1081ff },
+            { c = colors.green_off,  hex = 0x141414 },
+            { c = colors.yellow,     hex = 0xf5e633 },
+            { c = colors.yellow_off, hex = 0x141414 },
+            { c = colors.red,        hex = 0xff521a },
+            { c = colors.red_off,    hex = 0x141414 }
+        },
+        -- tritanopia
+        {
+            { c = colors.green,      hex = 0x40cbd7 },
+            { c = colors.green_hc,   hex = 0x40cbd7 },
+            { c = colors.green_off,  hex = 0x141414 },
+            { c = colors.yellow,     hex = 0xffbc00 },
+            { c = colors.yellow_off, hex = 0x141414 },
+            { c = colors.red,        hex = 0xff0000 },
+            { c = colors.red_off,    hex = 0x141414 }
+        },
+        -- blue indicators
+        {
+            { c = colors.green,      hex = 0x1081ff },
+            { c = colors.green_hc,   hex = 0x1081ff },
+            { c = colors.green_off,  hex = 0x053466 },
+        },
+        -- standard, black backgrounds
+        {
+            { c = colors.green_off,  hex = 0x141414 },
+            { c = colors.yellow_off, hex = 0x141414 },
+            { c = colors.red_off,    hex = 0x141414 }
+        },
+        -- blue indicators, black backgrounds
+        {
+            { c = colors.green,      hex = 0x1081ff },
+            { c = colors.green_hc,   hex = 0x1081ff },
+            { c = colors.green_off,  hex = 0x141414 },
+            { c = colors.yellow_off, hex = 0x141414 },
+            { c = colors.red_off,    hex = 0x141414 }
+        }
+    }
+}
+
+---@type fp_theme
+themes.basalt = {
+    text = colors.white,
+    label = colors.gray,
+    label_dark = colors.ivory,
+    disabled = colors.lightGray,
+    bg = colors.ivory,
+
+    header = cpair(colors.white, colors.gray),
+
+    highlight_box = cpair(colors.white, colors.gray),
+    highlight_box_bright = cpair(colors.black, colors.lightGray),
+    field_box = cpair(colors.white, colors.gray),
+
+    colors = {
+        { c = colors.red,        hex = 0xf18486 },
+        { c = colors.orange,     hex = 0xffb659 },
+        { c = colors.yellow,     hex = 0xefe37c },
+        { c = colors.green_off,  hex = 0x436b41 },
+        { c = colors.green,      hex = 0x7ae175 },
+        { c = colors.green_hc,   hex = 0x7ae175 },
+        { c = colors.lightBlue,  hex = 0x7dc6f2 },
+        { c = colors.blue,       hex = 0x56aae6 },
+        { c = colors.yellow_hc,  hex = 0xe9cd68 },
+        { c = colors.ivory,      hex = 0x4d4e52 },
+        { c = colors.yellow_off, hex = 0x757040 },
+        { c = colors.white,      hex = 0xbfbfbf },
+        { c = colors.lightGray,  hex = 0x848794 },
+        { c = colors.gray,       hex = 0x5c5f68 },
+        { c = colors.black,      hex = 0x333333 },
+        { c = colors.red_off,    hex = 0x512d2d }
+    },
+
+    color_modes = {
+        -- standard
+        {},
+        -- deuteranopia
+        {
+            { c = colors.green,      hex = 0x65aeff },
+            { c = colors.green_hc,   hex = 0x99c9ff },
+            { c = colors.green_off,  hex = 0x333333 },
+            { c = colors.yellow,     hex = 0xf7c311 },
+            { c = colors.yellow_off, hex = 0x333333 },
+            { c = colors.red,        hex = 0xf18486 },
+            { c = colors.red_off,    hex = 0x333333 }
+        },
+        -- protanopia
+        {
+            { c = colors.green,      hex = 0x65aeff },
+            { c = colors.green_hc,   hex = 0x99c9ff },
+            { c = colors.green_off,  hex = 0x333333 },
+            { c = colors.yellow,     hex = 0xf5e633 },
+            { c = colors.yellow_off, hex = 0x333333 },
+            { c = colors.red,        hex = 0xff8058 },
+            { c = colors.red_off,    hex = 0x333333 }
+        },
+        -- tritanopia
+        {
+            { c = colors.green,      hex = 0x00ecff },
+            { c = colors.green_hc,   hex = 0x00ecff },
+            { c = colors.green_off,  hex = 0x333333 },
+            { c = colors.yellow,     hex = 0xffbc00 },
+            { c = colors.yellow_off, hex = 0x333333 },
+            { c = colors.red,        hex = 0xdf4949 },
+            { c = colors.red_off,    hex = 0x333333 }
+        },
+        -- blue indicators
+        {
+            { c = colors.green,      hex = 0x65aeff },
+            { c = colors.green_hc,   hex = 0x99c9ff },
+            { c = colors.green_off,  hex = 0x365e8a },
+        },
+        -- standard, black backgrounds
+        {
+            { c = colors.green_off,  hex = 0x333333 },
+            { c = colors.yellow_off, hex = 0x333333 },
+            { c = colors.red_off,    hex = 0x333333 }
+        },
+        -- blue indicators, black backgrounds
+        {
+            { c = colors.green,      hex = 0x65aeff },
+            { c = colors.green_hc,   hex = 0x99c9ff },
+            { c = colors.green_off,  hex = 0x333333 },
+            { c = colors.yellow_off, hex = 0x333333 },
+            { c = colors.red_off,    hex = 0x333333 }
+        }
+    }
+}
+
+-- get style fields for a front panel based on the provided theme
+---@param theme fp_theme
+function themes.get_fp_style(theme)
+    ---@class fp_style
+    local style =  {
+        root = cpair(theme.text, theme.bg),
+
+        text = cpair(theme.text, theme.bg),
+        text_fg = cpair(theme.text, colors._INHERIT),
+
+        label_fg = cpair(theme.label, colors._INHERIT),
+        label_d_fg = cpair(theme.label_dark, colors._INHERIT),
+
+        disabled_fg = cpair(theme.disabled, colors._INHERIT)
+    }
+
+    return style
+end
+
+--#endregion
+
+--#region Main UI Color Palettes
+
+---@class ui_palette
+themes.smooth_stone = {
+    colors = {
+        { c = colors.red,       hex = 0xdf4949 },
+        { c = colors.orange,    hex = 0xffb659 },
+        { c = colors.yellow,    hex = 0xfffc79 },
+        { c = colors.lime,      hex = 0x80ff80 },
+        { c = colors.green,     hex = 0x4aee8a },
+        { c = colors.cyan,      hex = 0x34bac8 },
+        { c = colors.lightBlue, hex = 0x6cc0f2 },
+        { c = colors.blue,      hex = 0x0096ff },
+        { c = colors.purple,    hex = 0xb156ee },
+        { c = colors.pink,      hex = 0xf26ba2 },
+        { c = colors.magenta,   hex = 0xf9488a },
+        { c = colors.white,     hex = 0xf0f0f0 },
+        { c = colors.lightGray, hex = 0xcacaca },
+        { c = colors.gray,      hex = 0x575757 },
+        { c = colors.black,     hex = 0x191919 },
+        { c = colors.brown,     hex = 0x7f664c }
+    },
+
+    -- color re-mappings for assistive modes
+    color_modes = {
+        -- standard
+        {},
+        -- deuteranopia
+        {
+            { c = colors.blue,   hex = 0x1081ff },
+            { c = colors.yellow, hex = 0xf7c311 },
+            { c = colors.red,    hex = 0xfb5615 }
+        },
+        -- protanopia
+        {
+            { c = colors.blue,   hex = 0x1081ff },
+            { c = colors.yellow, hex = 0xf5e633 },
+            { c = colors.red,    hex = 0xff521a }
+        },
+        -- tritanopia
+        {
+            { c = colors.blue,   hex = 0x40cbd7 },
+            { c = colors.yellow, hex = 0xffbc00 },
+            { c = colors.red,    hex = 0xff0000 }
+        },
+        -- blue indicators
+        {
+            { c = colors.blue,   hex = 0x1081ff },
+            { c = colors.yellow, hex = 0xfffc79 },
+            { c = colors.red,    hex = 0xdf4949 }
+        },
+        -- standard, black backgrounds
+        {},
+        -- blue indicators, black backgrounds
+        {
+            { c = colors.blue,   hex = 0x1081ff },
+            { c = colors.yellow, hex = 0xfffc79 },
+            { c = colors.red,    hex = 0xdf4949 }
+        }
+    }
+}
+
+---@type ui_palette
+themes.deepslate = {
+    colors = {
+        { c = colors.red,       hex = 0xeb6a6c },
+        { c = colors.orange,    hex = 0xf2b86c },
+        { c = colors.yellow,    hex = 0xd9cf81 },
+        { c = colors.lime,      hex = 0x80ff80 },
+        { c = colors.green,     hex = 0x70e19b },
+        { c = colors.cyan,      hex = 0x7ccdd0 },
+        { c = colors.lightBlue, hex = 0x99ceef },
+        { c = colors.blue,      hex = 0x60bcff },
+        { c = colors.purple,    hex = 0xc38aea },
+        { c = colors.pink,      hex = 0xff7fb8 },
+        { c = colors.magenta,   hex = 0xf980dd },
+        { c = colors.white,     hex = 0xd9d9d9 },
+        { c = colors.lightGray, hex = 0x949494 },
+        { c = colors.gray,      hex = 0x575757 },
+        { c = colors.black,     hex = 0x262626 },
+        { c = colors.brown,     hex = 0xb18f6a }
+    },
+
+    -- color re-mappings for assistive modes
+    color_modes = {
+        -- standard
+        {},
+        -- deuteranopia
+        {
+            { c = colors.blue,   hex = 0x65aeff },
+            { c = colors.yellow, hex = 0xf7c311 },
+            { c = colors.red,    hex = 0xfb5615 }
+        },
+        -- protanopia
+        {
+            { c = colors.blue,   hex = 0x65aeff },
+            { c = colors.yellow, hex = 0xf5e633 },
+            { c = colors.red,    hex = 0xff8058 }
+        },
+        -- tritanopia
+        {
+            { c = colors.blue,   hex = 0x00ecff },
+            { c = colors.yellow, hex = 0xffbc00 },
+            { c = colors.red,    hex = 0xdf4949 }
+        },
+        -- blue indicators
+        {
+            { c = colors.blue,   hex = 0x65aeff },
+            { c = colors.yellow, hex = 0xd9cf81 },
+            { c = colors.red,    hex = 0xeb6a6c }
+        },
+        -- standard, black backgrounds
+        {},
+        -- blue indicators, black backgrounds
+        {
+            { c = colors.blue,   hex = 0x65aeff },
+            { c = colors.yellow, hex = 0xd9cf81 },
+            { c = colors.red,    hex = 0xeb6a6c }
+        }
+    }
+}
+
+--#endregion
+
+return themes

pocket/configure.lua

@@ -7,6 +7,7 @@ local tcd         = require("scada-common.tcd")
 local util        = require("scada-common.util")
 
 local core        = require("graphics.core")
+local themes      = require("graphics.themes")
 
 local DisplayBox  = require("graphics.elements.displaybox")
 local Div         = require("graphics.elements.div")
@@ -41,21 +42,7 @@ local style = {}
 style.root = cpair(colors.black, colors.lightGray)
 style.header = cpair(colors.white, colors.gray)
 
-style.colors = {
+style.colors = themes.smooth_stone.colors
-    { c = colors.red,       hex = 0xdf4949 },
-    { c = colors.orange,    hex = 0xffb659 },
-    { c = colors.yellow,    hex = 0xfffc79 },
-    { c = colors.lime,      hex = 0x80ff80 },
-    { c = colors.green,     hex = 0x4aee8a },
-    { c = colors.cyan,      hex = 0x34bac8 },
-    { c = colors.lightBlue, hex = 0x6cc0f2 },
-    { c = colors.blue,      hex = 0x0096ff },
-    { c = colors.purple,    hex = 0xb156ee },
-    { c = colors.pink,      hex = 0xf26ba2 },
-    { c = colors.magenta,   hex = 0xf9488a },
-    { c = colors.lightGray, hex = 0xcacaca },
-    { c = colors.gray,      hex = 0x575757 }
-}
 
 local bw_fg_bg = cpair(colors.black, colors.white)
 local g_lg_fg_bg = cpair(colors.gray, colors.lightGray)
@@ -112,7 +99,7 @@ local fields = {
     { "AuthKey", "Facility Auth Key" , ""},
     { "LogMode", "Log Mode", log.MODE.APPEND },
     { "LogPath", "Log Path", "/log.txt" },
-    { "LogDebug","Log Debug Messages", false }
+    { "LogDebug", "Log Debug Messages", false }
 }
 
 -- load data from the settings file

pocket/startup.lua

@@ -18,7 +18,7 @@ local iocontrol = require("pocket.iocontrol")
 local pocket    = require("pocket.pocket")
 local renderer  = require("pocket.renderer")
 
-local POCKET_VERSION = "v0.7.0-alpha"
+local POCKET_VERSION = "v0.7.3-alpha"
 
 local println = util.println
 local println_ts = util.println_ts
@@ -31,9 +31,13 @@ if not pocket.load_config() then
     -- try to reconfigure (user action)
     local success, error = configure.configure(true)
     if success then
-        assert(pocket.load_config(), "failed to load valid configuration")
+        if not pocket.load_config() then
+            println("failed to load a valid configuration, please reconfigure")
+            return
+        end
     else
-        assert(success, "pocket configuration error: " .. error)
+        println("configuration error: " .. error)
+        return
     end
 end
 
@@ -50,6 +54,7 @@ log.info("BOOTING pocket.startup " .. POCKET_VERSION)
 log.info("========================================")
 
 crash.set_env("pocket", POCKET_VERSION)
+crash.dbg_log_env()
 
 ----------------------------------------
 -- main application

reactor-plc/configure.lua

@@ -8,6 +8,7 @@ local tcd         = require("scada-common.tcd")
 local util        = require("scada-common.util")
 
 local core        = require("graphics.core")
+local themes      = require("graphics.themes")
 
 local DisplayBox  = require("graphics.elements.displaybox")
 local Div         = require("graphics.elements.div")
@@ -23,6 +24,8 @@ local RadioButton = require("graphics.elements.controls.radio_button")
 local NumberField = require("graphics.elements.form.number_field")
 local TextField   = require("graphics.elements.form.text_field")
 
+local IndLight    = require("graphics.elements.indicators.light")
+
 local println = util.println
 local tri = util.trinary
 
@@ -34,8 +37,10 @@ local RIGHT = core.ALIGN.RIGHT
 
 -- changes to the config data/format to let the user know
 local changes = {
-    {"v1.6.2", { "AuthKey minimum length is now 8 (if set)" } },
+    { "v1.6.2", { "AuthKey minimum length is now 8 (if set)" } },
-    {"v1.6.8", { "ConnTimeout can now have a fractional part" } }
+    { "v1.6.8", { "ConnTimeout can now have a fractional part" } },
+    { "v1.6.15", { "Added front panel UI theme", "Added color accessibility modes" } },
+    { "v1.7.3", { "Added standard with black off state color mode", "Added blue indicator color modes" } }
 }
 
 ---@class plc_configurator
@@ -46,34 +51,25 @@ local style = {}
 style.root = cpair(colors.black, colors.lightGray)
 style.header = cpair(colors.white, colors.gray)
 
-style.colors = {
+style.colors = themes.smooth_stone.colors
-    { c = colors.red,       hex = 0xdf4949 },
-    { c = colors.orange,    hex = 0xffb659 },
-    { c = colors.yellow,    hex = 0xfffc79 },
-    { c = colors.lime,      hex = 0x80ff80 },
-    { c = colors.green,     hex = 0x4aee8a },
-    { c = colors.cyan,      hex = 0x34bac8 },
-    { c = colors.lightBlue, hex = 0x6cc0f2 },
-    { c = colors.blue,      hex = 0x0096ff },
-    { c = colors.purple,    hex = 0xb156ee },
-    { c = colors.pink,      hex = 0xf26ba2 },
-    { c = colors.magenta,   hex = 0xf9488a },
-    { c = colors.lightGray, hex = 0xcacaca },
-    { c = colors.gray,      hex = 0x575757 }
-}
 
 local bw_fg_bg = cpair(colors.black, colors.white)
 local g_lg_fg_bg = cpair(colors.gray, colors.lightGray)
 local nav_fg_bg = bw_fg_bg
 local btn_act_fg_bg = cpair(colors.white, colors.gray)
 
+---@class _plc_cfg_tool_ctl
 local tool_ctl = {
     ask_config = false,
     has_config = false,
     viewing_config = false,
     importing_legacy = false,
+    jumped_to_color = false,
 
     view_cfg = nil,         ---@type graphics_element
+    color_cfg = nil,        ---@type graphics_element
+    color_next = nil,       ---@type graphics_element
+    color_apply = nil,      ---@type graphics_element
     settings_apply = nil,   ---@type graphics_element
 
     set_networked = nil,    ---@type function
@@ -103,6 +99,8 @@ local tmp_cfg = {
     LogMode = 0,
     LogPath = "",
     LogDebug = false,
+    FrontPanelTheme = 1,
+    ColorMode = 1
 }
 
 ---@class plc_config
@@ -124,7 +122,9 @@ local fields = {
     { "AuthKey", "Facility Auth Key" , ""},
     { "LogMode", "Log Mode", log.MODE.APPEND },
     { "LogPath", "Log Path", "/log.txt" },
-    { "LogDebug","Log Debug Messages", false }
+    { "LogDebug", "Log Debug Messages", false },
+    { "FrontPanelTheme", "Front Panel Theme", themes.FP_THEME.SANDSTONE },
+    { "ColorMode", "Color Mode", themes.COLOR_MODE.STANDARD }
 }
 
 local side_options = { "Top", "Bottom", "Left", "Right", "Front", "Back" }
@@ -176,10 +176,11 @@ local function config_view(display)
     local plc_cfg = Div{parent=root_pane_div,x=1,y=1}
     local net_cfg = Div{parent=root_pane_div,x=1,y=1}
     local log_cfg = Div{parent=root_pane_div,x=1,y=1}
+    local clr_cfg = Div{parent=root_pane_div,x=1,y=1}
     local summary = Div{parent=root_pane_div,x=1,y=1}
     local changelog = Div{parent=root_pane_div,x=1,y=1}
 
-    local main_pane = MultiPane{parent=root_pane_div,x=1,y=1,panes={main_page,plc_cfg,net_cfg,log_cfg,summary,changelog}}
+    local main_pane = MultiPane{parent=root_pane_div,x=1,y=1,panes={main_page,plc_cfg,net_cfg,log_cfg,clr_cfg,summary,changelog}}
 
     -- Main Page
 
@@ -196,7 +197,7 @@ local function config_view(display)
         tool_ctl.viewing_config = true
         tool_ctl.gen_summary(settings_cfg)
         tool_ctl.settings_apply.hide(true)
-        main_pane.set_value(5)
+        main_pane.set_value(6)
     end
 
     if fs.exists("/reactor-plc/config.lua") then
@@ -207,10 +208,21 @@ local function config_view(display)
     PushButton{parent=main_page,x=2,y=y_start,min_width=18,text="Configure System",callback=function()main_pane.set_value(2)end,fg_bg=cpair(colors.black,colors.blue),active_fg_bg=btn_act_fg_bg}
     tool_ctl.view_cfg = PushButton{parent=main_page,x=2,y=y_start+2,min_width=20,text="View Configuration",callback=view_config,fg_bg=cpair(colors.black,colors.blue),active_fg_bg=btn_act_fg_bg,dis_fg_bg=cpair(colors.lightGray,colors.white)}
 
-    if not tool_ctl.has_config then tool_ctl.view_cfg.disable() end
+    local function jump_color()
+        tool_ctl.jumped_to_color = true
+        tool_ctl.color_next.hide(true)
+        tool_ctl.color_apply.show()
+        main_pane.set_value(5)
+    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=39,y=17,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}
+    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)}
+    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}
+
+    if not tool_ctl.has_config then
+        tool_ctl.view_cfg.disable()
+        tool_ctl.color_cfg.disable()
+    end
 
     --#region PLC
 
@@ -419,10 +431,8 @@ local function config_view(display)
             tmp_cfg.LogMode = mode.get_value() - 1
             tmp_cfg.LogPath = path.get_value()
             tmp_cfg.LogDebug = en_dbg.get_value()
-            tool_ctl.gen_summary(tmp_cfg)
+            tool_ctl.color_apply.hide(true)
-            tool_ctl.viewing_config = false
+            tool_ctl.color_next.show()
-            tool_ctl.importing_legacy = false
-            tool_ctl.settings_apply.show()
             main_pane.set_value(5)
         else path_err.show() end
     end
@@ -436,6 +446,116 @@ local function config_view(display)
 
     --#endregion
 
+    --#region Color Options
+
+    local clr_c_1 = Div{parent=clr_cfg,x=2,y=4,width=49}
+    local clr_c_2 = Div{parent=clr_cfg,x=2,y=4,width=49}
+    local clr_c_3 = Div{parent=clr_cfg,x=2,y=4,width=49}
+    local clr_c_4 = Div{parent=clr_cfg,x=2,y=4,width=49}
+
+    local clr_pane = MultiPane{parent=clr_cfg,x=1,y=4,panes={clr_c_1,clr_c_2,clr_c_3,clr_c_4}}
+
+    TextBox{parent=clr_cfg,x=1,y=2,height=1,text=" Color Configuration",fg_bg=cpair(colors.black,colors.magenta)}
+
+    TextBox{parent=clr_c_1,x=1,y=1,height=2,text="Here you can select the color theme for the front panel."}
+    TextBox{parent=clr_c_1,x=1,y=4,height=2,text="Click 'Accessibility' below to access colorblind assistive options.",fg_bg=g_lg_fg_bg}
+
+    TextBox{parent=clr_c_1,x=1,y=7,height=1,text="Front Panel Theme"}
+    local fp_theme = RadioButton{parent=clr_c_1,x=1,y=8,default=ini_cfg.FrontPanelTheme,options=themes.FP_THEME_NAMES,callback=function()end,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.magenta}
+
+    TextBox{parent=clr_c_2,x=1,y=1,height=6,text="This system uses color heavily to distinguish ok and not, with some indicators using many colors. By selecting a mode below, indicators will change as shown. For non-standard modes, indicators with more than two colors will be split up."}
+
+    TextBox{parent=clr_c_2,x=21,y=7,height=1,text="Preview"}
+    local _ = IndLight{parent=clr_c_2,x=21,y=8,label="Good",colors=cpair(colors.black,colors.green)}
+    _ = IndLight{parent=clr_c_2,x=21,y=9,label="Warning",colors=cpair(colors.black,colors.yellow)}
+    _ = IndLight{parent=clr_c_2,x=21,y=10,label="Bad",colors=cpair(colors.black,colors.red)}
+    local b_off = IndLight{parent=clr_c_2,x=21,y=11,label="Off",colors=cpair(colors.black,colors.black),hidden=true}
+    local g_off = IndLight{parent=clr_c_2,x=21,y=11,label="Off",colors=cpair(colors.gray,colors.gray),hidden=true}
+
+    local function recolor(value)
+        local c = themes.smooth_stone.color_modes[value]
+
+        if value == themes.COLOR_MODE.STANDARD or value == themes.COLOR_MODE.BLUE_IND then
+            b_off.hide()
+            g_off.show()
+        else
+            g_off.hide()
+            b_off.show()
+        end
+
+        if #c == 0 then
+            for i = 1, #style.colors do term.setPaletteColor(style.colors[i].c, style.colors[i].hex) end
+        else
+            term.setPaletteColor(colors.green, c[1].hex)
+            term.setPaletteColor(colors.yellow, c[2].hex)
+            term.setPaletteColor(colors.red, c[3].hex)
+        end
+    end
+
+    TextBox{parent=clr_c_2,x=1,y=7,height=1,width=10,text="Color Mode"}
+    local c_mode = RadioButton{parent=clr_c_2,x=1,y=8,default=ini_cfg.ColorMode,options=themes.COLOR_MODE_NAMES,callback=recolor,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.magenta}
+
+    TextBox{parent=clr_c_2,x=21,y=13,height=2,width=18,text="Note: exact color varies by theme.",fg_bg=g_lg_fg_bg}
+
+    PushButton{parent=clr_c_2,x=44,y=14,min_width=6,text="Done",callback=function()clr_pane.set_value(1)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+
+    local function back_from_colors()
+        main_pane.set_value(util.trinary(tool_ctl.jumped_to_color, 1, 4))
+        tool_ctl.jumped_to_color = false
+        recolor(1)
+    end
+
+    local function show_access()
+        clr_pane.set_value(2)
+        recolor(c_mode.get_value())
+    end
+
+    local function submit_colors()
+        tmp_cfg.FrontPanelTheme = fp_theme.get_value()
+        tmp_cfg.ColorMode = c_mode.get_value()
+
+        if tool_ctl.jumped_to_color then
+            settings.set("FrontPanelTheme", tmp_cfg.FrontPanelTheme)
+            settings.set("ColorMode", tmp_cfg.ColorMode)
+
+            if settings.save("/reactor-plc.settings") then
+                load_settings(settings_cfg, true)
+                load_settings(ini_cfg)
+                clr_pane.set_value(3)
+            else
+                clr_pane.set_value(4)
+            end
+        else
+            tool_ctl.gen_summary(tmp_cfg)
+            tool_ctl.viewing_config = false
+            tool_ctl.importing_legacy = false
+            tool_ctl.settings_apply.show()
+            main_pane.set_value(6)
+        end
+    end
+
+    PushButton{parent=clr_c_1,x=1,y=14,text="\x1b Back",callback=back_from_colors,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    PushButton{parent=clr_c_1,x=8,y=14,min_width=15,text="Accessibility",callback=show_access,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    tool_ctl.color_next = PushButton{parent=clr_c_1,x=44,y=14,text="Next \x1a",callback=submit_colors,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    tool_ctl.color_apply = PushButton{parent=clr_c_1,x=43,y=14,min_width=7,text="Apply",callback=submit_colors,fg_bg=cpair(colors.black,colors.green),active_fg_bg=btn_act_fg_bg}
+
+    tool_ctl.color_apply.hide(true)
+
+    local function c_go_home()
+        main_pane.set_value(1)
+        clr_pane.set_value(1)
+    end
+
+    TextBox{parent=clr_c_3,x=1,y=1,height=1,text="Settings saved!"}
+    PushButton{parent=clr_c_3,x=1,y=14,min_width=6,text="Exit",callback=exit,fg_bg=cpair(colors.black,colors.red),active_fg_bg=cpair(colors.white,colors.gray)}
+    PushButton{parent=clr_c_3,x=44,y=14,min_width=6,text="Home",callback=c_go_home,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+
+    TextBox{parent=clr_c_4,x=1,y=1,height=5,text="Failed to save the settings file.\n\nThere may not be enough space for the modification or server file permissions may be denying writes."}
+    PushButton{parent=clr_c_4,x=1,y=14,min_width=6,text="Exit",callback=exit,fg_bg=cpair(colors.black,colors.red),active_fg_bg=cpair(colors.white,colors.gray)}
+    PushButton{parent=clr_c_4,x=44,y=14,min_width=6,text="Home",callback=c_go_home,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+
+    --#endregion
+
     --#region Summary and Saving
 
     local sum_c_1 = Div{parent=summary,x=2,y=4,width=49}
@@ -456,7 +576,7 @@ local function config_view(display)
             tool_ctl.importing_legacy = false
             tool_ctl.settings_apply.show()
         else
-            main_pane.set_value(4)
+            main_pane.set_value(5)
         end
     end
 
@@ -487,6 +607,8 @@ local function config_view(display)
             try_set(mode, ini_cfg.LogMode)
             try_set(path, ini_cfg.LogPath)
             try_set(en_dbg, ini_cfg.LogDebug)
+            try_set(fp_theme, ini_cfg.FrontPanelTheme)
+            try_set(c_mode, ini_cfg.ColorMode)
 
             tool_ctl.view_cfg.enable()
 
@@ -511,6 +633,7 @@ local function config_view(display)
         main_pane.set_value(1)
         plc_pane.set_value(1)
         net_pane.set_value(1)
+        clr_pane.set_value(1)
         sum_pane.set_value(1)
     end
 
@@ -588,7 +711,7 @@ local function config_view(display)
 
         tool_ctl.gen_summary(tmp_cfg)
         sum_pane.set_value(1)
-        main_pane.set_value(5)
+        main_pane.set_value(6)
         tool_ctl.importing_legacy = true
     end
 
@@ -617,9 +740,15 @@ local function config_view(display)
             local raw = cfg[f[1]]
             local val = util.strval(raw)
 
-            if f[1] == "AuthKey" then val = string.rep("*", string.len(val)) end
+            if f[1] == "AuthKey" then val = string.rep("*", string.len(val))
-            if f[1] == "LogMode" then val = util.trinary(raw == log.MODE.APPEND, "append", "replace") end
+            elseif f[1] == "LogMode" then val = util.trinary(raw == log.MODE.APPEND, "append", "replace")
-            if f[1] == "EmerCoolColor" and raw ~= nil then val = rsio.color_name(raw) end
+            elseif f[1] == "EmerCoolColor" and raw ~= nil then val = rsio.color_name(raw)
+            elseif f[1] == "FrontPanelTheme" then
+                val = util.strval(themes.fp_theme_name(raw))
+            elseif f[1] == "ColorMode" then
+                val = util.strval(themes.color_mode_name(raw))
+            end
+
             if val == "nil" then val = "<not set>" end
 
             local c = util.trinary(alternate, g_lg_fg_bg, cpair(colors.gray,colors.white))

reactor-plc/databus.lua

@@ -70,9 +70,9 @@ function databus.tx_link_state(state)
 end
 
 -- transmit reactor enable state across the bus
----@param active boolean reactor active
+---@param active any reactor active
 function databus.tx_reactor_state(active)
-    databus.ps.publish("reactor_active", active)
+    databus.ps.publish("reactor_active", active == true)
 end
 
 -- transmit RPS data across the bus

reactor-plc/panel/front_panel.lua

@@ -23,6 +23,8 @@ local LED        = require("graphics.elements.indicators.led")
 local LEDPair    = require("graphics.elements.indicators.ledpair")
 local RGBLED     = require("graphics.elements.indicators.ledrgb")
 
+local LINK_STATE = types.PANEL_LINK_STATE
+
 local ALIGN = core.ALIGN
 
 local cpair = core.cpair
@@ -34,8 +36,12 @@ local ind_red = style.ind_red
 -- create new front panel view
 ---@param panel graphics_element main displaybox
 local function init(panel)
-    local header = TextBox{parent=panel,y=1,text="REACTOR PLC - UNIT ?",alignment=ALIGN.CENTER,height=1,fg_bg=style.header}
+    local s_hi_box = style.theme.highlight_box
-    header.register(databus.ps, "unit_id", function (id) header.set_value(util.c("REACTOR PLC - UNIT ", id)) end)
+
+    local disabled_fg = style.fp.disabled_fg
+
+    local header = TextBox{parent=panel,y=1,text="FISSION REACTOR PLC - UNIT ?",alignment=ALIGN.CENTER,height=1,fg_bg=style.theme.header}
+    header.register(databus.ps, "unit_id", function (id) header.set_value(util.c("FISSION REACTOR PLC - UNIT ", id)) end)
 
     --
     -- system indicators
@@ -52,13 +58,47 @@ local function init(panel)
 
     local reactor = LEDPair{parent=system,label="REACTOR",off=colors.red,c1=colors.yellow,c2=colors.green}
     local modem = LED{parent=system,label="MODEM",colors=ind_grn}
-    local network = RGBLED{parent=system,label="NETWORK",colors={colors.green,colors.red,colors.orange,colors.yellow,colors.gray}}
+
-    network.update(types.PANEL_LINK_STATE.DISCONNECTED)
+    if not style.colorblind then
+        local network = RGBLED{parent=system,label="NETWORK",colors={colors.green,colors.red,colors.orange,colors.yellow,style.ind_bkg}}
+        network.update(types.PANEL_LINK_STATE.DISCONNECTED)
+        network.register(databus.ps, "link_state", network.update)
+    else
+        local nt_lnk = LEDPair{parent=system,label="NT LINKED",off=style.ind_bkg,c1=colors.red,c2=colors.green}
+        local nt_ver = LEDPair{parent=system,label="NT VERSION",off=style.ind_bkg,c1=colors.red,c2=colors.green}
+        local nt_col = LED{parent=system,label="NT COLLISION",colors=ind_red}
+
+        nt_lnk.register(databus.ps, "link_state", function (state)
+            local value = 2
+
+            if state == LINK_STATE.DISCONNECTED then
+                value = 1
+            elseif state == LINK_STATE.LINKED then
+                value = 3
+            end
+
+            nt_lnk.update(value)
+        end)
+
+        nt_ver.register(databus.ps, "link_state", function (state)
+            local value = 3
+
+            if state == LINK_STATE.BAD_VERSION then
+                value = 2
+            elseif state == LINK_STATE.DISCONNECTED then
+                value = 1
+            end
+
+            nt_ver.update(value)
+        end)
+
+        nt_col.register(databus.ps, "link_state", function (state) nt_col.update(state == LINK_STATE.COLLISION) end)
+    end
+
     system.line_break()
 
     reactor.register(databus.ps, "reactor_dev_state", reactor.update)
     modem.register(databus.ps, "has_modem", modem.update)
-    network.register(databus.ps, "link_state", network.update)
 
     local rt_main = LED{parent=system,label="RT MAIN",colors=ind_grn}
     local rt_rps  = LED{parent=system,label="RT RPS",colors=ind_grn}
@@ -75,7 +115,7 @@ local function init(panel)
 
 ---@diagnostic disable-next-line: undefined-field
     local comp_id = util.sprintf("(%d)", os.getComputerID())
-    TextBox{parent=system,x=9,y=5,width=6,height=1,text=comp_id,fg_bg=cpair(colors.lightGray,colors.ivory)}
+    TextBox{parent=system,x=9,y=5,width=6,height=1,text=comp_id,fg_bg=disabled_fg}
 
     --
     -- status & controls
@@ -91,12 +131,12 @@ local function init(panel)
         emer_cool.register(databus.ps, "emer_cool", emer_cool.update)
     end
 
-    local status_trip_rct = Rectangle{parent=status,width=20,height=3,x=1,border=border(1,colors.lightGray,true),even_inner=true,fg_bg=cpair(colors.black,colors.ivory)}
+    local status_trip_rct = Rectangle{parent=status,width=20,height=3,x=1,border=border(1,s_hi_box.bkg,true),even_inner=true}
-    local status_trip = Div{parent=status_trip_rct,width=18,height=1,fg_bg=cpair(colors.black,colors.lightGray)}
+    local status_trip = Div{parent=status_trip_rct,width=18,height=1,fg_bg=s_hi_box}
     local scram = LED{parent=status_trip,width=10,label="RPS TRIP",colors=ind_red,flash=true,period=flasher.PERIOD.BLINK_250_MS}
 
-    local controls_rct = Rectangle{parent=status,width=17,height=3,x=1,border=border(1,colors.white,true),even_inner=true,fg_bg=cpair(colors.black,colors.ivory)}
+    local controls_rct = Rectangle{parent=status,width=17,height=3,x=1,border=border(1,s_hi_box.bkg,true),even_inner=true}
-    local controls = Div{parent=controls_rct,width=15,height=1,fg_bg=cpair(colors.black,colors.white)}
+    local controls = Div{parent=controls_rct,width=15,height=1,fg_bg=s_hi_box}
     PushButton{parent=controls,x=1,y=1,min_width=7,text="SCRAM",callback=databus.rps_scram,fg_bg=cpair(colors.black,colors.red),active_fg_bg=cpair(colors.black,colors.red_off)}
     PushButton{parent=controls,x=9,y=1,min_width=7,text="RESET",callback=databus.rps_reset,fg_bg=cpair(colors.black,colors.yellow),active_fg_bg=cpair(colors.black,colors.yellow_off)}
 
@@ -107,9 +147,9 @@ local function init(panel)
     -- about footer
     --
 
-    local about   = Rectangle{parent=panel,width=32,height=3,x=2,y=16,border=border(1,colors.ivory),thin=true,fg_bg=cpair(colors.black,colors.white)}
+    local about   = Div{parent=panel,width=15,height=3,x=1,y=18,fg_bg=disabled_fg}
-    local fw_v    = TextBox{parent=about,x=2,y=1,text="FW: v00.00.00",alignment=ALIGN.LEFT,height=1}
+    local fw_v    = TextBox{parent=about,x=1,y=1,text="FW: v00.00.00",alignment=ALIGN.LEFT,height=1}
-    local comms_v = TextBox{parent=about,x=17,y=1,text="NT: v00.00.00",alignment=ALIGN.LEFT,height=1}
+    local comms_v = TextBox{parent=about,x=1,y=2,text="NT: v00.00.00",alignment=ALIGN.LEFT,height=1}
 
     fw_v.register(databus.ps, "version", function (version) fw_v.set_value(util.c("FW: ", version)) end)
     comms_v.register(databus.ps, "comms_version", function (version) comms_v.set_value(util.c("NT: v", version)) end)
@@ -118,7 +158,7 @@ local function init(panel)
     -- rps list
     --
 
-    local rps = Rectangle{parent=panel,width=16,height=16,x=36,y=3,border=border(1,colors.lightGray),thin=true,fg_bg=cpair(colors.black,colors.lightGray)}
+    local rps = Rectangle{parent=panel,width=16,height=16,x=36,y=3,border=border(1,s_hi_box.bkg),thin=true,fg_bg=s_hi_box}
     local rps_man  = LED{parent=rps,label="MANUAL",colors=ind_red}
     local rps_auto = LED{parent=rps,label="AUTOMATIC",colors=ind_red}
     local rps_tmo  = LED{parent=rps,label="TIMEOUT",colors=ind_red}

reactor-plc/panel/style.lua

@@ -2,46 +2,40 @@
 -- Graphics Style Options
 --
 
-local core = require("graphics.core")
+local core   = require("graphics.core")
+local themes = require("graphics.themes")
 
+---@class plc_style
 local style = {}
 
 local cpair = core.cpair
 
--- GLOBAL --
+style.theme = themes.sandstone
-
+style.fp = themes.get_fp_style(style.theme)
--- remap global colors
+style.colorblind = false
-colors.ivory = colors.pink
-colors.yellow_hc = colors.purple
-colors.red_off = colors.brown
-colors.yellow_off = colors.magenta
-colors.green_off = colors.lime
-
-style.root = cpair(colors.black, colors.ivory)
-style.header = cpair(colors.black, colors.lightGray)
-
-style.colors = {
-    { c = colors.red,       hex = 0xdf4949 },   -- RED ON
-    { c = colors.orange,    hex = 0xffb659 },
-    { c = colors.yellow,    hex = 0xf9fb53 },   -- YELLOW ON
-    { c = colors.lime,      hex = 0x16665a },   -- GREEN OFF
-    { c = colors.green,     hex = 0x6be551 },   -- GREEN ON
-    { c = colors.cyan,      hex = 0x34bac8 },
-    { c = colors.lightBlue, hex = 0x6cc0f2 },
-    { c = colors.blue,      hex = 0x0096ff },
-    { c = colors.purple,    hex = 0xb156ee },   -- YELLOW HIGH CONTRAST
-    { c = colors.pink,      hex = 0xdcd9ca },   -- IVORY
-    { c = colors.magenta,   hex = 0x85862c },   -- YELLOW OFF
-    -- { c = colors.white,     hex = 0xdcd9ca },
-    { c = colors.lightGray, hex = 0xb1b8b3 },
-    { c = colors.gray,      hex = 0x575757 },
-    -- { c = colors.black,     hex = 0x191919 },
-    { c = colors.brown,     hex = 0x672223 }    -- RED OFF
-}
-
--- COMMON COLOR PAIRS --
 
 style.ind_grn = cpair(colors.green, colors.green_off)
 style.ind_red = cpair(colors.red, colors.red_off)
 
+-- set theme per configuration
+---@param fp FP_THEME front panel theme
+---@param color_mode COLOR_MODE the color mode to use
+function style.set_theme(fp, color_mode)
+    if fp == themes.FP_THEME.SANDSTONE then
+        style.theme = themes.sandstone
+    elseif fp == themes.FP_THEME.BASALT then
+        style.theme = themes.basalt
+    end
+
+    style.fp = themes.get_fp_style(style.theme)
+
+    style.colorblind = color_mode ~= themes.COLOR_MODE.STANDARD and color_mode ~= themes.COLOR_MODE.STD_ON_BLACK
+
+    if color_mode == themes.COLOR_MODE.STANDARD or color_mode == themes.COLOR_MODE.BLUE_IND then
+        style.ind_bkg = colors.gray
+    else
+        style.ind_bkg = colors.black
+    end
+end
+
 return style

reactor-plc/plc.lua

@@ -6,6 +6,8 @@ local rsio    = require("scada-common.rsio")
 local types   = require("scada-common.types")
 local util    = require("scada-common.util")
 
+local themes  = require("graphics.themes")
+
 local databus = require("reactor-plc.databus")
 
 local plc = {}
@@ -52,6 +54,9 @@ function plc.load_config()
     config.LogPath = settings.get("LogPath")
     config.LogDebug = settings.get("LogDebug")
 
+    config.FrontPanelTheme = settings.get("FrontPanelTheme")
+    config.ColorMode = settings.get("ColorMode")
+
     local cfv = util.new_validator()
 
     cfv.assert_type_bool(config.Networked)
@@ -78,6 +83,11 @@ function plc.load_config()
     cfv.assert_type_str(config.LogPath)
     cfv.assert_type_bool(config.LogDebug)
 
+    cfv.assert_type_int(config.FrontPanelTheme)
+    cfv.assert_range(config.FrontPanelTheme, 1, 2)
+    cfv.assert_type_int(config.ColorMode)
+    cfv.assert_range(config.ColorMode, 1, themes.COLOR_MODE.NUM_MODES)
+
     -- check emergency coolant configuration if enabled
     if config.EmerCoolEnable then
         cfv.assert_eq(rsio.is_valid_side(config.EmerCoolSide), true)
@@ -129,6 +139,21 @@ function plc.rps_init(reactor, is_formed)
         end
     end
 
+    -- check if the result of a peripheral call was OK, handle the failure if not
+    ---@nodiscard
+    ---@param result any PPM function call result
+    ---@return boolean succeeded if the result is OK, false if it was a PPM failure
+    local function _check_and_handle_ppm_call(result)
+        if result == ppm.ACCESS_FAULT then
+            _set_fault()
+
+            -- if undefined, then the reactor isn't formed
+            if reactor.__p_last_fault() == ppm.UNDEFINED_FIELD then self.formed = false end
+        else return true end
+
+        return false
+    end
+
     -- set emergency coolant control (if configured)
     ---@param state boolean true to enable emergency coolant, false to disable
     local function _set_emer_cool(state)
@@ -167,25 +192,20 @@ function plc.rps_init(reactor, is_formed)
     -- check if the reactor is formed
     local function _is_formed()
         local formed = reactor.isFormed()
-        if formed == ppm.ACCESS_FAULT then
+        if _check_and_handle_ppm_call(formed) then
-            -- lost the peripheral or terminated, handled later
-            _set_fault()
-        else
             self.formed = formed
+        end
 
-            if not self.state[state_keys.sys_fail] then
+        -- always update, since some ppm failures constitute not being formed
-                self.state[state_keys.sys_fail] = not formed
+        if not self.state[state_keys.sys_fail] then
-            end
+            self.state[state_keys.sys_fail] = not self.formed
         end
     end
 
     -- check if the reactor is force disabled
     local function _is_force_disabled()
         local disabled = reactor.isForceDisabled()
-        if disabled == ppm.ACCESS_FAULT then
+        if _check_and_handle_ppm_call(disabled) then
-            -- lost the peripheral or terminated, handled later
-            _set_fault()
-        else
             self.force_disabled = disabled
 
             if not self.state[state_keys.force_disabled] then
@@ -197,22 +217,16 @@ function plc.rps_init(reactor, is_formed)
     -- check for high damage
     local function _high_damage()
         local damage_percent = reactor.getDamagePercent()
-        if damage_percent == ppm.ACCESS_FAULT then
+        if _check_and_handle_ppm_call(damage_percent) and not self.state[state_keys.high_dmg] then
-            -- lost the peripheral or terminated, handled later
-            _set_fault()
-        elseif not self.state[state_keys.high_dmg] then
             self.state[state_keys.high_dmg] = damage_percent >= RPS_LIMITS.MAX_DAMAGE_PERCENT
         end
     end
 
     -- check if the reactor is at a critically high temperature
     local function _high_temp()
-        -- mekanism: MAX_DAMAGE_TEMPERATURE = 1_200
+        -- mekanism: MAX_DAMAGE_TEMPERATURE = 1200K
         local temp = reactor.getTemperature()
-        if temp == ppm.ACCESS_FAULT then
+        if _check_and_handle_ppm_call(temp) and not self.state[state_keys.high_temp] then
-            -- lost the peripheral or terminated, handled later
-            _set_fault()
-        elseif not self.state[state_keys.high_temp] then
             self.state[state_keys.high_temp] = temp >= RPS_LIMITS.MAX_DAMAGE_TEMPERATURE
         end
     end
@@ -220,10 +234,7 @@ function plc.rps_init(reactor, is_formed)
     -- check if there is very low coolant
     local function _low_coolant()
         local coolant_filled = reactor.getCoolantFilledPercentage()
-        if coolant_filled == ppm.ACCESS_FAULT then
+        if _check_and_handle_ppm_call(coolant_filled) and not self.state[state_keys.low_coolant] then
-            -- lost the peripheral or terminated, handled later
-            _set_fault()
-        elseif not self.state[state_keys.low_coolant] then
             self.state[state_keys.low_coolant] = coolant_filled < RPS_LIMITS.MIN_COOLANT_FILL
         end
     end
@@ -231,10 +242,7 @@ function plc.rps_init(reactor, is_formed)
     -- check for excess waste (>80% filled)
     local function _excess_waste()
         local w_filled = reactor.getWasteFilledPercentage()
-        if w_filled == ppm.ACCESS_FAULT then
+        if _check_and_handle_ppm_call(w_filled) and not self.state[state_keys.ex_waste] then
-            -- lost the peripheral or terminated, handled later
-            _set_fault()
-        elseif not self.state[state_keys.ex_waste] then
             self.state[state_keys.ex_waste] = w_filled > RPS_LIMITS.MAX_WASTE_FILL
         end
     end
@@ -242,10 +250,7 @@ function plc.rps_init(reactor, is_formed)
     -- check for heated coolant backup (>95% filled)
     local function _excess_heated_coolant()
         local hc_filled = reactor.getHeatedCoolantFilledPercentage()
-        if hc_filled == ppm.ACCESS_FAULT then
+        if _check_and_handle_ppm_call(hc_filled) and not self.state[state_keys.ex_hcoolant] then
-            -- lost the peripheral or terminated, handled later
-            _set_fault()
-        elseif not self.state[state_keys.ex_hcoolant] then
             self.state[state_keys.ex_hcoolant] = hc_filled > RPS_LIMITS.MAX_HEATED_COLLANT_FILL
         end
     end
@@ -253,10 +258,7 @@ function plc.rps_init(reactor, is_formed)
     -- check if there is no fuel
     local function _insufficient_fuel()
         local fuel = reactor.getFuelFilledPercentage()
-        if fuel == ppm.ACCESS_FAULT then
+        if _check_and_handle_ppm_call(fuel) and not self.state[state_keys.no_fuel] then
-            -- lost the peripheral or terminated, handled later
-            _set_fault()
-        elseif not self.state[state_keys.no_fuel] then
             self.state[state_keys.no_fuel] = fuel <= RPS_LIMITS.NO_FUEL_FILL
         end
     end
@@ -477,13 +479,22 @@ function plc.rps_init(reactor, is_formed)
         self.tripped = false
         self.trip_cause = RPS_TRIP_CAUSE.OK
 
-        for i = 1, #self.state do
+        for i = 1, #self.state do self.state[i] = false end
-            self.state[i] = false
-        end
 
         if not quiet then log.info("RPS: reset") end
     end
 
+    -- partial RPS reset that only clears fault and sys_fail
+    function public.reset_formed()
+        self.tripped = false
+        self.trip_cause = RPS_TRIP_CAUSE.OK
+
+        self.state[state_keys.fault] = false
+        self.state[state_keys.sys_fail] = false
+
+        log.info("RPS: partial reset on formed")
+    end
+
     -- reset the automatic and timeout trip flags, then clear trip if that was the trip cause
     function public.auto_reset()
         self.state[state_keys.automatic] = false

reactor-plc/renderer.lua

@@ -18,11 +18,16 @@ local ui = {
 }
 
 -- try to start the UI
+---@param theme FP_THEME front panel theme
+---@param color_mode COLOR_MODE color mode
 ---@return boolean success, any error_msg
-function renderer.try_start_ui()
+function renderer.try_start_ui(theme, color_mode)
     local status, msg = true, nil
 
     if ui.display == nil then
+        -- set theme
+        style.set_theme(theme, color_mode)
+
         -- reset terminal
         term.setTextColor(colors.white)
         term.setBackgroundColor(colors.black)
@@ -30,13 +35,19 @@ function renderer.try_start_ui()
         term.setCursorPos(1, 1)
 
         -- set overridden colors
-        for i = 1, #style.colors do
+        for i = 1, #style.theme.colors do
-            term.setPaletteColor(style.colors[i].c, style.colors[i].hex)
+            term.setPaletteColor(style.theme.colors[i].c, style.theme.colors[i].hex)
+        end
+
+        -- apply color mode
+        local c_mode_overrides = style.theme.color_modes[color_mode]
+        for i = 1, #c_mode_overrides do
+            term.setPaletteColor(c_mode_overrides[i].c, c_mode_overrides[i].hex)
         end
 
         -- init front panel view
         status, msg = pcall(function ()
-            ui.display = DisplayBox{window=term.current(),fg_bg=style.root}
+            ui.display = DisplayBox{window=term.current(),fg_bg=style.fp.root}
             panel_view(ui.display)
         end)
 
@@ -64,9 +75,9 @@ function renderer.close_ui()
         ui.display = nil
 
         -- restore colors
-        for i = 1, #style.colors do
+        for i = 1, #style.theme.colors do
-            local r, g, b = term.nativePaletteColor(style.colors[i].c)
+            local r, g, b = term.nativePaletteColor(style.theme.colors[i].c)
-            term.setPaletteColor(style.colors[i].c, r, g, b)
+            term.setPaletteColor(style.theme.colors[i].c, r, g, b)
         end
 
         -- reset terminal

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.6.11"
+local R_PLC_VERSION = "v1.7.4"
 
 local println = util.println
 local println_ts = util.println_ts
@@ -31,9 +31,13 @@ if not plc.load_config() then
     -- try to reconfigure (user action)
     local success, error = configure.configure(true)
     if success then
-        assert(plc.load_config(), "failed to load valid configuration")
+        if not plc.load_config() then
+            println("failed to load a valid configuration, please reconfigure")
+            return
+        end
     else
-        assert(success, "reactor PLC configuration error: " .. error)
+        println("configuration error: " .. error)
+        return
     end
 end
 
@@ -51,6 +55,7 @@ log.info("========================================")
 println(">> Reactor PLC " .. R_PLC_VERSION .. " <<")
 
 crash.set_env("reactor-plc", R_PLC_VERSION)
+crash.dbg_log_env()
 
 ----------------------------------------
 -- main application
@@ -131,13 +136,13 @@ local function main()
 
     -- we need a reactor, can at least do some things even if it isn't formed though
     if plc_state.no_reactor then
-        println("init> fission reactor not found");
+        println("init> fission reactor not found")
         log.warning("init> no reactor on startup")
 
         plc_state.init_ok = false
         plc_state.degraded = true
     elseif not smem_dev.reactor.isFormed() then
-        println("init> fission reactor not formed");
+        println("init> fission reactor is not formed")
         log.warning("init> reactor logic adapter present, but reactor is not formed")
 
         plc_state.degraded = true
@@ -172,8 +177,9 @@ local function main()
         -- front panel time!
         if not renderer.ui_ready() then
             local message
-            plc_state.fp_ok, message = renderer.try_start_ui()
+            plc_state.fp_ok, message = renderer.try_start_ui(config.FrontPanelTheme, config.ColorMode)
 
+            -- ...or not
             if not plc_state.fp_ok then
                 println_ts(util.c("UI error: ", message))
                 println("init> running without front panel")

reactor-plc/threads.lua

@@ -125,9 +125,8 @@ function threads.thread__main(smem, init)
                                 plc_comms.reconnect_reactor(plc_dev.reactor)
                             end
 
-                            -- reset RPS for newly connected reactor
+                            -- partial reset of RPS, specific to becoming formed
-                            -- without this, is_formed will be out of date and cause it to think its no longer formed again
+                            rps.reset_formed()
-                            rps.reset()
                         else
                             -- fully lost the reactor now :(
                             println_ts("reactor lost (failed reconnect)!")
@@ -231,9 +230,8 @@ function threads.thread__main(smem, init)
                                 plc_comms.reconnect_reactor(plc_dev.reactor)
                             end
 
-                            -- reset RPS for newly connected reactor
+                            -- partial reset of RPS, specific to becoming formed
-                            -- without this, is_formed will be out of date and cause it to think its no longer formed again
+                            rps.reset_formed()
-                            rps.reset()
                         end
                     elseif networked and type == "modem" then
                         -- note, check init_ok first since nic will be nil if it is false

rtu/configure.lua

@@ -9,6 +9,7 @@ local tcd         = require("scada-common.tcd")
 local util        = require("scada-common.util")
 
 local core        = require("graphics.core")
+local themes      = require("graphics.themes")
 
 local DisplayBox  = require("graphics.elements.displaybox")
 local Div         = require("graphics.elements.div")
@@ -24,6 +25,8 @@ local RadioButton = require("graphics.elements.controls.radio_button")
 local NumberField = require("graphics.elements.form.number_field")
 local TextField   = require("graphics.elements.form.text_field")
 
+local IndLight    = require("graphics.elements.indicators.light")
+
 local println = util.println
 local tri = util.trinary
 
@@ -73,7 +76,9 @@ assert(#PORT_DSGN == rsio.NUM_PORTS)
 
 -- changes to the config data/format to let the user know
 local changes = {
-    {"v1.7.9", { "ConnTimeout can now have a fractional part" } }
+    { "v1.7.9", { "ConnTimeout can now have a fractional part" } },
+    { "v1.7.15", { "Added front panel UI theme", "Added color accessibility modes" } },
+    { "v1.9.2", { "Added standard with black off state color mode", "Added blue indicator color modes" } }
 }
 
 ---@class rtu_rs_definition
@@ -98,34 +103,22 @@ local style = {}
 style.root = cpair(colors.black, colors.lightGray)
 style.header = cpair(colors.white, colors.gray)
 
-style.colors = {
+style.colors = themes.smooth_stone.colors
-    { c = colors.red,       hex = 0xdf4949 },
-    { c = colors.orange,    hex = 0xffb659 },
-    { c = colors.yellow,    hex = 0xfffc79 },
-    { c = colors.lime,      hex = 0x80ff80 },
-    { c = colors.green,     hex = 0x4aee8a },
-    { c = colors.cyan,      hex = 0x34bac8 },
-    { c = colors.lightBlue, hex = 0x6cc0f2 },
-    { c = colors.blue,      hex = 0x0096ff },
-    { c = colors.purple,    hex = 0xb156ee },
-    { c = colors.pink,      hex = 0xf26ba2 },
-    { c = colors.magenta,   hex = 0xf9488a },
-    { c = colors.lightGray, hex = 0xcacaca },
-    { c = colors.gray,      hex = 0x575757 }
-}
 
 local bw_fg_bg = cpair(colors.black, colors.white)
 local g_lg_fg_bg = cpair(colors.gray, colors.lightGray)
 local nav_fg_bg = bw_fg_bg
 local btn_act_fg_bg = cpair(colors.white, colors.gray)
 
+---@class _rtu_cfg_tool_ctl
 local tool_ctl = {
     ask_config = false,
     has_config = false,
     viewing_config = false,
     importing_legacy = false,
     importing_any_dc = false,
-    peri_cfg_editing = false, ---@type string|false
+    jumped_to_color = false,
+    peri_cfg_editing = false, ---@type integer|false
     peri_cfg_manual = false,
     rs_cfg_port = IO.F_SCRAM, ---@type IO_PORT
     rs_cfg_editing = false,   ---@type integer|false
@@ -133,6 +126,9 @@ local tool_ctl = {
     view_gw_cfg = nil,        ---@type graphics_element
     dev_cfg = nil,            ---@type graphics_element
     rs_cfg = nil,             ---@type graphics_element
+    color_cfg = nil,          ---@type graphics_element
+    color_next = nil,         ---@type graphics_element
+    color_apply = nil,        ---@type graphics_element
     settings_apply = nil,     ---@type graphics_element
     settings_confirm = nil,   ---@type graphics_element
 
@@ -181,7 +177,9 @@ local tmp_cfg = {
     AuthKey = nil,      ---@type string|nil
     LogMode = 0,
     LogPath = "",
-    LogDebug = false
+    LogDebug = false,
+    FrontPanelTheme = 1,
+    ColorMode = 1
 }
 
 ---@class rtu_config
@@ -198,7 +196,9 @@ local fields = {
     { "AuthKey", "Facility Auth Key", "" },
     { "LogMode", "Log Mode", log.MODE.APPEND },
     { "LogPath", "Log Path", "/log.txt" },
-    { "LogDebug","Log Debug Messages", false }
+    { "LogDebug", "Log Debug Messages", false },
+    { "FrontPanelTheme", "Front Panel Theme", themes.FP_THEME.SANDSTONE },
+    { "ColorMode", "Color Mode", themes.COLOR_MODE.STANDARD }
 }
 
 local side_options = { "Top", "Bottom", "Left", "Right", "Front", "Back" }
@@ -266,12 +266,13 @@ local function config_view(display)
     local spkr_cfg = Div{parent=root_pane_div,x=1,y=1}
     local net_cfg = Div{parent=root_pane_div,x=1,y=1}
     local log_cfg = Div{parent=root_pane_div,x=1,y=1}
+    local clr_cfg = Div{parent=root_pane_div,x=1,y=1}
     local summary = Div{parent=root_pane_div,x=1,y=1}
     local changelog = Div{parent=root_pane_div,x=1,y=1}
     local peri_cfg = Div{parent=root_pane_div,x=1,y=1}
     local rs_cfg = Div{parent=root_pane_div,x=1,y=1}
 
-    local main_pane = MultiPane{parent=root_pane_div,x=1,y=1,panes={main_page,spkr_cfg,net_cfg,log_cfg,summary,changelog,peri_cfg,rs_cfg}}
+    local main_pane = MultiPane{parent=root_pane_div,x=1,y=1,panes={main_page,spkr_cfg,net_cfg,log_cfg,clr_cfg,summary,changelog,peri_cfg,rs_cfg}}
 
     --#region Main Page
 
@@ -290,7 +291,7 @@ local function config_view(display)
         tool_ctl.gen_summary(settings_cfg)
         tool_ctl.settings_apply.hide(true)
         tool_ctl.settings_confirm.hide(true)
-        main_pane.set_value(5)
+        main_pane.set_value(6)
     end
 
     if fs.exists("/rtu/config.lua") then
@@ -300,12 +301,12 @@ local function config_view(display)
 
     local function show_peri_conns()
         tool_ctl.gen_peri_summary(ini_cfg)
-        main_pane.set_value(7)
+        main_pane.set_value(8)
     end
 
     local function show_rs_conns()
         tool_ctl.gen_rs_summary(ini_cfg)
-        main_pane.set_value(8)
+        main_pane.set_value(9)
     end
 
     PushButton{parent=main_page,x=2,y=y_start,min_width=19,text="Configure Gateway",callback=function()main_pane.set_value(2)end,fg_bg=cpair(colors.black,colors.blue),active_fg_bg=btn_act_fg_bg}
@@ -313,15 +314,24 @@ local function config_view(display)
     tool_ctl.dev_cfg = PushButton{parent=main_page,x=2,y=y_start+4,min_width=24,text="Peripheral Connections",callback=show_peri_conns,fg_bg=cpair(colors.black,colors.yellow),active_fg_bg=btn_act_fg_bg,dis_fg_bg=cpair(colors.lightGray,colors.white)}
     tool_ctl.rs_cfg = PushButton{parent=main_page,x=2,y=y_start+6,min_width=22,text="Redstone Connections",callback=show_rs_conns,fg_bg=cpair(colors.black,colors.yellow),active_fg_bg=btn_act_fg_bg,dis_fg_bg=cpair(colors.lightGray,colors.white)}
 
+    local function jump_color()
+        tool_ctl.jumped_to_color = true
+        tool_ctl.color_next.hide(true)
+        tool_ctl.color_apply.show()
+        main_pane.set_value(5)
+    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)}
+    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}
+
     if not tool_ctl.has_config then
         tool_ctl.view_gw_cfg.disable()
         tool_ctl.dev_cfg.disable()
         tool_ctl.rs_cfg.disable()
+        tool_ctl.color_cfg.disable()
     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=39,y=17,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}
-
     --#endregion
 
     --#region Speakers
@@ -480,11 +490,8 @@ local function config_view(display)
             tmp_cfg.LogMode = mode.get_value() - 1
             tmp_cfg.LogPath = path.get_value()
             tmp_cfg.LogDebug = en_dbg.get_value()
-            tool_ctl.gen_summary(tmp_cfg)
+            tool_ctl.color_apply.hide(true)
-            tool_ctl.viewing_config = false
+            tool_ctl.color_next.show()
-            tool_ctl.importing_legacy = false
-            tool_ctl.settings_apply.show()
-            tool_ctl.settings_confirm.hide(true)
             main_pane.set_value(5)
         else path_err.show() end
     end
@@ -494,6 +501,112 @@ local function config_view(display)
 
     --#endregion
 
+    --#region Color Options
+
+    local clr_c_1 = Div{parent=clr_cfg,x=2,y=4,width=49}
+    local clr_c_2 = Div{parent=clr_cfg,x=2,y=4,width=49}
+    local clr_c_3 = Div{parent=clr_cfg,x=2,y=4,width=49}
+    local clr_c_4 = Div{parent=clr_cfg,x=2,y=4,width=49}
+
+    local clr_pane = MultiPane{parent=clr_cfg,x=1,y=4,panes={clr_c_1,clr_c_2,clr_c_3,clr_c_4}}
+
+    TextBox{parent=clr_cfg,x=1,y=2,height=1,text=" Color Configuration",fg_bg=cpair(colors.black,colors.magenta)}
+
+    TextBox{parent=clr_c_1,x=1,y=1,height=2,text="Here you can select the color theme for the front panel."}
+    TextBox{parent=clr_c_1,x=1,y=4,height=2,text="Click 'Accessibility' below to access colorblind assistive options.",fg_bg=g_lg_fg_bg}
+
+    TextBox{parent=clr_c_1,x=1,y=7,height=1,text="Front Panel Theme"}
+    local fp_theme = RadioButton{parent=clr_c_1,x=1,y=8,default=ini_cfg.FrontPanelTheme,options=themes.FP_THEME_NAMES,callback=function()end,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.magenta}
+
+    TextBox{parent=clr_c_2,x=1,y=1,height=6,text="This system uses color heavily to distinguish ok and not, with some indicators using many colors. By selecting a mode below, indicators will change as shown. For non-standard modes, indicators with more than two colors will be split up."}
+
+    TextBox{parent=clr_c_2,x=21,y=7,height=1,text="Preview"}
+    local _ = IndLight{parent=clr_c_2,x=21,y=8,label="Good",colors=cpair(colors.black,colors.green)}
+    _ = IndLight{parent=clr_c_2,x=21,y=9,label="Warning",colors=cpair(colors.black,colors.yellow)}
+    _ = IndLight{parent=clr_c_2,x=21,y=10,label="Bad",colors=cpair(colors.black,colors.red)}
+    local b_off = IndLight{parent=clr_c_2,x=21,y=11,label="Off",colors=cpair(colors.black,colors.black),hidden=true}
+    local g_off = IndLight{parent=clr_c_2,x=21,y=11,label="Off",colors=cpair(colors.gray,colors.gray),hidden=true}
+
+    local function recolor(value)
+        local c = themes.smooth_stone.color_modes[value]
+
+        if value == themes.COLOR_MODE.STANDARD or value == themes.COLOR_MODE.BLUE_IND then
+            b_off.hide()
+            g_off.show()
+        else
+            g_off.hide()
+            b_off.show()
+        end
+
+        if #c == 0 then
+            for i = 1, #style.colors do term.setPaletteColor(style.colors[i].c, style.colors[i].hex) end
+        else
+            term.setPaletteColor(colors.green, c[1].hex)
+            term.setPaletteColor(colors.yellow, c[2].hex)
+            term.setPaletteColor(colors.red, c[3].hex)
+        end
+    end
+
+    TextBox{parent=clr_c_2,x=1,y=7,height=1,width=10,text="Color Mode"}
+    local c_mode = RadioButton{parent=clr_c_2,x=1,y=8,default=ini_cfg.ColorMode,options=themes.COLOR_MODE_NAMES,callback=recolor,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.magenta}
+
+    TextBox{parent=clr_c_2,x=21,y=13,height=2,width=18,text="Note: exact color varies by theme.",fg_bg=g_lg_fg_bg}
+
+    PushButton{parent=clr_c_2,x=44,y=14,min_width=6,text="Done",callback=function()clr_pane.set_value(1)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+
+    local function back_from_colors()
+        main_pane.set_value(util.trinary(tool_ctl.jumped_to_color, 1, 4))
+        tool_ctl.jumped_to_color = false
+        recolor(1)
+    end
+
+    local function show_access()
+        clr_pane.set_value(2)
+        recolor(c_mode.get_value())
+    end
+
+    local function submit_colors()
+        tmp_cfg.FrontPanelTheme = fp_theme.get_value()
+        tmp_cfg.ColorMode = c_mode.get_value()
+
+        if tool_ctl.jumped_to_color then
+            settings.set("FrontPanelTheme", tmp_cfg.FrontPanelTheme)
+            settings.set("ColorMode", tmp_cfg.ColorMode)
+
+            if settings.save("/rtu.settings") then
+                load_settings(settings_cfg, true)
+                load_settings(ini_cfg)
+                clr_pane.set_value(3)
+            else
+                clr_pane.set_value(4)
+            end
+        else
+            tool_ctl.gen_summary(tmp_cfg)
+            tool_ctl.viewing_config = false
+            tool_ctl.importing_legacy = false
+            tool_ctl.settings_apply.show()
+            tool_ctl.settings_confirm.hide(true)
+            main_pane.set_value(6)
+        end
+    end
+
+    PushButton{parent=clr_c_1,x=1,y=14,text="\x1b Back",callback=back_from_colors,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    PushButton{parent=clr_c_1,x=8,y=14,min_width=15,text="Accessibility",callback=show_access,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    tool_ctl.color_next = PushButton{parent=clr_c_1,x=44,y=14,text="Next \x1a",callback=submit_colors,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    tool_ctl.color_apply = PushButton{parent=clr_c_1,x=43,y=14,min_width=7,text="Apply",callback=submit_colors,fg_bg=cpair(colors.black,colors.green),active_fg_bg=btn_act_fg_bg}
+
+    tool_ctl.color_apply.hide(true)
+
+    TextBox{parent=clr_c_3,x=1,y=1,height=1,text="Settings saved!"}
+    PushButton{parent=clr_c_3,x=1,y=14,min_width=6,text="Exit",callback=exit,fg_bg=cpair(colors.black,colors.red),active_fg_bg=cpair(colors.white,colors.gray)}
+    PushButton{parent=clr_c_3,x=44,y=14,min_width=6,text="Home",callback=function()tool_ctl.go_home()end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+
+    TextBox{parent=clr_c_4,x=1,y=1,height=5,text="Failed to save the settings file.\n\nThere may not be enough space for the modification or server file permissions may be denying writes."}
+    PushButton{parent=clr_c_4,x=1,y=14,min_width=6,text="Exit",callback=exit,fg_bg=cpair(colors.black,colors.red),active_fg_bg=cpair(colors.white,colors.gray)}
+    PushButton{parent=clr_c_4,x=44,y=14,min_width=6,text="Home",callback=function()tool_ctl.go_home()end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+
+    --#endregion
+
     --#region Summary and Saving
 
     local sum_c_1 = Div{parent=summary,x=2,y=4,width=49}
@@ -520,7 +633,7 @@ local function config_view(display)
             end
 
             tool_ctl.viewing_config = false
-        else main_pane.set_value(4) end
+        else main_pane.set_value(5) end
     end
 
     ---@param element graphics_element
@@ -552,6 +665,8 @@ local function config_view(display)
             try_set(mode, ini_cfg.LogMode)
             try_set(path, ini_cfg.LogPath)
             try_set(en_dbg, ini_cfg.LogDebug)
+            try_set(fp_theme, ini_cfg.FrontPanelTheme)
+            try_set(c_mode, ini_cfg.ColorMode)
 
             if not exclude_conns then
                 tmp_cfg.Peripherals = deep_copy_peri(ini_cfg.Peripherals)
@@ -589,7 +704,20 @@ local function config_view(display)
     PushButton{parent=sum_c_3,x=1,y=14,text="\x1b Back",callback=function()sum_pane.set_value(2)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
     PushButton{parent=sum_c_3,x=43,y=14,min_width=7,text="Apply",callback=save_and_continue,fg_bg=cpair(colors.black,colors.green),active_fg_bg=btn_act_fg_bg}
 
+    local function jump_peri_conns()
+        tool_ctl.go_home()
+        show_peri_conns()
+    end
+
+    local function jump_rs_conns()
+        tool_ctl.go_home()
+        show_rs_conns()
+    end
+
     TextBox{parent=sum_c_4,x=1,y=1,height=1,text="Settings saved!"}
+    TextBox{parent=sum_c_4,x=1,y=3,height=4,text="Remember to configure any peripherals or redstone that you have connected to this RTU gateway if you have not already done so, or if you have added, removed, or modified any of them."}
+    PushButton{parent=sum_c_4,x=1,y=8,min_width=24,text="Peripheral Connections",callback=jump_peri_conns,fg_bg=cpair(colors.black,colors.yellow),active_fg_bg=btn_act_fg_bg}
+    PushButton{parent=sum_c_4,x=1,y=10,min_width=22,text="Redstone Connections",callback=jump_rs_conns,fg_bg=cpair(colors.black,colors.yellow),active_fg_bg=btn_act_fg_bg}
     PushButton{parent=sum_c_4,x=1,y=14,min_width=6,text="Exit",callback=exit,fg_bg=cpair(colors.black,colors.red),active_fg_bg=cpair(colors.white,colors.gray)}
     PushButton{parent=sum_c_4,x=44,y=14,min_width=6,text="Home",callback=function()tool_ctl.go_home()end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
 
@@ -1257,7 +1385,7 @@ local function config_view(display)
 
         tool_ctl.gen_summary(tmp_cfg)
         if tool_ctl.importing_any_dc then sum_pane.set_value(7) else sum_pane.set_value(1) end
-        main_pane.set_value(5)
+        main_pane.set_value(6)
         tool_ctl.settings_apply.hide(true)
         tool_ctl.settings_confirm.show()
         tool_ctl.importing_legacy = true
@@ -1271,6 +1399,7 @@ local function config_view(display)
 
         main_pane.set_value(1)
         net_pane.set_value(1)
+        clr_pane.set_value(1)
         sum_pane.set_value(1)
         peri_pane.set_value(1)
         rs_pane.set_value(1)
@@ -1301,8 +1430,14 @@ local function config_view(display)
             local raw = cfg[f[1]]
             local val = util.strval(raw)
 
-            if f[1] == "AuthKey" then val = string.rep("*", string.len(val)) end
+            if f[1] == "AuthKey" then val = string.rep("*", string.len(val))
-            if f[1] == "LogMode" then val = util.trinary(raw == log.MODE.APPEND, "append", "replace") end
+            elseif f[1] == "LogMode" then val = util.trinary(raw == log.MODE.APPEND, "append", "replace")
+            elseif f[1] == "FrontPanelTheme" then
+                val = util.strval(themes.fp_theme_name(raw))
+            elseif f[1] == "ColorMode" then
+                val = util.strval(themes.color_mode_name(raw))
+            end
+
             if val == "nil" then val = "<not set>" end
 
             local c = util.trinary(alternate, g_lg_fg_bg, cpair(colors.gray,colors.white))

rtu/dev/boilerv_rtu.lua

@@ -7,60 +7,51 @@ local boilerv_rtu = {}
 ---@param boiler table
 ---@return rtu_device interface, boolean faulted
 function boilerv_rtu.new(boiler)
-    local unit = rtu.init_unit()
+    local unit = rtu.init_unit(boiler)
-
-    -- disable auto fault clearing
-    boiler.__p_clear_fault()
-    boiler.__p_disable_afc()
 
     -- discrete inputs --
-    unit.connect_di(boiler.isFormed)
+    unit.connect_di("isFormed")
 
     -- coils --
     -- none
 
     -- input registers --
     -- multiblock properties
-    unit.connect_input_reg(boiler.getLength)
+    unit.connect_input_reg("getLength")
-    unit.connect_input_reg(boiler.getWidth)
+    unit.connect_input_reg("getWidth")
-    unit.connect_input_reg(boiler.getHeight)
+    unit.connect_input_reg("getHeight")
-    unit.connect_input_reg(boiler.getMinPos)
+    unit.connect_input_reg("getMinPos")
-    unit.connect_input_reg(boiler.getMaxPos)
+    unit.connect_input_reg("getMaxPos")
     -- build properties
-    unit.connect_input_reg(boiler.getBoilCapacity)
+    unit.connect_input_reg("getBoilCapacity")
-    unit.connect_input_reg(boiler.getSteamCapacity)
+    unit.connect_input_reg("getSteamCapacity")
-    unit.connect_input_reg(boiler.getWaterCapacity)
+    unit.connect_input_reg("getWaterCapacity")
-    unit.connect_input_reg(boiler.getHeatedCoolantCapacity)
+    unit.connect_input_reg("getHeatedCoolantCapacity")
-    unit.connect_input_reg(boiler.getCooledCoolantCapacity)
+    unit.connect_input_reg("getCooledCoolantCapacity")
-    unit.connect_input_reg(boiler.getSuperheaters)
+    unit.connect_input_reg("getSuperheaters")
-    unit.connect_input_reg(boiler.getMaxBoilRate)
+    unit.connect_input_reg("getMaxBoilRate")
     -- current state
-    unit.connect_input_reg(boiler.getTemperature)
+    unit.connect_input_reg("getTemperature")
-    unit.connect_input_reg(boiler.getBoilRate)
+    unit.connect_input_reg("getBoilRate")
-    unit.connect_input_reg(boiler.getEnvironmentalLoss)
+    unit.connect_input_reg("getEnvironmentalLoss")
     -- tanks
-    unit.connect_input_reg(boiler.getSteam)
+    unit.connect_input_reg("getSteam")
-    unit.connect_input_reg(boiler.getSteamNeeded)
+    unit.connect_input_reg("getSteamNeeded")
-    unit.connect_input_reg(boiler.getSteamFilledPercentage)
+    unit.connect_input_reg("getSteamFilledPercentage")
-    unit.connect_input_reg(boiler.getWater)
+    unit.connect_input_reg("getWater")
-    unit.connect_input_reg(boiler.getWaterNeeded)
+    unit.connect_input_reg("getWaterNeeded")
-    unit.connect_input_reg(boiler.getWaterFilledPercentage)
+    unit.connect_input_reg("getWaterFilledPercentage")
-    unit.connect_input_reg(boiler.getHeatedCoolant)
+    unit.connect_input_reg("getHeatedCoolant")
-    unit.connect_input_reg(boiler.getHeatedCoolantNeeded)
+    unit.connect_input_reg("getHeatedCoolantNeeded")
-    unit.connect_input_reg(boiler.getHeatedCoolantFilledPercentage)
+    unit.connect_input_reg("getHeatedCoolantFilledPercentage")
-    unit.connect_input_reg(boiler.getCooledCoolant)
+    unit.connect_input_reg("getCooledCoolant")
-    unit.connect_input_reg(boiler.getCooledCoolantNeeded)
+    unit.connect_input_reg("getCooledCoolantNeeded")
-    unit.connect_input_reg(boiler.getCooledCoolantFilledPercentage)
+    unit.connect_input_reg("getCooledCoolantFilledPercentage")
 
     -- holding registers --
     -- none
 
-    -- check if any calls faulted
+    return unit.interface(), false
-    local faulted = boiler.__p_is_faulted()
-    boiler.__p_clear_fault()
-    boiler.__p_enable_afc()
-
-    return unit.interface(), faulted
 end
 
 return boilerv_rtu

rtu/dev/dynamicv_rtu.lua

@@ -7,14 +7,10 @@ local dynamicv_rtu = {}
 ---@param dynamic_tank table
 ---@return rtu_device interface, boolean faulted
 function dynamicv_rtu.new(dynamic_tank)
-    local unit = rtu.init_unit()
+    local unit = rtu.init_unit(dynamic_tank)
-
-    -- disable auto fault clearing
-    dynamic_tank.__p_clear_fault()
-    dynamic_tank.__p_disable_afc()
 
     -- discrete inputs --
-    unit.connect_di(dynamic_tank.isFormed)
+    unit.connect_di("isFormed")
 
     -- coils --
     unit.connect_coil(function () dynamic_tank.incrementContainerEditMode() end, function () end)
@@ -22,27 +18,22 @@ function dynamicv_rtu.new(dynamic_tank)
 
     -- input registers --
     -- multiblock properties
-    unit.connect_input_reg(dynamic_tank.getLength)
+    unit.connect_input_reg("getLength")
-    unit.connect_input_reg(dynamic_tank.getWidth)
+    unit.connect_input_reg("getWidth")
-    unit.connect_input_reg(dynamic_tank.getHeight)
+    unit.connect_input_reg("getHeight")
-    unit.connect_input_reg(dynamic_tank.getMinPos)
+    unit.connect_input_reg("getMinPos")
-    unit.connect_input_reg(dynamic_tank.getMaxPos)
+    unit.connect_input_reg("getMaxPos")
     -- build properties
-    unit.connect_input_reg(dynamic_tank.getTankCapacity)
+    unit.connect_input_reg("getTankCapacity")
-    unit.connect_input_reg(dynamic_tank.getChemicalTankCapacity)
+    unit.connect_input_reg("getChemicalTankCapacity")
     -- tanks/containers
-    unit.connect_input_reg(dynamic_tank.getStored)
+    unit.connect_input_reg("getStored")
-    unit.connect_input_reg(dynamic_tank.getFilledPercentage)
+    unit.connect_input_reg("getFilledPercentage")
 
     -- holding registers --
-    unit.connect_holding_reg(dynamic_tank.getContainerEditMode, dynamic_tank.setContainerEditMode)
+    unit.connect_holding_reg("getContainerEditMode", "setContainerEditMode")
 
-    -- check if any calls faulted
+    return unit.interface(), false
-    local faulted = dynamic_tank.__p_is_faulted()
-    dynamic_tank.__p_clear_fault()
-    dynamic_tank.__p_enable_afc()
-
-    return unit.interface(), faulted
 end
 
 return dynamicv_rtu

rtu/dev/envd_rtu.lua

@@ -7,7 +7,7 @@ local envd_rtu = {}
 ---@param envd table
 ---@return rtu_device interface, boolean faulted
 function envd_rtu.new(envd)
-    local unit = rtu.init_unit()
+    local unit = rtu.init_unit(envd)
 
     -- disable auto fault clearing
     envd.__p_clear_fault()

rtu/dev/imatrix_rtu.lua

@@ -7,47 +7,38 @@ local imatrix_rtu = {}
 ---@param imatrix table
 ---@return rtu_device interface, boolean faulted
 function imatrix_rtu.new(imatrix)
-    local unit = rtu.init_unit()
+    local unit = rtu.init_unit(imatrix)
-
-    -- disable auto fault clearing
-    imatrix.__p_clear_fault()
-    imatrix.__p_disable_afc()
 
     -- discrete inputs --
-    unit.connect_di(imatrix.isFormed)
+    unit.connect_di("isFormed")
 
     -- coils --
     -- none
 
     -- input registers --
     -- multiblock properties
-    unit.connect_input_reg(imatrix.getLength)
+    unit.connect_input_reg("getLength")
-    unit.connect_input_reg(imatrix.getWidth)
+    unit.connect_input_reg("getWidth")
-    unit.connect_input_reg(imatrix.getHeight)
+    unit.connect_input_reg("getHeight")
-    unit.connect_input_reg(imatrix.getMinPos)
+    unit.connect_input_reg("getMinPos")
-    unit.connect_input_reg(imatrix.getMaxPos)
+    unit.connect_input_reg("getMaxPos")
     -- build properties
-    unit.connect_input_reg(imatrix.getMaxEnergy)
+    unit.connect_input_reg("getMaxEnergy")
-    unit.connect_input_reg(imatrix.getTransferCap)
+    unit.connect_input_reg("getTransferCap")
-    unit.connect_input_reg(imatrix.getInstalledCells)
+    unit.connect_input_reg("getInstalledCells")
-    unit.connect_input_reg(imatrix.getInstalledProviders)
+    unit.connect_input_reg("getInstalledProviders")
     -- I/O rates
-    unit.connect_input_reg(imatrix.getLastInput)
+    unit.connect_input_reg("getLastInput")
-    unit.connect_input_reg(imatrix.getLastOutput)
+    unit.connect_input_reg("getLastOutput")
     -- tanks
-    unit.connect_input_reg(imatrix.getEnergy)
+    unit.connect_input_reg("getEnergy")
-    unit.connect_input_reg(imatrix.getEnergyNeeded)
+    unit.connect_input_reg("getEnergyNeeded")
-    unit.connect_input_reg(imatrix.getEnergyFilledPercentage)
+    unit.connect_input_reg("getEnergyFilledPercentage")
 
     -- holding registers --
     -- none
 
-    -- check if any calls faulted
+    return unit.interface(), false
-    local faulted = imatrix.__p_is_faulted()
-    imatrix.__p_clear_fault()
-    imatrix.__p_enable_afc()
-
-    return unit.interface(), faulted
 end
 
 return imatrix_rtu

rtu/dev/sna_rtu.lua

@@ -7,7 +7,7 @@ local sna_rtu = {}
 ---@param sna table
 ---@return rtu_device interface, boolean faulted
 function sna_rtu.new(sna)
-    local unit = rtu.init_unit()
+    local unit = rtu.init_unit(sna)
 
     -- disable auto fault clearing
     sna.__p_clear_fault()

rtu/dev/sps_rtu.lua

@@ -7,52 +7,43 @@ local sps_rtu = {}
 ---@param sps table
 ---@return rtu_device interface, boolean faulted
 function sps_rtu.new(sps)
-    local unit = rtu.init_unit()
+    local unit = rtu.init_unit(sps)
-
-    -- disable auto fault clearing
-    sps.__p_clear_fault()
-    sps.__p_disable_afc()
 
     -- discrete inputs --
-    unit.connect_di(sps.isFormed)
+    unit.connect_di("isFormed")
 
     -- coils --
     -- none
 
     -- input registers --
     -- multiblock properties
-    unit.connect_input_reg(sps.getLength)
+    unit.connect_input_reg("getLength")
-    unit.connect_input_reg(sps.getWidth)
+    unit.connect_input_reg("getWidth")
-    unit.connect_input_reg(sps.getHeight)
+    unit.connect_input_reg("getHeight")
-    unit.connect_input_reg(sps.getMinPos)
+    unit.connect_input_reg("getMinPos")
-    unit.connect_input_reg(sps.getMaxPos)
+    unit.connect_input_reg("getMaxPos")
     -- build properties
-    unit.connect_input_reg(sps.getCoils)
+    unit.connect_input_reg("getCoils")
-    unit.connect_input_reg(sps.getInputCapacity)
+    unit.connect_input_reg("getInputCapacity")
-    unit.connect_input_reg(sps.getOutputCapacity)
+    unit.connect_input_reg("getOutputCapacity")
-    unit.connect_input_reg(sps.getMaxEnergy)
+    unit.connect_input_reg("getMaxEnergy")
     -- current state
-    unit.connect_input_reg(sps.getProcessRate)
+    unit.connect_input_reg("getProcessRate")
     -- tanks
-    unit.connect_input_reg(sps.getInput)
+    unit.connect_input_reg("getInput")
-    unit.connect_input_reg(sps.getInputNeeded)
+    unit.connect_input_reg("getInputNeeded")
-    unit.connect_input_reg(sps.getInputFilledPercentage)
+    unit.connect_input_reg("getInputFilledPercentage")
-    unit.connect_input_reg(sps.getOutput)
+    unit.connect_input_reg("getOutput")
-    unit.connect_input_reg(sps.getOutputNeeded)
+    unit.connect_input_reg("getOutputNeeded")
-    unit.connect_input_reg(sps.getOutputFilledPercentage)
+    unit.connect_input_reg("getOutputFilledPercentage")
-    unit.connect_input_reg(sps.getEnergy)
+    unit.connect_input_reg("getEnergy")
-    unit.connect_input_reg(sps.getEnergyNeeded)
+    unit.connect_input_reg("getEnergyNeeded")
-    unit.connect_input_reg(sps.getEnergyFilledPercentage)
+    unit.connect_input_reg("getEnergyFilledPercentage")
 
     -- holding registers --
     -- none
 
-    -- check if any calls faulted
+    return unit.interface(), false
-    local faulted = sps.__p_is_faulted()
-    sps.__p_clear_fault()
-    sps.__p_enable_afc()
-
-    return unit.interface(), faulted
 end
 
 return sps_rtu

rtu/dev/turbinev_rtu.lua

@@ -7,14 +7,10 @@ local turbinev_rtu = {}
 ---@param turbine table
 ---@return rtu_device interface, boolean faulted
 function turbinev_rtu.new(turbine)
-    local unit = rtu.init_unit()
+    local unit = rtu.init_unit(turbine)
-
-    -- disable auto fault clearing
-    turbine.__p_clear_fault()
-    turbine.__p_disable_afc()
 
     -- discrete inputs --
-    unit.connect_di(turbine.isFormed)
+    unit.connect_di("isFormed")
 
     -- coils --
     unit.connect_coil(function () turbine.incrementDumpingMode() end, function () end)
@@ -22,44 +18,39 @@ function turbinev_rtu.new(turbine)
 
     -- input registers --
     -- multiblock properties
-    unit.connect_input_reg(turbine.getLength)
+    unit.connect_input_reg("getLength")
-    unit.connect_input_reg(turbine.getWidth)
+    unit.connect_input_reg("getWidth")
-    unit.connect_input_reg(turbine.getHeight)
+    unit.connect_input_reg("getHeight")
-    unit.connect_input_reg(turbine.getMinPos)
+    unit.connect_input_reg("getMinPos")
-    unit.connect_input_reg(turbine.getMaxPos)
+    unit.connect_input_reg("getMaxPos")
     -- build properties
-    unit.connect_input_reg(turbine.getBlades)
+    unit.connect_input_reg("getBlades")
-    unit.connect_input_reg(turbine.getCoils)
+    unit.connect_input_reg("getCoils")
-    unit.connect_input_reg(turbine.getVents)
+    unit.connect_input_reg("getVents")
-    unit.connect_input_reg(turbine.getDispersers)
+    unit.connect_input_reg("getDispersers")
-    unit.connect_input_reg(turbine.getCondensers)
+    unit.connect_input_reg("getCondensers")
-    unit.connect_input_reg(turbine.getSteamCapacity)
+    unit.connect_input_reg("getSteamCapacity")
-    unit.connect_input_reg(turbine.getMaxEnergy)
+    unit.connect_input_reg("getMaxEnergy")
-    unit.connect_input_reg(turbine.getMaxFlowRate)
+    unit.connect_input_reg("getMaxFlowRate")
-    unit.connect_input_reg(turbine.getMaxProduction)
+    unit.connect_input_reg("getMaxProduction")
-    unit.connect_input_reg(turbine.getMaxWaterOutput)
+    unit.connect_input_reg("getMaxWaterOutput")
     -- current state
-    unit.connect_input_reg(turbine.getFlowRate)
+    unit.connect_input_reg("getFlowRate")
-    unit.connect_input_reg(turbine.getProductionRate)
+    unit.connect_input_reg("getProductionRate")
-    unit.connect_input_reg(turbine.getLastSteamInputRate)
+    unit.connect_input_reg("getLastSteamInputRate")
-    unit.connect_input_reg(turbine.getDumpingMode)
+    unit.connect_input_reg("getDumpingMode")
     -- tanks/containers
-    unit.connect_input_reg(turbine.getSteam)
+    unit.connect_input_reg("getSteam")
-    unit.connect_input_reg(turbine.getSteamNeeded)
+    unit.connect_input_reg("getSteamNeeded")
-    unit.connect_input_reg(turbine.getSteamFilledPercentage)
+    unit.connect_input_reg("getSteamFilledPercentage")
-    unit.connect_input_reg(turbine.getEnergy)
+    unit.connect_input_reg("getEnergy")
-    unit.connect_input_reg(turbine.getEnergyNeeded)
+    unit.connect_input_reg("getEnergyNeeded")
-    unit.connect_input_reg(turbine.getEnergyFilledPercentage)
+    unit.connect_input_reg("getEnergyFilledPercentage")
 
     -- holding registers --
-    unit.connect_holding_reg(turbine.getDumpingMode, turbine.setDumpingMode)
+    unit.connect_holding_reg("getDumpingMode", "setDumpingMode")
 
-    -- check if any calls faulted
+    return unit.interface(), false
-    local faulted = turbine.__p_is_faulted()
-    turbine.__p_clear_fault()
-    turbine.__p_enable_afc()
-
-    return unit.interface(), faulted
 end
 
 return turbinev_rtu

rtu/modbus.lua

@@ -37,12 +37,7 @@ function modbus.new(rtu_dev, use_parallel_read)
                     end)
                 else
                     readings[i], access_fault = rtu_dev.read_coil(addr)
-
+                    if access_fault then break end
-                    if access_fault then
-                        return_ok = false
-                        readings = MODBUS_EXCODE.SERVER_DEVICE_FAIL
-                        break
-                    end
                 end
             end
 
@@ -86,12 +81,7 @@ function modbus.new(rtu_dev, use_parallel_read)
                     end)
                 else
                     readings[i], access_fault = rtu_dev.read_di(addr)
-
+                    if access_fault then break end
-                    if access_fault then
-                        return_ok = false
-                        readings = MODBUS_EXCODE.SERVER_DEVICE_FAIL
-                        break
-                    end
                 end
             end
 
@@ -135,12 +125,7 @@ function modbus.new(rtu_dev, use_parallel_read)
                     end)
                 else
                     readings[i], access_fault = rtu_dev.read_holding_reg(addr)
-
+                    if access_fault then break end
-                    if access_fault then
-                        return_ok = false
-                        readings = MODBUS_EXCODE.SERVER_DEVICE_FAIL
-                        break
-                    end
                 end
             end
 
@@ -184,12 +169,7 @@ function modbus.new(rtu_dev, use_parallel_read)
                     end)
                 else
                     readings[i], access_fault = rtu_dev.read_input_reg(addr)
-
+                    if access_fault then break end
-                    if access_fault then
-                        return_ok = false
-                        readings = MODBUS_EXCODE.SERVER_DEVICE_FAIL
-                        break
-                    end
                 end
             end
 

rtu/panel/front_panel.lua

@@ -16,14 +16,15 @@ local TextBox       = require("graphics.elements.textbox")
 
 local DataIndicator = require("graphics.elements.indicators.data")
 local LED           = require("graphics.elements.indicators.led")
+local LEDPair       = require("graphics.elements.indicators.ledpair")
 local RGBLED        = require("graphics.elements.indicators.ledrgb")
 
+local LINK_STATE = types.PANEL_LINK_STATE
+
 local ALIGN = core.ALIGN
 
 local cpair = core.cpair
 
-local fp_label = style.fp_label
-
 local ind_grn = style.ind_grn
 
 local UNIT_TYPE_LABELS = { "UNKNOWN", "REDSTONE", "BOILER", "TURBINE", "DYNAMIC TANK", "IND MATRIX", "SPS", "SNA", "ENV DETECTOR" }
@@ -32,7 +33,9 @@ local UNIT_TYPE_LABELS = { "UNKNOWN", "REDSTONE", "BOILER", "TURBINE", "DYNAMIC
 ---@param panel graphics_element main displaybox
 ---@param units table unit list
 local function init(panel, units)
-    TextBox{parent=panel,y=1,text="RTU GATEWAY",alignment=ALIGN.CENTER,height=1,fg_bg=style.header}
+    local disabled_fg = style.fp.disabled_fg
+
+    TextBox{parent=panel,y=1,text="RTU GATEWAY",alignment=ALIGN.CENTER,height=1,fg_bg=style.theme.header}
 
     --
     -- system indicators
@@ -48,12 +51,43 @@ local function init(panel, units)
     heartbeat.register(databus.ps, "heartbeat", heartbeat.update)
 
     local modem = LED{parent=system,label="MODEM",colors=ind_grn}
-    local network = RGBLED{parent=system,label="NETWORK",colors={colors.green,colors.red,colors.orange,colors.yellow,colors.gray}}
+
-    network.update(types.PANEL_LINK_STATE.DISCONNECTED)
+    if not style.colorblind then
+        local network = RGBLED{parent=system,label="NETWORK",colors={colors.green,colors.red,colors.orange,colors.yellow,style.ind_bkg}}
+        network.update(types.PANEL_LINK_STATE.DISCONNECTED)
+        network.register(databus.ps, "link_state", network.update)
+    else
+        local nt_lnk = LEDPair{parent=system,label="NT LINKED",off=style.ind_bkg,c1=colors.red,c2=colors.green}
+        local nt_ver = LEDPair{parent=system,label="NT VERSION",off=style.ind_bkg,c1=colors.red,c2=colors.green}
+
+        nt_lnk.register(databus.ps, "link_state", function (state)
+            local value = 2
+
+            if state == LINK_STATE.DISCONNECTED then
+                value = 1
+            elseif state == LINK_STATE.LINKED then
+                value = 3
+            end
+
+            nt_lnk.update(value)
+        end)
+
+        nt_ver.register(databus.ps, "link_state", function (state)
+            local value = 3
+
+            if state == LINK_STATE.BAD_VERSION then
+                value = 2
+            elseif state == LINK_STATE.DISCONNECTED then
+                value = 1
+            end
+
+            nt_ver.update(value)
+        end)
+    end
+
     system.line_break()
 
     modem.register(databus.ps, "has_modem", modem.update)
-    network.register(databus.ps, "link_state", network.update)
 
     local rt_main = LED{parent=system,label="RT MAIN",colors=ind_grn}
     local rt_comm = LED{parent=system,label="RT COMMS",colors=ind_grn}
@@ -64,17 +98,17 @@ local function init(panel, units)
 
 ---@diagnostic disable-next-line: undefined-field
     local comp_id = util.sprintf("(%d)", os.getComputerID())
-    TextBox{parent=system,x=9,y=4,width=6,height=1,text=comp_id,fg_bg=fp_label}
+    TextBox{parent=system,x=9,y=4,width=6,height=1,text=comp_id,fg_bg=disabled_fg}
 
-    TextBox{parent=system,x=1,y=14,text="SPEAKERS",height=1,width=8,fg_bg=style.label}
+    TextBox{parent=system,x=1,y=14,text="SPEAKERS",height=1,width=8,fg_bg=style.fp.text_fg}
-    local speaker_count = DataIndicator{parent=system,x=10,y=14,label="",format="%3d",value=0,width=3,fg_bg=cpair(colors.gray,colors.white)}
+    local speaker_count = DataIndicator{parent=system,x=10,y=14,label="",format="%3d",value=0,width=3,fg_bg=style.theme.field_box}
     speaker_count.register(databus.ps, "speaker_count", speaker_count.update)
 
     --
     -- about label
     --
 
-    local about   = Div{parent=panel,width=15,height=3,x=1,y=18,fg_bg=fp_label}
+    local about   = Div{parent=panel,width=15,height=3,x=1,y=18,fg_bg=disabled_fg}
     local fw_v    = TextBox{parent=about,x=1,y=1,text="FW: v00.00.00",alignment=ALIGN.LEFT,height=1}
     local comms_v = TextBox{parent=about,x=1,y=2,text="NT: v00.00.00",alignment=ALIGN.LEFT,height=1}
 
@@ -116,7 +150,7 @@ local function init(panel, units)
 
         -- assignment (unit # or facility)
         local for_unit = util.trinary(unit.reactor == 0, "\x1a FACIL ", "\x1a UNIT " .. unit.reactor)
-        TextBox{parent=unit_hw_statuses,y=i,x=19,text=for_unit,height=1,fg_bg=fp_label}
+        TextBox{parent=unit_hw_statuses,y=i,x=19,text=for_unit,height=1,fg_bg=disabled_fg}
     end
 end
 

rtu/panel/style.lua

@@ -2,47 +2,39 @@
 -- Graphics Style Options
 --
 
-local core = require("graphics.core")
+local core   = require("graphics.core")
+local themes = require("graphics.themes")
 
+---@class rtu_style
 local style = {}
 
 local cpair = core.cpair
 
--- GLOBAL --
+style.theme = themes.sandstone
-
+style.fp = themes.get_fp_style(style.theme)
--- remap global colors
+style.colorblind = false
-colors.ivory = colors.pink
-colors.yellow_hc = colors.purple
-colors.red_off = colors.brown
-colors.yellow_off = colors.magenta
-colors.green_off = colors.lime
-
-style.root = cpair(colors.black, colors.ivory)
-style.header = cpair(colors.black, colors.lightGray)
-
-style.colors = {
-    { c = colors.red,       hex = 0xdf4949 },   -- RED ON
-    { c = colors.orange,    hex = 0xffb659 },
-    { c = colors.yellow,    hex = 0xf9fb53 },   -- YELLOW ON
-    { c = colors.lime,      hex = 0x16665a },   -- GREEN OFF
-    { c = colors.green,     hex = 0x6be551 },   -- GREEN ON
-    { c = colors.cyan,      hex = 0x34bac8 },
-    { c = colors.lightBlue, hex = 0x6cc0f2 },
-    { c = colors.blue,      hex = 0x0096ff },
-    { c = colors.purple,    hex = 0xb156ee },   -- YELLOW HIGH CONTRAST
-    { c = colors.pink,      hex = 0xdcd9ca },   -- IVORY
-    { c = colors.magenta,   hex = 0x85862c },   -- YELLOW OFF
-    -- { c = colors.white,     hex = 0xdcd9ca },
-    { c = colors.lightGray, hex = 0xb1b8b3 },
-    { c = colors.gray,      hex = 0x575757 },
-    -- { c = colors.black,     hex = 0x191919 },
-    { c = colors.brown,     hex = 0x672223 }    -- RED OFF
-}
-
--- COMMON COLOR PAIRS --
-
-style.fp_label = cpair(colors.lightGray, colors.ivory)
 
 style.ind_grn = cpair(colors.green, colors.green_off)
 
+-- set theme per configuration
+---@param fp FP_THEME front panel theme
+---@param color_mode COLOR_MODE the color mode to use
+function style.set_theme(fp, color_mode)
+    if fp == themes.FP_THEME.SANDSTONE then
+        style.theme = themes.sandstone
+    elseif fp == themes.FP_THEME.BASALT then
+        style.theme = themes.basalt
+    end
+
+    style.fp = themes.get_fp_style(style.theme)
+
+    style.colorblind = color_mode ~= themes.COLOR_MODE.STANDARD and color_mode ~= themes.COLOR_MODE.STD_ON_BLACK
+
+    if color_mode == themes.COLOR_MODE.STANDARD or color_mode == themes.COLOR_MODE.BLUE_IND then
+        style.ind_bkg = colors.gray
+    else
+        style.ind_bkg = colors.black
+    end
+end
+
 return style

rtu/renderer.lua

@@ -19,11 +19,16 @@ local ui = {
 
 -- try to start the UI
 ---@param units table RTU units
+---@param theme FP_THEME front panel theme
+---@param color_mode COLOR_MODE color mode
 ---@return boolean success, any error_msg
-function renderer.try_start_ui(units)
+function renderer.try_start_ui(units, theme, color_mode)
     local status, msg = true, nil
 
     if ui.display == nil then
+        -- set theme
+        style.set_theme(theme, color_mode)
+
         -- reset terminal
         term.setTextColor(colors.white)
         term.setBackgroundColor(colors.black)
@@ -31,13 +36,19 @@ function renderer.try_start_ui(units)
         term.setCursorPos(1, 1)
 
         -- set overridden colors
-        for i = 1, #style.colors do
+        for i = 1, #style.theme.colors do
-            term.setPaletteColor(style.colors[i].c, style.colors[i].hex)
+            term.setPaletteColor(style.theme.colors[i].c, style.theme.colors[i].hex)
+        end
+
+        -- apply color mode
+        local c_mode_overrides = style.theme.color_modes[color_mode]
+        for i = 1, #c_mode_overrides do
+            term.setPaletteColor(c_mode_overrides[i].c, c_mode_overrides[i].hex)
         end
 
         -- init front panel view
         status, msg = pcall(function ()
-            ui.display = DisplayBox{window=term.current(),fg_bg=style.root}
+            ui.display = DisplayBox{window=term.current(),fg_bg=style.fp.root}
             panel_view(ui.display, units)
         end)
 
@@ -65,9 +76,9 @@ function renderer.close_ui()
         ui.display = nil
 
         -- restore colors
-        for i = 1, #style.colors do
+        for i = 1, #style.theme.colors do
-            local r, g, b = term.nativePaletteColor(style.colors[i].c)
+            local r, g, b = term.nativePaletteColor(style.theme.colors[i].c)
-            term.setPaletteColor(style.colors[i].c, r, g, b)
+            term.setPaletteColor(style.theme.colors[i].c, r, g, b)
         end
 
         -- reset terminal

rtu/rtu.lua

@@ -5,6 +5,8 @@ local log     = require("scada-common.log")
 local types   = require("scada-common.types")
 local util    = require("scada-common.util")
 
+local themes  = require("graphics.themes")
+
 local databus = require("rtu.databus")
 local modbus  = require("rtu.modbus")
 
@@ -29,15 +31,20 @@ function rtu.load_config()
     config.Redstone = settings.get("Redstone")
 
     config.SpeakerVolume = settings.get("SpeakerVolume")
+
     config.SVR_Channel = settings.get("SVR_Channel")
     config.RTU_Channel = settings.get("RTU_Channel")
     config.ConnTimeout = settings.get("ConnTimeout")
     config.TrustedRange = settings.get("TrustedRange")
     config.AuthKey = settings.get("AuthKey")
+
     config.LogMode = settings.get("LogMode")
     config.LogPath = settings.get("LogPath")
     config.LogDebug = settings.get("LogDebug")
 
+    config.FrontPanelTheme = settings.get("FrontPanelTheme")
+    config.ColorMode = settings.get("ColorMode")
+
     local cfv = util.new_validator()
 
     cfv.assert_type_num(config.SpeakerVolume)
@@ -61,15 +68,22 @@ function rtu.load_config()
     cfv.assert_type_str(config.LogPath)
     cfv.assert_type_bool(config.LogDebug)
 
+    cfv.assert_type_int(config.FrontPanelTheme)
+    cfv.assert_range(config.FrontPanelTheme, 1, 2)
+    cfv.assert_type_int(config.ColorMode)
+    cfv.assert_range(config.ColorMode, 1, themes.COLOR_MODE.NUM_MODES)
+
     cfv.assert_type_table(config.Peripherals)
     cfv.assert_type_table(config.Redstone)
 
     return cfv.valid()
 end
 
--- create a new RTU unit
+-- create a new RTU unit<br>
+-- if this is for a PPM peripheral, auto fault clearing MUST stay enabled once access begins
 ---@nodiscard
-function rtu.init_unit()
+---@param device table|nil peripheral device, if applicable
+function rtu.init_unit(device)
     local self = {
         discrete_inputs = {},
         coils = {},
@@ -80,12 +94,18 @@ function rtu.init_unit()
 
     local insert = table.insert
 
+    local stub = function () log.warning("tried to call an RTU function stub") end
+
     ---@class rtu_device
     local public = {}
 
     ---@class rtu
     local protected = {}
 
+    -- function to check if the peripheral (if exists) is faulted
+    local function _is_faulted() return false end
+    if device then _is_faulted = device.__p_is_faulted end
+
     -- refresh IO count
     local function _count_io()
         self.io_count_cache = { #self.discrete_inputs, #self.coils, #self.input_regs, #self.holding_regs }
@@ -97,13 +117,26 @@ function rtu.init_unit()
         return self.io_count_cache[1], self.io_count_cache[2], self.io_count_cache[3], self.io_count_cache[4]
     end
 
+    -- pass a function through or generate one to call a function by name from the device
+    ---@param f function|string function or device function name
+    local function _as_func(f)
+        if type(f) == "string" then
+            local name = f
+            if device then
+                f = function (...) return device[name](...) end
+            else f = stub end
+        end
+
+        return f
+    end
+
     -- discrete inputs: single bit read-only
 
     -- connect discrete input
-    ---@param f function
+    ---@param f function|string function or function name
     ---@return integer count count of discrete inputs
     function protected.connect_di(f)
-        insert(self.discrete_inputs, { read = f })
+        insert(self.discrete_inputs, { read = _as_func(f) })
         _count_io()
         return #self.discrete_inputs
     end
@@ -112,19 +145,18 @@ function rtu.init_unit()
     ---@param di_addr integer
     ---@return any value, boolean access_fault
     function public.read_di(di_addr)
-        ppm.clear_fault()
         local value = self.discrete_inputs[di_addr].read()
-        return value, ppm.is_faulted()
+        return value, _is_faulted()
     end
 
     -- coils: single bit read-write
 
     -- connect coil
-    ---@param f_read function
+    ---@param f_read function|string function or function name
-    ---@param f_write function
+    ---@param f_write function|string function or function name
     ---@return integer count count of coils
     function protected.connect_coil(f_read, f_write)
-        insert(self.coils, { read = f_read, write = f_write })
+        insert(self.coils, { read = _as_func(f_read), write = _as_func(f_write) })
         _count_io()
         return #self.coils
     end
@@ -133,9 +165,8 @@ function rtu.init_unit()
     ---@param coil_addr integer
     ---@return any value, boolean access_fault
     function public.read_coil(coil_addr)
-        ppm.clear_fault()
         local value = self.coils[coil_addr].read()
-        return value, ppm.is_faulted()
+        return value, _is_faulted()
     end
 
     -- write coil
@@ -143,18 +174,17 @@ function rtu.init_unit()
     ---@param value any
     ---@return boolean access_fault
     function public.write_coil(coil_addr, value)
-        ppm.clear_fault()
         self.coils[coil_addr].write(value)
-        return ppm.is_faulted()
+        return _is_faulted()
     end
 
     -- input registers: multi-bit read-only
 
     -- connect input register
-    ---@param f function
+    ---@param f function|string function or function name
     ---@return integer count count of input registers
     function protected.connect_input_reg(f)
-        insert(self.input_regs, { read = f })
+        insert(self.input_regs, { read = _as_func(f) })
         _count_io()
         return #self.input_regs
     end
@@ -163,19 +193,18 @@ function rtu.init_unit()
     ---@param reg_addr integer
     ---@return any value, boolean access_fault
     function public.read_input_reg(reg_addr)
-        ppm.clear_fault()
         local value = self.input_regs[reg_addr].read()
-        return value, ppm.is_faulted()
+        return value, _is_faulted()
     end
 
     -- holding registers: multi-bit read-write
 
     -- connect holding register
-    ---@param f_read function
+    ---@param f_read function|string function or function name
-    ---@param f_write function
+    ---@param f_write function|string function or function name
     ---@return integer count count of holding registers
     function protected.connect_holding_reg(f_read, f_write)
-        insert(self.holding_regs, { read = f_read, write = f_write })
+        insert(self.holding_regs, { read = _as_func(f_read), write = _as_func(f_write) })
         _count_io()
         return #self.holding_regs
     end
@@ -184,9 +213,8 @@ function rtu.init_unit()
     ---@param reg_addr integer
     ---@return any value, boolean access_fault
     function public.read_holding_reg(reg_addr)
-        ppm.clear_fault()
         local value = self.holding_regs[reg_addr].read()
-        return value, ppm.is_faulted()
+        return value, _is_faulted()
     end
 
     -- write holding register
@@ -194,9 +222,8 @@ function rtu.init_unit()
     ---@param value any
     ---@return boolean access_fault
     function public.write_holding_reg(reg_addr, value)
-        ppm.clear_fault()
         self.holding_regs[reg_addr].write(value)
-        return ppm.is_faulted()
+        return _is_faulted()
     end
 
     -- public RTU device access

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.7.13"
+local RTU_VERSION = "v1.9.3"
 
 local RTU_UNIT_TYPE = types.RTU_UNIT_TYPE
 local RTU_UNIT_HW_STATE = databus.RTU_UNIT_HW_STATE
@@ -47,9 +47,13 @@ if not rtu.load_config() then
     -- try to reconfigure (user action)
     local success, error = configure.configure(true)
     if success then
-        assert(rtu.load_config(), "failed to load valid configuration")
+        if not rtu.load_config() then
+            println("failed to load a valid configuration, please reconfigure")
+            return
+        end
     else
-        assert(success, "RTU configuration error: " .. error)
+        println("configuration error: " .. error)
+        return
     end
 end
 
@@ -67,6 +71,7 @@ log.info("========================================")
 println(">> RTU GATEWAY " .. RTU_VERSION .. " <<")
 
 crash.set_env("rtu", RTU_VERSION)
+crash.dbg_log_env()
 
 ----------------------------------------
 -- main application
@@ -338,7 +343,7 @@ local function main()
                 is_multiblock = true
                 formed = device.isFormed()
 
-                if formed == ppm.UNDEFINED_FIELD or formed == ppm.ACCESS_FAULT then
+                if formed == ppm.ACCESS_FAULT then
                     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"))
                     return false
@@ -353,7 +358,7 @@ local function main()
                 is_multiblock = true
                 formed = device.isFormed()
 
-                if formed == ppm.UNDEFINED_FIELD or formed == ppm.ACCESS_FAULT then
+                if formed == ppm.ACCESS_FAULT then
                     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"))
                     return false
@@ -373,7 +378,7 @@ local function main()
                 is_multiblock = true
                 formed = device.isFormed()
 
-                if formed == ppm.UNDEFINED_FIELD or formed == ppm.ACCESS_FAULT then
+                if formed == ppm.ACCESS_FAULT then
                     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"))
                     return false
@@ -387,7 +392,7 @@ local function main()
                 is_multiblock = true
                 formed = device.isFormed()
 
-                if formed == ppm.UNDEFINED_FIELD or formed == ppm.ACCESS_FAULT then
+                if formed == ppm.ACCESS_FAULT then
                     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"))
                     return false
@@ -401,7 +406,7 @@ local function main()
                 is_multiblock = true
                 formed = device.isFormed()
 
-                if formed == ppm.UNDEFINED_FIELD or formed == ppm.ACCESS_FAULT then
+                if formed == ppm.ACCESS_FAULT then
                     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"))
                     return false
@@ -467,7 +472,8 @@ local function main()
                 for_message = util.c("reactor ", for_reactor)
             end
 
-            log.info(util.c("sys_config> initialized RTU unit #", #units, ": ", name, " (", types.rtu_type_to_string(rtu_type), ") [", index, "] for ", for_message))
+            local index_str = util.trinary(index ~= nil, util.c(" [", index, "]"), "")
+            log.info(util.c("sys_config> initialized RTU unit #", #units, ": ", name, " (", types.rtu_type_to_string(rtu_type), ")", index_str, " for ", for_message))
 
             rtu_unit.uid = #units
 
@@ -502,7 +508,7 @@ local function main()
     if sys_config() then
         -- start UI
         local message
-        rtu_state.fp_ok, message = renderer.try_start_ui(units)
+        rtu_state.fp_ok, message = renderer.try_start_ui(units, config.FrontPanelTheme, config.ColorMode)
 
         if not rtu_state.fp_ok then
             println_ts(util.c("UI error: ", message))

rtu/threads.lua

@@ -517,82 +517,23 @@ function threads.thread__unit_comms(smem, unit)
 
             -- check if multiblock is still formed if this is a multiblock
             if unit.is_multiblock and (util.time_ms() - last_f_check > 250) then
-                local is_formed = unit.device.isFormed()
-
                 last_f_check = util.time_ms()
 
+                local is_formed = unit.device.isFormed()
+
                 if unit.formed == nil then
                     unit.formed = is_formed
                     if is_formed then unit.hw_state = UNIT_HW_STATE.OK end
+                elseif not unit.formed then
+                    unit.hw_state = UNIT_HW_STATE.UNFORMED
                 end
 
-                if not unit.formed then unit.hw_state = UNIT_HW_STATE.UNFORMED end
+                if (is_formed == true) and not unit.formed then
-
+                    unit.hw_state = UNIT_HW_STATE.OK
-                if (not unit.formed) and is_formed then
+                    log.info(util.c(detail_name, " is now formed"))
-                    -- newly re-formed
+                    rtu_comms.send_remounted(unit.uid)
-                    local iface = ppm.get_iface(unit.device)
+                elseif (is_formed == false) and unit.formed then
-                    if iface then
+                    log.warning(util.c(detail_name, " is no longer formed"))
-                        log.info(util.c("unmounting and remounting reformed RTU unit ", detail_name))
-
-                        ppm.unmount(unit.device)
-
-                        local type, device = ppm.mount(iface)
-                        local faulted = false
-
-                        if device ~= nil then
-                            if type == "boilerValve" and unit.type == RTU_UNIT_TYPE.BOILER_VALVE then
-                                -- boiler multiblock
-                                unit.device = device
-                                unit.rtu, faulted = boilerv_rtu.new(device)
-                                unit.formed = device.isFormed()
-                                unit.modbus_io = modbus.new(unit.rtu, true)
-                            elseif type == "turbineValve" and unit.type == RTU_UNIT_TYPE.TURBINE_VALVE then
-                                -- turbine multiblock
-                                unit.device = device
-                                unit.rtu, faulted = turbinev_rtu.new(device)
-                                unit.formed = device.isFormed()
-                                unit.modbus_io = modbus.new(unit.rtu, true)
-                            elseif type == "dynamicValve" and unit.type == RTU_UNIT_TYPE.DYNAMIC_VALVE then
-                                -- dynamic tank multiblock
-                                unit.device = device
-                                unit.rtu, faulted = dynamicv_rtu.new(device)
-                                unit.formed = device.isFormed()
-                                unit.modbus_io = modbus.new(unit.rtu, true)
-                            elseif type == "inductionPort" and unit.type == RTU_UNIT_TYPE.IMATRIX then
-                                -- induction matrix multiblock
-                                unit.device = device
-                                unit.rtu, faulted = imatrix_rtu.new(device)
-                                unit.formed = device.isFormed()
-                                unit.modbus_io = modbus.new(unit.rtu, true)
-                            elseif type == "spsPort" and unit.type == RTU_UNIT_TYPE.SPS then
-                                -- SPS multiblock
-                                unit.device = device
-                                unit.rtu, faulted = sps_rtu.new(device)
-                                unit.formed = device.isFormed()
-                                unit.modbus_io = modbus.new(unit.rtu, true)
-                            else
-                                log.error("illegal remount of non-multiblock RTU or type change attempted for " .. short_name, true)
-                            end
-
-                            if unit.formed and faulted then
-                                -- something is still wrong = can't mark as formed yet
-                                unit.formed = false
-                                unit.hw_state = UNIT_HW_STATE.UNFORMED
-                                log.info(util.c("assuming ", unit.name, " is not formed due to PPM faults while initializing"))
-                            else
-                                unit.hw_state = UNIT_HW_STATE.OK
-                                rtu_comms.send_remounted(unit.uid)
-                            end
-
-                            local type_name = types.rtu_type_to_string(unit.type)
-                            log.info(util.c("reconnected the ", type_name, " on interface ", unit.name))
-                        else
-                            -- fully lost the peripheral now :(
-                            log.error(util.c(unit.name, " lost (failed reconnect)"))
-                        end
-                    else
-                        log.error("failed to get interface of previously connected RTU unit " .. detail_name, true)
-                    end
                 end
 
                 unit.formed = is_formed

scada-common/comms.lua

@@ -17,7 +17,7 @@ local max_distance = nil
 local comms = {}
 
 -- protocol/data version (protocol/data independent changes tracked by util.lua version)
-comms.version = "2.4.4"
+comms.version = "2.4.5"
 
 ---@enum PROTOCOL
 local PROTOCOL = {

scada-common/crash.lua

@@ -24,6 +24,21 @@ function crash.set_env(application, version)
     ver = version
 end
 
+-- log environment versions
+---@param log_msg function log function to use
+local function log_versions(log_msg)
+    log_msg(util.c("RUNTIME:          ", _HOST))
+    log_msg(util.c("LUA VERSION:      ", _VERSION))
+    log_msg(util.c("APPLICATION:      ", app))
+    log_msg(util.c("FIRMWARE VERSION: ", ver))
+    log_msg(util.c("COMMS VERSION:    ", comms.version))
+    if has_graphics then log_msg(util.c("GRAPHICS VERSION: ", core.version)) end
+    if has_lockbox  then log_msg(util.c("LOCKBOX VERSION:  ", lockbox.version)) end
+end
+
+-- when running with debug logs, log the useful information that the crash handler knows
+function crash.dbg_log_env() log_versions(log.debug) end
+
 -- handle a crash error
 ---@param error string error message
 function crash.handler(error)
@@ -31,13 +46,7 @@ function crash.handler(error)
     log.info("=====> FATAL SOFTWARE FAULT <=====")
     log.fatal(error)
     log.info("----------------------------------")
-    log.info(util.c("RUNTIME:          ", _HOST))
+    log_versions(log.info)
-    log.info(util.c("LUA VERSION:      ", _VERSION))
-    log.info(util.c("APPLICATION:      ", app))
-    log.info(util.c("FIRMWARE VERSION: ", ver))
-    log.info(util.c("COMMS VERSION:    ", comms.version))
-    if has_graphics then log.info(util.c("GRAPHICS VERSION: ", core.version))    end
-    if has_lockbox  then log.info(util.c("LOCKBOX VERSION:  ", lockbox.version)) end
     log.info("----------------------------------")
     log.info(debug.traceback("--- begin debug trace ---", 1))
     log.info("--- end debug trace ---")

scada-common/network.lua

@@ -53,6 +53,11 @@ function network.init_mac(passkey)
     return init_time
 end
 
+-- de-initialize message authentication system
+function network.deinit_mac()
+    c_eng.key, c_eng.hmac = nil, nil
+end
+
 -- generate HMAC of message
 ---@nodiscard
 ---@param message string initial value concatenated with ciphertext

scada-common/ppm.lua

@@ -9,7 +9,7 @@ local util = require("scada-common.util")
 local ppm = {}
 
 local ACCESS_FAULT        = nil                 ---@type nil
-local UNDEFINED_FIELD     = "undefined field"
+local UNDEFINED_FIELD     = "__PPM_UNDEF_FIELD__"
 local VIRTUAL_DEVICE_TYPE = "ppm_vdev"
 
 ppm.ACCESS_FAULT          = ACCESS_FAULT
@@ -51,11 +51,13 @@ local function peri_init(iface)
         self.device = peripheral.wrap(iface)
     end
 
-    -- initialization process (re-map)
+    -- create a protected version of a peripheral function call
-
+    ---@nodiscard
-    for key, func in pairs(self.device) do
+    ---@param key string function name
-        self.fault_counts[key] = 0
+    ---@param func function function
-        self.device[key] = function (...)
+    ---@return function method protected version of the function
+    local function protect_peri_function(key, func)
+        return function (...)
             local return_table = table.pack(pcall(func, ...))
 
             local status = return_table[1]
@@ -85,20 +87,24 @@ local function peri_init(iface)
                         count_str = " [" .. self.fault_counts[key] .. " total faults]"
                     end
 
-                    log.error(util.c("PPM: protected ", key, "() -> ", result, count_str))
+                    log.error(util.c("PPM: [@", iface, "] protected ", key, "() -> ", result, count_str))
                 end
 
                 self.fault_counts[key] = self.fault_counts[key] + 1
 
-                if result == "Terminated" then
+                if result == "Terminated" then ppm_sys.terminate = true end
-                    ppm_sys.terminate = true
-                end
 
-                return ACCESS_FAULT
+                return ACCESS_FAULT, result
             end
         end
     end
 
+    -- initialization process (re-map)
+    for key, func in pairs(self.device) do
+        self.fault_counts[key] = 0
+        self.device[key] = protect_peri_function(key, func)
+    end
+
     -- fault management & monitoring functions
 
     local function clear_fault() self.faulted = false end
@@ -131,31 +137,42 @@ local function peri_init(iface)
 
     local mt = {
         __index = function (_, key)
-            -- this will continuously be counting calls here as faults
+            -- try to find the function in case it was added (multiblock formed)
-            -- unlike other functions, faults here can't be cleared as it is just not defined
+            local funcs = peripheral.wrap(iface)
-            if self.fault_counts[key] == nil then
+            if (type(funcs) == "table") and (type(funcs[key]) == "function") then
-                self.fault_counts[key] = 0
+                -- add this function then return it
+                self.device[key] = protect_peri_function(key, funcs[key])
+                log.info(util.c("PPM: [@", iface, "] initialized previously undefined field ", key, "()"))
+
+                return self.device[key]
             end
 
-            -- function failed
+            -- function still missing, return an undefined function handler
-            self.faulted = true
+            -- note: code should avoid storing functions for multiblocks and instead try to index them again
-            self.last_fault = UNDEFINED_FIELD
+            return (function ()
+                -- this will continuously be counting calls here as faults
+                if self.fault_counts[key] == nil then self.fault_counts[key] = 0 end
 
-            ppm_sys.faulted = true
+                -- function failed
-            ppm_sys.last_fault = UNDEFINED_FIELD
+                self.faulted = true
+                self.last_fault = UNDEFINED_FIELD
 
-            if not ppm_sys.mute and (self.fault_counts[key] % REPORT_FREQUENCY == 0) then
+                ppm_sys.faulted = true
-                local count_str = ""
+                ppm_sys.last_fault = UNDEFINED_FIELD
-                if self.fault_counts[key] > 0 then
+
-                    count_str = " [" .. self.fault_counts[key] .. " total calls]"
+                if not ppm_sys.mute and (self.fault_counts[key] % REPORT_FREQUENCY == 0) then
+                    local count_str = ""
+                    if self.fault_counts[key] > 0 then
+                        count_str = " [" .. self.fault_counts[key] .. " total calls]"
+                    end
+
+                    log.error(util.c("PPM: [@", iface, "] caught undefined function ", key, "()", count_str))
                 end
 
-                log.error(util.c("PPM: caught undefined function ", key, "()", count_str))
+                self.fault_counts[key] = self.fault_counts[key] + 1
-            end
 
-            self.fault_counts[key] = self.fault_counts[key] + 1
+                return ACCESS_FAULT, UNDEFINED_FIELD
-
+            end)
-            return (function () return ACCESS_FAULT end)
         end
     }
 
@@ -300,6 +317,17 @@ function ppm.handle_unmount(iface)
     return pm_type, pm_dev
 end
 
+-- log all mounts, to be used if `ppm.mount_all` is called before logging is ready
+function ppm.log_mounts()
+    for iface, mount in pairs(ppm_sys.mounts) do
+        log.info(util.c("PPM: had found a ", mount.type, " (", iface, ")"))
+    end
+
+    if util.table_len(ppm_sys.mounts) == 0 then
+        log.warning("PPM: no devices had been found")
+    end
+end
+
 -- GENERAL ACCESSORS --
 
 -- list all available peripherals

scada-common/util.lua

@@ -22,7 +22,7 @@ local t_pack   = table.pack
 local util = {}
 
 -- scada-common version
-util.version = "1.1.14"
+util.version = "1.2.0"
 
 util.TICK_TIME_S = 0.05
 util.TICK_TIME_MS = 50
@@ -284,11 +284,13 @@ function util.cancel_timer(timer) os.cancelTimer(timer) end
 
 --#region PARALLELIZATION
 
--- protected sleep call so we still are in charge of catching termination
+-- protected sleep call so we still are in charge of catching termination<br>
----@param t integer seconds
+-- returns the result of pcall
+---@param t number seconds
+---@return boolean success, any result, any ...
 --- EVENT_CONSUMER: this function consumes events
 ---@diagnostic disable-next-line: undefined-field
-function util.psleep(t) pcall(os.sleep, t) end
+function util.psleep(t) return pcall(os.sleep, t) end
 
 -- no-op to provide a brief pause (1 tick) to yield<br>
 --- EVENT_CONSUMER: this function consumes events

supervisor/configure.lua

@@ -7,6 +7,7 @@ local tcd         = require("scada-common.tcd")
 local util        = require("scada-common.util")
 
 local core        = require("graphics.core")
+local themes      = require("graphics.themes")
 
 local DisplayBox  = require("graphics.elements.displaybox")
 local Div         = require("graphics.elements.div")
@@ -22,6 +23,8 @@ local RadioButton = require("graphics.elements.controls.radio_button")
 local NumberField = require("graphics.elements.form.number_field")
 local TextField   = require("graphics.elements.form.text_field")
 
+local IndLight    = require("graphics.elements.indicators.light")
+
 local println = util.println
 local tri = util.trinary
 
@@ -32,7 +35,10 @@ local CENTER = core.ALIGN.CENTER
 local RIGHT = core.ALIGN.RIGHT
 
 -- changes to the config data/format to let the user know
-local changes = {}
+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" } }
+}
 
 ---@class svr_configurator
 local configurator = {}
@@ -42,34 +48,25 @@ local style = {}
 style.root = cpair(colors.black, colors.lightGray)
 style.header = cpair(colors.white, colors.gray)
 
-style.colors = {
+style.colors = themes.smooth_stone.colors
-    { c = colors.red,       hex = 0xdf4949 },
-    { c = colors.orange,    hex = 0xffb659 },
-    { c = colors.yellow,    hex = 0xfffc79 },
-    { c = colors.lime,      hex = 0x80ff80 },
-    { c = colors.green,     hex = 0x4aee8a },
-    { c = colors.cyan,      hex = 0x34bac8 },
-    { c = colors.lightBlue, hex = 0x6cc0f2 },
-    { c = colors.blue,      hex = 0x0096ff },
-    { c = colors.purple,    hex = 0xb156ee },
-    { c = colors.pink,      hex = 0xf26ba2 },
-    { c = colors.magenta,   hex = 0xf9488a },
-    { c = colors.lightGray, hex = 0xcacaca },
-    { c = colors.gray,      hex = 0x575757 }
-}
 
 local bw_fg_bg = cpair(colors.black, colors.white)
 local g_lg_fg_bg = cpair(colors.gray, colors.lightGray)
 local nav_fg_bg = bw_fg_bg
 local btn_act_fg_bg = cpair(colors.white, colors.gray)
 
+---@class _svr_cfg_tool_ctl
 local tool_ctl = {
     ask_config = false,
     has_config = false,
     viewing_config = false,
     importing_legacy = false,
+    jumped_to_color = false,
 
     view_cfg = nil,         ---@type graphics_element
+    color_cfg = nil,        ---@type graphics_element
+    color_next = nil,       ---@type graphics_element
+    color_apply = nil,      ---@type graphics_element
     settings_apply = nil,   ---@type graphics_element
 
     gen_summary = nil,      ---@type function
@@ -108,6 +105,8 @@ local tmp_cfg = {
     LogMode = 0,
     LogPath = "",
     LogDebug = false,
+    FrontPanelTheme = 1,
+    ColorMode = 1
 }
 
 ---@class svr_config
@@ -134,7 +133,9 @@ local fields = {
     { "AuthKey", "Facility Auth Key" , ""},
     { "LogMode", "Log Mode", log.MODE.APPEND },
     { "LogPath", "Log Path", "/log.txt" },
-    { "LogDebug","Log Debug Messages", false }
+    { "LogDebug", "Log Debug Messages", false },
+    { "FrontPanelTheme", "Front Panel Theme", themes.FP_THEME.SANDSTONE },
+    { "ColorMode", "Color Mode", themes.COLOR_MODE.STANDARD }
 }
 
 -- load data from the settings file
@@ -164,11 +165,12 @@ local function config_view(display)
     local svr_cfg = Div{parent=root_pane_div,x=1,y=1}
     local net_cfg = Div{parent=root_pane_div,x=1,y=1}
     local log_cfg = Div{parent=root_pane_div,x=1,y=1}
+    local clr_cfg = Div{parent=root_pane_div,x=1,y=1}
     local summary = Div{parent=root_pane_div,x=1,y=1}
     local changelog = Div{parent=root_pane_div,x=1,y=1}
     local import_err = Div{parent=root_pane_div,x=1,y=1}
 
-    local main_pane = MultiPane{parent=root_pane_div,x=1,y=1,panes={main_page,svr_cfg,net_cfg,log_cfg,summary,changelog,import_err}}
+    local main_pane = MultiPane{parent=root_pane_div,x=1,y=1,panes={main_page,svr_cfg,net_cfg,log_cfg,clr_cfg,summary,changelog,import_err}}
 
     -- Main Page
 
@@ -185,7 +187,7 @@ local function config_view(display)
         tool_ctl.viewing_config = true
         tool_ctl.gen_summary(settings_cfg)
         tool_ctl.settings_apply.hide(true)
-        main_pane.set_value(5)
+        main_pane.set_value(6)
     end
 
     if fs.exists("/supervisor/config.lua") then
@@ -196,10 +198,21 @@ local function config_view(display)
     PushButton{parent=main_page,x=2,y=y_start,min_width=18,text="Configure System",callback=function()main_pane.set_value(2)end,fg_bg=cpair(colors.black,colors.blue),active_fg_bg=btn_act_fg_bg}
     tool_ctl.view_cfg = PushButton{parent=main_page,x=2,y=y_start+2,min_width=20,text="View Configuration",callback=view_config,fg_bg=cpair(colors.black,colors.blue),active_fg_bg=btn_act_fg_bg,dis_fg_bg=cpair(colors.lightGray,colors.white)}
 
-    if not tool_ctl.has_config then tool_ctl.view_cfg.disable() end
+    local function jump_color()
+        tool_ctl.jumped_to_color = true
+        tool_ctl.color_next.hide(true)
+        tool_ctl.color_apply.show()
+        main_pane.set_value(5)
+    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=39,y=17,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}
+    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)}
+    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}
+
+    if not tool_ctl.has_config then
+        tool_ctl.view_cfg.disable()
+        tool_ctl.color_cfg.disable()
+    end
 
     --#region Facility
 
@@ -721,10 +734,8 @@ local function config_view(display)
             tmp_cfg.LogMode = mode.get_value() - 1
             tmp_cfg.LogPath = path.get_value()
             tmp_cfg.LogDebug = en_dbg.get_value()
-            tool_ctl.gen_summary(tmp_cfg)
+            tool_ctl.color_apply.hide(true)
-            tool_ctl.viewing_config = false
+            tool_ctl.color_next.show()
-            tool_ctl.importing_legacy = false
-            tool_ctl.settings_apply.show()
             main_pane.set_value(5)
         else path_err.show() end
     end
@@ -734,6 +745,116 @@ local function config_view(display)
 
     --#endregion
 
+    --#region Color Options
+
+    local clr_c_1 = Div{parent=clr_cfg,x=2,y=4,width=49}
+    local clr_c_2 = Div{parent=clr_cfg,x=2,y=4,width=49}
+    local clr_c_3 = Div{parent=clr_cfg,x=2,y=4,width=49}
+    local clr_c_4 = Div{parent=clr_cfg,x=2,y=4,width=49}
+
+    local clr_pane = MultiPane{parent=clr_cfg,x=1,y=4,panes={clr_c_1,clr_c_2,clr_c_3,clr_c_4}}
+
+    TextBox{parent=clr_cfg,x=1,y=2,height=1,text=" Color Configuration",fg_bg=cpair(colors.black,colors.magenta)}
+
+    TextBox{parent=clr_c_1,x=1,y=1,height=2,text="Here you can select the color theme for the front panel."}
+    TextBox{parent=clr_c_1,x=1,y=4,height=2,text="Click 'Accessibility' below to access colorblind assistive options.",fg_bg=g_lg_fg_bg}
+
+    TextBox{parent=clr_c_1,x=1,y=7,height=1,text="Front Panel Theme"}
+    local fp_theme = RadioButton{parent=clr_c_1,x=1,y=8,default=ini_cfg.FrontPanelTheme,options=themes.FP_THEME_NAMES,callback=function()end,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.magenta}
+
+    TextBox{parent=clr_c_2,x=1,y=1,height=6,text="This system uses color heavily to distinguish ok and not, with some indicators using many colors. By selecting a mode below, indicators will change as shown. For non-standard modes, indicators with more than two colors will be split up."}
+
+    TextBox{parent=clr_c_2,x=21,y=7,height=1,text="Preview"}
+    local _ = IndLight{parent=clr_c_2,x=21,y=8,label="Good",colors=cpair(colors.black,colors.green)}
+    _ = IndLight{parent=clr_c_2,x=21,y=9,label="Warning",colors=cpair(colors.black,colors.yellow)}
+    _ = IndLight{parent=clr_c_2,x=21,y=10,label="Bad",colors=cpair(colors.black,colors.red)}
+    local b_off = IndLight{parent=clr_c_2,x=21,y=11,label="Off",colors=cpair(colors.black,colors.black),hidden=true}
+    local g_off = IndLight{parent=clr_c_2,x=21,y=11,label="Off",colors=cpair(colors.gray,colors.gray),hidden=true}
+
+    local function recolor(value)
+        local c = themes.smooth_stone.color_modes[value]
+
+        if value == themes.COLOR_MODE.STANDARD or value == themes.COLOR_MODE.BLUE_IND then
+            b_off.hide()
+            g_off.show()
+        else
+            g_off.hide()
+            b_off.show()
+        end
+
+        if #c == 0 then
+            for i = 1, #style.colors do term.setPaletteColor(style.colors[i].c, style.colors[i].hex) end
+        else
+            term.setPaletteColor(colors.green, c[1].hex)
+            term.setPaletteColor(colors.yellow, c[2].hex)
+            term.setPaletteColor(colors.red, c[3].hex)
+        end
+    end
+
+    TextBox{parent=clr_c_2,x=1,y=7,height=1,width=10,text="Color Mode"}
+    local c_mode = RadioButton{parent=clr_c_2,x=1,y=8,default=ini_cfg.ColorMode,options=themes.COLOR_MODE_NAMES,callback=recolor,radio_colors=cpair(colors.lightGray,colors.black),select_color=colors.magenta}
+
+    TextBox{parent=clr_c_2,x=21,y=13,height=2,width=18,text="Note: exact color varies by theme.",fg_bg=g_lg_fg_bg}
+
+    PushButton{parent=clr_c_2,x=44,y=14,min_width=6,text="Done",callback=function()clr_pane.set_value(1)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+
+    local function back_from_colors()
+        main_pane.set_value(util.trinary(tool_ctl.jumped_to_color, 1, 4))
+        tool_ctl.jumped_to_color = false
+        recolor(1)
+    end
+
+    local function show_access()
+        clr_pane.set_value(2)
+        recolor(c_mode.get_value())
+    end
+
+    local function submit_colors()
+        tmp_cfg.FrontPanelTheme = fp_theme.get_value()
+        tmp_cfg.ColorMode = c_mode.get_value()
+
+        if tool_ctl.jumped_to_color then
+            settings.set("FrontPanelTheme", tmp_cfg.FrontPanelTheme)
+            settings.set("ColorMode", tmp_cfg.ColorMode)
+
+            if settings.save("/supervisor.settings") then
+                load_settings(settings_cfg, true)
+                load_settings(ini_cfg)
+                clr_pane.set_value(3)
+            else
+                clr_pane.set_value(4)
+            end
+        else
+            tool_ctl.gen_summary(tmp_cfg)
+            tool_ctl.viewing_config = false
+            tool_ctl.importing_legacy = false
+            tool_ctl.settings_apply.show()
+            main_pane.set_value(6)
+        end
+    end
+
+    PushButton{parent=clr_c_1,x=1,y=14,text="\x1b Back",callback=back_from_colors,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    PushButton{parent=clr_c_1,x=8,y=14,min_width=15,text="Accessibility",callback=show_access,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    tool_ctl.color_next = PushButton{parent=clr_c_1,x=44,y=14,text="Next \x1a",callback=submit_colors,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+    tool_ctl.color_apply = PushButton{parent=clr_c_1,x=43,y=14,min_width=7,text="Apply",callback=submit_colors,fg_bg=cpair(colors.black,colors.green),active_fg_bg=btn_act_fg_bg}
+
+    tool_ctl.color_apply.hide(true)
+
+    local function c_go_home()
+        main_pane.set_value(1)
+        clr_pane.set_value(1)
+    end
+
+    TextBox{parent=clr_c_3,x=1,y=1,height=1,text="Settings saved!"}
+    PushButton{parent=clr_c_3,x=1,y=14,min_width=6,text="Exit",callback=exit,fg_bg=cpair(colors.black,colors.red),active_fg_bg=cpair(colors.white,colors.gray)}
+    PushButton{parent=clr_c_3,x=44,y=14,min_width=6,text="Home",callback=c_go_home,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+
+    TextBox{parent=clr_c_4,x=1,y=1,height=5,text="Failed to save the settings file.\n\nThere may not be enough space for the modification or server file permissions may be denying writes."}
+    PushButton{parent=clr_c_4,x=1,y=14,min_width=6,text="Exit",callback=exit,fg_bg=cpair(colors.black,colors.red),active_fg_bg=cpair(colors.white,colors.gray)}
+    PushButton{parent=clr_c_4,x=44,y=14,min_width=6,text="Home",callback=c_go_home,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
+
+    --#endregion
+
     --#region Summary and Saving
 
     local sum_c_1 = Div{parent=summary,x=2,y=4,width=49}
@@ -754,7 +875,7 @@ local function config_view(display)
             tool_ctl.importing_legacy = false
             tool_ctl.settings_apply.show()
         else
-            main_pane.set_value(4)
+            main_pane.set_value(5)
         end
     end
 
@@ -787,6 +908,8 @@ local function config_view(display)
             try_set(mode, ini_cfg.LogMode)
             try_set(path, ini_cfg.LogPath)
             try_set(en_dbg, ini_cfg.LogDebug)
+            try_set(fp_theme, ini_cfg.FrontPanelTheme)
+            try_set(c_mode, ini_cfg.ColorMode)
 
             for i = 1, #ini_cfg.CoolingConfig do
                 local cfg, elems = ini_cfg.CoolingConfig[i], tool_ctl.cooling_elems[i]
@@ -824,6 +947,7 @@ local function config_view(display)
         main_pane.set_value(1)
         svr_pane.set_value(1)
         net_pane.set_value(1)
+        clr_pane.set_value(1)
         sum_pane.set_value(1)
     end
 
@@ -887,7 +1011,7 @@ local function config_view(display)
 
         if config.REACTOR_COOLING == nil or tmp_cfg.UnitCount ~= #config.REACTOR_COOLING then
             import_err_msg.set_value("Cooling configuration table length must match the number of units.")
-            main_pane.set_value(7)
+            main_pane.set_value(8)
             return
         end
 
@@ -896,7 +1020,7 @@ local function config_view(display)
 
             if type(cfg) ~= "table" then
                 import_err_msg.set_value("Cooling configuration for unit " .. i .. " must be a table.")
-                main_pane.set_value(7)
+                main_pane.set_value(8)
                 return
             end
 
@@ -907,14 +1031,14 @@ local function config_view(display)
 
         if not (util.is_int(tmp_cfg.FacilityTankMode) and tmp_cfg.FacilityTankMode >= 0 and tmp_cfg.FacilityTankMode <= 8) then
             import_err_msg.set_value("Invalid tank mode present in config. FAC_TANK_MODE must be a number 0 through 8.")
-            main_pane.set_value(7)
+            main_pane.set_value(8)
             return
         end
 
         if config.FAC_TANK_MODE > 0 then
             if config.FAC_TANK_DEFS == nil or tmp_cfg.UnitCount ~= #config.FAC_TANK_DEFS then
                 import_err_msg.set_value("Facility tank definitions table length must match the number of units when using facility tanks.")
-                main_pane.set_value(7)
+                main_pane.set_value(8)
                 return
             end
 
@@ -945,7 +1069,7 @@ local function config_view(display)
 
         tool_ctl.gen_summary(tmp_cfg)
         sum_pane.set_value(1)
-        main_pane.set_value(5)
+        main_pane.set_value(6)
         tool_ctl.importing_legacy = true
     end
 
@@ -976,6 +1100,10 @@ local function config_view(display)
 
             if f[1] == "AuthKey" then val = string.rep("*", string.len(val))
             elseif f[1] == "LogMode" then val = util.trinary(raw == log.MODE.APPEND, "append", "replace")
+            elseif f[1] == "FrontPanelTheme" then
+                val = util.strval(themes.fp_theme_name(raw))
+            elseif f[1] == "ColorMode" then
+                val = util.strval(themes.color_mode_name(raw))
             elseif f[1] == "CoolingConfig" and type(cfg.CoolingConfig) == "table" then
                 val = ""
 

supervisor/databus.lua

@@ -64,7 +64,7 @@ function databus.tx_plc_rtt(reactor_id, rtt)
     elseif rtt > WARN_RTT then
         databus.ps.publish("plc_" .. reactor_id .. "_rtt_color", colors.yellow_hc)
     else
-        databus.ps.publish("plc_" .. reactor_id .. "_rtt_color", colors.green)
+        databus.ps.publish("plc_" .. reactor_id .. "_rtt_color", colors.green_hc)
     end
 end
 
@@ -95,7 +95,7 @@ function databus.tx_rtu_rtt(session_id, rtt)
     elseif rtt > WARN_RTT then
         databus.ps.publish("rtu_" .. session_id .. "_rtt_color", colors.yellow_hc)
     else
-        databus.ps.publish("rtu_" .. session_id .. "_rtt_color", colors.green)
+        databus.ps.publish("rtu_" .. session_id .. "_rtt_color", colors.green_hc)
     end
 end
 
@@ -134,7 +134,7 @@ function databus.tx_crd_rtt(rtt)
     elseif rtt > WARN_RTT then
         databus.ps.publish("crd_rtt_color", colors.yellow_hc)
     else
-        databus.ps.publish("crd_rtt_color", colors.green)
+        databus.ps.publish("crd_rtt_color", colors.green_hc)
     end
 end
 
@@ -165,7 +165,7 @@ function databus.tx_pdg_rtt(session_id, rtt)
     elseif rtt > WARN_RTT then
         databus.ps.publish("pdg_" .. session_id .. "_rtt_color", colors.yellow_hc)
     else
-        databus.ps.publish("pdg_" .. session_id .. "_rtt_color", colors.green)
+        databus.ps.publish("pdg_" .. session_id .. "_rtt_color", colors.green_hc)
     end
 end
 

supervisor/facility.lua

@@ -152,6 +152,8 @@ function facility.new(num_reactors, cooling_conf)
         table.insert(self.test_tone_states, false)
     end
 
+    -- PRIVATE FUNCTIONS --
+
     -- check if all auto-controlled units completed ramping
     ---@nodiscard
     local function _all_units_ramped()
@@ -228,7 +230,7 @@ function facility.new(num_reactors, cooling_conf)
     ---@class facility
     local public = {}
 
-    -- ADD/LINK DEVICES --
+    --#region Add/Link Devices
 
     -- link a redstone RTU session
     ---@param rs_unit unit_session
@@ -268,11 +270,9 @@ function facility.new(num_reactors, cooling_conf)
         for _, v in pairs(self.rtu_list) do util.filter_table(v, function (s) return s.get_session_id() ~= session end) end
     end
 
-    -- UPDATE --
+    --#endregion
 
-    -- supervisor sessions reporting the list of active RTU sessions
+    --#region Update
-    ---@param rtu_sessions table session list of all connected RTUs
-    function public.report_rtus(rtu_sessions) self.rtu_conn_count = #rtu_sessions end
 
     -- update (iterate) the facility management
     function public.update()
@@ -323,7 +323,7 @@ function facility.new(num_reactors, cooling_conf)
         -- Run Process Control --
         -------------------------
 
-        --#region Process Control
+        --#region
 
         local avg_charge = self.avg_charge.compute()
         local avg_inflow = self.avg_inflow.compute()
@@ -597,7 +597,7 @@ function facility.new(num_reactors, cooling_conf)
         -- Evaluate Automatic SCRAM --
         ------------------------------
 
-        --#region Automatic SCRAM
+        --#region
 
         local astatus = self.ascram_status
 
@@ -727,6 +727,8 @@ function facility.new(num_reactors, cooling_conf)
         -- Handle Redstone I/O --
         -------------------------
 
+        --#region
+
         if #self.redstone > 0 then
             -- handle facility SCRAM
             if self.io_ctl.digital_read(IO.F_SCRAM) then
@@ -756,10 +758,14 @@ function facility.new(num_reactors, cooling_conf)
             self.io_ctl.digital_write(IO.F_ALARM_ANY, has_any_alarm)
         end
 
+        --#endregion
+
         ----------------
         -- Unit Tasks --
         ----------------
 
+        --#region
+
         local insufficent_po_rate = false
         local need_emcool = false
 
@@ -798,10 +804,14 @@ function facility.new(num_reactors, cooling_conf)
             end
         end
 
+        --#endregion
+
         ------------------------
         -- Update Alarm Tones --
         ------------------------
 
+        --#region
+
         local allow_test = self.allow_testing and self.test_tone_set
 
         local alarms = { false, false, false, false, false, false, false, false, false, false, false, false }
@@ -888,6 +898,8 @@ function facility.new(num_reactors, cooling_conf)
             self.test_tone_set = false
             self.test_tone_reset = true
         end
+
+        --#endregion
     end
 
     -- call the update function of all units in the facility<br>
@@ -900,7 +912,9 @@ function facility.new(num_reactors, cooling_conf)
         end
     end
 
-    -- COMMANDS --
+    --#endregion
+
+    --#region Commands
 
     -- SCRAM all reactor units
     function public.scram_all()
@@ -988,7 +1002,9 @@ function facility.new(num_reactors, cooling_conf)
         }
     end
 
-    -- SETTINGS --
+    --#endregion
+
+    --#region Settings
 
     -- set the automatic control group of a unit
     ---@param unit_id integer unit ID
@@ -1029,7 +1045,9 @@ function facility.new(num_reactors, cooling_conf)
         return self.pu_fallback
     end
 
-    -- DIAGNOSTIC TESTING --
+    --#endregion
+
+    --#region Diagnostic Testing
 
     -- attempt to set a test tone state
     ---@param id TONE|0 tone ID or 0 to disable all
@@ -1069,7 +1087,9 @@ function facility.new(num_reactors, cooling_conf)
         return self.allow_testing, self.test_alarm_states
     end
 
-    -- READ STATES/PROPERTIES --
+    --#endregion
+
+    --#region Read States/Properties
 
     -- get current alarm tone on/off states
     ---@nodiscard
@@ -1183,6 +1203,12 @@ function facility.new(num_reactors, cooling_conf)
         return status
     end
 
+    --#endregion
+
+    -- supervisor sessions reporting the list of active RTU sessions
+    ---@param rtu_sessions table session list of all connected RTUs
+    function public.report_rtus(rtu_sessions) self.rtu_conn_count = #rtu_sessions end
+
     -- get the units in this facility
     ---@nodiscard
     function public.get_units() return self.units end

supervisor/panel/components/pdg_entry.lua

@@ -17,31 +17,32 @@ local ALIGN = core.ALIGN
 
 local cpair = core.cpair
 
-local black_lg = style.black_lg
-local lg_white = style.lg_white
-
 -- create a pocket diagnostics list entry
 ---@param parent graphics_element parent
 ---@param id integer PDG session ID
 local function init(parent, id)
+    local s_hi_box = style.theme.highlight_box
+
+    local label_fg = style.fp.label_fg
+
     -- root div
     local root = Div{parent=parent,x=2,y=2,height=4,width=parent.get_width()-2,hidden=true}
-    local entry = Div{parent=root,x=2,y=1,height=3,fg_bg=style.bw_fg_bg}
+    local entry = Div{parent=root,x=2,y=1,height=3,fg_bg=style.theme.highlight_box_bright}
 
     local ps_prefix = "pdg_" .. id .. "_"
 
-    TextBox{parent=entry,x=1,y=1,text="",width=8,height=1,fg_bg=black_lg}
+    TextBox{parent=entry,x=1,y=1,text="",width=8,height=1,fg_bg=s_hi_box}
-    local pdg_addr = TextBox{parent=entry,x=1,y=2,text="@ C ??",alignment=ALIGN.CENTER,width=8,height=1,fg_bg=black_lg,nav_active=cpair(colors.gray,colors.black)}
+    local pdg_addr = TextBox{parent=entry,x=1,y=2,text="@ C ??",alignment=ALIGN.CENTER,width=8,height=1,fg_bg=s_hi_box,nav_active=cpair(colors.gray,colors.black)}
-    TextBox{parent=entry,x=1,y=3,text="",width=8,height=1,fg_bg=black_lg}
+    TextBox{parent=entry,x=1,y=3,text="",width=8,height=1,fg_bg=s_hi_box}
     pdg_addr.register(databus.ps, ps_prefix .. "addr", pdg_addr.set_value)
 
     TextBox{parent=entry,x=10,y=2,text="FW:",width=3,height=1}
-    local pdg_fw_v = TextBox{parent=entry,x=14,y=2,text=" ------- ",width=20,height=1,fg_bg=lg_white}
+    local pdg_fw_v = TextBox{parent=entry,x=14,y=2,text=" ------- ",width=20,height=1,fg_bg=label_fg}
     pdg_fw_v.register(databus.ps, ps_prefix .. "fw", pdg_fw_v.set_value)
 
     TextBox{parent=entry,x=35,y=2,text="RTT:",width=4,height=1}
-    local pdg_rtt = DataIndicator{parent=entry,x=40,y=2,label="",unit="",format="%5d",value=0,width=5,fg_bg=lg_white}
+    local pdg_rtt = DataIndicator{parent=entry,x=40,y=2,label="",unit="",format="%5d",value=0,width=5,fg_bg=label_fg}
-    TextBox{parent=entry,x=46,y=2,text="ms",width=4,height=1,fg_bg=lg_white}
+    TextBox{parent=entry,x=46,y=2,text="ms",width=4,height=1,fg_bg=label_fg}
     pdg_rtt.register(databus.ps, ps_prefix .. "rtt", pdg_rtt.update)
     pdg_rtt.register(databus.ps, ps_prefix .. "rtt_color", pdg_rtt.recolor)
 

supervisor/panel/components/rtu_entry.lua

@@ -17,35 +17,36 @@ local ALIGN = core.ALIGN
 
 local cpair = core.cpair
 
-local black_lg = style.black_lg
-local lg_white = style.lg_white
-
 -- create an RTU list entry
 ---@param parent graphics_element parent
 ---@param id integer RTU session ID
 local function init(parent, id)
+    local s_hi_box = style.theme.highlight_box
+
+    local label_fg = style.fp.label_fg
+
     -- root div
     local root = Div{parent=parent,x=2,y=2,height=4,width=parent.get_width()-2,hidden=true}
-    local entry = Div{parent=root,x=2,y=1,height=3,fg_bg=style.bw_fg_bg}
+    local entry = Div{parent=root,x=2,y=1,height=3,fg_bg=style.theme.highlight_box_bright}
 
     local ps_prefix = "rtu_" .. id .. "_"
 
-    TextBox{parent=entry,x=1,y=1,text="",width=8,height=1,fg_bg=black_lg}
+    TextBox{parent=entry,x=1,y=1,text="",width=8,height=1,fg_bg=s_hi_box}
-    local rtu_addr = TextBox{parent=entry,x=1,y=2,text="@ C ??",alignment=ALIGN.CENTER,width=8,height=1,fg_bg=black_lg,nav_active=cpair(colors.gray,colors.black)}
+    local rtu_addr = TextBox{parent=entry,x=1,y=2,text="@ C ??",alignment=ALIGN.CENTER,width=8,height=1,fg_bg=s_hi_box,nav_active=cpair(colors.gray,colors.black)}
-    TextBox{parent=entry,x=1,y=3,text="",width=8,height=1,fg_bg=black_lg}
+    TextBox{parent=entry,x=1,y=3,text="",width=8,height=1,fg_bg=s_hi_box}
     rtu_addr.register(databus.ps, ps_prefix .. "addr", rtu_addr.set_value)
 
     TextBox{parent=entry,x=10,y=2,text="UNITS:",width=7,height=1}
-    local unit_count = DataIndicator{parent=entry,x=17,y=2,label="",unit="",format="%2d",value=0,width=2,fg_bg=style.gray_white}
+    local unit_count = DataIndicator{parent=entry,x=17,y=2,label="",unit="",format="%2d",value=0,width=2,fg_bg=style.fp.label_d_fg}
     unit_count.register(databus.ps, ps_prefix .. "units", unit_count.set_value)
 
     TextBox{parent=entry,x=21,y=2,text="FW:",width=3,height=1}
-    local rtu_fw_v = TextBox{parent=entry,x=25,y=2,text=" ------- ",width=9,height=1,fg_bg=lg_white}
+    local rtu_fw_v = TextBox{parent=entry,x=25,y=2,text=" ------- ",width=9,height=1,fg_bg=label_fg}
     rtu_fw_v.register(databus.ps, ps_prefix .. "fw", rtu_fw_v.set_value)
 
     TextBox{parent=entry,x=36,y=2,text="RTT:",width=4,height=1}
-    local rtu_rtt = DataIndicator{parent=entry,x=40,y=2,label="",unit="",format="%5d",value=0,width=5,fg_bg=lg_white}
+    local rtu_rtt = DataIndicator{parent=entry,x=40,y=2,label="",unit="",format="%5d",value=0,width=5,fg_bg=label_fg}
-    TextBox{parent=entry,x=46,y=2,text="ms",width=4,height=1,fg_bg=lg_white}
+    TextBox{parent=entry,x=46,y=2,text="ms",width=4,height=1,fg_bg=label_fg}
     rtu_rtt.register(databus.ps, ps_prefix .. "rtt", rtu_rtt.update)
     rtu_rtt.register(databus.ps, ps_prefix .. "rtt_color", rtu_rtt.recolor)
 

supervisor/panel/front_panel.lua

@@ -29,18 +29,18 @@ local ALIGN = core.ALIGN
 
 local cpair = core.cpair
 
-local bw_fg_bg = style.bw_fg_bg
-
-local black_lg = style.black_lg
-local lg_white = style.lg_white
-local gry_wht = style.gray_white
-
 local ind_grn = style.ind_grn
 
 -- create new front panel view
 ---@param panel graphics_element main displaybox
 local function init(panel)
-    TextBox{parent=panel,y=1,text="SCADA SUPERVISOR",alignment=ALIGN.CENTER,height=1,fg_bg=style.header}
+    local s_hi_box = style.theme.highlight_box
+    local s_hi_bright = style.theme.highlight_box_bright
+
+    local label_fg = style.fp.label_fg
+    local label_d_fg = style.fp.label_d_fg
+
+    TextBox{parent=panel,y=1,text="SCADA SUPERVISOR",alignment=ALIGN.CENTER,height=1,fg_bg=style.theme.header}
 
     local page_div = Div{parent=panel,x=1,y=3}
 
@@ -66,13 +66,13 @@ local function init(panel)
 
 ---@diagnostic disable-next-line: undefined-field
     local comp_id = util.sprintf("(%d)", os.getComputerID())
-    TextBox{parent=system,x=9,y=4,width=6,height=1,text=comp_id,fg_bg=style.fp_label}
+    TextBox{parent=system,x=9,y=4,width=6,height=1,text=comp_id,fg_bg=style.fp.disabled_fg}
 
     --
     -- about footer
     --
 
-    local about   = Div{parent=main_page,width=15,height=3,x=1,y=16,fg_bg=style.fp_label}
+    local about   = Div{parent=main_page,width=15,height=3,x=1,y=16,fg_bg=style.fp.disabled_fg}
     local fw_v    = TextBox{parent=about,x=1,y=1,text="FW: v00.00.00",alignment=ALIGN.LEFT,height=1}
     local comms_v = TextBox{parent=about,x=1,y=2,text="NT: v00.00.00",alignment=ALIGN.LEFT,height=1}
 
@@ -90,25 +90,25 @@ local function init(panel)
 
     for i = 1, supervisor.config.UnitCount do
         local ps_prefix = "plc_" .. i .. "_"
-        local plc_entry = Div{parent=plc_list,height=3,fg_bg=bw_fg_bg}
+        local plc_entry = Div{parent=plc_list,height=3,fg_bg=s_hi_bright}
 
-        TextBox{parent=plc_entry,x=1,y=1,text="",width=8,height=1,fg_bg=black_lg}
+        TextBox{parent=plc_entry,x=1,y=1,text="",width=8,height=1,fg_bg=s_hi_box}
-        TextBox{parent=plc_entry,x=1,y=2,text="UNIT "..i,alignment=ALIGN.CENTER,width=8,height=1,fg_bg=black_lg}
+        TextBox{parent=plc_entry,x=1,y=2,text="UNIT "..i,alignment=ALIGN.CENTER,width=8,height=1,fg_bg=s_hi_box}
-        TextBox{parent=plc_entry,x=1,y=3,text="",width=8,height=1,fg_bg=black_lg}
+        TextBox{parent=plc_entry,x=1,y=3,text="",width=8,height=1,fg_bg=s_hi_box}
 
-        local conn = LED{parent=plc_entry,x=10,y=2,label="LINK",colors=ind_grn}
+        local conn = LED{parent=plc_entry,x=10,y=2,label="LINK",colors=cpair(colors.green_hc,colors.green_off)}
         conn.register(databus.ps, ps_prefix .. "conn", conn.update)
 
-        local plc_addr = TextBox{parent=plc_entry,x=17,y=2,text=" --- ",width=5,height=1,fg_bg=gry_wht}
+        local plc_addr = TextBox{parent=plc_entry,x=17,y=2,text=" --- ",width=5,height=1,fg_bg=label_d_fg}
         plc_addr.register(databus.ps, ps_prefix .. "addr", plc_addr.set_value)
 
         TextBox{parent=plc_entry,x=23,y=2,text="FW:",width=3,height=1}
-        local plc_fw_v = TextBox{parent=plc_entry,x=27,y=2,text=" ------- ",width=9,height=1,fg_bg=lg_white}
+        local plc_fw_v = TextBox{parent=plc_entry,x=27,y=2,text=" ------- ",width=9,height=1,fg_bg=label_fg}
         plc_fw_v.register(databus.ps, ps_prefix .. "fw", plc_fw_v.set_value)
 
         TextBox{parent=plc_entry,x=37,y=2,text="RTT:",width=4,height=1}
-        local plc_rtt = DataIndicator{parent=plc_entry,x=42,y=2,label="",unit="",format="%4d",value=0,width=4,fg_bg=lg_white}
+        local plc_rtt = DataIndicator{parent=plc_entry,x=42,y=2,label="",unit="",format="%4d",value=0,width=4,fg_bg=label_fg}
-        TextBox{parent=plc_entry,x=47,y=2,text="ms",width=4,height=1,fg_bg=lg_white}
+        TextBox{parent=plc_entry,x=47,y=2,text="ms",width=4,height=1,fg_bg=label_fg}
         plc_rtt.register(databus.ps, ps_prefix .. "rtt", plc_rtt.update)
         plc_rtt.register(databus.ps, ps_prefix .. "rtt_color", plc_rtt.recolor)
 
@@ -124,29 +124,29 @@ local function init(panel)
     -- coordinator page
 
     local crd_page = Div{parent=page_div,x=1,y=1,hidden=true}
-    local crd_box = Div{parent=crd_page,x=2,y=2,width=49,height=4,fg_bg=bw_fg_bg}
+    local crd_box = Div{parent=crd_page,x=2,y=2,width=49,height=4,fg_bg=s_hi_bright}
 
-    local crd_conn = LED{parent=crd_box,x=2,y=2,label="CONNECTION",colors=ind_grn}
+    local crd_conn = LED{parent=crd_box,x=2,y=2,label="CONNECTION",colors=cpair(colors.green_hc,colors.green_off)}
     crd_conn.register(databus.ps, "crd_conn", crd_conn.update)
 
-    TextBox{parent=crd_box,x=4,y=3,text="COMPUTER",width=8,height=1,fg_bg=gry_wht}
+    TextBox{parent=crd_box,x=4,y=3,text="COMPUTER",width=8,height=1,fg_bg=label_d_fg}
-    local crd_addr = TextBox{parent=crd_box,x=13,y=3,text="---",width=5,height=1,fg_bg=gry_wht}
+    local crd_addr = TextBox{parent=crd_box,x=13,y=3,text="---",width=5,height=1,fg_bg=label_d_fg}
     crd_addr.register(databus.ps, "crd_addr", crd_addr.set_value)
 
     TextBox{parent=crd_box,x=22,y=2,text="FW:",width=3,height=1}
-    local crd_fw_v = TextBox{parent=crd_box,x=26,y=2,text=" ------- ",width=9,height=1,fg_bg=lg_white}
+    local crd_fw_v = TextBox{parent=crd_box,x=26,y=2,text=" ------- ",width=9,height=1,fg_bg=label_fg}
     crd_fw_v.register(databus.ps, "crd_fw", crd_fw_v.set_value)
 
     TextBox{parent=crd_box,x=36,y=2,text="RTT:",width=4,height=1}
-    local crd_rtt = DataIndicator{parent=crd_box,x=41,y=2,label="",unit="",format="%5d",value=0,width=5,fg_bg=lg_white}
+    local crd_rtt = DataIndicator{parent=crd_box,x=41,y=2,label="",unit="",format="%5d",value=0,width=5,fg_bg=label_fg}
-    TextBox{parent=crd_box,x=47,y=2,text="ms",width=4,height=1,fg_bg=lg_white}
+    TextBox{parent=crd_box,x=47,y=2,text="ms",width=4,height=1,fg_bg=label_fg}
     crd_rtt.register(databus.ps, "crd_rtt", crd_rtt.update)
     crd_rtt.register(databus.ps, "crd_rtt_color", crd_rtt.recolor)
 
     -- pocket diagnostics page
 
     local pkt_page = Div{parent=page_div,x=1,y=1,hidden=true}
-    local pdg_list = ListBox{parent=pkt_page,x=1,y=1,height=17,width=51,scroll_height=1000,fg_bg=cpair(colors.black,colors.ivory),nav_fg_bg=cpair(colors.gray,colors.lightGray),nav_active=cpair(colors.black,colors.gray)}
+    local pdg_list = ListBox{parent=pkt_page,x=1,y=1,height=17,width=51,scroll_height=1000,fg_bg=style.fp.text_fg,nav_fg_bg=cpair(colors.gray,colors.lightGray),nav_active=cpair(colors.black,colors.gray)}
     local _ = Div{parent=pdg_list,height=1,hidden=true} -- padding
 
     -- assemble page panes
@@ -156,14 +156,14 @@ local function init(panel)
     local page_pane = MultiPane{parent=page_div,x=1,y=1,panes=panes}
 
     local tabs = {
-        { name = "SVR", color = cpair(colors.black, colors.ivory) },
+        { name = "SVR", color = style.fp.text },
-        { name = "PLC", color = cpair(colors.black, colors.ivory) },
+        { name = "PLC", color = style.fp.text },
-        { name = "RTU", color = cpair(colors.black, colors.ivory) },
+        { name = "RTU", color = style.fp.text },
-        { name = "CRD", color = cpair(colors.black, colors.ivory) },
+        { name = "CRD", color = style.fp.text },
-        { name = "PKT", color = cpair(colors.black, colors.ivory) },
+        { name = "PKT", color = style.fp.text },
     }
 
-    TabBar{parent=panel,y=2,tabs=tabs,min_width=9,callback=page_pane.set_value,fg_bg=bw_fg_bg}
+    TabBar{parent=panel,y=2,tabs=tabs,min_width=9,callback=page_pane.set_value,fg_bg=style.theme.highlight_box_bright}
 
     -- link RTU/PDG list management to PGI
     pgi.link_elements(rtu_list, rtu_entry, pdg_list, pdg_entry)

supervisor/panel/style.lua

@@ -2,53 +2,33 @@
 -- Graphics Style Options
 --
 
-local core = require("graphics.core")
+local core   = require("graphics.core")
+local themes = require("graphics.themes")
 
+---@class svr_style
 local style = {}
 
 local cpair = core.cpair
 
--- GLOBAL --
+style.theme = themes.sandstone
-
+style.fp = themes.get_fp_style(style.theme)
--- remap global colors
+style.colorblind = false
-colors.ivory = colors.pink
-colors.yellow_hc = colors.purple
-colors.red_off = colors.brown
-colors.yellow_off = colors.magenta
-colors.green_off = colors.lime
-
-style.root = cpair(colors.black, colors.ivory)
-style.header = cpair(colors.black, colors.lightGray)
-
-style.colors = {
-    { c = colors.red,       hex = 0xdf4949 },   -- RED ON
-    { c = colors.orange,    hex = 0xffb659 },
-    { c = colors.yellow,    hex = 0xf9fb53 },   -- YELLOW ON
-    { c = colors.lime,      hex = 0x16665a },   -- GREEN OFF
-    { c = colors.green,     hex = 0x6be551 },   -- GREEN ON
-    { c = colors.cyan,      hex = 0x34bac8 },
-    { c = colors.lightBlue, hex = 0x6cc0f2 },
-    { c = colors.blue,      hex = 0x0008fe },   -- LCD BLUE
-    { c = colors.purple,    hex = 0xe3bc2a },   -- YELLOW HIGH CONTRAST
-    { c = colors.pink,      hex = 0xdcd9ca },   -- IVORY
-    { c = colors.magenta,   hex = 0x85862c },   -- YELLOW OFF
-    -- { c = colors.white,     hex = 0xdcd9ca },
-    { c = colors.lightGray, hex = 0xb1b8b3 },
-    { c = colors.gray,      hex = 0x575757 },
-    -- { c = colors.black,     hex = 0x191919 },
-    { c = colors.brown,     hex = 0x672223 }    -- RED OFF
-}
-
--- COMMON COLOR PAIRS --
-
-style.text_fg_bg = cpair(colors.black, colors.ivory)
-style.bw_fg_bg = cpair(colors.black, colors.white)
-style.fp_label = cpair(colors.lightGray, colors.ivory)
-
-style.black_lg = cpair(colors.black, colors.lightGray)
-style.lg_white = cpair(colors.lightGray, colors.white)
-style.gray_white = cpair(colors.gray, colors.white)
 
 style.ind_grn = cpair(colors.green, colors.green_off)
 
+-- set theme per configuration
+---@param fp FP_THEME front panel theme
+---@param color_mode COLOR_MODE the color mode to use
+function style.set_theme(fp, color_mode)
+    if fp == themes.FP_THEME.SANDSTONE then
+        style.theme = themes.sandstone
+    elseif fp == themes.FP_THEME.BASALT then
+        style.theme = themes.basalt
+    end
+
+    style.fp = themes.get_fp_style(style.theme)
+
+    style.colorblind = color_mode ~= themes.COLOR_MODE.STANDARD and color_mode ~= themes.COLOR_MODE.STD_ON_BLACK
+end
+
 return style

supervisor/renderer.lua

@@ -19,11 +19,16 @@ local ui = {
 }
 
 -- try to start the UI
+---@param theme FP_THEME front panel theme
+---@param color_mode COLOR_MODE color mode
 ---@return boolean success, any error_msg
-function renderer.try_start_ui()
+function renderer.try_start_ui(theme, color_mode)
     local status, msg = true, nil
 
     if ui.display == nil then
+        -- set theme
+        style.set_theme(theme, color_mode)
+
         -- reset terminal
         term.setTextColor(colors.white)
         term.setBackgroundColor(colors.black)
@@ -31,13 +36,19 @@ function renderer.try_start_ui()
         term.setCursorPos(1, 1)
 
         -- set overridden colors
-        for i = 1, #style.colors do
+        for i = 1, #style.theme.colors do
-            term.setPaletteColor(style.colors[i].c, style.colors[i].hex)
+            term.setPaletteColor(style.theme.colors[i].c, style.theme.colors[i].hex)
+        end
+
+        -- apply color mode
+        local c_mode_overrides = style.theme.color_modes[color_mode]
+        for i = 1, #c_mode_overrides do
+            term.setPaletteColor(c_mode_overrides[i].c, c_mode_overrides[i].hex)
         end
 
         -- init front panel view
         status, msg = pcall(function ()
-            ui.display = DisplayBox{window=term.current(),fg_bg=style.root}
+            ui.display = DisplayBox{window=term.current(),fg_bg=style.fp.root}
             panel_view(ui.display)
         end)
 
@@ -70,9 +81,9 @@ function renderer.close_ui()
         ui.display = nil
 
         -- restore colors
-        for i = 1, #style.colors do
+        for i = 1, #style.theme.colors do
-            local r, g, b = term.nativePaletteColor(style.colors[i].c)
+            local r, g, b = term.nativePaletteColor(style.theme.colors[i].c)
-            term.setPaletteColor(style.colors[i].c, r, g, b)
+            term.setPaletteColor(style.theme.colors[i].c, r, g, b)
         end
 
         -- reset terminal

supervisor/startup.lua

@@ -21,7 +21,7 @@ local supervisor = require("supervisor.supervisor")
 
 local svsessions = require("supervisor.session.svsessions")
 
-local SUPERVISOR_VERSION = "v1.2.8"
+local SUPERVISOR_VERSION = "v1.3.4"
 
 local println = util.println
 local println_ts = util.println_ts
@@ -34,9 +34,13 @@ if not supervisor.load_config() then
     -- try to reconfigure (user action)
     local success, error = configure.configure(true)
     if success then
-        assert(supervisor.load_config(), "failed to load valid configuration")
+        if not supervisor.load_config() then
+            println("failed to load a valid configuration, please reconfigure")
+            return
+        end
     else
-        assert(success, "supervisor configuration error: " .. error)
+        println("configuration error: " .. error)
+        return
     end
 end
 
@@ -82,6 +86,7 @@ log.info("========================================")
 println(">> SCADA Supervisor " .. SUPERVISOR_VERSION .. " <<")
 
 crash.set_env("supervisor", SUPERVISOR_VERSION)
+crash.dbg_log_env()
 
 ----------------------------------------
 -- main application
@@ -114,7 +119,7 @@ local function main()
     databus.tx_hw_modem(true)
 
     -- start UI
-    local fp_ok, message = renderer.try_start_ui()
+    local fp_ok, message = renderer.try_start_ui(config.FrontPanelTheme, config.ColorMode)
 
     if not fp_ok then
         println_ts(util.c("UI error: ", message))

supervisor/supervisor.lua

@@ -2,6 +2,8 @@ local comms      = require("scada-common.comms")
 local log        = require("scada-common.log")
 local util       = require("scada-common.util")
 
+local themes     = require("graphics.themes")
+
 local svsessions = require("supervisor.session.svsessions")
 
 local supervisor = {}
@@ -43,6 +45,9 @@ function supervisor.load_config()
     config.LogPath = settings.get("LogPath")
     config.LogDebug = settings.get("LogDebug")
 
+    config.FrontPanelTheme = settings.get("FrontPanelTheme")
+    config.ColorMode = settings.get("ColorMode")
+
     local cfv = util.new_validator()
 
     cfv.assert_type_int(config.UnitCount)
@@ -81,6 +86,11 @@ function supervisor.load_config()
     cfv.assert_type_str(config.LogPath)
     cfv.assert_type_bool(config.LogDebug)
 
+    cfv.assert_type_int(config.FrontPanelTheme)
+    cfv.assert_range(config.FrontPanelTheme, 1, 2)
+    cfv.assert_type_int(config.ColorMode)
+    cfv.assert_range(config.ColorMode, 1, themes.COLOR_MODE.NUM_MODES)
+
     return cfv.valid()
 end
 

supervisor/unit.lua

@@ -77,7 +77,6 @@ function unit.new(reactor_id, num_boilers, num_turbines)
         tanks = {},
         snas = {},
         envd = {},
-        sna_prod_rate = 0,
         -- redstone control
         io_ctl = nil,   ---@type rs_controller
         valves = {},    ---@type unit_valves
@@ -256,7 +255,7 @@ function unit.new(reactor_id, num_boilers, num_turbines)
 
     -- PRIVATE FUNCTIONS --
 
-    --#region time derivative utility functions
+    --#region Time Derivative Utility Functions
 
     -- compute a change with respect to time of the given value
     ---@param key string value key
@@ -331,7 +330,7 @@ function unit.new(reactor_id, num_boilers, num_turbines)
 
     --#endregion
 
-    --#region redstone I/O
+    --#region Redstone I/O
 
     -- create a generic valve interface
     ---@nodiscard
@@ -398,8 +397,7 @@ function unit.new(reactor_id, num_boilers, num_turbines)
     ---@class reactor_unit
     local public = {}
 
-    -- ADD/LINK DEVICES --
+    --#region Add/Link Devices
-    --#region
 
     -- link the PLC
     ---@param plc_session plc_session_struct
@@ -489,7 +487,7 @@ function unit.new(reactor_id, num_boilers, num_turbines)
 
     --#endregion
 
-    -- UPDATE SESSION --
+    --#region Update Session
 
     -- update (iterate) this unit
     function public.update()
@@ -557,8 +555,9 @@ function unit.new(reactor_id, num_boilers, num_turbines)
         end
     end
 
-    -- AUTO CONTROL OPERATIONS --
+    --#endregion
-    --#region
+
+    --#region Auto Control Operations
 
     -- engage automatic control
     function public.auto_engage()
@@ -645,8 +644,7 @@ function unit.new(reactor_id, num_boilers, num_turbines)
 
     --#endregion
 
-    -- OPERATIONS --
+    --#region Operations
-    --#region
 
     -- queue a command to disable the reactor
     function public.disable()
@@ -726,8 +724,7 @@ function unit.new(reactor_id, num_boilers, num_turbines)
 
     --#endregion
 
-    -- READ STATES/PROPERTIES --
+    --#region Read States/Properties
-    --#region
 
     -- check if an alarm of at least a certain priority level is tripped
     ---@nodiscard
@@ -857,13 +854,15 @@ function unit.new(reactor_id, num_boilers, num_turbines)
             status.tanks[tank.get_device_idx()] = { tank.is_faulted(), db.formed, db.state, db.tanks }
         end
 
-        -- basic SNA statistical information
+        -- SNA statistical information
-        local total_peak = 0
+        local total_peak, total_avail, total_out = 0, 0, 0
         for i = 1, #self.snas do
             local db = self.snas[i].get_db()    ---@type sna_session_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)
         end
-        status.sna = { #self.snas, public.get_sna_rate(), total_peak }
+        status.sna = { #self.snas, total_peak, total_avail, total_out }
 
         -- radiation monitors (environment detectors)
         status.envds = {}
@@ -876,7 +875,7 @@ function unit.new(reactor_id, num_boilers, num_turbines)
         return status
     end
 
-    -- get the current total [max] production rate is
+    -- get the current total max production rate
     ---@nodiscard
     ---@return number total_avail_rate
     function public.get_sna_rate()

supervisor/unitlogic.lua

@@ -54,9 +54,7 @@ function logic.update_annunciator(self)
     -- variables for boiler, or reactor if no boilers used
     local total_boil_rate = 0.0
 
-    -------------
+    --#region Reactor
-    -- REACTOR --
-    -------------
 
     annunc.AutoControl = self.auto_engaged
 
@@ -143,9 +141,9 @@ function logic.update_annunciator(self)
         self.plc_cache.ok = false
     end
 
-    ---------------
+    --#endregion
-    -- MISC RTUs --
+
-    ---------------
+    --#region Misc RTUs
 
     local max_rad, any_faulted = 0, false
 
@@ -170,9 +168,9 @@ function logic.update_annunciator(self)
         end
     end
 
-    -------------
+    --#endregion
-    -- BOILERS --
+
-    -------------
+    --#region Boilers
 
     local boilers_ready = num_boilers == #self.boilers
 
@@ -230,9 +228,9 @@ function logic.update_annunciator(self)
         boiler_water_dt_sum = _get_dt(DT_KEYS.ReactorCCool)
     end
 
-    ---------------------------
+    --#endregion
-    -- COOLANT FEED MISMATCH --
+
-    ---------------------------
+    --#region Coolant Feed Mismatch
 
     -- check coolant feed mismatch if using boilers, otherwise calculate with reactor
     local cfmismatch = false
@@ -263,9 +261,9 @@ function logic.update_annunciator(self)
 
     annunc.CoolantFeedMismatch = cfmismatch
 
-    --------------
+    --#endregion
-    -- TURBINES --
+
-    --------------
+    --#region Turbines
 
     local turbines_ready = num_turbines == #self.turbines
 
@@ -340,6 +338,8 @@ function logic.update_annunciator(self)
         annunc.TurbineTrip[idx] = has_steam and db.state.flow_rate == 0
     end
 
+    --#endregion
+
     -- update auto control ready state for this unit
     self.db.control.ready = plc_ready and boilers_ready and turbines_ready
 end
@@ -730,6 +730,8 @@ end
 function logic.handle_redstone(self)
     local AISTATE = self.types.AISTATE
     local annunc = self.db.annunciator
+    local cache = self.plc_cache
+    local rps = cache.rps_status
 
     -- check if an alarm is active (tripped or ack'd)
     ---@nodiscard
@@ -741,18 +743,18 @@ function logic.handle_redstone(self)
 
     -- reactor controls
     if self.plc_s ~= nil then
-        if (not self.plc_cache.rps_status.manual) and self.io_ctl.digital_read(IO.R_SCRAM) then
+        if (not rps.manual) and self.io_ctl.digital_read(IO.R_SCRAM) then
             -- reactor SCRAM requested but not yet done; perform it
             self.plc_s.in_queue.push_command(PLC_S_CMDS.SCRAM)
         end
 
-        if self.plc_cache.rps_trip and self.io_ctl.digital_read(IO.R_RESET) then
+        if cache.rps_trip and self.io_ctl.digital_read(IO.R_RESET) then
             -- reactor RPS reset requested but not yet done; perform it
             self.plc_s.in_queue.push_command(PLC_S_CMDS.RPS_RESET)
         end
 
-        if (not self.auto_engaged) and (not self.plc_cache.active) and
+        if (not self.auto_engaged) and (not cache.active) and
-           (not self.plc_cache.rps_trip) and self.io_ctl.digital_read(IO.R_ENABLE) then
+           (not cache.rps_trip) and self.io_ctl.digital_read(IO.R_ENABLE) then
             -- reactor enable requested and allowable, but not yet done; perform it
             self.plc_s.in_queue.push_command(PLC_S_CMDS.ENABLE)
         end
@@ -761,25 +763,23 @@ function logic.handle_redstone(self)
     -- check for request to ack all alarms
     if self.io_ctl.digital_read(IO.U_ACK) then
         for i = 1, #self.db.alarm_states do
-            if self.db.alarm_states[i] == ALARM_STATE.TRIPPED then
+            if self.db.alarm_states[i] == ALARM_STATE.TRIPPED then self.db.alarm_states[i] = ALARM_STATE.ACKED end
-                self.db.alarm_states[i] = ALARM_STATE.ACKED
-            end
         end
     end
 
     -- write reactor status outputs
-    self.io_ctl.digital_write(IO.R_ACTIVE, self.plc_cache.active)
+    self.io_ctl.digital_write(IO.R_ACTIVE, cache.active)
     self.io_ctl.digital_write(IO.R_AUTO_CTRL, self.auto_engaged)
-    self.io_ctl.digital_write(IO.R_SCRAMMED, self.plc_cache.rps_trip)
+    self.io_ctl.digital_write(IO.R_SCRAMMED, cache.rps_trip)
-    self.io_ctl.digital_write(IO.R_AUTO_SCRAM, self.plc_cache.rps_status.automatic)
+    self.io_ctl.digital_write(IO.R_AUTO_SCRAM, rps.automatic)
-    self.io_ctl.digital_write(IO.R_HIGH_DMG, self.plc_cache.rps_status.high_dmg)
+    self.io_ctl.digital_write(IO.R_HIGH_DMG, rps.high_dmg)
-    self.io_ctl.digital_write(IO.R_HIGH_TEMP, self.plc_cache.rps_status.high_temp)
+    self.io_ctl.digital_write(IO.R_HIGH_TEMP, rps.high_temp)
-    self.io_ctl.digital_write(IO.R_LOW_COOLANT, self.plc_cache.rps_status.low_cool)
+    self.io_ctl.digital_write(IO.R_LOW_COOLANT, rps.low_cool)
-    self.io_ctl.digital_write(IO.R_EXCESS_HC, self.plc_cache.rps_status.ex_hcool)
+    self.io_ctl.digital_write(IO.R_EXCESS_HC, rps.ex_hcool)
-    self.io_ctl.digital_write(IO.R_EXCESS_WS, self.plc_cache.rps_status.ex_waste)
+    self.io_ctl.digital_write(IO.R_EXCESS_WS, rps.ex_waste)
-    self.io_ctl.digital_write(IO.R_INSUFF_FUEL, self.plc_cache.rps_status.no_fuel)
+    self.io_ctl.digital_write(IO.R_INSUFF_FUEL, rps.no_fuel)
-    self.io_ctl.digital_write(IO.R_PLC_FAULT, self.plc_cache.rps_status.fault)
+    self.io_ctl.digital_write(IO.R_PLC_FAULT, rps.fault)
-    self.io_ctl.digital_write(IO.R_PLC_TIMEOUT, self.plc_cache.rps_status.timeout)
+    self.io_ctl.digital_write(IO.R_PLC_TIMEOUT, rps.timeout)
 
     -- write unit outputs
 
@@ -797,13 +797,28 @@ function logic.handle_redstone(self)
     -- Emergency Coolant --
     -----------------------
 
-    local enable_emer_cool = self.plc_cache.rps_status.low_cool or
+    local boiler_water_low = false
-        (self.auto_engaged and annunc.CoolantLevelLow and is_active(self.alarms.ReactorOverTemp))
+    for i = 1, #annunc.WaterLevelLow do boiler_water_low = boiler_water_low or annunc.WaterLevelLow[i] end
+
+    local enable_emer_cool = rps.low_cool or
+        (self.auto_engaged and
+        (annunc.CoolantLevelLow or (boiler_water_low and rps.ex_hcool)) and
+        is_active(self.alarms.ReactorOverTemp))
+
+    if enable_emer_cool and not self.emcool_opened then
+        log.debug(util.c(">> Emergency Coolant Enable Detail Report (Unit ", self.r_id, ") <<"))
+        log.debug(util.c("| CoolantLevelLow[", annunc.CoolantLevelLow, "] CoolantLevelLowLow[", rps.low_cool, "] ExcessHeatedCoolant[", rps.ex_hcool, "]"))
+        log.debug(util.c("| ReactorOverTemp[", AISTATE_NAMES[self.alarms.ReactorOverTemp.state], "]"))
+
+        for i = 1, #annunc.WaterLevelLow do
+            log.debug(util.c("| WaterLevelLow(", i, ")[", annunc.WaterLevelLow[i], "]"))
+        end
+    end
 
     -- don't turn off emergency coolant on sufficient coolant level since it might drop again
     -- turn off once system is OK again
     -- if auto control is engaged, alarm check will SCRAM on reactor over temp so that's covered
-    if not self.plc_cache.rps_trip then
+    if not cache.rps_trip then
         -- set turbines to not dump steam
         for i = 1, #self.turbines do
             local session = self.turbines[i]    ---@type unit_session

test/watch_psil_allocs.lua

@@ -0,0 +1,56 @@
+-- add this to psil:
+
+--[[
+    -- count the number of subscribers in this PSIL instance
+    ---@return integer count
+    function public.count()
+        local c = 0
+        for _, val in pairs(ic) do
+            for _ = 1, #val.subscribers do c = c + 1 end
+        end
+        return c
+    end
+]]--
+
+
+-- add this to coordinator iocontrol front panel heartbeat function:
+
+--[[
+if io.facility then
+    local count = io.facility.ps.count()
+
+    count = count + io.facility.env_d_ps.count()
+
+    for x = 1, #io.facility.induction_ps_tbl do
+        count = count + io.facility.induction_ps_tbl[x].count()
+    end
+
+    for x = 1, #io.facility.sps_ps_tbl do
+        count = count + io.facility.sps_ps_tbl[x].count()
+    end
+
+    for x = 1, #io.facility.tank_ps_tbl do
+        count = count + io.facility.tank_ps_tbl[x].count()
+    end
+
+    for i = 1, #io.units do
+        local entry = io.units[i] ---@type ioctl_unit
+
+        count = count + entry.unit_ps.count()
+
+        for x = 1, #entry.boiler_ps_tbl do
+            count = count + entry.boiler_ps_tbl[x].count()
+        end
+
+        for x = 1, #entry.turbine_ps_tbl do
+            count = count + entry.turbine_ps_tbl[x].count()
+        end
+
+        for x = 1, #entry.tank_ps_tbl do
+            count = count + entry.tank_ps_tbl[x].count()
+        end
+    end
+
+    log.debug(count)
+end
+]]--