diff --git a/coordinator/iocontrol.lua b/coordinator/iocontrol.lua index 66e6e5c..9a788db 100644 --- a/coordinator/iocontrol.lua +++ b/coordinator/iocontrol.lua @@ -1112,8 +1112,9 @@ function iocontrol.update_unit_statuses(statuses) unit.rad_monitors = {} for id, envd in pairs(rtu_statuses.envds) do - local radiation = envd[2] ---@type radiation_reading - local rad_raw = envd[3] ---@type number + local rtu_faulted = envd[1] ---@type boolean + local radiation = envd[2] ---@type radiation_reading + local rad_raw = envd[3] ---@type number any_conn = true @@ -1122,7 +1123,9 @@ function iocontrol.update_unit_statuses(statuses) max_reading = radiation end - unit.rad_monitors[id] = { radiation = radiation, raw = rad_raw } + if not rtu_faulted then + unit.rad_monitors[id] = { radiation = radiation, raw = rad_raw } + end end if any_conn then diff --git a/pocket/startup.lua b/pocket/startup.lua index 71e2a73..b2f7874 100644 --- a/pocket/startup.lua +++ b/pocket/startup.lua @@ -22,7 +22,7 @@ local pocket = require("pocket.pocket") local renderer = require("pocket.renderer") local threads = require("pocket.threads") -local POCKET_VERSION = "v0.13.4-beta" +local POCKET_VERSION = "v0.13.5-beta" local println = util.println local println_ts = util.println_ts diff --git a/pocket/ui/apps/radiation.lua b/pocket/ui/apps/radiation.lua index 8676f13..e40cb6d 100644 --- a/pocket/ui/apps/radiation.lua +++ b/pocket/ui/apps/radiation.lua @@ -2,24 +2,24 @@ -- Radiation Monitor App -- -local util = require("scada-common.util") +local util = require("scada-common.util") -local iocontrol = require("pocket.iocontrol") -local pocket = require("pocket.pocket") +local iocontrol = require("pocket.iocontrol") +local pocket = require("pocket.pocket") -local style = require("pocket.ui.style") +local style = require("pocket.ui.style") -local core = require("graphics.core") +local core = require("graphics.core") -local Div = require("graphics.elements.Div") +local Div = require("graphics.elements.Div") local ListBox = require("graphics.elements.ListBox") -local MultiPane = require("graphics.elements.MultiPane") -local Rectangle = require("graphics.elements.Rectangle") -local TextBox = require("graphics.elements.TextBox") +local MultiPane = require("graphics.elements.MultiPane") +local Rectangle = require("graphics.elements.Rectangle") +local TextBox = require("graphics.elements.TextBox") -local WaitingAnim = require("graphics.elements.animations.Waiting") +local WaitingAnim = require("graphics.elements.animations.Waiting") -local RadIndicator = require("graphics.elements.indicators.RadIndicator") +local RadIndicator = require("graphics.elements.indicators.RadIndicator") local ALIGN = core.ALIGN local cpair = core.cpair diff --git a/scada-common/comms.lua b/scada-common/comms.lua index 75a99ad..2f3ef71 100644 --- a/scada-common/comms.lua +++ b/scada-common/comms.lua @@ -17,8 +17,8 @@ local max_distance = nil local comms = {} -- protocol/data versions (protocol/data independent changes tracked by util.lua version) -comms.version = "3.0.6" -comms.api_version = "0.0.9" +comms.version = "3.0.7" +comms.api_version = "0.0.10" ---@enum PROTOCOL local PROTOCOL = {