From 8439e02586c888f59f7ee576e92a49cfc0d9be35 Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Sat, 9 Nov 2024 11:56:56 -0500 Subject: [PATCH] #535 added startup button to configurators --- coordinator/configure.lua | 15 ++++++++++++--- coordinator/startup.lua | 2 +- pocket/configure.lua | 13 +++++++++++-- pocket/startup.lua | 2 +- reactor-plc/configure.lua | 17 +++++++++++++---- reactor-plc/startup.lua | 2 +- rtu/configure.lua | 15 ++++++++++++--- rtu/startup.lua | 2 +- startup.lua | 2 +- supervisor/configure.lua | 15 ++++++++++++--- supervisor/startup.lua | 2 +- 11 files changed, 66 insertions(+), 21 deletions(-) diff --git a/coordinator/configure.lua b/coordinator/configure.lua index 3c9bfe7..453cc44 100644 --- a/coordinator/configure.lua +++ b/coordinator/configure.lua @@ -58,6 +58,7 @@ style.btn_dis_fg_bg = cpair(colors.lightGray,colors.white) local tool_ctl = { sv_cool_conf = nil, ---@type [ integer, integer ][] list of boiler & turbine counts + launch_startup = false, start_fail = 0, fail_message = "", has_config = false, @@ -236,9 +237,17 @@ local function config_view(display) main_pane.set_value(8) end + local function startup() + tool_ctl.launch_startup = true + exit() + 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} - 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=cpair(colors.lightGray,colors.white)} - PushButton{parent=main_page,x=39,y=17,min_width=12,text="Change Log",callback=function()main_pane.set_value(10)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg} + local start_btn = PushButton{parent=main_page,x=42,y=17,min_width=9,text="Startup",callback=startup,fg_bg=cpair(colors.black,colors.green),active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg} + tool_ctl.color_cfg = PushButton{parent=main_page,x=36,y=y_start,min_width=15,text="Color Options",callback=jump_color,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg,dis_fg_bg=cpair(colors.lightGray,colors.white)} + PushButton{parent=main_page,x=39,y=y_start+2,min_width=12,text="Change Log",callback=function()main_pane.set_value(10)end,fg_bg=nav_fg_bg,active_fg_bg=btn_act_fg_bg} + + if tool_ctl.start_fail ~= 0 then start_btn.disable() end if not tool_ctl.has_config then tool_ctl.view_cfg.disable() @@ -372,7 +381,7 @@ function configurator.configure(start_code, message) println("configurator error: " .. error) end - return status, error + return status, error, tool_ctl.launch_startup end return configurator diff --git a/coordinator/startup.lua b/coordinator/startup.lua index 7b08aba..b6ee0ed 100644 --- a/coordinator/startup.lua +++ b/coordinator/startup.lua @@ -19,7 +19,7 @@ local renderer = require("coordinator.renderer") local sounder = require("coordinator.sounder") local threads = require("coordinator.threads") -local COORDINATOR_VERSION = "v1.5.14" +local COORDINATOR_VERSION = "v1.5.15" local CHUNK_LOAD_DELAY_S = 30.0 diff --git a/pocket/configure.lua b/pocket/configure.lua index 69a99c7..175be03 100644 --- a/pocket/configure.lua +++ b/pocket/configure.lua @@ -50,6 +50,7 @@ style.btn_dis_fg_bg = cpair(colors.lightGray, colors.white) ---@class _pkt_cfg_tool_ctl local tool_ctl = { + launch_startup = false, ask_config = false, has_config = false, viewing_config = false, @@ -162,8 +163,16 @@ local function config_view(display) if not tool_ctl.has_config then tool_ctl.view_cfg.disable() end + local function startup() + tool_ctl.launch_startup = true + exit() + end + PushButton{parent=main_page,x=2,y=18,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=14,y=18,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} + local start_btn = PushButton{parent=main_page,x=17,y=18,min_width=9,text="Startup",callback=startup,fg_bg=cpair(colors.black,colors.green),active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg} + PushButton{parent=main_page,x=2,y=y_start+4,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} + + if tool_ctl.ask_config then start_btn.disable() end --#endregion @@ -254,7 +263,7 @@ function configurator.configure(ask_config) println("configurator error: " .. error) end - return status, error + return status, error, tool_ctl.launch_startup end return configurator diff --git a/pocket/startup.lua b/pocket/startup.lua index 36330e3..29a84e3 100644 --- a/pocket/startup.lua +++ b/pocket/startup.lua @@ -20,7 +20,7 @@ local pocket = require("pocket.pocket") local renderer = require("pocket.renderer") local threads = require("pocket.threads") -local POCKET_VERSION = "v0.12.8-alpha" +local POCKET_VERSION = "v0.12.9-alpha" local println = util.println local println_ts = util.println_ts diff --git a/reactor-plc/configure.lua b/reactor-plc/configure.lua index 828c2e6..db0d507 100644 --- a/reactor-plc/configure.lua +++ b/reactor-plc/configure.lua @@ -53,6 +53,7 @@ style.btn_dis_fg_bg = cpair(colors.lightGray, colors.white) ---@class _plc_cfg_tool_ctl local tool_ctl = { + launch_startup = false, ask_config = false, has_config = false, viewing_config = false, @@ -184,10 +185,18 @@ local function config_view(display) main_pane.set_value(5) end + local function startup() + tool_ctl.launch_startup = true + exit() + 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=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} - 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} + local start_btn = PushButton{parent=main_page,x=42,y=17,min_width=9,text="Startup",callback=startup,fg_bg=cpair(colors.black,colors.green),active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg} + PushButton{parent=main_page,x=39,y=y_start,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=36,y=y_start+2,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=y_start+4,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 tool_ctl.ask_config then start_btn.disable() end if not tool_ctl.has_config then tool_ctl.view_cfg.disable() @@ -293,7 +302,7 @@ function configurator.configure(ask_config) println("configurator error: " .. error) end - return status, error + return status, error, tool_ctl.launch_startup end return configurator diff --git a/reactor-plc/startup.lua b/reactor-plc/startup.lua index 67dc290..6a6643a 100644 --- a/reactor-plc/startup.lua +++ b/reactor-plc/startup.lua @@ -18,7 +18,7 @@ local plc = require("reactor-plc.plc") local renderer = require("reactor-plc.renderer") local threads = require("reactor-plc.threads") -local R_PLC_VERSION = "v1.8.12" +local R_PLC_VERSION = "v1.8.13" local println = util.println local println_ts = util.println_ts diff --git a/rtu/configure.lua b/rtu/configure.lua index d4453d1..e623731 100644 --- a/rtu/configure.lua +++ b/rtu/configure.lua @@ -55,6 +55,7 @@ style.btn_dis_fg_bg = cpair(colors.lightGray, colors.white) ---@class _rtu_cfg_tool_ctl local tool_ctl = { + launch_startup = false, ask_config = false, has_config = false, viewing_config = false, @@ -218,9 +219,17 @@ local function config_view(display) main_pane.set_value(5) end + local function startup() + tool_ctl.launch_startup = true + exit() + 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} - 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} + local start_btn = PushButton{parent=main_page,x=42,y=17,min_width=9,text="Startup",callback=startup,fg_bg=cpair(colors.black,colors.green),active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg} + tool_ctl.color_cfg = PushButton{parent=main_page,x=36,y=y_start,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=y_start+2,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 tool_ctl.ask_config then start_btn.disable() end if not tool_ctl.has_config then tool_ctl.view_gw_cfg.disable() @@ -346,7 +355,7 @@ function configurator.configure(ask_config) println("configurator error: " .. error) end - return status, error + return status, error, tool_ctl.launch_startup end return configurator diff --git a/rtu/startup.lua b/rtu/startup.lua index f5ec27f..3f5c3c1 100644 --- a/rtu/startup.lua +++ b/rtu/startup.lua @@ -31,7 +31,7 @@ local sna_rtu = require("rtu.dev.sna_rtu") local sps_rtu = require("rtu.dev.sps_rtu") local turbinev_rtu = require("rtu.dev.turbinev_rtu") -local RTU_VERSION = "v1.10.14" +local RTU_VERSION = "v1.10.15" local RTU_UNIT_TYPE = types.RTU_UNIT_TYPE local RTU_HW_STATE = databus.RTU_HW_STATE diff --git a/startup.lua b/startup.lua index 662d989..97122b6 100644 --- a/startup.lua +++ b/startup.lua @@ -1,4 +1,4 @@ -local BOOTLOADER_VERSION = "1.1" +local BOOTLOADER_VERSION = "1.2" print("SCADA BOOTLOADER V" .. BOOTLOADER_VERSION) print("BOOT> SCANNING FOR APPLICATIONS...") diff --git a/supervisor/configure.lua b/supervisor/configure.lua index aaab65e..0b1b558 100644 --- a/supervisor/configure.lua +++ b/supervisor/configure.lua @@ -51,6 +51,7 @@ style.btn_dis_fg_bg = cpair(colors.lightGray, colors.white) ---@class _svr_cfg_tool_ctl local tool_ctl = { + launch_startup = false, ask_config = false, has_config = false, viewing_config = false, @@ -201,9 +202,17 @@ local function config_view(display) main_pane.set_value(5) end + local function startup() + tool_ctl.launch_startup = true + exit() + 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} - 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} + local start_btn = PushButton{parent=main_page,x=42,y=17,min_width=9,text="Startup",callback=startup,fg_bg=cpair(colors.black,colors.green),active_fg_bg=btn_act_fg_bg,dis_fg_bg=btn_dis_fg_bg} + tool_ctl.color_cfg = PushButton{parent=main_page,x=36,y=y_start,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=y_start+2,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 tool_ctl.ask_config then start_btn.disable() end if not tool_ctl.has_config then tool_ctl.view_cfg.disable() @@ -308,7 +317,7 @@ function configurator.configure(ask_config) println("configurator error: " .. error) end - return status, error + return status, error, tool_ctl.launch_startup end return configurator diff --git a/supervisor/startup.lua b/supervisor/startup.lua index 1fd33c7..4d31d6a 100644 --- a/supervisor/startup.lua +++ b/supervisor/startup.lua @@ -22,7 +22,7 @@ local supervisor = require("supervisor.supervisor") local svsessions = require("supervisor.session.svsessions") -local SUPERVISOR_VERSION = "v1.5.14" +local SUPERVISOR_VERSION = "v1.5.15" local println = util.println local println_ts = util.println_ts