TheHomecraft/cc-mek-scada
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup, #593 fixes, version increment

Browse Source
This commit is contained in:
Mikayla Fischler 2025-06-21 14:58:45 -04:00
parent a104d8ba83
commit abe0c45534
4 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
coordinator/iocontrol.lua
View File

@ -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

2
pocket/startup.lua
View File

@ -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

22
pocket/ui/apps/radiation.lua
View File

@ -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

4
scada-common/comms.lua
View File

@ -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 = {