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

cleanup

Browse Source
This commit is contained in:
Mikayla Fischler 2024-11-19 21:21:05 -05:00
parent 8469bb78a3
commit 8bdb6b9ed6
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
coordinator/iocontrol.lua
View File

@ -665,7 +665,7 @@ function iocontrol.update_facility_status(status)
-- SPS statuses -- SPS statuses
if type(rtu_statuses.sps) == "table" then if type(rtu_statuses.sps) == "table" then
local comp_stat = 1 local sps_status = 1
for id = 1, #fac.sps_ps_tbl do for id = 1, #fac.sps_ps_tbl do
if rtu_statuses.sps[id] == nil then if rtu_statuses.sps[id] == nil then
@ -682,18 +682,13 @@ function iocontrol.update_facility_status(status)
local rtu_faulted = _record_multiblock_status(sps, data, ps) local rtu_faulted = _record_multiblock_status(sps, data, ps)
if rtu_faulted then if rtu_faulted then
comp_stat = 3 -- faulted sps_status = 3 -- faulted
elseif data.formed then elseif data.formed then
if data.state.process_rate > 0 then -- active / idle
comp_stat = 5 -- active sps_status = util.trinary(data.state.process_rate > 0, 5, 4)
else else sps_status = 2 end -- not formed
comp_stat = 4 -- idle
end
else
comp_stat = 2 -- not formed
end
ps.publish("computed_status", comp_stat) ps.publish("computed_status", sps_status)
io.facility.ps.publish("am_rate", data.state.process_rate * 1000) io.facility.ps.publish("am_rate", data.state.process_rate * 1000)
else else
@ -701,7 +696,7 @@ function iocontrol.update_facility_status(status)
end end
end end
io.facility.sps_status = comp_stat io.facility.sps_status = sps_status
else else
log.debug(log_header .. "sps list not a table") log.debug(log_header .. "sps list not a table")
valid = false valid = false

2
pocket/ui/apps/waste.lua
View File

@ -78,7 +78,7 @@ local function new_view(root)
end end
end end
--#region unit settings/status --#region unit waste options/statistics
for i = 1, db.facility.num_units do for i = 1, db.facility.num_units do
local u_pane = Div{parent=page_div} local u_pane = Div{parent=page_div}