From 89ff502964b10e99e6c1857bcbab4306cb82efc9 Mon Sep 17 00:00:00 2001 From: Mikayla Fischler Date: Fri, 22 Apr 2022 21:44:33 -0400 Subject: [PATCH] #30 supervisor comms code updated for new comms design --- supervisor/supervisor.lua | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/supervisor/supervisor.lua b/supervisor/supervisor.lua index 86e35a2..0ce314a 100644 --- a/supervisor/supervisor.lua +++ b/supervisor/supervisor.lua @@ -29,15 +29,24 @@ function superv_comms(mode, num_reactors, modem, dev_listen, coord_listen) if not self.modem.isOpen(self.dev_listen) then self.modem.open(self.dev_listen) end + if not self.modem.isOpen(self.coord_listen) then self.modem.open(self.coord_listen) end end + -- open at construct time + _open_channels() + + -- send PLC link request responses local _send_plc_linking = function (dest, msg) - local packet = comms.scada_packet() - packet.make(self.ln_seq_num, PROTOCOLS.RPLC, msg) - self.modem.transmit(dest, self.dev_listen, packet.raw()) + local s_pkt = comms.scada_packet() + local r_pkt = comms.rplc_packet() + + r_pkt.make(0, RPLC_TYPES.LINK_REQ, msg) + s_pkt.make(self.ln_seq_num, PROTOCOLS.RPLC, r_pkt.raw_sendable()) + + self.modem.transmit(dest, self.dev_listen, s_pkt.raw_sendable()) self.ln_seq_num = self.ln_seq_num + 1 end