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

RTU advertisement sends as basic array, re-ordered input registers on turbine RTU

Browse Source
This commit is contained in:
Mikayla Fischler 2022-05-13 09:39:28 -04:00
parent 13fcf265b7
commit 635e7b7f59
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtu/dev/turbine_rtu.lua
View File

@ -23,15 +23,15 @@ turbine_rtu.new = function (turbine)
self.rtu.connect_input_reg(self.turbine.getVents) self.rtu.connect_input_reg(self.turbine.getVents)
self.rtu.connect_input_reg(self.turbine.getDispersers) self.rtu.connect_input_reg(self.turbine.getDispersers)
self.rtu.connect_input_reg(self.turbine.getCondensers) self.rtu.connect_input_reg(self.turbine.getCondensers)
self.rtu.connect_input_reg(self.turbine.getDumpingMode)
self.rtu.connect_input_reg(self.turbine.getSteamCapacity) self.rtu.connect_input_reg(self.turbine.getSteamCapacity)
self.rtu.connect_input_reg(self.turbine.getMaxFlowRate) self.rtu.connect_input_reg(self.turbine.getMaxFlowRate)
self.rtu.connect_input_reg(self.turbine.getMaxWaterOutput)
self.rtu.connect_input_reg(self.turbine.getMaxProduction) self.rtu.connect_input_reg(self.turbine.getMaxProduction)
self.rtu.connect_input_reg(self.turbine.getMaxWaterOutput)
-- current state -- current state
self.rtu.connect_input_reg(self.turbine.getFlowRate) self.rtu.connect_input_reg(self.turbine.getFlowRate)
self.rtu.connect_input_reg(self.turbine.getProductionRate) self.rtu.connect_input_reg(self.turbine.getProductionRate)
self.rtu.connect_input_reg(self.turbine.getLastSteamInputRate) self.rtu.connect_input_reg(self.turbine.getLastSteamInputRate)
self.rtu.connect_input_reg(self.turbine.getDumpingMode)
-- tanks -- tanks
self.rtu.connect_input_reg(self.turbine.getSteam) self.rtu.connect_input_reg(self.turbine.getSteam)
self.rtu.connect_input_reg(self.turbine.getSteamNeeded) self.rtu.connect_input_reg(self.turbine.getSteamNeeded)

10
rtu/rtu.lua
View File

@ -256,16 +256,14 @@ rtu.comms = function (modem, local_port, server_port, conn_watchdog)
local type = comms.rtu_t_to_advert_type(unit.type) local type = comms.rtu_t_to_advert_type(unit.type)
if type ~= nil then if type ~= nil then
---@class rtu_advertisement
local advert = { local advert = {
type = type, ---@type integer type,
index = unit.index, ---@type integer unit.index,
reactor = unit.reactor, ---@type integer unit.reactor
rsio = nil ---@type table|nil
} }
if type == RTU_ADVERT_TYPES.REDSTONE then if type == RTU_ADVERT_TYPES.REDSTONE then
advert.rsio = unit.device insert(advert, unit.device)
end end
insert(advertisement, advert) insert(advertisement, advert)