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

#123 RTU startup without devices, fixed repeat RTU advert handling, added PPM virtual devices, fixed log out of space detection, updated RTU type conversion functions in comms

Browse Source
This commit is contained in:
Mikayla Fischler
2022-11-12 01:35:31 -05:00
parent f940c136bf
commit 1a01bec7e4
18 changed files with 205 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
supervisor/session/rtu/boilerv.lua
View File

@@ -46,7 +46,7 @@ function boilerv.new(session_id, unit_id, advert, out_queue)
local log_tag = "session.rtu(" .. session_id .. ").boilerv(" .. advert.index .. "): "
local self = {
session = unit_session.new(unit_id, advert, out_queue, log_tag, TXN_TAGS),
session = unit_session.new(session_id, unit_id, advert, out_queue, log_tag, TXN_TAGS),
has_build = false,
periodics = {
next_formed_req = 0,

2
supervisor/session/rtu/envd.lua
View File

@@ -37,7 +37,7 @@ function envd.new(session_id, unit_id, advert, out_queue)
local log_tag = "session.rtu(" .. session_id .. ").envd(" .. advert.index .. "): "
local self = {
session = unit_session.new(unit_id, advert, out_queue, log_tag, TXN_TAGS),
session = unit_session.new(session_id, unit_id, advert, out_queue, log_tag, TXN_TAGS),
periodics = {
next_rad_req = 0
},

2
supervisor/session/rtu/imatrix.lua
View File

@@ -46,7 +46,7 @@ function imatrix.new(session_id, unit_id, advert, out_queue)
local log_tag = "session.rtu(" .. session_id .. ").imatrix(" .. advert.index .. "): "
local self = {
session = unit_session.new(unit_id, advert, out_queue, log_tag, TXN_TAGS),
session = unit_session.new(session_id, unit_id, advert, out_queue, log_tag, TXN_TAGS),
has_build = false,
periodics = {
next_formed_req = 0,

2
supervisor/session/rtu/redstone.lua
View File

@@ -61,7 +61,7 @@ function redstone.new(session_id, unit_id, advert, out_queue)
local log_tag = "session.rtu(" .. session_id .. ").redstone(" .. unit_id .. "): "
local self = {
session = unit_session.new(unit_id, advert, out_queue, log_tag, TXN_TAGS),
session = unit_session.new(session_id, unit_id, advert, out_queue, log_tag, TXN_TAGS),
in_q = mqueue.new(),
has_di = false,
has_ai = false,

2
supervisor/session/rtu/sna.lua
View File

@@ -43,7 +43,7 @@ function sna.new(session_id, unit_id, advert, out_queue)
local log_tag = "session.rtu(" .. session_id .. ").sna(" .. advert.index .. "): "
local self = {
session = unit_session.new(unit_id, advert, out_queue, log_tag, TXN_TAGS),
session = unit_session.new(session_id, unit_id, advert, out_queue, log_tag, TXN_TAGS),
has_build = false,
periodics = {
next_build_req = 0,

2
supervisor/session/rtu/sps.lua
View File

@@ -46,7 +46,7 @@ function sps.new(session_id, unit_id, advert, out_queue)
local log_tag = "session.rtu(" .. session_id .. ").sps(" .. advert.index .. "): "
local self = {
session = unit_session.new(unit_id, advert, out_queue, log_tag, TXN_TAGS),
session = unit_session.new(session_id, unit_id, advert, out_queue, log_tag, TXN_TAGS),
has_build = false,
periodics = {
next_formed_req = 0,

2
supervisor/session/rtu/turbinev.lua
View File

@@ -66,7 +66,7 @@ function turbinev.new(session_id, unit_id, advert, out_queue)
local log_tag = "session.rtu(" .. session_id .. ").turbinev(" .. advert.index .. "): "
local self = {
session = unit_session.new(unit_id, advert, out_queue, log_tag, TXN_TAGS),
session = unit_session.new(session_id, unit_id, advert, out_queue, log_tag, TXN_TAGS),
in_q = mqueue.new(),
has_build = false,
periodics = {

5
supervisor/session/rtu/unit_session.lua
View File

@@ -22,12 +22,13 @@ unit_session.RTU_US_CMDS = RTU_US_CMDS
unit_session.RTU_US_DATA = RTU_US_DATA
-- create a new unit session runner
---@param session_id integer RTU session ID
---@param unit_id integer MODBUS unit ID
---@param advert rtu_advertisement RTU advertisement for this unit
---@param out_queue mqueue send queue
---@param log_tag string logging tag
---@param txn_tags table transaction log tags
function unit_session.new(unit_id, advert, out_queue, log_tag, txn_tags)
function unit_session.new(session_id, unit_id, advert, out_queue, log_tag, txn_tags)
local self = {
log_tag = log_tag,
txn_tags = txn_tags,
@@ -132,6 +133,8 @@ function unit_session.new(unit_id, advert, out_queue, log_tag, txn_tags)
-- PUBLIC FUNCTIONS --
-- get the unit ID
function public.get_session_id() return session_id end
-- get the unit ID
function public.get_unit_id() return self.unit_id end
-- get the device index