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

don't disable self-check even if there is no config

Browse Source
This commit is contained in:
Mikayla Fischler 2024-07-28 16:41:39 -04:00
parent 9bffd6feee
commit bcc55628cf
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,7 +119,7 @@ local function self_check(sc_log)
-- this consumes events, but that is fine here -- this consumes events, but that is fine here
self.self_check_msg(nil, reactor and reactor.isFormed(), "ensure the fission reactor multiblock is formed") self.self_check_msg(nil, reactor and reactor.isFormed(), "ensure the fission reactor multiblock is formed")
self.self_check_msg("> check configuration...", valid_cfg, "go through Configure System again and apply settings to repair any corrupted or missing settings") self.self_check_msg("> check configuration...", valid_cfg, "go through Configure System and apply settings to set any missing settings and repair any corrupted ones")
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...")

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

@ -474,7 +474,6 @@ function system.create(tool_ctl, main_pane, cfg_sys, divs, style, exit)
try_set(c_mode, ini_cfg.ColorMode) try_set(c_mode, ini_cfg.ColorMode)
tool_ctl.view_cfg.enable() tool_ctl.view_cfg.enable()
tool_ctl.self_check.enable()
tool_ctl.color_cfg.enable() tool_ctl.color_cfg.enable()
if self.importing_legacy then if self.importing_legacy then

4
reactor-plc/configure.lua
View File

@ -59,7 +59,6 @@ local tool_ctl = {
jumped_to_color = false, jumped_to_color = false,
view_cfg = nil, ---@type graphics_element view_cfg = nil, ---@type graphics_element
self_check = nil, ---@type graphics_element
color_cfg = nil, ---@type graphics_element color_cfg = nil, ---@type graphics_element
color_next = nil, ---@type graphics_element color_next = nil, ---@type graphics_element
color_apply = nil, ---@type graphics_element color_apply = nil, ---@type graphics_element
@ -186,13 +185,12 @@ local function config_view(display)
end end
PushButton{parent=main_page,x=2,y=17,min_width=6,text="Exit",callback=exit,fg_bg=cpair(colors.black,colors.red),active_fg_bg=btn_act_fg_bg} PushButton{parent=main_page,x=2,y=17,min_width=6,text="Exit",callback=exit,fg_bg=cpair(colors.black,colors.red),active_fg_bg=btn_act_fg_bg}
tool_ctl.self_check = PushButton{parent=main_page,x=10,y=17,min_width=12,text="Self-Check",callback=function()main_pane.set_value(8)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg} PushButton{parent=main_page,x=10,y=17,min_width=12,text="Self-Check",callback=function()main_pane.set_value(8)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg}
tool_ctl.color_cfg = PushButton{parent=main_page,x=23,y=17,min_width=15,text="Color Options",callback=jump_color,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg} tool_ctl.color_cfg = PushButton{parent=main_page,x=23,y=17,min_width=15,text="Color Options",callback=jump_color,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg}
PushButton{parent=main_page,x=39,y=17,min_width=12,text="Change Log",callback=function()main_pane.set_value(7)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg} PushButton{parent=main_page,x=39,y=17,min_width=12,text="Change Log",callback=function()main_pane.set_value(7)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg}
if not tool_ctl.has_config then if not tool_ctl.has_config then
tool_ctl.view_cfg.disable() tool_ctl.view_cfg.disable()
tool_ctl.self_check.disable()
tool_ctl.color_cfg.disable() tool_ctl.color_cfg.disable()
end end

2
reactor-plc/startup.lua
View File

@ -18,7 +18,7 @@ local plc = require("reactor-plc.plc")
local renderer = require("reactor-plc.renderer") local renderer = require("reactor-plc.renderer")
local threads = require("reactor-plc.threads") local threads = require("reactor-plc.threads")
local R_PLC_VERSION = "v1.8.1" local R_PLC_VERSION = "v1.8.2"
local println = util.println local println = util.println
local println_ts = util.println_ts local println_ts = util.println_ts