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

#118 bugfixes with cleanup

Browse Source
This commit is contained in:
Mikayla Fischler 2023-02-24 23:59:39 -05:00
parent b7895080cb
commit 16d6372d7b
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
install_manifest.json
View File

@ -2,10 +2,10 @@
"versions": { "versions": {
"bootloader": "0.2", "bootloader": "0.2",
"comms": "1.4.0", "comms": "1.4.0",
"reactor-plc": "beta-v0.11.1", "reactor-plc": "v0.12.0",
"rtu": "beta-v0.11.2", "rtu": "v0.12.1",
"supervisor": "beta-v0.12.2", "supervisor": "v0.13.1",
"coordinator": "beta-v0.10.1", "coordinator": "v0.11.0",
"pocket": "alpha-v0.0.0" "pocket": "alpha-v0.0.0"
}, },
"files": { "files": {
@ -177,13 +177,13 @@
}, },
"sizes": { "sizes": {
"system": 1982, "system": 1982,
"common": 88163, "common": 88565,
"graphics": 99360, "graphics": 99858,
"lockbox": 100797, "lockbox": 100797,
"reactor-plc": 75902, "reactor-plc": 75621,
"rtu": 81679, "rtu": 85496,
"supervisor": 268416, "supervisor": 270182,
"coordinator": 181783, "coordinator": 183279,
"pocket": 335 "pocket": 335
} }
} }

4
rtu/rtu.lua
View File

@ -219,10 +219,10 @@ function rtu.comms(version, modem, local_port, server_port, range, conn_watchdog
for i = 1, #units do for i = 1, #units do
local unit = units[i] ---@type rtu_unit_registry_entry local unit = units[i] ---@type rtu_unit_registry_entry
if type ~= nil then if unit.type ~= nil then
local advert = { unit.type, unit.index, unit.reactor } local advert = { unit.type, unit.index, unit.reactor }
if type == RTU_UNIT_TYPE.REDSTONE then if unit.type == RTU_UNIT_TYPE.REDSTONE then
insert(advert, unit.device) insert(advert, unit.device)
end end

2
rtu/startup.lua
View File

@ -25,7 +25,7 @@ local sna_rtu = require("rtu.dev.sna_rtu")
local sps_rtu = require("rtu.dev.sps_rtu") local sps_rtu = require("rtu.dev.sps_rtu")
local turbinev_rtu = require("rtu.dev.turbinev_rtu") local turbinev_rtu = require("rtu.dev.turbinev_rtu")
local RTU_VERSION = "v0.12.0" local RTU_VERSION = "v0.12.1"
local RTU_UNIT_TYPE = types.RTU_UNIT_TYPE local RTU_UNIT_TYPE = types.RTU_UNIT_TYPE

16
scada-common/types.lua
View File

@ -121,14 +121,14 @@ types.TRI_FAIL = {
---@enum PROCESS ---@enum PROCESS
types.PROCESS = { types.PROCESS = {
INACTIVE = 1, INACTIVE = 0,
MAX_BURN = 2, MAX_BURN = 1,
BURN_RATE = 3, BURN_RATE = 2,
CHARGE = 4, CHARGE = 3,
GEN_RATE = 5, GEN_RATE = 4,
MATRIX_FAULT_IDLE = 6, MATRIX_FAULT_IDLE = 5,
SYSTEM_ALARM_IDLE = 7, SYSTEM_ALARM_IDLE = 6,
GEN_RATE_FAULT_IDLE = 8 GEN_RATE_FAULT_IDLE = 7
} }
types.PROCESS_NAMES = { types.PROCESS_NAMES = {

2
supervisor/facility.lua
View File

@ -292,7 +292,7 @@ function facility.new(num_reactors, cooling_conf)
if state_changed then if state_changed then
self.saturated = false self.saturated = false
log.debug("FAC: state changed from " .. PROCESS_NAMES[self.last_mode] .. " to " .. PROCESS_NAMES[self.mode]) log.debug("FAC: state changed from " .. PROCESS_NAMES[self.last_mode + 1] .. " to " .. PROCESS_NAMES[self.mode + 1])
if (self.last_mode == PROCESS.INACTIVE) or (self.last_mode == PROCESS.GEN_RATE_FAULT_IDLE) then if (self.last_mode == PROCESS.INACTIVE) or (self.last_mode == PROCESS.GEN_RATE_FAULT_IDLE) then
self.start_fail = START_STATUS.OK self.start_fail = START_STATUS.OK

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 = "v0.13.0" local SUPERVISOR_VERSION = "v0.13.1"
local print = util.print local print = util.print
local println = util.println local println = util.println