From 22a615952032ed2ebca8ad2a26df0281f5ce4542 Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Tue, 10 May 2022 17:17:55 -0400 Subject: [PATCH] updated globals list, fixed packet references that were linking to old controller mistakenly --- .vscode/settings.json | 3 ++- rtu/threads.lua | 2 +- supervisor/session/rtu.lua | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 75bb696..77e08ef 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,6 +6,7 @@ "rs", "bit", "parallel", - "colors" + "colors", + "textutils" ] } \ No newline at end of file diff --git a/rtu/threads.lua b/rtu/threads.lua index 5799efb..213781e 100644 --- a/rtu/threads.lua +++ b/rtu/threads.lua @@ -234,7 +234,7 @@ threads.thread__unit_comms = function (smem, unit) elseif msg.qtype == mqueue.TYPE.PACKET then -- received a packet unit.modbus_busy = true - local return_code, reply = unit.modbus_io.handle_packet(packet) + local return_code, reply = unit.modbus_io.handle_packet(msg.message) rtu_comms.send_modbus(reply) unit.modbus_busy = false end diff --git a/supervisor/session/rtu.lua b/supervisor/session/rtu.lua index fb60904..a360be9 100644 --- a/supervisor/session/rtu.lua +++ b/supervisor/session/rtu.lua @@ -99,8 +99,8 @@ rtu.new_session = function (id, in_queue, out_queue) self.connected = false elseif pkt.type == SCADA_MGMT_TYPES.RTU_ADVERT then -- RTU unit advertisement - for i = 1, packet.length do - local unit = packet.data[i] + for i = 1, pkt.length do + local unit = pkt.data[i] end else log.debug(log_header .. "handler received unsupported SCADA_MGMT packet type " .. pkt.type)