From 0ca002316fa17ad647c65668070a21ea03028934 Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Sun, 14 Apr 2024 15:28:38 -0400 Subject: [PATCH] work on pocket, bumped comms version for PR --- pocket/pocket.lua | 4 ++-- pocket/ui/main.lua | 2 +- pocket/ui/pages/unit_page.lua | 4 +++- scada-common/comms.lua | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pocket/pocket.lua b/pocket/pocket.lua index 0d3b8da..711f409 100644 --- a/pocket/pocket.lua +++ b/pocket/pocket.lua @@ -349,8 +349,8 @@ function pocket.comms(version, nic, sv_watchdog, api_watchdog) -- get configuration local conf = { num_units = fac_config[1], cooling = fac_config[2] } - ---@todo - iocontrol.init_fac(conf, public, 0) + ---@todo unit options + iocontrol.init_fac(conf, public, 1) log.info("coordinator connection established") self.establish_delay_counter = 0 diff --git a/pocket/ui/main.lua b/pocket/ui/main.lua index 6bd2479..02e33fd 100644 --- a/pocket/ui/main.lua +++ b/pocket/ui/main.lua @@ -72,7 +72,7 @@ local function init(main) local page_div = Div{parent=main_pane,x=4,y=1} local sidebar_tabs = { - { char = "#", color = cpair(colors.black,colors.green) } + { char = "#", color = cpair(colors.black, colors.green) } } home_page(page_div) diff --git a/pocket/ui/pages/unit_page.lua b/pocket/ui/pages/unit_page.lua index fc22e4e..273ad27 100644 --- a/pocket/ui/pages/unit_page.lua +++ b/pocket/ui/pages/unit_page.lua @@ -21,7 +21,9 @@ local function new_view(root) local app = db.nav.register_app(iocontrol.APP_ID.UNITS, main) app.new_page(nil, function () end) - TextBox{parent=main,text="UNITS",x=1,y=1,height=1,alignment=ALIGN.CENTER} + TextBox{parent=main,y=2,text="UNITS",height=1,alignment=ALIGN.CENTER} + + TextBox{parent=main,y=4,text="work in progress",height=1,alignment=ALIGN.CENTER} return main end diff --git a/scada-common/comms.lua b/scada-common/comms.lua index 9e2148b..fffaaee 100644 --- a/scada-common/comms.lua +++ b/scada-common/comms.lua @@ -17,7 +17,7 @@ local max_distance = nil local comms = {} -- protocol/data versions (protocol/data independent changes tracked by util.lua version) -comms.version = "2.4.5" +comms.version = "2.5.0" comms.api_version = "0.0.1" ---@enum PROTOCOL