GitHub/cc-scada
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

work on pocket, bumped comms version for PR

Browse Source
This commit is contained in:
Mikayla Fischler
2024-04-14 15:28:38 -04:00
parent 9fe34648c2
commit 0ca002316f
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pocket/pocket.lua
View File

@@ -349,8 +349,8 @@ function pocket.comms(version, nic, sv_watchdog, api_watchdog)
-- get configuration -- get configuration
local conf = { num_units = fac_config[1], cooling = fac_config[2] } local conf = { num_units = fac_config[1], cooling = fac_config[2] }
---@todo ---@todo unit options
iocontrol.init_fac(conf, public, 0) iocontrol.init_fac(conf, public, 1)
log.info("coordinator connection established") log.info("coordinator connection established")
self.establish_delay_counter = 0 self.establish_delay_counter = 0

2
pocket/ui/main.lua
View File

@@ -72,7 +72,7 @@ local function init(main)
local page_div = Div{parent=main_pane,x=4,y=1} local page_div = Div{parent=main_pane,x=4,y=1}
local sidebar_tabs = { local sidebar_tabs = {
{ char = "#", color = cpair(colors.black,colors.green) } { char = "#", color = cpair(colors.black, colors.green) }
} }
home_page(page_div) home_page(page_div)

4
pocket/ui/pages/unit_page.lua
View File

@@ -21,7 +21,9 @@ local function new_view(root)
local app = db.nav.register_app(iocontrol.APP_ID.UNITS, main) local app = db.nav.register_app(iocontrol.APP_ID.UNITS, main)
app.new_page(nil, function () end) 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 return main
end end

2
scada-common/comms.lua
View File

@@ -17,7 +17,7 @@ local max_distance = nil
local comms = {} local comms = {}
-- protocol/data versions (protocol/data independent changes tracked by util.lua version) -- 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" comms.api_version = "0.0.1"
---@enum PROTOCOL ---@enum PROTOCOL