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

#528 reactor PLC configurator fixes

Browse Source
This commit is contained in:
Mikayla Fischler 2024-07-26 23:06:42 -04:00
parent ec107929bc
commit 8e4bb583a8
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
reactor-plc/config/check.lua
View File

@ -124,6 +124,13 @@ local function self_check(sc_log)
if valid_cfg and modem then if valid_cfg and modem then
self.self_check_msg("> check supervisor connection...") self.self_check_msg("> check supervisor connection...")
-- init mac as needed
if self.settings.AuthKey and string.len(self.settings.AuthKey) >= 8 then
network.init_mac(self.settings.AuthKey)
else
network.deinit_mac()
end
self.nic = network.nic(modem) self.nic = network.nic(modem)
self.nic.closeAll() self.nic.closeAll()

6
reactor-plc/config/system.lua
View File

@ -63,13 +63,13 @@ local system = {}
-- create the system configuration view -- create the system configuration view
---@param tool_ctl _plc_cfg_tool_ctl ---@param tool_ctl _plc_cfg_tool_ctl
---@param main_pane graphics_element ---@param main_pane graphics_element
---@param settings table ---@param cfg_sys table
---@param divs table ---@param divs table
---@param style table ---@param style table
---@param exit function ---@param exit function
function system.create(tool_ctl, main_pane, settings, divs, style, exit) function system.create(tool_ctl, main_pane, cfg_sys, divs, style, exit)
---@type plc_config, plc_config, plc_config, table, function ---@type plc_config, plc_config, plc_config, table, function
local settings_cfg, ini_cfg, tmp_cfg, fields, load_settings = table.unpack(settings) local settings_cfg, ini_cfg, tmp_cfg, fields, load_settings = table.unpack(cfg_sys)
---@type graphics_element, graphics_element, graphics_element, graphics_element, graphics_element ---@type graphics_element, graphics_element, graphics_element, graphics_element, graphics_element
local plc_cfg, net_cfg, log_cfg, clr_cfg, summary = table.unpack(divs) local plc_cfg, net_cfg, log_cfg, clr_cfg, summary = table.unpack(divs)

2
reactor-plc/configure.lua
View File

@ -277,7 +277,7 @@ function configurator.configure(ask_config)
elseif event == "paste" then elseif event == "paste" then
display.handle_paste(param1) display.handle_paste(param1)
elseif event == "modem_message" then elseif event == "modem_message" then
check.handle_msg(param1, param2, param3, param4, param5) check.receive_sv(param1, param2, param3, param4, param5)
end end
if event == "terminate" then return end if event == "terminate" then return end