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

Merge branch 'devel' into 193-pocket-main-application

Browse Source
This commit is contained in:
Mikayla Fischler
2023-04-19 20:37:19 -04:00
parent 7929318096 2371a75130
commit c49ad63d6a
16 changed files with 77 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
supervisor/session/plc.lua
View File

@@ -273,7 +273,7 @@ function plc.new_session(id, reactor_id, in_queue, out_queue, timeout)
if pkt.length == 1 then
return pkt.data[1]
else
log.warning(log_header .. "RPLC ACK length mismatch")
log.debug(log_header .. "RPLC ACK length mismatch")
return nil
end
end
@@ -296,7 +296,7 @@ function plc.new_session(id, reactor_id, in_queue, out_queue, timeout)
---@cast pkt rplc_frame
-- check reactor ID
if pkt.id ~= reactor_id then
log.warning(log_header .. "RPLC packet with ID not matching reactor ID: reactor " .. reactor_id .. " != " .. pkt.id)
log.warning(log_header .. "discarding RPLC packet with ID not matching reactor ID: reactor " .. reactor_id .. " != " .. pkt.id)
return
end
@@ -635,7 +635,7 @@ function plc.new_session(id, reactor_id, in_queue, out_queue, timeout)
_send(RPLC_TYPE.RPS_AUTO_RESET, {})
end
else
log.warning(log_header .. "unsupported command received in in_queue (this is a bug)")
log.error(log_header .. "unsupported command received in in_queue (this is a bug)", true)
end
elseif message.qtype == mqueue.TYPE.DATA then
-- instruction with body
@@ -682,7 +682,7 @@ function plc.new_session(id, reactor_id, in_queue, out_queue, timeout)
end
end
else
log.warning(log_header .. "unsupported data command received in in_queue (this is a bug)")
log.error(log_header .. "unsupported data command received in in_queue (this is a bug)", true)
end
end
end