Merge branch 'devel' into pocket-alpha-dev

pocket/configure.lua

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

pocket/iocontrol.lua

@@ -148,7 +148,7 @@ function iocontrol.init_fac(conf)
         auto_scram = false,
         ---@type ascram_status
         ascram_status = {
-            matrix_dc = false,
+            matrix_fault = false,
             matrix_fill = false,
             crit_alarm = false,
             radiation = false,
@@ -908,7 +908,7 @@ function iocontrol.record_process_data(data)
     fac.ps.publish("auto_saturated", fac.auto_saturated)
 
     fac.ps.publish("auto_scram", fac.auto_scram)
-    fac.ps.publish("as_matrix_dc", fac.ascram_status.matrix_dc)
+    fac.ps.publish("as_matrix_fault", fac.ascram_status.matrix_fault)
     fac.ps.publish("as_matrix_fill", fac.ascram_status.matrix_fill)
     fac.ps.publish("as_crit_alarm", fac.ascram_status.crit_alarm)
     fac.ps.publish("as_radiation", fac.ascram_status.radiation)

pocket/startup.lua

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

pocket/ui/apps/process.lua

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

pocket/ui/docs.lua

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