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

#401 working RTU and PKT computer lists

Browse Source
This commit is contained in:
Mikayla Fischler 2025-08-13 11:32:49 -03:00
parent a678b8dbe0
commit 415cb71294
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pocket/iorx.lua
View File

@ -947,6 +947,9 @@ function iorx.record_network_data(data)
ps.publish("comp_disconnect", false) ps.publish("comp_disconnect", false)
end end
-- clear the tracked connected computer record
function iorx.clear_comp_record() comp_record = {} end
return function (io_obj) return function (io_obj)
io = io_obj io = io_obj
return iorx return iorx

35
pocket/ui/apps/comps.lua
View File

@ -90,7 +90,7 @@ local function new_view(root)
local function create_common_indicators(pfx, rect) local function create_common_indicators(pfx, rect)
local first = TextBox{parent=rect,text="Computer",fg_bg=box_label} local first = TextBox{parent=rect,text="Computer",fg_bg=box_label}
TextBox{parent=rect,text="Firmware",fg_bg=box_label} TextBox{parent=rect,text="Firmware",fg_bg=box_label}
TextBox{parent=rect,text="RTT",fg_bg=box_label} TextBox{parent=rect,text="RTT (ms)",fg_bg=box_label}
local y = first.get_y() local y = first.get_y()
local addr = TextBox{parent=rect,x=10,y=y,text="---"} local addr = TextBox{parent=rect,x=10,y=y,text="---"}
@ -171,35 +171,35 @@ local function new_view(root)
TextBox{parent=p_div,y=1,text="PLC Devices",alignment=ALIGN.CENTER} TextBox{parent=p_div,y=1,text="PLC Devices",alignment=ALIGN.CENTER}
local plc_list = ListBox{parent=p_div,y=6,scroll_height=100,nav_fg_bg=cpair(colors.lightGray,colors.gray),nav_active=cpair(colors.white,colors.gray)} local plc_list = ListBox{parent=p_div,y=3,scroll_height=100,nav_fg_bg=cpair(colors.lightGray,colors.gray),nav_active=cpair(colors.white,colors.gray)}
local plc_elems = {} ---@type graphics_element[] local plc_elems = {} ---@type graphics_element[]
--#endregion --#endregion
--#region RTU page --#region RTU page
local r_div = Div{parent=panes[2],width=main.get_width()} local r_div = Div{parent=panes[3],width=main.get_width()}
local rtu_page = app.new_page(nil, 3) local rtu_page = app.new_page(nil, 3)
rtu_page.tasks = { update } rtu_page.tasks = { update }
TextBox{parent=r_div,y=1,text="RTU Gateway Devices",alignment=ALIGN.CENTER} TextBox{parent=r_div,y=1,text="RTU Gateway Devices",alignment=ALIGN.CENTER}
local rtu_list = ListBox{parent=p_div,y=6,scroll_height=100,nav_fg_bg=cpair(colors.lightGray,colors.gray),nav_active=cpair(colors.white,colors.gray)} local rtu_list = ListBox{parent=r_div,y=3,scroll_height=100,nav_fg_bg=cpair(colors.lightGray,colors.gray),nav_active=cpair(colors.white,colors.gray)}
local rtu_elems = {} ---@type graphics_element[] local rtu_elems = {} ---@type graphics_element[]
--#endregion --#endregion
--#region RTU page --#region RTU page
local pk_div = Div{parent=panes[2],width=main.get_width()} local pk_div = Div{parent=panes[4],width=main.get_width()}
local pkt_page = app.new_page(nil, 4) local pkt_page = app.new_page(nil, 4)
pkt_page.tasks = { update } pkt_page.tasks = { update }
TextBox{parent=pk_div,y=1,text="Pocket Devices",alignment=ALIGN.CENTER} TextBox{parent=pk_div,y=1,text="Pocket Devices",alignment=ALIGN.CENTER}
local pkt_list = ListBox{parent=p_div,y=6,scroll_height=100,nav_fg_bg=cpair(colors.lightGray,colors.gray),nav_active=cpair(colors.white,colors.gray)} local pkt_list = ListBox{parent=pk_div,y=3,scroll_height=100,nav_fg_bg=cpair(colors.lightGray,colors.gray),nav_active=cpair(colors.white,colors.gray)}
local pkt_elems = {} ---@type graphics_element[] local pkt_elems = {} ---@type graphics_element[]
--#endregion --#endregion
@ -213,25 +213,25 @@ local function new_view(root)
local type = ps.get(pfx .. "_type") local type = ps.get(pfx .. "_type")
if type == DEV_TYPE.PLC then if type == DEV_TYPE.PLC then
plc_elems[id] = Div{parent=plc_list,height=5} plc_elems[id] = Div{parent=plc_list,height=8}
local rect = Rectangle{parent=plc_elems[id],height=6,x=2,width=20,border=border(1,colors.gray,true),thin=true,fg_bg=cpair(colors.black,colors.lightGray)} local rect = Rectangle{parent=plc_elems[id],height=6,x=2,width=20,border=border(1,colors.white,true),thin=true,fg_bg=cpair(colors.white,colors.gray)}
local title = TextBox{parent=rect,text="PLC (Unit ?) @ "..id} local title = TextBox{parent=rect,text="PLC (Unit ?)"}
title.register(ps, pfx .. "_unit", function (unit) title.set_value("PLC (Unit " .. unit .. ") @ " .. id) end) title.register(ps, pfx .. "_unit", function (unit) title.set_value("PLC (Unit " .. unit .. ") @ " .. id) end)
create_common_indicators(pfx, rect) create_common_indicators(pfx, rect)
elseif type == DEV_TYPE.RTU then elseif type == DEV_TYPE.RTU then
rtu_elems[id] = Div{parent=rtu_list,height=5} rtu_elems[id] = Div{parent=rtu_list,height=8}
local rect = Rectangle{parent=rtu_elems[id],height=6,x=2,width=20,border=border(1,colors.gray,true),thin=true,fg_bg=cpair(colors.black,colors.lightGray)} local rect = Rectangle{parent=rtu_elems[id],height=6,x=2,width=20,border=border(1,colors.white,true),thin=true,fg_bg=cpair(colors.white,colors.gray)}
TextBox{parent=rect,text="RTU Gateway @ "..id} TextBox{parent=rect,text="RTU Gateway"}
create_common_indicators(pfx, rect) create_common_indicators(pfx, rect)
elseif type == DEV_TYPE.PKT then elseif type == DEV_TYPE.PKT then
pkt_elems[id] = Div{parent=pkt_list,height=5} pkt_elems[id] = Div{parent=pkt_list,height=8}
local rect = Rectangle{parent=pkt_elems[id],height=6,x=2,width=20,border=border(1,colors.gray,true),thin=true,fg_bg=cpair(colors.black,colors.lightGray)} local rect = Rectangle{parent=pkt_elems[id],height=6,x=2,width=20,border=border(1,colors.white,true),thin=true,fg_bg=cpair(colors.white,colors.gray)}
TextBox{parent=rect,text="Pocket @ "..id} TextBox{parent=rect,text="Pocket Computer"}
create_common_indicators(pfx, rect) create_common_indicators(pfx, rect)
end end
@ -267,7 +267,7 @@ local function new_view(root)
{ label = " @ ", color = core.cpair(colors.black, colors.blue), callback = main_page.nav_to }, { label = " @ ", color = core.cpair(colors.black, colors.blue), callback = main_page.nav_to },
{ label = "PLC", color = core.cpair(colors.black, colors.red), callback = plc_page.nav_to }, { label = "PLC", color = core.cpair(colors.black, colors.red), callback = plc_page.nav_to },
{ label = "RTU", color = core.cpair(colors.black, colors.orange), callback = rtu_page.nav_to }, { label = "RTU", color = core.cpair(colors.black, colors.orange), callback = rtu_page.nav_to },
{ label = "PKT", color = core.cpair(colors.black, colors.gray), callback = pkt_page.nav_to } { label = "PKT", color = core.cpair(colors.black, colors.lightGray), callback = pkt_page.nav_to }
} }
app.set_sidebar(list) app.set_sidebar(list)
@ -289,6 +289,9 @@ local function new_view(root)
-- show loading screen -- show loading screen
load_pane.set_value(1) load_pane.set_value(1)
-- clear the list of connected computers so that connections re-appear on reload of this app
iocontrol.rx.clear_comp_record()
end end
app.set_load(load) app.set_load(load)

4
supervisor/session/pocket.lua
View File

@ -206,13 +206,13 @@ function pocket.new_session(id, s_addr, i_seq_num, in_queue, out_queue, timeout,
-- add connected RTUs -- add connected RTUs
for i = 1, #sessions.rtu do for i = 1, #sessions.rtu do
local s = sessions.rtu[i] local s = sessions.rtu[i]
table.insert(devices, { DEV_TYPE.RTU, s.s_addr, s.version, get(s.instance.get_id() .. "_rtt") }) table.insert(devices, { DEV_TYPE.RTU, s.s_addr, s.version, get("rtu_" .. s.instance.get_id() .. "_rtt") })
end end
-- add connected pocket computers -- add connected pocket computers
for i = 1, #sessions.pdg do for i = 1, #sessions.pdg do
local s = sessions.pdg[i] local s = sessions.pdg[i]
table.insert(devices, { DEV_TYPE.PKT, s.s_addr, s.version, get(s.instance.get_id() .. "_rtt") }) table.insert(devices, { DEV_TYPE.PKT, s.s_addr, s.version, get("pdg_" .. s.instance.get_id() .. "_rtt") })
end end
_send_mgmt(MGMT_TYPE.INFO_LIST_CMP, devices) _send_mgmt(MGMT_TYPE.INFO_LIST_CMP, devices)