example updates

Author: snhobbs

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "examples/libmodbus_tests/-f"]
-	path = examples/libmodbus_tests/-f
-	url = git@github.com:stephane/libmodbus.git
 [submodule "examples/libmodbus_tests/libmodbus"]
 	path = examples/libmodbus_tests/libmodbus
 	url = git@github.com:stephane/libmodbus.git
@@ -16,3 +13,6 @@
 [submodule "include/flatbuffers"]
 	path = include/flatbuffers
 	url = git@github.com:snhobbs/flatbuffers.git
+[submodule "include/BareMetalHardwareAbstraction"]
+	path = include/HardwareInterfaces
+	url = git@github.com:snhobbs/BareMetalHardwareAbstraction

examples/LinuxSlave/source/main.cpp

@@ -24,7 +24,7 @@ int main(int argc, char* argv[]){
   while(true) {
     loops++;
     slave.Run();
-    sleep(0.05);
+    //sleep(0.5);
 #if 0
     if (loops%(1<<10) == 0) {
       printf("[");

examples/libmodbus_tests/libmodbus_client/libmodbus_slave/libmodbus_slave.cpp

@@ -46,14 +46,14 @@ int main(int argc, char* argv[]) {
     loops++;
 
     len = modbus_receive(ctx, req);
-    if (len == -1) break;
+    if (len == -1) continue;
 
     len = modbus_reply(ctx, req, len, mapping);
     for (std::size_t i=0; i<len; i++){
       std::cout << static_cast<int>(req[i]) << ", ";
     }
     std::cout << std::endl;
-    if (len == -1) break;
+    if (len == -1) continue;
 
 #if 0
   if (loops%16 == 0) {

examples/posix/PosixSerial.h

@@ -64,7 +64,7 @@ int SetupSerial(const char *device, const speed_t baudrate = B9600) {
   return connection;
 }
 
-class UartController : public IODevice {
+class UartController: public IODevice<RingBuffer<uint8_t, 1024>> {
   const char *const device_name_;
   const speed_t baudrate_;
   int connection_ = 0;

examples/pymodbus_tests/asynchronous_server.py

@@ -8,11 +8,12 @@
 of nodes which can be helpful for testing monitoring software.
 """
 # --------------------------------------------------------------------------- #
+import sys
 # import the various server implementations
 # --------------------------------------------------------------------------- #
-from pymodbus.server.asynchronous import StartTcpServer
-from pymodbus.server.asynchronous import StartUdpServer
-from pymodbus.server.asynchronous import StartSerialServer
+#from pymodbus.server.asynchronous import StartTcpServer
+#from pymodbus.server.asynchronous import StartUdpServer
+from pymodbus.server import StartSerialServer
 
 from pymodbus.device import ModbusDeviceIdentification
 from pymodbus.datastore import ModbusSequentialDataBlock
@@ -33,7 +34,7 @@
 log.setLevel(logging.DEBUG)
 
 
-def run_async_server():
+def run_async_server(port="/dev/ttyUSB0"):
     # ----------------------------------------------------------------------- #
     # initialize your data store
     # ----------------------------------------------------------------------- #
@@ -146,8 +147,8 @@ def run_async_server():
     # StartUdpServer(context, identity=identity, address=("127.0.0.1", 5020))
 
     # RTU Server
-    StartSerialServer(context, identity=identity,
-                      port='/dev/ttyUSB0', framer=ModbusRtuFramer, baud=9600)
+    StartSerialServer(context=context, identity=identity,
+                      port=port, framer=ModbusRtuFramer, baud=9600)
 
     # ASCII Server
     # StartSerialServer(context, identity=identity,
@@ -159,5 +160,4 @@ def run_async_server():
 
 
 if __name__ == "__main__":
-    run_async_server()
-
+    run_async_server(sys.argv[1] if len(sys.argv)>1 else "/dev/ttyUSB0")

examples/pymodbus_tests/custom_message.py

@@ -18,9 +18,7 @@
 # import the various server implementations
 # --------------------------------------------------------------------------- #
 from pymodbus.pdu import ModbusRequest, ModbusResponse, ModbusExceptions
-from pymodbus.client.sync import ModbusTcpClient as ModbusClient
 from pymodbus.bit_read_message import ReadCoilsRequest
-from pymodbus.compat import int2byte, byte2int
 # --------------------------------------------------------------------------- #
 # configure the client logging
 # --------------------------------------------------------------------------- #
@@ -34,7 +32,7 @@
 # --------------------------------------------------------------------------- #
 # The following is simply a read coil request that always reads 16 coils.
 # Since the function code is already registered with the decoder factory,
-# this will be decoded as a read coil response. If you implement a new 
+# this will be decoded as a read coil response. If you implement a new
 # method that is not currently implemented, you must register the request
 # and response with a ClientDecoder factory.
 # --------------------------------------------------------------------------- #
@@ -47,13 +45,13 @@ class CustomModbusResponse(ModbusResponse):
     def __init__(self, values=None, **kwargs):
         ModbusResponse.__init__(self, **kwargs)
         self.values = values or []
-    
+
     def encode(self):
         """ Encodes response pdu
 
         :returns: The encoded packet message
         """
-        result = int2byte(len(self.values) * 2)
+        result = bytes([len(self.values) * 2])
         for register in self.values:
             result += struct.pack('>H', register)
         return result
@@ -117,6 +115,7 @@ def __init__(self, address, **kwargs):
 
 
 if __name__ == "__main__":
+    from pymodbus.client.sync import ModbusTcpClient as ModbusClient
     with ModbusClient(host='localhost', port=5020) as client:
         client.register(CustomModbusResponse)
         request = CustomModbusRequest(1, unit=1)

examples/pymodbus_tests/test_device_identifier.py

@@ -3,28 +3,35 @@
 from serial import Serial
 from time import sleep
 import sys
+import click
 
-device = "/tmp/ptyp0"
-if(len(sys.argv) > 1) :
-    device = sys.argv[1]
+@click.command()
+@click.option("--device", "-d", default="/tmp/ptyp0")
+@click.option("--address", "-a", type=int, default=3)
+@click.option("--repeat", "-r", type=int, default=0)
+@click.option("--period", "-p", type=float, default=1)
+@click.option("--baud", "-d", type=int, default=9600)
+def run(device, address, repeat, period, baud):
+    s = Serial(device, baud)
+    crc = Crc(width = 16, poly = 0x8005,reflect_in = True, xor_in = 0xffff, reflect_out = True, xor_out = 0x0000)
 
-slave_address = 0x03
-if(len(sys.argv) > 2) :
-    slave_address = int(sys.argv[2])
+    count = 0
+    while True:
+        if count > repeat + 1 and repeat > 0:
+            break
+        else:
+            count -= 1
+        function = 0x2b
+        frame = [address, function, 0x0f, 0x01, 0x00]
+        crc_calc = crc.bit_by_bit(frame)
+        frame.append(crc_calc & 0xff)
+        frame.append((crc_calc >> 8) & 0xff)
+        s.write(bytes(frame))
+        print([hex(d) for d in frame])
+        data = (s.read_all())
+        print(data, len(data))
+        print([chr(d) for d in data])
+        sleep(period)
 
-s = Serial(device, 9600)
-#s = Serial("/dev/ttyUSB0", 9600)
-crc = Crc(width = 16, poly = 0x8005,reflect_in = True, xor_in = 0xffff, reflect_out = True, xor_out = 0x0000)
-
-function = 0x2b
-frame = [slave_address, function, 0x0f, 0x01, 0x00]
-
-crc_calc = crc.bit_by_bit(frame)
-frame.append(crc_calc & 0xff)
-frame.append((crc_calc >> 8) & 0xff)
-s.write(bytes(frame))
-print([hex(d) for d in frame])
-sleep(2)
-data = (s.read_all())
-print(data, len(data))
-print([chr(d) for d in data])
+if __name__ == "__main__":
+    run()