Minecraft/cc-mek-scada
1
0
Fork 0
mirror of https://github.com/MikaylaFischler/cc-mek-scada.git synced 2024-08-30 18:22:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

#127 uncommitted changes for annunciator changes

Browse Source
This commit is contained in:
Mikayla Fischler 2022-11-17 12:04:30 -05:00
parent 29793ba7c4
commit 657cd15c59
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
supervisor/session/unit.lua
View File

@ -218,35 +218,35 @@ function unit.new(for_reactor, num_boilers, num_turbines)
local boiler_water_dt_sum = 0.0 local boiler_water_dt_sum = 0.0
if self.counts.boilers > 0 then if self.counts.boilers > 0 then
-- go through boilers for stats and online -- go through boilers for stats and online
for i = 1, #self.boilers do
local session = self.boilers[i] ---@type unit_session
local boiler = session.get_db() ---@type boilerv_session_db
total_boil_rate = total_boil_rate + boiler.state.boil_rate
boiler_steam_dt_sum = _get_dt(DT_KEYS.BoilerSteam .. self.boilers[i].get_device_idx())
boiler_water_dt_sum = _get_dt(DT_KEYS.BoilerWater .. self.boilers[i].get_device_idx())
self.db.annunciator.BoilerOnline[session.get_device_idx()] = true
end
-- check heating rate low
if self.plc_s ~= nil and #self.boilers > 0 then
local r_db = self.plc_i.get_db()
-- check for inactive boilers while reactor is active
for i = 1, #self.boilers do for i = 1, #self.boilers do
local boiler = self.boilers[i] ---@type unit_session local session = self.boilers[i] ---@type unit_session
local idx = boiler.get_device_idx() local boiler = session.get_db() ---@type boilerv_session_db
local db = boiler.get_db() ---@type boilerv_session_db
if r_db.mek_status.status then total_boil_rate = total_boil_rate + boiler.state.boil_rate
self.db.annunciator.HeatingRateLow[idx] = db.state.boil_rate == 0 boiler_steam_dt_sum = _get_dt(DT_KEYS.BoilerSteam .. self.boilers[i].get_device_idx())
else boiler_water_dt_sum = _get_dt(DT_KEYS.BoilerWater .. self.boilers[i].get_device_idx())
self.db.annunciator.HeatingRateLow[idx] = false
self.db.annunciator.BoilerOnline[session.get_device_idx()] = true
end
-- check heating rate low
if self.plc_s ~= nil and #self.boilers > 0 then
local r_db = self.plc_i.get_db()
-- check for inactive boilers while reactor is active
for i = 1, #self.boilers do
local boiler = self.boilers[i] ---@type unit_session
local idx = boiler.get_device_idx()
local db = boiler.get_db() ---@type boilerv_session_db
if r_db.mek_status.status then
self.db.annunciator.HeatingRateLow[idx] = db.state.boil_rate == 0
else
self.db.annunciator.HeatingRateLow[idx] = false
end
end end
end end
end
else else
boiler_steam_dt_sum = _get_dt(DT_KEYS.ReactorHCool) boiler_steam_dt_sum = _get_dt(DT_KEYS.ReactorHCool)
boiler_water_dt_sum = _get_dt(DT_KEYS.ReactorCCool) boiler_water_dt_sum = _get_dt(DT_KEYS.ReactorCCool)
@ -260,16 +260,16 @@ function unit.new(for_reactor, num_boilers, num_turbines)
local cfmismatch = false local cfmismatch = false
if self.counts.boilers > 0 then if self.counts.boilers > 0 then
for i = 1, #self.boilers do for i = 1, #self.boilers do
local boiler = self.boilers[i] ---@type unit_session local boiler = self.boilers[i] ---@type unit_session
local idx = boiler.get_device_idx() local idx = boiler.get_device_idx()
local db = boiler.get_db() ---@type boilerv_session_db local db = boiler.get_db() ---@type boilerv_session_db
local gaining_hc = _get_dt(DT_KEYS.BoilerHCool .. idx) > 10.0 or db.tanks.hcool_fill == 1 local gaining_hc = _get_dt(DT_KEYS.BoilerHCool .. idx) > 10.0 or db.tanks.hcool_fill == 1
-- gaining heated coolant -- gaining heated coolant
cfmismatch = cfmismatch or gaining_hc cfmismatch = cfmismatch or gaining_hc
-- losing cooled coolant -- losing cooled coolant
cfmismatch = cfmismatch or _get_dt(DT_KEYS.BoilerCCool .. idx) < -10.0 or (gaining_hc and db.tanks.ccool_fill == 0) cfmismatch = cfmismatch or _get_dt(DT_KEYS.BoilerCCool .. idx) < -10.0 or (gaining_hc and db.tanks.ccool_fill == 0)
end end
elseif self.plc_s ~= nil then elseif self.plc_s ~= nil then

2
supervisor/startup.lua
View File

@ -14,7 +14,7 @@ local svsessions = require("supervisor.session.svsessions")
local config = require("supervisor.config") local config = require("supervisor.config")
local supervisor = require("supervisor.supervisor") local supervisor = require("supervisor.supervisor")
local SUPERVISOR_VERSION = "beta-v0.7.9" local SUPERVISOR_VERSION = "beta-v0.7.10"
local print = util.print local print = util.print
local println = util.println local println = util.println