From f1b1f0b75afeb1ba0f02118aa8935b88aeea3bc1 Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Wed, 7 Jun 2023 14:18:13 -0400 Subject: [PATCH] updated supervisor front panel default computer ID place holders and fixed PDG establish using channel in messages --- supervisor/panel/components/pdg_entry.lua | 2 +- supervisor/panel/components/rtu_entry.lua | 2 +- supervisor/startup.lua | 2 +- supervisor/supervisor.lua | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/supervisor/panel/components/pdg_entry.lua b/supervisor/panel/components/pdg_entry.lua index 2c85d59..1e49fca 100644 --- a/supervisor/panel/components/pdg_entry.lua +++ b/supervisor/panel/components/pdg_entry.lua @@ -26,7 +26,7 @@ local function init(parent, id) local ps_prefix = "pdg_" .. id .. "_" TextBox{parent=entry,x=1,y=1,text="",width=8,height=1,fg_bg=cpair(colors.black,colors.lightGray)} - local pdg_addr = TextBox{parent=entry,x=1,y=2,text="C #?",alignment=TEXT_ALIGN.CENTER,width=8,height=1,fg_bg=cpair(colors.black,colors.lightGray),nav_active=cpair(colors.gray,colors.black)} + local pdg_addr = TextBox{parent=entry,x=1,y=2,text="@ C ??",alignment=TEXT_ALIGN.CENTER,width=8,height=1,fg_bg=cpair(colors.black,colors.lightGray),nav_active=cpair(colors.gray,colors.black)} TextBox{parent=entry,x=1,y=3,text="",width=8,height=1,fg_bg=cpair(colors.black,colors.lightGray)} pdg_addr.register(databus.ps, ps_prefix .. "addr", pdg_addr.set_value) diff --git a/supervisor/panel/components/rtu_entry.lua b/supervisor/panel/components/rtu_entry.lua index 94900ab..d9634e9 100644 --- a/supervisor/panel/components/rtu_entry.lua +++ b/supervisor/panel/components/rtu_entry.lua @@ -26,7 +26,7 @@ local function init(parent, id) local ps_prefix = "rtu_" .. id .. "_" TextBox{parent=entry,x=1,y=1,text="",width=8,height=1,fg_bg=cpair(colors.black,colors.lightGray)} - local rtu_addr = TextBox{parent=entry,x=1,y=2,text="C #?",alignment=TEXT_ALIGN.CENTER,width=8,height=1,fg_bg=cpair(colors.black,colors.lightGray),nav_active=cpair(colors.gray,colors.black)} + local rtu_addr = TextBox{parent=entry,x=1,y=2,text="@ C ??",alignment=TEXT_ALIGN.CENTER,width=8,height=1,fg_bg=cpair(colors.black,colors.lightGray),nav_active=cpair(colors.gray,colors.black)} TextBox{parent=entry,x=1,y=3,text="",width=8,height=1,fg_bg=cpair(colors.black,colors.lightGray)} rtu_addr.register(databus.ps, ps_prefix .. "addr", rtu_addr.set_value) diff --git a/supervisor/startup.lua b/supervisor/startup.lua index 2919f0f..687ede1 100644 --- a/supervisor/startup.lua +++ b/supervisor/startup.lua @@ -20,7 +20,7 @@ local supervisor = require("supervisor.supervisor") local svsessions = require("supervisor.session.svsessions") -local SUPERVISOR_VERSION = "v0.17.4" +local SUPERVISOR_VERSION = "v0.17.5" local println = util.println local println_ts = util.println_ts diff --git a/supervisor/supervisor.lua b/supervisor/supervisor.lua index e51fdd6..cfc52d8 100644 --- a/supervisor/supervisor.lua +++ b/supervisor/supervisor.lua @@ -382,8 +382,8 @@ function supervisor.comms(_version, modem, fp_ok) -- this is an attempt to establish a new pocket diagnostic session local s_id = svsessions.establish_pdg_session(src_addr, firmware_v) - println(util.c("PKT (", firmware_v, ") [:", r_chan, "] \xbb connected")) - log.info(util.c("PDG_ESTABLISH: pocket (", firmware_v, ") [:", r_chan, "] connected with session ID ", s_id)) + println(util.c("PKT (", firmware_v, ") [@", src_addr, "] \xbb connected")) + log.info(util.c("PDG_ESTABLISH: pocket (", firmware_v, ") [@", src_addr, "] connected with session ID ", s_id)) _send_establish(packet.scada_frame, ESTABLISH_ACK.ALLOW) else