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

Merge pull request #288 from MikaylaFischler/devel

Browse Source 
2023.07.17 Hotfix
This commit is contained in:
Mikayla 2023-07-17 22:48:03 -04:00 committed by GitHub
commit 8f7d7c3ead
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
coordinator/process.lua
View File

@ -75,6 +75,10 @@ function process.init(iocontrol, coord_comms)
end end
log.info("PROCESS: loaded auto control settings from coord.settings") log.info("PROCESS: loaded auto control settings from coord.settings")
-- notify supervisor of auto waste config
self.comms.send_fac_command(FAC_COMMAND.SET_WASTE_MODE, self.config.waste_product)
self.comms.send_fac_command(FAC_COMMAND.SET_PU_FB, self.config.pu_fallback)
end end
-- unit waste states -- unit waste states

2
coordinator/startup.lua
View File

@ -22,7 +22,7 @@ local sounder = require("coordinator.sounder")
local apisessions = require("coordinator.session.apisessions") local apisessions = require("coordinator.session.apisessions")
local COORDINATOR_VERSION = "v0.21.0" local COORDINATOR_VERSION = "v0.21.1"
local println = util.println local println = util.println
local println_ts = util.println_ts local println_ts = util.println_ts

2
supervisor/startup.lua
View File

@ -21,7 +21,7 @@ local supervisor = require("supervisor.supervisor")
local svsessions = require("supervisor.session.svsessions") local svsessions = require("supervisor.session.svsessions")
local SUPERVISOR_VERSION = "v0.20.2" local SUPERVISOR_VERSION = "v0.20.3"
local println = util.println local println = util.println
local println_ts = util.println_ts local println_ts = util.println_ts

16
supervisor/unitlogic.lua
View File

@ -327,13 +327,14 @@ function logic.update_annunciator(self)
--[[ --[[
Generator Trip Generator Trip
a generator trip is when a generator suddenly and unexpectedly loses it's external load a generator trip is when a generator suddenly and unexpectedly loses it's external load, which occurs when a power plant
oftentimes this is when a power plant is disconnected from the grid for one reason or another is disconnected from the grid. in our case, this is when the turbine is disconnected, or what it's connected to becomes
in this case we just: fully charged. this is identified by detecting if:
- check if internal power storage of turbine is increasing - the internal power storage of the turbine is increasing AND
that means there is no external load and there will be a turbine trip soon if this is not resolved - there is at least 5% energy fill (preventing false trips with periodic power extraction from other mods)
this would then mean there is no external load and there will be a turbine trip soon if this is not resolved
]]-- ]]--
self.db.annunciator.GeneratorTrip[idx] = _get_dt(DT_KEYS.TurbinePower .. idx) > 0.0 self.db.annunciator.GeneratorTrip[idx] = (_get_dt(DT_KEYS.TurbinePower .. idx) > 0.0) and (db.tanks.energy_fill > 0.05)
--[[ --[[
Turbine Trip Turbine Trip
@ -504,9 +505,6 @@ function logic.update_alarms(self)
local rcs_trans = any_low or any_over or gen_trip or annunc.RCPTrip or annunc.MaxWaterReturnFeed local rcs_trans = any_low or any_over or gen_trip or annunc.RCPTrip or annunc.MaxWaterReturnFeed
-- only care about RCS flow low early with boilers
if self.num_boilers > 0 then rcs_trans = rcs_trans or annunc.RCSFlowLow end
-- annunciator indicators for these states may not indicate a real issue when: -- annunciator indicators for these states may not indicate a real issue when:
-- > flow is ramping up right after reactor start -- > flow is ramping up right after reactor start
-- > flow is ramping down after reactor shutdown -- > flow is ramping down after reactor shutdown