diff --git a/pocket/configure.lua b/pocket/configure.lua index 9ac13f0..6c0f728 100644 --- a/pocket/configure.lua +++ b/pocket/configure.lua @@ -361,7 +361,7 @@ local function config_view(display) local function save_and_continue() for k, v in pairs(tmp_cfg) do settings.set(k, v) end - if settings.save("pocket.settings") then + if settings.save("/pocket.settings") then load_settings(settings_cfg, true) load_settings(ini_cfg) @@ -487,8 +487,7 @@ local function config_view(display) local val = util.strval(raw) if f[1] == "AuthKey" then val = string.rep("*", string.len(val)) - elseif f[1] == "LogMode" then val = util.trinary(raw == log.MODE.APPEND, "append", "replace") - end + elseif f[1] == "LogMode" then val = util.trinary(raw == log.MODE.APPEND, "append", "replace") end if val == "nil" then val = "" end diff --git a/reactor-plc/configure.lua b/reactor-plc/configure.lua index 62f7d85..db9162d 100644 --- a/reactor-plc/configure.lua +++ b/reactor-plc/configure.lua @@ -181,7 +181,7 @@ local function config_view(display) local main_pane = MultiPane{parent=root_pane_div,x=1,y=1,panes={main_page,plc_cfg,net_cfg,log_cfg,summary,changelog}} - -- MAIN PAGE + -- Main Page local y_start = 5 @@ -212,7 +212,7 @@ local function config_view(display) 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=39,y=17,min_width=12,text="Change Log",callback=function()main_pane.set_value(6)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg} - -- PLC CONFIG + --#region PLC local plc_c_1 = Div{parent=plc_cfg,x=2,y=4,width=49} local plc_c_2 = Div{parent=plc_cfg,x=2,y=4,width=49} @@ -290,7 +290,9 @@ local function config_view(display) PushButton{parent=plc_c_4,x=1,y=14,text="\x1b Back",callback=function()plc_pane.set_value(3)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg} PushButton{parent=plc_c_4,x=44,y=14,text="Next \x1a",callback=submit_emcool,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg} - -- NET CONFIG + --#endregion + + --#region Network local net_c_1 = Div{parent=net_cfg,x=2,y=4,width=49} local net_c_2 = Div{parent=net_cfg,x=2,y=4,width=49} @@ -390,7 +392,9 @@ local function config_view(display) PushButton{parent=net_c_3,x=1,y=14,text="\x1b Back",callback=function()net_pane.set_value(2)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg} PushButton{parent=net_c_3,x=44,y=14,text="Next \x1a",callback=submit_auth,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg} - -- LOG CONFIG + --#endregion + + --#region Logging local log_c_1 = Div{parent=log_cfg,x=2,y=4,width=49} @@ -430,7 +434,9 @@ local function config_view(display) PushButton{parent=log_c_1,x=1,y=14,text="\x1b Back",callback=back_from_log,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg} PushButton{parent=log_c_1,x=44,y=14,text="Next \x1a",callback=submit_log,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg} - -- SUMMARY OF CHANGES + --#endregion + + --#region Summary and Saving local sum_c_1 = Div{parent=summary,x=2,y=4,width=49} local sum_c_2 = Div{parent=summary,x=2,y=4,width=49} @@ -463,7 +469,7 @@ local function config_view(display) local function save_and_continue() for k, v in pairs(tmp_cfg) do settings.set(k, v) end - if settings.save("reactor-plc.settings") then + if settings.save("/reactor-plc.settings") then load_settings(settings_cfg, true) load_settings(ini_cfg) @@ -525,7 +531,9 @@ local function config_view(display) PushButton{parent=sum_c_4,x=1,y=14,min_width=6,text="Home",callback=go_home,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg} PushButton{parent=sum_c_4,x=44,y=14,min_width=6,text="Exit",callback=exit,fg_bg=cpair(colors.black,colors.red),active_fg_bg=cpair(colors.white,colors.gray)} - -- CONFIG CHANGE LOG + --#endregion + + -- Config Change Log local cl = Div{parent=changelog,x=2,y=4,width=49} @@ -646,7 +654,7 @@ local function reset_term() end -- run the reactor PLC configurator ----@param ask_config? boolean indicate if this is being called by the PLC startup app due to an invalid configuration +---@param ask_config? boolean indicate if this is being called by the startup app due to an invalid configuration function configurator.configure(ask_config) tool_ctl.ask_config = ask_config == true diff --git a/rtu/configure.lua b/rtu/configure.lua index d84cdc7..131623b 100644 --- a/rtu/configure.lua +++ b/rtu/configure.lua @@ -273,7 +273,7 @@ local function config_view(display) local main_pane = MultiPane{parent=root_pane_div,x=1,y=1,panes={main_page,spkr_cfg,net_cfg,log_cfg,summary,changelog,peri_cfg,rs_cfg}} - --#region MAIN PAGE + --#region Main Page local y_start = 2 @@ -324,7 +324,7 @@ local function config_view(display) --#endregion - --#region SPEAKER CONFIG + --#region Speakers local spkr_c = Div{parent=spkr_cfg,x=2,y=4,width=49} @@ -353,7 +353,7 @@ local function config_view(display) --#endregion - --#region NET CONFIG + --#region Network local net_c_1 = Div{parent=net_cfg,x=2,y=4,width=49} local net_c_2 = Div{parent=net_cfg,x=2,y=4,width=49} @@ -455,7 +455,7 @@ local function config_view(display) --#endregion - --#region LOG CONFIG + --#region Logging local log_c_1 = Div{parent=log_cfg,x=2,y=4,width=49} @@ -494,7 +494,7 @@ local function config_view(display) --#endregion - --#region SUMMARY OF CHANGES + --#region Summary and Saving local sum_c_1 = Div{parent=summary,x=2,y=4,width=49} local sum_c_2 = Div{parent=summary,x=2,y=4,width=49} @@ -539,7 +539,7 @@ local function config_view(display) if settings.get("Peripherals") == nil then settings.set("Peripherals", {}) end if settings.get("Redstone") == nil then settings.set("Redstone", {}) end - if settings.save("rtu.settings") then + if settings.save("/rtu.settings") then load_settings(settings_cfg, true) load_settings(ini_cfg) @@ -614,7 +614,7 @@ local function config_view(display) --#endregion - --#region CONFIG CHANGE LOG + --#region Config Change Log local cl = Div{parent=changelog,x=2,y=4,width=49} @@ -635,7 +635,7 @@ local function config_view(display) --#endregion - --#region DEVICES + --#region Peripherals local peri_c_1 = Div{parent=peri_cfg,x=2,y=4,width=49} local peri_c_2 = Div{parent=peri_cfg,x=2,y=4,width=49} @@ -659,7 +659,7 @@ local function config_view(display) local function peri_apply() settings.set("Peripherals", tmp_cfg.Peripherals) - if settings.save("rtu.settings") then + if settings.save("/rtu.settings") then load_settings(settings_cfg, true) load_settings(ini_cfg) peri_pane.set_value(5) @@ -949,7 +949,7 @@ local function config_view(display) --#endregion - --#region REDSTONE + --#region Redstone local rs_c_1 = Div{parent=rs_cfg,x=2,y=4,width=49} local rs_c_2 = Div{parent=rs_cfg,x=2,y=4,width=49} @@ -973,7 +973,7 @@ local function config_view(display) local function rs_apply() settings.set("Redstone", tmp_cfg.Redstone) - if settings.save("rtu.settings") then + if settings.save("/rtu.settings") then load_settings(settings_cfg, true) load_settings(ini_cfg) rs_pane.set_value(4) @@ -1466,7 +1466,7 @@ local function reset_term() end -- run the RTU gateway configurator ----@param ask_config? boolean indicate if this is being called by the RTU startup app due to an invalid configuration +---@param ask_config? boolean indicate if this is being called by the startup app due to an invalid configuration function configurator.configure(ask_config) tool_ctl.ask_config = ask_config == true diff --git a/supervisor/configure.lua b/supervisor/configure.lua index 357f733..34398b6 100644 --- a/supervisor/configure.lua +++ b/supervisor/configure.lua @@ -170,7 +170,7 @@ local function config_view(display) local main_pane = MultiPane{parent=root_pane_div,x=1,y=1,panes={main_page,svr_cfg,net_cfg,log_cfg,summary,changelog,import_err}} - -- MAIN PAGE + -- Main Page local y_start = 5 @@ -201,7 +201,7 @@ local function config_view(display) 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=39,y=17,min_width=12,text="Change Log",callback=function()main_pane.set_value(6)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg} - -- SUPERVISOR CONFIG + --#region Facility local svr_c_1 = Div{parent=svr_cfg,x=2,y=4,width=49} local svr_c_2 = Div{parent=svr_cfg,x=2,y=4,width=49} @@ -564,7 +564,9 @@ local function config_view(display) PushButton{parent=svr_c_6,x=1,y=14,text="\x1b Back",callback=function()svr_pane.set_value(5)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg} - -- NET CONFIG + --#endregion + + --#region Network local net_c_1 = Div{parent=net_cfg,x=2,y=4,width=49} local net_c_2 = Div{parent=net_cfg,x=2,y=4,width=49} @@ -692,7 +694,9 @@ local function config_view(display) PushButton{parent=net_c_4,x=1,y=14,text="\x1b Back",callback=function()net_pane.set_value(3)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg} PushButton{parent=net_c_4,x=44,y=14,text="Next \x1a",callback=submit_auth,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg} - -- LOG CONFIG + --#endregion + + --#region Logging local log_c_1 = Div{parent=log_cfg,x=2,y=4,width=49} @@ -728,7 +732,9 @@ local function config_view(display) PushButton{parent=log_c_1,x=1,y=14,text="\x1b Back",callback=function()main_pane.set_value(3)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg} PushButton{parent=log_c_1,x=44,y=14,text="Next \x1a",callback=submit_log,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg} - -- SUMMARY OF CHANGES + --#endregion + + --#region Summary and Saving local sum_c_1 = Div{parent=summary,x=2,y=4,width=49} local sum_c_2 = Div{parent=summary,x=2,y=4,width=49} @@ -761,7 +767,7 @@ local function config_view(display) local function save_and_continue() for k, v in pairs(tmp_cfg) do settings.set(k, v) end - if settings.save("supervisor.settings") then + if settings.save("/supervisor.settings") then load_settings(settings_cfg, true) load_settings(ini_cfg) @@ -838,7 +844,9 @@ local function config_view(display) PushButton{parent=sum_c_4,x=1,y=14,min_width=6,text="Home",callback=go_home,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg} PushButton{parent=sum_c_4,x=44,y=14,min_width=6,text="Exit",callback=exit,fg_bg=cpair(colors.black,colors.red),active_fg_bg=cpair(colors.white,colors.gray)} - -- CONFIG CHANGE LOG + --#endregion + + -- Config Change Log local cl = Div{parent=changelog,x=2,y=4,width=49} @@ -857,7 +865,7 @@ local function config_view(display) PushButton{parent=cl,x=1,y=14,text="\x1b Back",callback=function()main_pane.set_value(1)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg} - -- IMPORT ERROR + -- Import Error local i_err = Div{parent=import_err,x=2,y=4,width=49} @@ -1033,7 +1041,7 @@ local function reset_term() end -- run the supervisor configurator ----@param ask_config? boolean indicate if this is being called by the supervisor startup app due to an invalid configuration +---@param ask_config? boolean indicate if this is being called by the startup app due to an invalid configuration function configurator.configure(ask_config) tool_ctl.ask_config = ask_config == true