From 2b8f71fc433480a4cbe94060c7a6ed4e6a5bb0ce Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Sun, 26 Feb 2023 14:22:25 -0500 Subject: [PATCH] status message cleanup and some updated comments --- coordinator/sounder.lua | 2 +- coordinator/startup.lua | 2 +- coordinator/ui/components/processctl.lua | 2 +- coordinator/ui/components/unit_detail.lua | 2 +- install_manifest.json | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/coordinator/sounder.lua b/coordinator/sounder.lua index 556fbbd..6eafb8d 100644 --- a/coordinator/sounder.lua +++ b/coordinator/sounder.lua @@ -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 diff --git a/coordinator/startup.lua b/coordinator/startup.lua index 75e0bb5..0502a8a 100644 --- a/coordinator/startup.lua +++ b/coordinator/startup.lua @@ -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 diff --git a/coordinator/ui/components/processctl.lua b/coordinator/ui/components/processctl.lua index 26944e0..5b8d8ae 100644 --- a/coordinator/ui/components/processctl.lua +++ b/coordinator/ui/components/processctl.lua @@ -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) diff --git a/coordinator/ui/components/unit_detail.lua b/coordinator/ui/components/unit_detail.lua index d1babd1..05e675d 100644 --- a/coordinator/ui/components/unit_detail.lua +++ b/coordinator/ui/components/unit_detail.lua @@ -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) diff --git a/install_manifest.json b/install_manifest.json index 0db383e..10b3be2 100644 --- a/install_manifest.json +++ b/install_manifest.json @@ -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 } } \ No newline at end of file