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

#469 made ETA tolerant to induction matrix capacity changes

Browse Source
This commit is contained in:
Mikayla Fischler 2024-04-28 01:26:44 -04:00
parent 826086951e
commit 6f768ef6b3
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scada-common/util.lua
View File

@ -189,11 +189,15 @@ function util.mov_avg(length)
---@class moving_average ---@class moving_average
local public = {} local public = {}
-- reset all to a given value -- reset all to a given value, or clear all data if no value is given
---@param x number value ---@param x number? value
function public.reset(x) function public.reset(x)
index = 1
data = {} data = {}
for _ = 1, length do t_insert(data, x) end
if x then
for _ = 1, length do t_insert(data, x) end
end
end end
-- record a new value -- record a new value

15
supervisor/facility.lua
View File

@ -133,6 +133,7 @@ function facility.new(config, cooling_conf)
avg_outflow = util.mov_avg(6), -- 3 seconds avg_outflow = util.mov_avg(6), -- 3 seconds
-- induction matrix charge delta stats -- induction matrix charge delta stats
avg_net = util.mov_avg(60), -- 60 seconds avg_net = util.mov_avg(60), -- 60 seconds
last_capacity = 0,
charge_last = 0, charge_last = 0,
charge_last_t = 0 charge_last_t = 0
} }
@ -326,7 +327,13 @@ function facility.new(config, cooling_conf)
self.charge_last = energy self.charge_last = energy
self.charge_last_t = charge_update self.charge_last_t = charge_update
self.avg_net.record(delta, charge_update) -- if the capacity changed, toss out existing data
if db.build.max_energy ~= self.last_capacity then
self.last_capacity = db.build.max_energy
self.avg_net.reset()
else
self.avg_net.record(delta, charge_update)
end
end end
else else
self.im_stat_init = true self.im_stat_init = true
@ -641,8 +648,7 @@ function facility.new(config, cooling_conf)
local astatus = self.ascram_status local astatus = self.ascram_status
if self.induction[1] ~= nil then if self.induction[1] ~= nil then
local matrix = self.induction[1] ---@type unit_session local db = self.induction[1].get_db() ---@type imatrix_session_db
local db = matrix.get_db() ---@type imatrix_session_db
-- clear matrix disconnected -- clear matrix disconnected
if astatus.matrix_dc then if astatus.matrix_dc then
@ -798,8 +804,7 @@ function facility.new(config, cooling_conf)
-- update induction matrix related outputs -- update induction matrix related outputs
if self.induction[1] ~= nil then if self.induction[1] ~= nil then
local matrix = self.induction[1] ---@type unit_session local db = self.induction[1].get_db() ---@type imatrix_session_db
local db = matrix.get_db() ---@type imatrix_session_db
self.io_ctl.digital_write(IO.F_MATRIX_LOW, db.tanks.energy_fill < const.RS_THRESHOLDS.IMATRIX_CHARGE_LOW) self.io_ctl.digital_write(IO.F_MATRIX_LOW, db.tanks.energy_fill < const.RS_THRESHOLDS.IMATRIX_CHARGE_LOW)
self.io_ctl.digital_write(IO.F_MATRIX_HIGH, db.tanks.energy_fill > const.RS_THRESHOLDS.IMATRIX_CHARGE_HIGH) self.io_ctl.digital_write(IO.F_MATRIX_HIGH, db.tanks.energy_fill > const.RS_THRESHOLDS.IMATRIX_CHARGE_HIGH)