Merge branch 'pocket-alpha-dev' of https://github.com/MikaylaFischler/cc-mek-scada into pocket-alpha-dev

pocket/iocontrol.lua

@@ -694,24 +694,38 @@ function iocontrol.record_unit_data(data)
 
     local control_status = 1
     local reactor_status = 1
+    local reactor_state = 1
     local rps_status = 1
 
     if unit.connected then
         -- update RPS status
         if unit.reactor_data.rps_tripped then
             control_status = 2
-            rps_status = util.trinary(unit.reactor_data.rps_trip_cause == "manual", 3, 2)
+
+            if unit.reactor_data.rps_trip_cause == "manual" then
+                reactor_state = 4   -- disabled
+                rps_status = 3
+            else
+                reactor_state = 6   -- SCRAM
+                rps_status = 2
+            end
         else rps_status = 4 end
 
         -- update reactor/control status
         if unit.reactor_data.mek_status.status then
             reactor_status = 4
+            reactor_state  = 5  -- running
             control_status = util.trinary(unit.annunciator.AutoControl, 4, 3)
         else
             if unit.reactor_data.no_reactor then
                 reactor_status = 2
-            elseif not unit.reactor_data.formed or unit.reactor_data.rps_status.force_dis then
+                reactor_state = 3   -- faulted
+            elseif not unit.reactor_data.formed then
                 reactor_status = 3
+                reactor_state = 2   -- not formed
+            elseif unit.reactor_data.rps_status.force_dis then
+                reactor_status = 3
+                reactor_state = 7   -- force disabled
             else
                 reactor_status = 4
             end
@@ -738,6 +752,7 @@ function iocontrol.record_unit_data(data)
 
     unit.unit_ps.publish("U_ControlStatus", control_status)
     unit.unit_ps.publish("U_ReactorStatus", reactor_status)
+    unit.unit_ps.publish("U_ReactorStateStatus", reactor_state)
     unit.unit_ps.publish("U_RPS", rps_status)
 
     --#endregion
@@ -751,20 +766,30 @@ function iocontrol.record_unit_data(data)
         local ps     = unit.boiler_ps_tbl[id]   ---@type psil
 
         local boiler_status = 1
+        local computed_status = 1
 
         if unit.rtu_hw.boilers[id].connected then
             if unit.rtu_hw.boilers[id].faulted then
                 boiler_status = 3
+                computed_status = 3
             elseif boiler.formed then
                 boiler_status = 4
+
+                if boiler.state.boil_rate > 0 then
+                    computed_status = 5
+                else
+                    computed_status = 4
+                end
             else
                 boiler_status = 2
+                computed_status = 2
             end
 
             _record_multiblock_status(unit.rtu_hw.boilers[id].faulted, boiler, ps)
         end
 
         ps.publish("BoilerStatus", boiler_status)
+        ps.publish("BoilerStateStatus", computed_status)
     end
 
     unit.turbine_data_tbl = data[8]
@@ -774,18 +799,32 @@ function iocontrol.record_unit_data(data)
         local ps      = unit.turbine_ps_tbl[id]   ---@type psil
 
         local turbine_status = 1
+        local computed_status = 1
 
         if unit.rtu_hw.turbines[id].connected then
             if unit.rtu_hw.turbines[id].faulted then
                 turbine_status = 3
+                computed_status = 3
             elseif turbine.formed then
                 turbine_status = 4
+
+                if turbine.tanks.energy_fill >= 0.99 then
+                    computed_status = 6
+                elseif turbine.state.flow_rate < 100 then
+                    computed_status = 4
+                else
+                    computed_status = 5
+                end
             else
                 turbine_status = 2
+                computed_status = 2
             end
+
+            _record_multiblock_status(unit.rtu_hw.turbines[id].faulted, turbine, ps)
         end
 
         ps.publish("TurbineStatus", turbine_status)
+        ps.publish("TurbineStateStatus", computed_status)
     end
 
     unit.tank_data_tbl = data[9]

pocket/ui/apps/unit.lua

@@ -11,6 +11,7 @@ local style     = require("pocket.ui.style")
 
 local boiler    = require("pocket.ui.pages.unit_boiler")
 local reactor   = require("pocket.ui.pages.unit_reactor")
+local turbine   = require("pocket.ui.pages.unit_turbine")
 
 local core      = require("graphics.core")
 
@@ -74,11 +75,11 @@ local function new_view(root)
         }
 
         for i = 1, unit.num_boilers do
-            table.insert(list, { label = "B-" .. i, color = core.cpair(colors.black, colors.lightBlue), callback = nav_links[id].boiler[i] })
+            table.insert(list, { label = "B-" .. i, color = core.cpair(colors.black, colors.lightGray), callback = nav_links[id].boiler[i] })
         end
 
         for i = 1, unit.num_turbines do
-            table.insert(list, { label = "T-" .. i, color = core.cpair(colors.black, colors.white), callback = function () end })
+            table.insert(list, { label = "T-" .. i, color = core.cpair(colors.black, colors.lightGray), callback = nav_links[id].turbine[i] })
         end
 
         app.set_sidebar(list)
@@ -336,6 +337,18 @@ local function new_view(root)
             end
 
             --#endregion
+
+            --#region Turbine Tabs
+
+            local tbn_pane = Div{parent=page_div}
+            nav_links[i].turbine = {}
+
+            for t_id = 1, unit.num_turbines do
+                local ps = unit.turbine_ps_tbl[t_id]
+                nav_links[i].turbine[t_id] = turbine(app, u_page, panes, tbn_pane, i, t_id, ps, update)
+            end
+
+            --#endregion
         end
 
         -- setup multipane

pocket/ui/pages/unit_boiler.lua

@@ -11,6 +11,7 @@ local Div           = require("graphics.elements.div")
 local TextBox       = require("graphics.elements.textbox")
 
 local DataIndicator = require("graphics.elements.indicators.data")
+local StateIndicator = require("graphics.elements.indicators.state")
 local IconIndicator = require("graphics.elements.indicators.icon")
 local VerticalBar   = require("graphics.elements.indicators.vbar")
 
@@ -22,7 +23,6 @@ local cpair = core.cpair
 local label     = style.label
 local lu_col    = style.label_unit_pair
 local text_fg   = style.text_fg
-local basic_states = style.icon_states.basic_states
 local red_ind_s = style.icon_states.red_ind_s
 local yel_ind_s = style.icon_states.yel_ind_s
 
@@ -43,7 +43,9 @@ return function (app, u_page, panes, blr_pane, b_id, ps, update)
     local blr_page = app.new_page(u_page, #panes)
     blr_page.tasks = { update }
 
-    TextBox{parent=blr_div,y=1,text="Boiler "..b_id,height=1,alignment=ALIGN.CENTER}
+    TextBox{parent=blr_div,y=1,text="BLR #"..b_id,width=8,height=1}
+    local status = StateIndicator{parent=blr_div,x=10,y=1,states=style.boiler.states,value=1,min_width=12}
+    status.register(ps, "BoilerStateStatus", status.update)
 
     local hcool = VerticalBar{parent=blr_div,x=1,y=4,fg_bg=cpair(colors.orange,colors.gray),height=5,width=1}
     local water = VerticalBar{parent=blr_div,x=3,y=4,fg_bg=cpair(colors.blue,colors.gray),height=5,width=1}
@@ -62,12 +64,9 @@ return function (app, u_page, panes, blr_pane, b_id, ps, update)
 
     TextBox{parent=blr_div,text="Temperature",x=5,y=5,width=13,height=1,fg_bg=label}
     local t_prec = util.trinary(db.temp_label == types.TEMP_SCALE_UNITS[types.TEMP_SCALE.KELVIN], 11, 10)
-    local temp = DataIndicator{parent=blr_div,x=5,y=6,lu_colors=lu_col,label="",unit=db.temp_label,format="%"..t_prec..".2f",value=17802.03,commas=true,width=13,fg_bg=text_fg}
+    local temp = DataIndicator{parent=blr_div,x=5,y=6,lu_colors=lu_col,label="",unit=db.temp_label,format="%"..t_prec..".2f",value=0,commas=true,width=13,fg_bg=text_fg}
-
-    local state = IconIndicator{parent=blr_div,x=7,y=3,label="State",states=basic_states}
 
     temp.register(ps, "temperature", function (t) temp.update(db.temp_convert(t)) end)
-    state.register(ps, "BoilerStatus", state.update)
 
     local b_wll = IconIndicator{parent=blr_div,y=10,label="Water Level Lo",states=red_ind_s}
     local b_hr  = IconIndicator{parent=blr_div,label="Heating Rate Lo",states=yel_ind_s}
@@ -75,5 +74,58 @@ return function (app, u_page, panes, blr_pane, b_id, ps, update)
     b_wll.register(ps, "WaterLevelLow", b_wll.update)
     b_hr.register(ps, "HeatingRateLow", b_hr.update)
 
+    TextBox{parent=blr_div,text="Boil Rate",x=1,y=13,width=12,height=1,fg_bg=label}
+    local boil_r = DataIndicator{parent=blr_div,x=6,y=14,lu_colors=lu_col,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=16,fg_bg=text_fg}
+
+    boil_r.register(ps, "boil_rate", boil_r.update)
+
+    local blr_ext_div = Div{parent=blr_pane,x=2,width=blr_pane.get_width()-2}
+    table.insert(panes, blr_ext_div)
+
+    local blr_ext_page = app.new_page(blr_page, #panes)
+    blr_ext_page.tasks = { update }
+
+    PushButton{parent=blr_div,x=9,y=18,text="MORE",min_width=6,fg_bg=cpair(colors.lightGray,colors.gray),active_fg_bg=cpair(colors.gray,colors.lightGray),callback=blr_ext_page.nav_to}
+    PushButton{parent=blr_ext_div,x=9,y=18,text="BACK",min_width=6,fg_bg=cpair(colors.lightGray,colors.gray),active_fg_bg=cpair(colors.gray,colors.lightGray),callback=blr_page.nav_to}
+
+    TextBox{parent=blr_ext_div,y=1,text="More Boiler Info",height=1,alignment=ALIGN.CENTER}
+
+    local function update_amount(indicator)
+        return function (x) indicator.update(x.amount) end
+    end
+
+    TextBox{parent=blr_ext_div,text="Hot Coolant",x=1,y=3,width=12,height=1,fg_bg=label}
+    local heated_p = DataIndicator{parent=blr_ext_div,x=14,y=3,lu_colors=lu_col,label="",unit="%",format="%6.2f",value=0,width=8,fg_bg=text_fg}
+    local hcool_amnt = DataIndicator{parent=blr_ext_div,x=1,y=4,lu_colors=lu_col,label="",unit="mB",format="%18.0f",value=0,commas=true,width=21,fg_bg=text_fg}
+
+    heated_p.register(ps, "hcool_fill", function (x) heated_p.update(x * 100) end)
+    hcool_amnt.register(ps, "hcool", update_amount(hcool_amnt))
+
+    TextBox{parent=blr_ext_div,text="Water Tank",x=1,y=6,width=9,height=1,fg_bg=label}
+    local fuel_p = DataIndicator{parent=blr_ext_div,x=14,y=6,lu_colors=lu_col,label="",unit="%",format="%6.2f",value=0,width=8,fg_bg=text_fg}
+    local fuel_amnt = DataIndicator{parent=blr_ext_div,x=1,y=7,lu_colors=lu_col,label="",unit="mB",format="%18.0f",value=0,commas=true,width=21,fg_bg=text_fg}
+
+    fuel_p.register(ps, "water_fill", function (x) fuel_p.update(x * 100) end)
+    fuel_amnt.register(ps, "water", update_amount(fuel_amnt))
+
+    TextBox{parent=blr_ext_div,text="Steam Tank",x=1,y=9,width=10,height=1,fg_bg=label}
+    local steam_p = DataIndicator{parent=blr_ext_div,x=14,y=9,lu_colors=lu_col,label="",unit="%",format="%6.2f",value=0,width=8,fg_bg=text_fg}
+    local steam_amnt = DataIndicator{parent=blr_ext_div,x=1,y=10,lu_colors=lu_col,label="",unit="mB",format="%18.0f",value=0,commas=true,width=21,fg_bg=text_fg}
+
+    steam_p.register(ps, "steam_fill", function (x) steam_p.update(x * 100) end)
+    steam_amnt.register(ps, "steam", update_amount(steam_amnt))
+
+    TextBox{parent=blr_ext_div,text="Cool Coolant",x=1,y=12,width=12,height=1,fg_bg=label}
+    local cooled_p = DataIndicator{parent=blr_ext_div,x=14,y=12,lu_colors=lu_col,label="",unit="%",format="%6.2f",value=0,width=8,fg_bg=text_fg}
+    local ccool_amnt = DataIndicator{parent=blr_ext_div,x=1,y=13,lu_colors=lu_col,label="",unit="mB",format="%18.0f",value=0,commas=true,width=21,fg_bg=text_fg}
+
+    cooled_p.register(ps, "ccool_fill", function (x) cooled_p.update(x * 100) end)
+    ccool_amnt.register(ps, "ccool", update_amount(ccool_amnt))
+
+    TextBox{parent=blr_ext_div,text="Env. Loss",x=1,y=15,width=9,height=1,fg_bg=label}
+    local env_loss = DataIndicator{parent=blr_ext_div,x=11,y=15,lu_colors=lu_col,label="",unit="",format="%11.8f",value=0,width=11,fg_bg=text_fg}
+
+    env_loss.register(ps, "env_loss", env_loss.update)
+
     return blr_page.nav_to
 end

pocket/ui/pages/unit_reactor.lua

@@ -11,6 +11,7 @@ local Div           = require("graphics.elements.div")
 local TextBox        = require("graphics.elements.textbox")
 
 local DataIndicator  = require("graphics.elements.indicators.data")
+local StateIndicator = require("graphics.elements.indicators.state")
 local IconIndicator  = require("graphics.elements.indicators.icon")
 local VerticalBar    = require("graphics.elements.indicators.vbar")
 
@@ -43,7 +44,9 @@ return function (app, u_page, panes, page_div, u_ps, update)
     local rct_page = app.new_page(u_page, #panes)
     rct_page.tasks = { update }
 
-    TextBox{parent=rct_div,y=1,text="Fission Reactor",height=1,alignment=ALIGN.CENTER}
+    TextBox{parent=rct_div,y=1,text="Reactor",width=8,height=1}
+    local status = StateIndicator{parent=rct_div,x=10,y=1,states=style.reactor.states,value=1,min_width=12}
+    status.register(u_ps, "U_ReactorStateStatus", status.update)
 
     local fuel  = VerticalBar{parent=rct_div,x=1,y=4,fg_bg=cpair(colors.lightGray,colors.gray),height=5,width=1}
     local ccool = VerticalBar{parent=rct_div,x=3,y=4,fg_bg=cpair(colors.blue,colors.gray),height=5,width=1}
@@ -76,17 +79,14 @@ return function (app, u_page, panes, page_div, u_ps, update)
         end
     end)
 
-    TextBox{parent=rct_div,text="Burn Rate",x=5,y=5,width=13,height=1,fg_bg=label}
+    TextBox{parent=rct_div,text="Burn Rate",x=5,y=4,width=13,height=1,fg_bg=label}
-    local burn_rate = DataIndicator{parent=rct_div,x=5,y=6,lu_colors=lu_col,label="",unit="mB/t",format="%8.2f",value=0,commas=true,width=13,fg_bg=text_fg}
+    local burn_rate = DataIndicator{parent=rct_div,x=5,y=5,lu_colors=lu_col,label="",unit="mB/t",format="%8.2f",value=0,commas=true,width=13,fg_bg=text_fg}
-    TextBox{parent=rct_div,text="Temperature",x=5,y=7,width=13,height=1,fg_bg=label}
+    TextBox{parent=rct_div,text="Temperature",x=5,y=6,width=13,height=1,fg_bg=label}
     local t_prec = util.trinary(db.temp_label == types.TEMP_SCALE_UNITS[types.TEMP_SCALE.KELVIN], 11, 10)
-    local core_temp = DataIndicator{parent=rct_div,x=5,y=8,lu_colors=lu_col,label="",unit=db.temp_label,format="%"..t_prec..".2f",value=0,commas=true,width=13,fg_bg=text_fg}
+    local core_temp = DataIndicator{parent=rct_div,x=5,y=7,lu_colors=lu_col,label="",unit=db.temp_label,format="%"..t_prec..".2f",value=0,commas=true,width=13,fg_bg=text_fg}
-
-    local state = IconIndicator{parent=rct_div,x=7,y=3,label="State",states=mode_states}
 
     burn_rate.register(u_ps, "act_burn_rate", burn_rate.update)
     core_temp.register(u_ps, "temp", function (t) core_temp.update(db.temp_convert(t)) end)
-    state.register(u_ps, "U_ControlStatus", state.update)
 
     local r_temp = IconIndicator{parent=rct_div,y=10,label="Reactor Temp. Hi",states=red_ind_s}
     local r_rhdt = IconIndicator{parent=rct_div,label="Hi Delta Temp.",states=yel_ind_s}
@@ -121,28 +121,28 @@ return function (app, u_page, panes, page_div, u_ps, update)
 
     TextBox{parent=rct_ext_div,text="Fuel Tank",x=1,y=3,width=9,height=1,fg_bg=label}
     local fuel_p = DataIndicator{parent=rct_ext_div,x=14,y=3,lu_colors=lu_col,label="",unit="%",format="%6.2f",value=0,width=8,fg_bg=text_fg}
-    local fuel_amnt = DataIndicator{parent=rct_ext_div,x=1,y=4,lu_colors=lu_col,label="",unit="mB/t",format="%16.0f",value=0,commas=true,width=21,fg_bg=text_fg}
+    local fuel_amnt = DataIndicator{parent=rct_ext_div,x=1,y=4,lu_colors=lu_col,label="",unit="mB",format="%18.0f",value=0,commas=true,width=21,fg_bg=text_fg}
 
     fuel_p.register(u_ps, "fuel_fill", function (x) fuel_p.update(x * 100) end)
     fuel_amnt.register(u_ps, "fuel", fuel_amnt.update)
 
     TextBox{parent=rct_ext_div,text="Cool Coolant",x=1,y=6,width=12,height=1,fg_bg=label}
     local cooled_p = DataIndicator{parent=rct_ext_div,x=14,y=6,lu_colors=lu_col,label="",unit="%",format="%6.2f",value=0,width=8,fg_bg=text_fg}
-    local ccool_amnt = DataIndicator{parent=rct_ext_div,x=1,y=7,lu_colors=lu_col,label="",unit="mB/t",format="%16.0f",value=0,commas=true,width=21,fg_bg=text_fg}
+    local ccool_amnt = DataIndicator{parent=rct_ext_div,x=1,y=7,lu_colors=lu_col,label="",unit="mB",format="%18.0f",value=0,commas=true,width=21,fg_bg=text_fg}
 
     cooled_p.register(u_ps, "ccool_fill", function (x) cooled_p.update(x * 100) end)
     ccool_amnt.register(u_ps, "ccool_amnt", ccool_amnt.update)
 
     TextBox{parent=rct_ext_div,text="Hot Coolant",x=1,y=9,width=12,height=1,fg_bg=label}
     local heated_p = DataIndicator{parent=rct_ext_div,x=14,y=9,lu_colors=lu_col,label="",unit="%",format="%6.2f",value=0,width=8,fg_bg=text_fg}
-    local hcool_amnt = DataIndicator{parent=rct_ext_div,x=1,y=10,lu_colors=lu_col,label="",unit="mB/t",format="%16.0f",value=0,commas=true,width=21,fg_bg=text_fg}
+    local hcool_amnt = DataIndicator{parent=rct_ext_div,x=1,y=10,lu_colors=lu_col,label="",unit="mB",format="%18.0f",value=0,commas=true,width=21,fg_bg=text_fg}
 
     heated_p.register(u_ps, "hcool_fill", function (x) heated_p.update(x * 100) end)
     hcool_amnt.register(u_ps, "hcool_amnt", hcool_amnt.update)
 
     TextBox{parent=rct_ext_div,text="Waste Tank",x=1,y=12,width=10,height=1,fg_bg=label}
     local waste_p = DataIndicator{parent=rct_ext_div,x=14,y=12,lu_colors=lu_col,label="",unit="%",format="%6.2f",value=0,width=8,fg_bg=text_fg}
-    local waste_amnt = DataIndicator{parent=rct_ext_div,x=1,y=13,lu_colors=lu_col,label="",unit="mB/t",format="%16.0f",value=0,commas=true,width=21,fg_bg=text_fg}
+    local waste_amnt = DataIndicator{parent=rct_ext_div,x=1,y=13,lu_colors=lu_col,label="",unit="mB",format="%18.0f",value=0,commas=true,width=21,fg_bg=text_fg}
 
     waste_p.register(u_ps, "waste_fill", function (x) waste_p.update(x * 100) end)
     waste_amnt.register(u_ps, "waste", waste_amnt.update)

pocket/ui/pages/unit_turbine.lua

@@ -0,0 +1,117 @@
+local util           = require("scada-common.util")
+
+local iocontrol      = require("pocket.iocontrol")
+
+local style          = require("pocket.ui.style")
+
+local core           = require("graphics.core")
+
+local Div            = require("graphics.elements.div")
+local TextBox        = require("graphics.elements.textbox")
+
+local DataIndicator  = require("graphics.elements.indicators.data")
+local IconIndicator  = require("graphics.elements.indicators.icon")
+local PowerIndicator = require("graphics.elements.indicators.power")
+local StateIndicator = require("graphics.elements.indicators.state")
+local VerticalBar    = require("graphics.elements.indicators.vbar")
+
+local PushButton     = require("graphics.elements.controls.push_button")
+
+local ALIGN = core.ALIGN
+local cpair = core.cpair
+
+local label     = style.label
+local lu_col    = style.label_unit_pair
+local text_fg   = style.text_fg
+local tri_ind_s = style.icon_states.tri_ind_s
+local red_ind_s = style.icon_states.red_ind_s
+local yel_ind_s = style.icon_states.yel_ind_s
+
+-- create a turbine view in the unit app
+---@param app pocket_app
+---@param u_page nav_tree_page
+---@param panes table
+---@param tbn_pane graphics_element
+---@param u_id integer unit ID
+---@param t_id integer turbine ID
+---@param ps psil
+---@param update function
+return function (app, u_page, panes, tbn_pane, u_id, t_id, ps, update)
+    local db = iocontrol.get_db()
+
+    local tbn_div = Div{parent=tbn_pane,x=2,width=tbn_pane.get_width()-2}
+    table.insert(panes, tbn_div)
+
+    local tbn_page = app.new_page(u_page, #panes)
+    tbn_page.tasks = { update }
+
+    TextBox{parent=tbn_div,y=1,text="TRBN #"..t_id,width=8,height=1}
+    local status = StateIndicator{parent=tbn_div,x=10,y=1,states=style.turbine.states,value=1,min_width=12}
+    status.register(ps, "TurbineStateStatus", status.update)
+
+    local steam = VerticalBar{parent=tbn_div,x=1,y=4,fg_bg=cpair(colors.white,colors.gray),height=5,width=1}
+    local ccool = VerticalBar{parent=tbn_div,x=21,y=4,fg_bg=cpair(colors.green,colors.gray),height=5,width=1}
+
+    TextBox{parent=tbn_div,text="S",x=1,y=3,width=1,height=1,fg_bg=label}
+    TextBox{parent=tbn_div,text="E",x=21,y=3,width=1,height=1,fg_bg=label}
+
+    steam.register(ps, "steam_fill", steam.update)
+    ccool.register(ps, "energy_fill", ccool.update)
+
+    TextBox{parent=tbn_div,text="Production",x=3,y=3,width=17,height=1,fg_bg=label}
+    local prod_rate = PowerIndicator{parent=tbn_div,x=3,y=4,lu_colors=lu_col,label="",format="%11.2f",value=0,rate=true,width=17,fg_bg=text_fg}
+    TextBox{parent=tbn_div,text="Flow Rate",x=3,y=5,width=17,height=1,fg_bg=label}
+    local flow_rate = DataIndicator{parent=tbn_div,x=3,y=6,lu_colors=lu_col,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=17,fg_bg=text_fg}
+    TextBox{parent=tbn_div,text="Steam Input Rate",x=3,y=7,width=17,height=1,fg_bg=label}
+    local input_rate = DataIndicator{parent=tbn_div,x=3,y=8,lu_colors=lu_col,label="",unit="mB/t",format="%11.0f",value=0,commas=true,width=17,fg_bg=text_fg}
+
+    prod_rate.register(ps, "prod_rate", function (val) prod_rate.update(util.joules_to_fe(val)) end)
+    flow_rate.register(ps, "flow_rate", flow_rate.update)
+    input_rate.register(ps, "steam_input_rate", input_rate.update)
+
+    local t_sdo = IconIndicator{parent=tbn_div,y=10,label="Steam Dumping",states=tri_ind_s}
+    local t_tos  = IconIndicator{parent=tbn_div,label="Over Speed",states=red_ind_s}
+    local t_gtrp  = IconIndicator{parent=tbn_div,label="Generator Trip",states=yel_ind_s}
+    local t_trp  = IconIndicator{parent=tbn_div,label="Turbine Trip",states=red_ind_s}
+
+    t_sdo.register(ps, "SteamDumpOpen", t_sdo.update)
+    t_tos.register(ps, "TurbineOverSpeed", t_tos.update)
+    t_gtrp.register(ps, "GeneratorTrip", t_gtrp.update)
+    t_trp.register(ps, "TurbineTrip", t_trp.update)
+
+
+    local tbn_ext_div = Div{parent=tbn_pane,x=2,width=tbn_pane.get_width()-2}
+    table.insert(panes, tbn_ext_div)
+
+    local tbn_ext_page = app.new_page(tbn_page, #panes)
+    tbn_ext_page.tasks = { update }
+
+    PushButton{parent=tbn_div,x=9,y=18,text="MORE",min_width=6,fg_bg=cpair(colors.lightGray,colors.gray),active_fg_bg=cpair(colors.gray,colors.lightGray),callback=tbn_ext_page.nav_to}
+    PushButton{parent=tbn_ext_div,x=9,y=18,text="BACK",min_width=6,fg_bg=cpair(colors.lightGray,colors.gray),active_fg_bg=cpair(colors.gray,colors.lightGray),callback=tbn_page.nav_to}
+
+    TextBox{parent=tbn_ext_div,y=1,text="More Turbine Info",height=1,alignment=ALIGN.CENTER}
+
+    TextBox{parent=tbn_ext_div,text="Steam Tank",x=1,y=3,width=10,height=1,fg_bg=label}
+    local steam_p = DataIndicator{parent=tbn_ext_div,x=14,y=3,lu_colors=lu_col,label="",unit="%",format="%6.2f",value=0,width=8,fg_bg=text_fg}
+    local steam_amnt = DataIndicator{parent=tbn_ext_div,x=1,y=4,lu_colors=lu_col,label="",unit="mB",format="%18.0f",value=0,commas=true,width=21,fg_bg=text_fg}
+
+    steam_p.register(ps, "steam_fill", function (x) steam_p.update(x * 100) end)
+    steam_amnt.register(ps, "steam", function (x) steam_amnt.update(x.amount) end)
+
+    TextBox{parent=tbn_ext_div,text="Energy Fill",x=1,y=6,width=12,height=1,fg_bg=label}
+    local charge_p = DataIndicator{parent=tbn_ext_div,x=14,y=6,lu_colors=lu_col,label="",unit="%",format="%6.2f",value=0,width=8,fg_bg=text_fg}
+    local charge_amnt = PowerIndicator{parent=tbn_ext_div,x=1,y=7,lu_colors=lu_col,label="",format="%17.4f",value=0,width=21,fg_bg=text_fg}
+
+    charge_p.register(ps, "energy_fill", function (x) charge_p.update(x * 100) end)
+    charge_amnt.register(ps, "energy", charge_amnt.update)
+
+    TextBox{parent=tbn_ext_div,text="Rotation Rate",x=1,y=9,width=13,height=1,fg_bg=label}
+    local rotation = DataIndicator{parent=tbn_ext_div,x=1,y=10,lu_colors=lu_col,label="",unit="",format="%21.12f",value=0,width=21,fg_bg=text_fg}
+
+    rotation.register(ps, "steam", function ()
+        local status, result = pcall(function () return util.turbine_rotation(db.units[u_id].turbine_data_tbl[t_id]) end)
+        if status then rotation.update(result) end
+    end)
+
+    return tbn_page.nav_to
+end

pocket/ui/style.lua

@@ -57,6 +57,12 @@ states.emc_ind_s = {
     { color = cpair(colors.black, colors.green), symbol = "+" }
 }
 
+states.tri_ind_s = {
+    { color = cpair(colors.black, colors.lightGray), symbol = "+" },
+    { color = cpair(colors.black, colors.yellow), symbol = "\x1e" },
+    { color = cpair(colors.black, colors.red), symbol = "-" }
+}
+
 states.red_ind_s = {
     { color = cpair(colors.black, colors.lightGray), symbol = "+" },
     { color = cpair(colors.black, colors.red), symbol = "-" }
@@ -76,7 +82,7 @@ style.reactor = {
     states = {
         {
             color = cpair(colors.black, colors.yellow),
-            text = "PLC OFF-LINE"
+            text = "OFF-LINE"
         },
         {
             color = cpair(colors.black, colors.orange),
@@ -100,7 +106,7 @@ style.reactor = {
         },
         {
             color = cpair(colors.black, colors.red),
-            text = "FORCE DISABLED"
+            text = "FORCE DSBL"
         }
     }
 }

scada-common/util.lua

@@ -4,6 +4,8 @@
 
 local cc_strings = require("cc.strings")
 
+local const      = require("scada-common.constants")
+
 local math = math
 local string = string
 local table = table
@@ -368,7 +370,7 @@ end
 
 --#endregion
 
---#region MEKANISM POWER
+--#region MEKANISM MATH
 
 -- convert Joules to FE
 ---@nodiscard
@@ -434,6 +436,22 @@ function util.power_format(fe, combine_label, format)
     end
 end
 
+-- compute Mekanism's rotation rate for a turbine
+---@nodiscard
+---@param turbine turbinev_session_db turbine data
+function util.turbine_rotation(turbine)
+    local build = turbine.build
+
+    local inner_vol = build.steam_cap / const.mek.TURBINE_GAS_PER_TANK
+    local disp_rate = (build.dispersers * const.mek.TURBINE_DISPERSER_FLOW) * inner_vol
+    local vent_rate = build.vents * const.mek.TURBINE_VENT_FLOW
+
+    local max_rate = math.min(disp_rate, vent_rate)
+    local flow = math.min(max_rate, turbine.tanks.steam.amount)
+
+    return (flow * (turbine.tanks.steam.amount / build.steam_cap)) / max_rate
+end
+
 --#endregion
 
 --#region UTILITY CLASSES

supervisor/startup.lua

@@ -21,7 +21,7 @@ local supervisor = require("supervisor.supervisor")
 
 local svsessions = require("supervisor.session.svsessions")
 
-local SUPERVISOR_VERSION = "v1.3.11"
+local SUPERVISOR_VERSION = "v1.3.12"
 
 local println = util.println
 local println_ts = util.println_ts

supervisor/unitlogic.lua

@@ -39,21 +39,6 @@ local ALARM_LIMS = const.ALARM_LIMITS
 ---@class unit_logic_extension
 local logic = {}
 
--- compute Mekanism's rotation rate for a turbine
----@param turbine turbinev_session_db
-local function turbine_rotation(turbine)
-    local build = turbine.build
-
-    local inner_vol = build.steam_cap / const.mek.TURBINE_GAS_PER_TANK
-    local disp_rate = (build.dispersers * const.mek.TURBINE_DISPERSER_FLOW) * inner_vol
-    local vent_rate = build.vents * const.mek.TURBINE_VENT_FLOW
-
-    local max_rate = math.min(disp_rate, vent_rate)
-    local flow = math.min(max_rate, turbine.tanks.steam.amount)
-
-    return (flow * (turbine.tanks.steam.amount / build.steam_cap)) / max_rate
-end
-
 -- update the annunciator
 ---@param self _unit_self
 function logic.update_annunciator(self)
@@ -333,7 +318,7 @@ function logic.update_annunciator(self)
         local last = self.turbine_stability_data[i]
 
         if (not self.turbine_flow_stable) and (turbine.state.steam_input_rate > 0) then
-            local rotation = turbine_rotation(turbine)
+            local rotation = util.turbine_rotation(turbine)
             local rotation_stable = false
 
             -- see if data updated, and if so, check rotation speed change