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

#8 handle redstone RTU MODBUS replies, bugfixes

Browse Source
This commit is contained in:
Mikayla Fischler 2022-05-14 20:42:28 -04:00
parent 94931ef5a2
commit 374bfb7a19
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,20 +125,26 @@ redstone.new = function (session_id, advert, out_queue)
if m_pkt.unit_id == self.uid then if m_pkt.unit_id == self.uid then
local txn_type = self.transaction_controller.resolve(m_pkt.txn_id) local txn_type = self.transaction_controller.resolve(m_pkt.txn_id)
if txn_type == TXN_TYPES.DI_READ then if txn_type == TXN_TYPES.DI_READ then
-- build response -- discrete input read response
if m_pkt.length == 1 then if m_pkt.length == #self.io_list.digital_in then
self.db.build.max_energy = m_pkt.data[1] for i = 1, m_pkt.length do
local channel = self.io_list.digital_in[i]
local value = m_pkt.data[i]
self.db[channel] = value
end
else else
log.debug(log_tag .. "MODBUS transaction reply length mismatch (emachine.build)") log.debug(log_tag .. "MODBUS transaction reply length mismatch (redstone.discrete_input_read)")
end end
elseif txn_type == TXN_TYPES.INPUT_REG_READ then elseif txn_type == TXN_TYPES.INPUT_REG_READ then
-- storage response -- input register read response
if m_pkt.length == 3 then if m_pkt.length == #self.io_list.analog_in then
self.db.storage.energy = m_pkt.data[1] for i = 1, m_pkt.length do
self.db.storage.energy_need = m_pkt.data[2] local channel = self.io_list.analog_in[i]
self.db.storage.energy_fill = m_pkt.data[3] local value = m_pkt.data[i]
self.db[channel] = value
end
else else
log.debug(log_tag .. "MODBUS transaction reply length mismatch (emachine.storage)") log.debug(log_tag .. "MODBUS transaction reply length mismatch (redstone.input_reg_read)")
end end
elseif txn_type == nil then elseif txn_type == nil then
log.error(log_tag .. "unknown transaction reply") log.error(log_tag .. "unknown transaction reply")
@ -165,14 +171,14 @@ redstone.new = function (session_id, advert, out_queue)
if self.has_di then if self.has_di then
if self.periodics.next_di_req <= time_now then if self.periodics.next_di_req <= time_now then
_request_discrete_inputs() _request_discrete_inputs()
self.periodics.next_di_req = time_now + PERIODICS.BUILD self.periodics.next_di_req = time_now + PERIODICS.INPUT_READ
end end
end end
if self.has_ai then if self.has_ai then
if self.periodics.next_ir_req <= time_now then if self.periodics.next_ir_req <= time_now then
_request_input_registers() _request_input_registers()
self.periodics.next_ir_req = time_now + PERIODICS.STORAGE self.periodics.next_ir_req = time_now + PERIODICS.INPUT_READ
end end
end end
end end