mirror of
https://github.com/MikaylaFischler/cc-mek-scada.git
synced 2024-08-30 18:22:34 +00:00
status message cleanup and some updated comments
This commit is contained in:
parent
b150072234
commit
2b8f71fc43
@ -329,7 +329,7 @@ function sounder.eval(units)
|
||||
if alarms[ALARM.CriticalDamage] then
|
||||
new_states[T_660Hz_Int_125ms] = true
|
||||
else
|
||||
-- EMERGENCY level alarms
|
||||
-- EMERGENCY level alarms + URGENT over temp
|
||||
if alarms[ALARM.ReactorDamage] or alarms[ALARM.ReactorOverTemp] or alarms[ALARM.ReactorWasteLeak] then
|
||||
new_states[T_544Hz_440Hz_Alt] = true
|
||||
-- URGENT level turbine trip
|
||||
|
@ -19,7 +19,7 @@ local iocontrol = require("coordinator.iocontrol")
|
||||
local renderer = require("coordinator.renderer")
|
||||
local sounder = require("coordinator.sounder")
|
||||
|
||||
local COORDINATOR_VERSION = "v0.11.4"
|
||||
local COORDINATOR_VERSION = "v0.11.5"
|
||||
|
||||
local print = util.print
|
||||
local println = util.println
|
||||
|
@ -201,7 +201,7 @@ local function new_view(root, x, y)
|
||||
|
||||
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=TEXT_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=TEXT_ALIGN.CENTER,fg_bg=cpair(colors.gray, colors.white)}
|
||||
local stat_line_2 = TextBox{parent=u_stat,x=1,y=2,text="awaiting data...",width=31,height=1,alignment=TEXT_ALIGN.CENTER,fg_bg=cpair(colors.gray, colors.white)}
|
||||
|
||||
facility.ps.subscribe("status_line_1", stat_line_1.set_value)
|
||||
facility.ps.subscribe("status_line_2", stat_line_2.set_value)
|
||||
|
@ -144,7 +144,7 @@ local function init(parent, id)
|
||||
|
||||
local u_stat = Rectangle{parent=main,border=border(1,colors.gray,true),thin=true,width=33,height=4,x=46,y=3,fg_bg=bw_fg_bg}
|
||||
local stat_line_1 = TextBox{parent=u_stat,x=1,y=1,text="UNKNOWN",width=33,height=1,alignment=TEXT_ALIGN.CENTER,fg_bg=bw_fg_bg}
|
||||
local stat_line_2 = TextBox{parent=u_stat,x=1,y=2,text="awaiting data",width=33,height=1,alignment=TEXT_ALIGN.CENTER,fg_bg=cpair(colors.gray, colors.white)}
|
||||
local stat_line_2 = TextBox{parent=u_stat,x=1,y=2,text="awaiting data...",width=33,height=1,alignment=TEXT_ALIGN.CENTER,fg_bg=cpair(colors.gray, colors.white)}
|
||||
|
||||
u_ps.subscribe("U_StatusLine1", stat_line_1.set_value)
|
||||
u_ps.subscribe("U_StatusLine2", stat_line_2.set_value)
|
||||
|
@ -4,8 +4,8 @@
|
||||
"comms": "1.4.0",
|
||||
"reactor-plc": "v0.12.1",
|
||||
"rtu": "v0.12.2",
|
||||
"supervisor": "v0.13.2",
|
||||
"coordinator": "v0.11.4",
|
||||
"supervisor": "v0.13.3",
|
||||
"coordinator": "v0.11.5",
|
||||
"pocket": "alpha-v0.0.0"
|
||||
},
|
||||
"files": {
|
||||
@ -178,13 +178,13 @@
|
||||
},
|
||||
"sizes": {
|
||||
"system": 1982,
|
||||
"common": 90500,
|
||||
"common": 90550,
|
||||
"graphics": 99858,
|
||||
"lockbox": 100797,
|
||||
"reactor-plc": 75545,
|
||||
"rtu": 83090,
|
||||
"supervisor": 271106,
|
||||
"coordinator": 179369,
|
||||
"supervisor": 271184,
|
||||
"coordinator": 179394,
|
||||
"pocket": 335
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user