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

#23 device version reporting

Browse Source
This commit is contained in:
Mikayla Fischler
2022-05-19 10:21:04 -04:00
parent dd553125d6
commit 6a168c884d
7 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtu/rtu.lua
View File

@@ -161,12 +161,14 @@ rtu.init_unit = function ()
end
-- RTU Communications
---@param version string
---@param modem table
---@param local_port integer
---@param server_port integer
---@param conn_watchdog watchdog
rtu.comms = function (modem, local_port, server_port, conn_watchdog)
rtu.comms = function (version, modem, local_port, server_port, conn_watchdog)
local self = {
version = version,
seq_num = 0,
r_seq_num = nil,
txn_id = 0,
@@ -249,7 +251,7 @@ rtu.comms = function (modem, local_port, server_port, conn_watchdog)
-- send capability advertisement
---@param units table
public.send_advertisement = function (units)
local advertisement = {}
local advertisement = { self.version }
for i = 1, #units do
local unit = units[i] --@type rtu_unit_registry_entry

4
rtu/startup.lua
View File

@@ -24,7 +24,7 @@ local imatrix_rtu = require("rtu.dev.imatrix_rtu")
local turbine_rtu = require("rtu.dev.turbine_rtu")
local turbinev_rtu = require("rtu.dev.turbinev_rtu")
local RTU_VERSION = "alpha-v0.6.6"
local RTU_VERSION = "alpha-v0.6.7"
local rtu_t = types.rtu_t
@@ -264,7 +264,7 @@ smem_sys.conn_watchdog = util.new_watchdog(5)
log.debug("boot> conn watchdog started")
-- setup comms
smem_sys.rtu_comms = rtu.comms(smem_dev.modem, config.LISTEN_PORT, config.SERVER_PORT, smem_sys.conn_watchdog)
smem_sys.rtu_comms = rtu.comms(RTU_VERSION, smem_dev.modem, config.LISTEN_PORT, config.SERVER_PORT, smem_sys.conn_watchdog)
log.debug("boot> comms init")
-- init threads