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

ppm patch to support multiple return value functions, changed lack of modem to emit fatal error

Browse Source
This commit is contained in:
Mikayla Fischler 2022-05-29 14:26:40 -04:00
parent 706bf4d3ba
commit ff5b163c1d
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reactor-plc/startup.lua
View File

@ -13,7 +13,7 @@ local config = require("reactor-plc.config")
local plc = require("reactor-plc.plc")
local threads = require("reactor-plc.threads")
local R_PLC_VERSION = "alpha-v0.7.2"
local R_PLC_VERSION = "beta-v0.7.3"
local print = util.print
local println = util.println

4
rtu/startup.lua
View File

@ -24,7 +24,7 @@ local imatrix_rtu = require("rtu.dev.imatrix_rtu")
local turbine_rtu = require("rtu.dev.turbine_rtu")
local turbinev_rtu = require("rtu.dev.turbinev_rtu")
local RTU_VERSION = "alpha-v0.7.1"
local RTU_VERSION = "beta-v0.7.2"
local rtu_t = types.rtu_t
@ -80,7 +80,7 @@ local smem_sys = __shared_memory.rtu_sys
-- get modem
if smem_dev.modem == nil then
println("boot> wireless modem not found")
log.warning("no wireless modem on startup")
log.fatal("no wireless modem on startup")
return
end

9
scada-common/ppm.lua
View File

@ -47,7 +47,10 @@ local peri_init = function (iface)
for key, func in pairs(self.device) do
self.fault_counts[key] = 0
self.device[key] = function (...)
local status, result = pcall(func, ...)
local return_table = table.pack(pcall(func, ...))
local status = return_table[1]
table.remove(return_table, 1)
if status then
-- auto fault clear
@ -56,8 +59,10 @@ local peri_init = function (iface)
self.fault_counts[key] = 0
return result
return table.unpack(return_table)
else
local result = return_table[1]
-- function failed
self.faulted = true
self.last_fault = result

4
supervisor/startup.lua
View File

@ -13,7 +13,7 @@ local svsessions = require("supervisor.session.svsessions")
local config = require("supervisor.config")
local supervisor = require("supervisor.supervisor")
local SUPERVISOR_VERSION = "alpha-v0.4.0"
local SUPERVISOR_VERSION = "beta-v0.4.1"
local print = util.print
local println = util.println
@ -33,7 +33,7 @@ ppm.mount_all()
local modem = ppm.get_wireless_modem()
if modem == nil then
println("boot> wireless modem not found")
log.warning("no wireless modem on startup")
log.fatal("no wireless modem on startup")
return
end