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
reactor-plc/plc.lua
View File

@@ -278,15 +278,17 @@ end
-- Reactor PLC Communications
---@param id integer
---@param version string
---@param modem table
---@param local_port integer
---@param server_port integer
---@param reactor table
---@param rps rps
---@param conn_watchdog watchdog
plc.comms = function (id, modem, local_port, server_port, reactor, rps, conn_watchdog)
plc.comms = function (id, version, modem, local_port, server_port, reactor, rps, conn_watchdog)
local self = {
id = id,
version = version,
seq_num = 0,
r_seq_num = nil,
modem = modem,
@@ -499,7 +501,7 @@ plc.comms = function (id, modem, local_port, server_port, reactor, rps, conn_wat
-- attempt to establish link with supervisor
public.send_link_req = function ()
_send(RPLC_TYPES.LINK_REQ, { self.id })
_send(RPLC_TYPES.LINK_REQ, { self.id, self.version })
end
-- send live status information

5
reactor-plc/startup.lua
View File

@@ -13,7 +13,7 @@ local config = require("reactor-plc.config")
local plc = require("reactor-plc.plc")
local threads = require("reactor-plc.threads")
local R_PLC_VERSION = "alpha-v0.6.7"
local R_PLC_VERSION = "alpha-v0.6.8"
local print = util.print
local println = util.println
@@ -117,7 +117,8 @@ local init = function ()
log.debug("init> conn watchdog started")
-- start comms
smem_sys.plc_comms = plc.comms(config.REACTOR_ID, smem_dev.modem, config.LISTEN_PORT, config.SERVER_PORT, smem_dev.reactor, smem_sys.rps, smem_sys.conn_watchdog)
smem_sys.plc_comms = plc.comms(config.REACTOR_ID, R_PLC_VERSION, smem_dev.modem, config.LISTEN_PORT, config.SERVER_PORT,
smem_dev.reactor, smem_sys.rps, smem_sys.conn_watchdog)
log.debug("init> comms init")
else
println("boot> starting in offline mode");