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

#306 #362 supervisor updates for RTU config changes

Browse Source
This commit is contained in:
Mikayla Fischler
2023-11-06 10:21:42 -05:00
parent dc0408881e
commit 838f80c30c
16 changed files with 94 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
supervisor/session/rtu.lua
View File

@@ -100,7 +100,7 @@ function rtu.new_session(id, s_addr, in_queue, out_queue, timeout, advertisement
-- validate unit advertisement
local advert_validator = util.new_validator()
advert_validator.assert_type_int(unit_advert.index)
advert_validator.assert(util.is_int(unit_advert.index) or (unit_advert.index == false))
advert_validator.assert_type_int(unit_advert.reactor)
if u_type == RTU_UNIT_TYPE.REDSTONE then
@@ -108,7 +108,7 @@ function rtu.new_session(id, s_addr, in_queue, out_queue, timeout, advertisement
end
if advert_validator.valid() then
advert_validator.assert_min(unit_advert.index, 1)
if util.is_int(unit_advert.index) then advert_validator.assert_min(unit_advert.index, 1) end
advert_validator.assert_min(unit_advert.reactor, 0)
advert_validator.assert_max(unit_advert.reactor, #self.fac_units)
if not advert_validator.valid() then u_type = false end

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

@@ -43,7 +43,7 @@ function boilerv.new(session_id, unit_id, advert, out_queue)
return nil
end
local log_tag = "session.rtu(" .. session_id .. ").boilerv(" .. advert.index .. "): "
local log_tag = util.c("session.rtu(", session_id, ").boilerv(", advert.index, ")[@", unit_id, "]: ")
local self = {
session = unit_session.new(session_id, unit_id, advert, out_queue, log_tag, TXN_TAGS),

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

@@ -55,7 +55,7 @@ function dynamicv.new(session_id, unit_id, advert, out_queue)
return nil
end
local log_tag = "session.rtu(" .. session_id .. ").dynamicv(" .. advert.index .. "): "
local log_tag = util.c("session.rtu(", session_id, ").dynamicv(", advert.index, ")[@", unit_id, "]: ")
local self = {
session = unit_session.new(session_id, unit_id, advert, out_queue, log_tag, TXN_TAGS),

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

@@ -34,7 +34,7 @@ function envd.new(session_id, unit_id, advert, out_queue)
return nil
end
local log_tag = "session.rtu(" .. session_id .. ").envd(" .. advert.index .. "): "
local log_tag = util.c("session.rtu(", session_id, ").envd[@", unit_id, "]: ")
local self = {
session = unit_session.new(session_id, unit_id, advert, out_queue, log_tag, TXN_TAGS),

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

@@ -43,7 +43,7 @@ function imatrix.new(session_id, unit_id, advert, out_queue)
return nil
end
local log_tag = "session.rtu(" .. session_id .. ").imatrix(" .. advert.index .. "): "
local log_tag = util.c("session.rtu(", session_id, ").imatrix[@", unit_id, "]: ")
local self = {
session = unit_session.new(session_id, unit_id, advert, out_queue, log_tag, TXN_TAGS),

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

@@ -56,8 +56,7 @@ function redstone.new(session_id, unit_id, advert, out_queue)
return nil
end
-- for redstone, use unit ID not device index
local log_tag = "session.rtu(" .. session_id .. ").redstone(" .. unit_id .. "): "
local log_tag = util.c("session.rtu(", session_id, ").redstone[@", unit_id, "]: ")
local self = {
session = unit_session.new(session_id, unit_id, advert, out_queue, log_tag, TXN_TAGS),

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

@@ -40,7 +40,7 @@ function sna.new(session_id, unit_id, advert, out_queue)
return nil
end
local log_tag = "session.rtu(" .. session_id .. ").sna(" .. advert.index .. "): "
local log_tag = util.c("session.rtu(", session_id, ").sna[@", unit_id, "]: ")
local self = {
session = unit_session.new(session_id, unit_id, advert, out_queue, log_tag, TXN_TAGS),

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

@@ -43,7 +43,7 @@ function sps.new(session_id, unit_id, advert, out_queue)
return nil
end
local log_tag = "session.rtu(" .. session_id .. ").sps(" .. advert.index .. "): "
local log_tag = util.c("session.rtu(", session_id, ").sps[@", unit_id, "]: ")
local self = {
session = unit_session.new(session_id, unit_id, advert, out_queue, log_tag, TXN_TAGS),

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

@@ -55,7 +55,7 @@ function turbinev.new(session_id, unit_id, advert, out_queue)
return nil
end
local log_tag = "session.rtu(" .. session_id .. ").turbinev(" .. advert.index .. "): "
local log_tag = util.c("session.rtu(", session_id, ").turbinev(", advert.index, ")[@", unit_id, "]: ")
local self = {
session = unit_session.new(session_id, unit_id, advert, out_queue, log_tag, TXN_TAGS),

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

@@ -152,7 +152,7 @@ function unit_session.new(session_id, unit_id, advert, out_queue, log_tag, txn_t
function public.get_unit_id() return unit_id end
-- get the device index
---@nodiscard
function public.get_device_idx() return self.device_index end
function public.get_device_idx() return self.device_index or 0 end
-- get the reactor ID
---@nodiscard
function public.get_reactor() return self.reactor end