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

#9 MODBUS test code; fixed rtu, modbus, redstone_rtu, and rsio bugs

Browse Source
This commit is contained in:
Mikayla Fischler
2022-05-27 18:10:06 -04:00
parent 51111f707f
commit 6df0a1d149
8 changed files with 385 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtu/dev/redstone_rtu.lua
View File

@@ -4,6 +4,7 @@ local rsio = require("scada-common.rsio")
local redstone_rtu = {}
local digital_read = rsio.digital_read
local digital_write = rsio.digital_write
local digital_is_active = rsio.digital_is_active
-- create new redstone device
@@ -61,12 +62,11 @@ redstone_rtu.new = function ()
f_write = function (level)
local output = rs.getBundledOutput(side)
local active = digital_is_active(channel, level)
if active then
colors.combine(output, color)
if digital_write(channel, level) then
output = colors.combine(output, color)
else
colors.subtract(output, color)
output = colors.subtract(output, color)
end
rs.setBundledOutput(side, output)

35
rtu/modbus.lua
View File

@@ -28,7 +28,7 @@ modbus.new = function (rtu_dev, use_parallel_read)
local readings = {}
local access_fault = false
local _, coils, _, _ = self.rtu.io_count()
local return_ok = ((c_addr_start + count) <= coils) and (count > 0)
local return_ok = ((c_addr_start + count) <= (coils + 1)) and (count > 0)
if return_ok then
for i = 1, count do
@@ -74,7 +74,7 @@ modbus.new = function (rtu_dev, use_parallel_read)
local readings = {}
local access_fault = false
local discrete_inputs, _, _, _ = self.rtu.io_count()
local return_ok = ((di_addr_start + count) <= discrete_inputs) and (count > 0)
local return_ok = ((di_addr_start + count) <= (discrete_inputs + 1)) and (count > 0)
if return_ok then
for i = 1, count do
@@ -120,7 +120,7 @@ modbus.new = function (rtu_dev, use_parallel_read)
local readings = {}
local access_fault = false
local _, _, _, hold_regs = self.rtu.io_count()
local return_ok = ((hr_addr_start + count) <= hold_regs) and (count > 0)
local return_ok = ((hr_addr_start + count) <= (hold_regs + 1)) and (count > 0)
if return_ok then
for i = 1, count do
@@ -166,7 +166,7 @@ modbus.new = function (rtu_dev, use_parallel_read)
local readings = {}
local access_fault = false
local _, _, input_regs, _ = self.rtu.io_count()
local return_ok = ((ir_addr_start + count) <= input_regs) and (count > 0)
local return_ok = ((ir_addr_start + count) <= (input_regs + 1)) and (count > 0)
if return_ok then
for i = 1, count do
@@ -255,7 +255,7 @@ modbus.new = function (rtu_dev, use_parallel_read)
local response = nil
local _, coils, _, _ = self.rtu.io_count()
local count = #values
local return_ok = ((c_addr_start + count) <= coils) and (count > 0)
local return_ok = ((c_addr_start + count) <= (coils + 1)) and (count > 0)
if return_ok then
for i = 1, count do
@@ -282,12 +282,12 @@ modbus.new = function (rtu_dev, use_parallel_read)
local response = nil
local _, _, _, hold_regs = self.rtu.io_count()
local count = #values
local return_ok = ((hr_addr_start + count) <= hold_regs) and (count > 0)
local return_ok = ((hr_addr_start + count) <= (hold_regs + 1)) and (count > 0)
if return_ok then
for i = 1, count do
local addr = hr_addr_start + i - 1
local access_fault = self.rtu.write_coil(addr, values[i])
local access_fault = self.rtu.write_holding_reg(addr, values[i])
if access_fault then
return_ok = false
@@ -309,12 +309,12 @@ modbus.new = function (rtu_dev, use_parallel_read)
local return_code = true
local response = { MODBUS_EXCODE.ACKNOWLEDGE }
if #packet.data == 2 then
if packet.length == 2 then
-- handle by function code
if packet.func_code == MODBUS_FCODE.READ_COILS then
elseif packet.func_code == MODBUS_FCODE.READ_DISCRETE_INPUTS then
elseif packet.func_code == MODBUS_FCODE.READ_MUL_HOLD_REGS then
elseif packet.func_code == MODBUS_FCODE.READ_INPUT_REGISTERS then
elseif packet.func_code == MODBUS_FCODE.READ_INPUT_REGS then
elseif packet.func_code == MODBUS_FCODE.WRITE_SINGLE_COIL then
elseif packet.func_code == MODBUS_FCODE.WRITE_SINGLE_HOLD_REG then
elseif packet.func_code == MODBUS_FCODE.WRITE_MUL_COILS then
@@ -351,7 +351,7 @@ modbus.new = function (rtu_dev, use_parallel_read)
local return_code = true
local response = nil
if #packet.data == 2 then
if packet.length == 2 then
-- handle by function code
if packet.func_code == MODBUS_FCODE.READ_COILS then
return_code, response = _1_read_coils(packet.data[1], packet.data[2])
@@ -359,7 +359,7 @@ modbus.new = function (rtu_dev, use_parallel_read)
return_code, response = _2_read_discrete_inputs(packet.data[1], packet.data[2])
elseif packet.func_code == MODBUS_FCODE.READ_MUL_HOLD_REGS then
return_code, response = _3_read_multiple_holding_registers(packet.data[1], packet.data[2])
elseif packet.func_code == MODBUS_FCODE.READ_INPUT_REGISTERS then
elseif packet.func_code == MODBUS_FCODE.READ_INPUT_REGS then
return_code, response = _4_read_input_registers(packet.data[1], packet.data[2])
elseif packet.func_code == MODBUS_FCODE.WRITE_SINGLE_COIL then
return_code, response = _5_write_single_coil(packet.data[1], packet.data[2])
@@ -384,14 +384,13 @@ modbus.new = function (rtu_dev, use_parallel_read)
if not return_code then
-- echo back with error flag
func_code = bit.bor(packet.func_code, MODBUS_FCODE.ERROR_FLAG)
end
if type(response) == "nil" then
response = { }
elseif type(response) == "number" then
response = { response }
elseif type(response) == "table" then
response = response
end
if type(response) == "table" then
elseif type(response) == "nil" then
response = {}
else
response = { response }
end
-- create reply

12
rtu/rtu.lua
View File

@@ -54,7 +54,7 @@ rtu.init_unit = function ()
---@param f function
---@return integer count count of discrete inputs
protected.connect_di = function (f)
insert(self.discrete_inputs, f)
insert(self.discrete_inputs, { read = f })
_count_io()
return #self.discrete_inputs
end
@@ -64,7 +64,7 @@ rtu.init_unit = function ()
---@return any value, boolean access_fault
public.read_di = function (di_addr)
ppm.clear_fault()
local value = self.discrete_inputs[di_addr]()
local value = self.discrete_inputs[di_addr].read()
return value, ppm.is_faulted()
end
@@ -105,7 +105,7 @@ rtu.init_unit = function ()
---@param f function
---@return integer count count of input registers
protected.connect_input_reg = function (f)
insert(self.input_regs, f)
insert(self.input_regs, { read = f })
_count_io()
return #self.input_regs
end
@@ -115,7 +115,7 @@ rtu.init_unit = function ()
---@return any value, boolean access_fault
public.read_input_reg = function (reg_addr)
ppm.clear_fault()
local value = self.coils[reg_addr]()
local value = self.input_regs[reg_addr].read()
return value, ppm.is_faulted()
end
@@ -136,7 +136,7 @@ rtu.init_unit = function ()
---@return any value, boolean access_fault
public.read_holding_reg = function (reg_addr)
ppm.clear_fault()
local value = self.coils[reg_addr].read()
local value = self.holding_regs[reg_addr].read()
return value, ppm.is_faulted()
end
@@ -146,7 +146,7 @@ rtu.init_unit = function ()
---@return boolean access_fault
public.write_holding_reg = function (reg_addr, value)
ppm.clear_fault()
self.coils[reg_addr].write(value)
self.holding_regs[reg_addr].write(value)
return ppm.is_faulted()
end

2
rtu/startup.lua
View File

@@ -24,7 +24,7 @@ local imatrix_rtu = require("rtu.dev.imatrix_rtu")
local turbine_rtu = require("rtu.dev.turbine_rtu")
local turbinev_rtu = require("rtu.dev.turbinev_rtu")
local RTU_VERSION = "alpha-v0.7.0"
local RTU_VERSION = "alpha-v0.7.1"
local rtu_t = types.rtu_t