stepfunc · jadamcrain · Jan 20, 2022 · Dec 10, 2021 · Dec 13, 2021 · Dec 14, 2021
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### Next ###
+* Add RTU support. See [#56](https://github.com/stepfunc/rodbus/pull/56).
+
 ### 0.9.1 ###
 * Client callbacks are now not blocking.
   See [#53](https://github.com/stepfunc/rodbus/pull/53).

diff --git a/deps-config.json b/deps-config.json
@@ -1,5 +1,22 @@
 {
     "ignore": ["rodbus", "tokio-mock"],
-    "allowed_licenses": ["Apache-2.0 OR MIT", "MIT", "MIT OR Unlicense"],
-    "crates": {}
+    "allowed_licenses": ["BSD-2-Clause", "MIT", "MPL-2.0"],
+    "crates": {
+        "crc": {
+            "license_name": "Apache-2.0 OR MIT",
+            "file_content": "TUlUIExpY2Vuc2UKCkNvcHlyaWdodCAoYykgMjAxNyBjcmMtcnMgRGV2ZWxvcGVycwoKUGVybWlzc2lvbiBpcyBoZXJlYnkgZ3JhbnRlZCwgZnJlZSBvZiBjaGFyZ2UsIHRvIGFueSBwZXJzb24gb2J0YWluaW5nIGEgY29weQpvZiB0aGlzIHNvZnR3YXJlIGFuZCBhc3NvY2lhdGVkIGRvY3VtZW50YXRpb24gZmlsZXMgKHRoZSAiU29mdHdhcmUiKSwgdG8gZGVhbAppbiB0aGUgU29mdHdhcmUgd2l0aG91dCByZXN0cmljdGlvbiwgaW5jbHVkaW5nIHdpdGhvdXQgbGltaXRhdGlvbiB0aGUgcmlnaHRzCnRvIHVzZSwgY29weSwgbW9kaWZ5LCBtZXJnZSwgcHVibGlzaCwgZGlzdHJpYnV0ZSwgc3VibGljZW5zZSwgYW5kL29yIHNlbGwKY29waWVzIG9mIHRoZSBTb2Z0d2FyZSwgYW5kIHRvIHBlcm1pdCBwZXJzb25zIHRvIHdob20gdGhlIFNvZnR3YXJlIGlzCmZ1cm5pc2hlZCB0byBkbyBzbywgc3ViamVjdCB0byB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnM6CgpUaGUgYWJvdmUgY29weXJpZ2h0IG5vdGljZSBhbmQgdGhpcyBwZXJtaXNzaW9uIG5vdGljZSBzaGFsbCBiZSBpbmNsdWRlZCBpbiBhbGwKY29waWVzIG9yIHN1YnN0YW50aWFsIHBvcnRpb25zIG9mIHRoZSBTb2Z0d2FyZS4KClRIRSBTT0ZUV0FSRSBJUyBQUk9WSURFRCAiQVMgSVMiLCBXSVRIT1VUIFdBUlJBTlRZIE9GIEFOWSBLSU5ELCBFWFBSRVNTIE9SCklNUExJRUQsIElOQ0xVRElORyBCVVQgTk9UIExJTUlURUQgVE8gVEhFIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZLApGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBTkQgTk9OSU5GUklOR0VNRU5ULiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUKQVVUSE9SUyBPUiBDT1BZUklHSFQgSE9MREVSUyBCRSBMSUFCTEUgRk9SIEFOWSBDTEFJTSwgREFNQUdFUyBPUiBPVEhFUgpMSUFCSUxJVFksIFdIRVRIRVIgSU4gQU4gQUNUSU9OIE9GIENPTlRSQUNULCBUT1JUIE9SIE9USEVSV0lTRSwgQVJJU0lORyBGUk9NLApPVVQgT0YgT1IgSU4gQ09OTkVDVElPTiBXSVRIIFRIRSBTT0ZUV0FSRSBPUiBUSEUgVVNFIE9SIE9USEVSIERFQUxJTkdTIElOIFRIRQpTT0ZUV0FSRS4K"
+        },
+        "crc-catalog": {
+            "license_name": "Apache-2.0 OR MIT",
+            "file_content": "TUlUIExpY2Vuc2UKCkNvcHlyaWdodCAoYykgMjAxOSBBa2hpbCBWZWxhZ2FwdWRpCgpQZXJtaXNzaW9uIGlzIGhlcmVieSBncmFudGVkLCBmcmVlIG9mIGNoYXJnZSwgdG8gYW55IHBlcnNvbiBvYnRhaW5pbmcgYSBjb3B5Cm9mIHRoaXMgc29mdHdhcmUgYW5kIGFzc29jaWF0ZWQgZG9jdW1lbnRhdGlvbiBmaWxlcyAodGhlICJTb2Z0d2FyZSIpLCB0byBkZWFsCmluIHRoZSBTb2Z0d2FyZSB3aXRob3V0IHJlc3RyaWN0aW9uLCBpbmNsdWRpbmcgd2l0aG91dCBsaW1pdGF0aW9uIHRoZSByaWdodHMKdG8gdXNlLCBjb3B5LCBtb2RpZnksIG1lcmdlLCBwdWJsaXNoLCBkaXN0cmlidXRlLCBzdWJsaWNlbnNlLCBhbmQvb3Igc2VsbApjb3BpZXMgb2YgdGhlIFNvZnR3YXJlLCBhbmQgdG8gcGVybWl0IHBlcnNvbnMgdG8gd2hvbSB0aGUgU29mdHdhcmUgaXMKZnVybmlzaGVkIHRvIGRvIHNvLCBzdWJqZWN0IHRvIHRoZSBmb2xsb3dpbmcgY29uZGl0aW9uczoKClRoZSBhYm92ZSBjb3B5cmlnaHQgbm90aWNlIGFuZCB0aGlzIHBlcm1pc3Npb24gbm90aWNlIHNoYWxsIGJlIGluY2x1ZGVkIGluIGFsbApjb3BpZXMgb3Igc3Vic3RhbnRpYWwgcG9ydGlvbnMgb2YgdGhlIFNvZnR3YXJlLgoKVEhFIFNPRlRXQVJFIElTIFBST1ZJREVEICJBUyBJUyIsIFdJVEhPVVQgV0FSUkFOVFkgT0YgQU5ZIEtJTkQsIEVYUFJFU1MgT1IKSU1QTElFRCwgSU5DTFVESU5HIEJVVCBOT1QgTElNSVRFRCBUTyBUSEUgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFksCkZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFORCBOT05JTkZSSU5HRU1FTlQuIElOIE5PIEVWRU5UIFNIQUxMIFRIRQpBVVRIT1JTIE9SIENPUFlSSUdIVCBIT0xERVJTIEJFIExJQUJMRSBGT1IgQU5ZIENMQUlNLCBEQU1BR0VTIE9SIE9USEVSCkxJQUJJTElUWSwgV0hFVEhFUiBJTiBBTiBBQ1RJT04gT0YgQ09OVFJBQ1QsIFRPUlQgT1IgT1RIRVJXSVNFLCBBUklTSU5HIEZST00sCk9VVCBPRiBPUiBJTiBDT05ORUNUSU9OIFdJVEggVEhFIFNPRlRXQVJFIE9SIFRIRSBVU0UgT1IgT1RIRVIgREVBTElOR1MgSU4gVEhFClNPRlRXQVJFLgo="
+        },
+        "serialport": {
+            "license_name": "MPL-2.0",
+            "file_content": "VGhpcyBTb3VyY2UgQ29kZSBGb3JtIGlzIHN1YmplY3QgdG8gdGhlIHRlcm1zIG9mIHRoZSBNb3ppbGxhIFB1YmxpYyBMaWNlbnNlLCB2LiAyLjAuIElmIGEgY29weSBvZgp0aGUgTVBMIHdhcyBub3QgZGlzdHJpYnV0ZWQgd2l0aCB0aGlzIGZpbGUsIFlvdSBjYW4gb2J0YWluIG9uZSBhdCBodHRwczovL21vemlsbGEub3JnL01QTC8yLjAvLgo="
+        },
+        "void": {
+            "license_name": "Apache-2.0 OR MIT",
+            "file_content": "Q29weXJpZ2h0IChjKSAyMDE1IFRoZSBydXN0LXZvaWQgRGV2ZWxvcGVycwoKUGVybWlzc2lvbiBpcyBoZXJlYnkgZ3JhbnRlZCwgZnJlZSBvZiBjaGFyZ2UsIHRvIGFueSBwZXJzb24gb2J0YWluaW5nIGEgY29weQpvZiB0aGlzIHNvZnR3YXJlIGFuZCBhc3NvY2lhdGVkIGRvY3VtZW50YXRpb24gZmlsZXMgKHRoZSAiU29mdHdhcmUiKSwgdG8gZGVhbAppbiB0aGUgU29mdHdhcmUgd2l0aG91dCByZXN0cmljdGlvbiwgaW5jbHVkaW5nIHdpdGhvdXQgbGltaXRhdGlvbiB0aGUgcmlnaHRzCnRvIHVzZSwgY29weSwgbW9kaWZ5LCBtZXJnZSwgcHVibGlzaCwgZGlzdHJpYnV0ZSwgc3VibGljZW5zZSwgYW5kL29yIHNlbGwKY29waWVzIG9mIHRoZSBTb2Z0d2FyZSwgYW5kIHRvIHBlcm1pdCBwZXJzb25zIHRvIHdob20gdGhlIFNvZnR3YXJlIGlzCmZ1cm5pc2hlZCB0byBkbyBzbywgc3ViamVjdCB0byB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnM6CgpUaGUgYWJvdmUgY29weXJpZ2h0IG5vdGljZSBhbmQgdGhpcyBwZXJtaXNzaW9uIG5vdGljZSBzaGFsbCBiZSBpbmNsdWRlZCBpbiBhbGwKY29waWVzIG9yIHN1YnN0YW50aWFsIHBvcnRpb25zIG9mIHRoZSBTb2Z0d2FyZS4KClRIRSBTT0ZUV0FSRSBJUyBQUk9WSURFRCAiQVMgSVMiLCBXSVRIT1VUIFdBUlJBTlRZIE9GIEFOWSBLSU5ELCBFWFBSRVNTIE9SCklNUExJRUQsIElOQ0xVRElORyBCVVQgTk9UIExJTUlURUQgVE8gVEhFIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZLApGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRSBBTkQgTk9OSU5GUklOR0VNRU5ULiBJTiBOTyBFVkVOVCBTSEFMTCBUSEUKQVVUSE9SUyBPUiBDT1BZUklHSFQgSE9MREVSUyBCRSBMSUFCTEUgRk9SIEFOWSBDTEFJTSwgREFNQUdFUyBPUiBPVEhFUgpMSUFCSUxJVFksIFdIRVRIRVIgSU4gQU4gQUNUSU9OIE9GIENPTlRSQUNULCBUT1JUIE9SIE9USEVSV0lTRSwgQVJJU0lORyBGUk9NLApPVVQgT0YgT1IgSU4gQ09OTkVDVElPTiBXSVRIIFRIRSBTT0ZUV0FSRSBPUiBUSEUgVVNFIE9SIE9USEVSIERFQUxJTkdTIElOIFRIRQpTT0ZUV0FSRS4K"
+        }
+    }
 }
diff --git a/ffi/bindings/c/client_example.c b/ffi/bindings/c/client_example.c
@@ -72,7 +72,7 @@ void on_write_complete(rodbus_error_info_t result, void *ctx)
 }
 /// ANCHOR_END: write_callback
 
-int main()
+int main(int argc, char* argv[])
 {
     // ANCHOR: logging_init
     // initialize logging with the default configuration
@@ -101,15 +101,36 @@ int main()
         goto cleanup;
     }
 
-    // initialize a Modbus TCP client channel
-    // ANCHOR: create_tcp_channel
-    rodbus_decode_level_t decode_level = rodbus_decode_level_init();
-    err = rodbus_create_tcp_client(runtime, "127.0.0.1:502", 100, rodbus_retry_strategy_init(), decode_level, &channel);
-    if (err) {
-        printf("Unable to initialize channel: %s\n", rodbus_param_error_to_string(err));
-        goto cleanup;
+    // initialize a Modbus client channel
+    if (argc > 1 && strcmp(argv[1], "--serial") == 0)
+    {
+        // ANCHOR: create_rtu_channel
+        rodbus_decode_level_t decode_level = rodbus_decode_level_init();
+        err = rodbus_create_rtu_client(runtime,
+            "/dev/ttySIM0", // path
+            rodbus_serial_port_settings_init(), // serial settings
+            1, // max queued requests
+            1000, // retry delay (in ms)
+            decode_level, // decode level
+            &channel
+        );
+        if (err) {
+            printf("Unable to initialize channel: %s\n", rodbus_param_error_to_string(err));
+            goto cleanup;
+        }
+        // ANCHOR_END: create_rtu_channel
+    }
+    else
+    {
+        // ANCHOR: create_tcp_channel
+        rodbus_decode_level_t decode_level = rodbus_decode_level_init();
+        err = rodbus_create_tcp_client(runtime, "127.0.0.1:502", 1, rodbus_retry_strategy_init(), decode_level, &channel);
+        if (err) {
+            printf("Unable to initialize channel: %s\n", rodbus_param_error_to_string(err));
+            goto cleanup;
+        }
+        // ANCHOR_END: create_tcp_channel
     }
-    // ANCHOR_END: create_tcp_channel
 
     // request param that we will be reusing
     // ANCHOR: request_param

diff --git a/ffi/bindings/c/server_example.c b/ffi/bindings/c/server_example.c
@@ -118,7 +118,7 @@ void update_input_register(rodbus_database_t *db, void *ctx)
     }
 }
 
-int main()
+int main(int argc, char* argv[])
 {
     // initialize logging with the default configuration
     rodbus_logger_t logger = rodbus_logger_init(&on_log_message, NULL, NULL);
@@ -150,17 +150,33 @@ int main()
     );
     // ANCHOR_END: device_map_init
 
-    // create the TCP server
-    // ANCHOR: tcp_server_create
-    rodbus_decode_level_t decode_level = rodbus_decode_level_init();
-    err = rodbus_create_tcp_server(runtime, "127.0.0.1:502", 100, map, decode_level, &server);
-    rodbus_device_map_destroy(map);
+    // create the server
+    if (argc > 1 && strcmp(argv[1], "--serial") == 0)
+    {
+        // ANCHOR: rtu_server_create
+        rodbus_decode_level_t decode_level = rodbus_decode_level_init();
+        err = rodbus_create_rtu_server(runtime, "/dev/ttySIM1", rodbus_serial_port_settings_init(), map, decode_level, &server);
+        rodbus_device_map_destroy(map);
 
-    if (err) {
-        printf("Unable to initialize server: %s\n", rodbus_param_error_to_string(err));
-        goto cleanup;
+        if (err) {
+            printf("Unable to initialize server: %s\n", rodbus_param_error_to_string(err));
+            goto cleanup;
+        }
+        // ANCHOR_END: rtu_server_create
+    }
+    else
+    {
+        // ANCHOR: tcp_server_create
+        rodbus_decode_level_t decode_level = rodbus_decode_level_init();
+        err = rodbus_create_tcp_server(runtime, "127.0.0.1:502", 100, map, decode_level, &server);
+        rodbus_device_map_destroy(map);
+
+        if (err) {
+            printf("Unable to initialize server: %s\n", rodbus_param_error_to_string(err));
+            goto cleanup;
+        }
+        // ANCHOR_END: tcp_server_create
     }
-    // ANCHOR_END: tcp_server_create
 
     // state passed to the update callbacks
     state_t state = {

diff --git a/ffi/bindings/dotnet/examples/client/Program.cs b/ffi/bindings/dotnet/examples/client/Program.cs
@@ -33,11 +33,29 @@ static void Main(string[] args)
             var runtime = new Runtime(new RuntimeConfig { NumCoreThreads = 4 });
             // ANCHOR_END: runtime_init
 
-            // initialize a Modbus TCP client channel
-            // ANCHOR: create_tcp_channel
-            var decodeLevel = new DecodeLevel();
-            var channel = Channel.CreateTcpClient(runtime, "127.0.0.1:502", 100, new RetryStrategy(), decodeLevel);
-            // ANCHOR_END: create_tcp_channel
+            // initialize a Modbus client channel
+            Channel channel = null;
+            if (Array.IndexOf(args, "--serial") == -1)
+            {
+                // ANCHOR: create_tcp_channel
+                var decodeLevel = new DecodeLevel();
+                channel = Channel.CreateTcpClient(runtime, "127.0.0.1:502", 1, new RetryStrategy(), decodeLevel);
+                // ANCHOR_END: create_tcp_channel
+            }
+            else
+            {
+                // ANCHOR: create_rtu_channel
+                var decodeLevel = new DecodeLevel();
+                channel = Channel.CreateRtuClient(
+                    runtime, // runtime
+                    "/dev/ttySIM0", // path
+                    new SerialPortSettings(), // serial settings
+                    1, // max queued requests
+                    TimeSpan.FromSeconds(1), // retry delay
+                    decodeLevel // decode level
+                );
+                // ANCHOR_END: create_rtu_channel
+            }
 
             try
             {
@@ -54,7 +72,7 @@ static void Main(string[] args)
         private static async Task RunChannel(Channel channel)
         {
             // ANCHOR: request_param
-            var param = new RequestParam(1, 1000);
+            var param = new RequestParam(1, TimeSpan.FromSeconds(1));
             // ANCHOR_END: request_param
             // ANCHOR: address_range
             var range = new AddressRange(0, 5);

diff --git a/ffi/bindings/dotnet/examples/server/Program.cs b/ffi/bindings/dotnet/examples/server/Program.cs
@@ -101,10 +101,21 @@ static void Main(string[] args)
             // ANCHOR_END: device_map_init
 
             // create the TCP server
-            // ANCHOR: tcp_server_create
-            var decodeLevel = new DecodeLevel();
-            var server = Server.CreateTcpServer(runtime, "127.0.0.1:502", 10, map, decodeLevel);
-            // ANCHOR_END: tcp_server_create
+            Server server = null;
+            if (Array.IndexOf(args, "--serial") == -1)
+            {
+                // ANCHOR: tcp_server_create
+                var decodeLevel = new DecodeLevel();
+                server = Server.CreateTcpServer(runtime, "127.0.0.1:502", 100, map, decodeLevel);
+                // ANCHOR_END: tcp_server_create
+            }
+            else
+            {
+                // ANCHOR: rtu_server_create
+                var decodeLevel = new DecodeLevel();
+                server = Server.CreateRtuServer(runtime, "/dev/ttySIM1", new SerialPortSettings(), map, decodeLevel);
+                // ANCHOR_END: rtu_server_create
+            }
 
             try
             {

diff --git a/ffi/bindings/dotnet/rodbus-tests/IntegrationTest.cs b/ffi/bindings/dotnet/rodbus-tests/IntegrationTest.cs
@@ -1,6 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using rodbus;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -80,7 +81,7 @@ public class IntegrationTest
         private static readonly byte UNIT_ID = 1;
         private static readonly ushort NUM_POINTS = 10;
         private static readonly string ENDPOINT = "127.0.0.1:20000";
-        private static readonly RequestParam param = new RequestParam(UNIT_ID, 1000);
+        private static readonly RequestParam param = new RequestParam(UNIT_ID, TimeSpan.FromSeconds(1));
 
         static void TestReadDiscreteInputs(Channel client)
         {

diff --git a/ffi/bindings/java/examples/src/main/java/io/stepfunc/rodbus/examples/ClientExample.java b/ffi/bindings/java/examples/src/main/java/io/stepfunc/rodbus/examples/ClientExample.java
@@ -7,6 +7,7 @@
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
+import java.time.Duration;
 import java.util.Arrays;
 
 // ANCHOR: logging_interface
@@ -32,11 +33,27 @@ public static void main(String[] args) throws Exception {
         Runtime runtime = new Runtime(runtimeConfig);
         // ANCHOR_END: runtime_init
 
-        // initialize a Modbus TCP client channel
-        // ANCHOR: create_tcp_channel
-        DecodeLevel decodeLevel = new DecodeLevel();
-        Channel channel = Channel.createTcpClient(runtime, "127.0.0.1:502", ushort(100), new RetryStrategy(), decodeLevel);
-        // ANCHOR_END: create_tcp_channel
+        // initialize a Modbus client channel
+        Channel channel = null;
+        if (!Arrays.asList(args).contains("--serial")) {
+            // ANCHOR: create_tcp_channel
+            DecodeLevel decodeLevel = new DecodeLevel();
+            channel = Channel.createTcpClient(runtime, "127.0.0.1:502", ushort(100), new RetryStrategy(), decodeLevel);
+            // ANCHOR_END: create_tcp_channel
+        }
+        else {
+            // ANCHOR: create_rtu_channel
+            DecodeLevel decodeLevel = new DecodeLevel();
+            channel = Channel.createRtuClient(
+                runtime,
+                "/dev/ttySIM0", // path
+                new SerialPortSettings(), // serial settings
+                ushort(1), // max queued requests
+                Duration.ofSeconds(1), // retry delay
+                decodeLevel // decode level
+            );
+            // ANCHOR_END: create_rtu_channel
+        }
 
         try {
             run(channel);
@@ -49,7 +66,7 @@ public static void main(String[] args) throws Exception {
 
     private static void run(Channel channel) throws Exception {
         // ANCHOR: request_param
-        final RequestParam param = new RequestParam(ubyte(1), uint(1000));
+        final RequestParam param = new RequestParam(ubyte(1), Duration.ofSeconds(1));
         // ANCHOR_END: request_param
         // ANCHOR: address_range
         final AddressRange range = new AddressRange(ushort(0), ushort(5));

diff --git a/ffi/bindings/java/examples/src/main/java/io/stepfunc/rodbus/examples/ServerExample.java b/ffi/bindings/java/examples/src/main/java/io/stepfunc/rodbus/examples/ServerExample.java
@@ -5,6 +5,8 @@
 import io.stepfunc.rodbus.*;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
+import java.time.Duration;
+import java.util.Arrays;
 import java.util.List;
 
 import io.stepfunc.rodbus.Runtime;
@@ -89,10 +91,19 @@ public static void main(String[] args) throws Exception {
         });
         // ANCHOR_END: device_map_init
 
-        // ANCHOR: tcp_server_create
-        DecodeLevel decodeLevel = new DecodeLevel();
-        Server server = Server.createTcpServer(runtime, "127.0.0.1:502", ushort(10), map, decodeLevel);
-        // ANCHOR_END: tcp_server_create
+        Server server = null;
+        if (!Arrays.asList(args).contains("--serial")) {
+            // ANCHOR: tcp_server_create
+            DecodeLevel decodeLevel = new DecodeLevel();
+            server = Server.createTcpServer(runtime, "127.0.0.1:502", ushort(100), map, decodeLevel);
+            // ANCHOR_END: tcp_server_create
+        }
+        else {
+            // ANCHOR: rtu_server_create
+            DecodeLevel decodeLevel = new DecodeLevel();
+            server = Server.createRtuServer(runtime, "/dev/ttySIM1", new SerialPortSettings(), map, decodeLevel);
+            // ANCHOR_END: rtu_server_create
+        }
 
         try {
             run(server);

diff --git a/ffi/bindings/java/rodbus-tests/src/test/java/io/stepfunc/rodbus/tests/IntegrationTest.java b/ffi/bindings/java/rodbus-tests/src/test/java/io/stepfunc/rodbus/tests/IntegrationTest.java
@@ -6,6 +6,7 @@
 import org.joou.*;
 import org.junit.jupiter.api.Test;
 
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -15,7 +16,7 @@
 
 public class IntegrationTest {
     static final UByte UNIT_ID = ubyte(1);
-    static final UInteger TIMEOUT_MS = uint(1000);
+    static final Duration TIMEOUT = Duration.ofSeconds(1);
     static final int NUM_POINTS = 10;
     static final String ENDPOINT = "127.0.0.1:20000";
 
@@ -93,7 +94,7 @@ public void clientAndServerCommunication() throws ExecutionException, Interrupte
     }
 
     private void testReadDiscreteInputs(Channel client) throws ExecutionException, InterruptedException {
-        RequestParam param = new RequestParam(UNIT_ID, TIMEOUT_MS);
+        RequestParam param = new RequestParam(UNIT_ID, TIMEOUT);
         AddressRange range = new AddressRange(ushort(2), ushort(3));
 
         BitReadResult result = client.readDiscreteInputs(param, range).toCompletableFuture().get();
@@ -118,7 +119,7 @@ private void testReadDiscreteInputs(Channel client) throws ExecutionException, I
     }
 
     private void testReadInputRegisters(Channel client) throws ExecutionException, InterruptedException {
-        RequestParam param = new RequestParam(UNIT_ID, TIMEOUT_MS);
+        RequestParam param = new RequestParam(UNIT_ID, TIMEOUT);
         AddressRange range = new AddressRange(ushort(3), ushort(3));
 
         RegisterReadResult result = client.readInputRegisters(param, range).toCompletableFuture().get();
@@ -143,7 +144,7 @@ private void testReadInputRegisters(Channel client) throws ExecutionException, I
     }
 
     private void testWriteSingleCoil(Channel client) throws ExecutionException, InterruptedException {
-        RequestParam param = new RequestParam(UNIT_ID, TIMEOUT_MS);
+        RequestParam param = new RequestParam(UNIT_ID, TIMEOUT);
         Bit bit = new Bit(ushort(1), true);
 
         ErrorInfo writeResult = client.writeSingleCoil(param, bit).toCompletableFuture().get();
@@ -164,7 +165,7 @@ private void testWriteSingleCoil(Channel client) throws ExecutionException, Inte
     }
 
     private void testWriteSingleRegister(Channel client) throws ExecutionException, InterruptedException {
-        RequestParam param = new RequestParam(UNIT_ID, TIMEOUT_MS);
+        RequestParam param = new RequestParam(UNIT_ID, TIMEOUT);
         Register register = new Register(ushort(1), ushort(22));
 
         ErrorInfo writeResult = client.writeSingleRegister(param, register).toCompletableFuture().get();
@@ -185,7 +186,7 @@ private void testWriteSingleRegister(Channel client) throws ExecutionException,
     }
 
     private void testWriteMultipleCoils(Channel client) throws ExecutionException, InterruptedException {
-        RequestParam param = new RequestParam(UNIT_ID, TIMEOUT_MS);
+        RequestParam param = new RequestParam(UNIT_ID, TIMEOUT);
 
         ErrorInfo writeResult = client.writeMultipleCoils(param, ushort(0), Arrays.asList(true, false, true)).toCompletableFuture().get();
         assertThat(writeResult.summary).isEqualTo(Status.OK);
@@ -207,7 +208,7 @@ private void testWriteMultipleCoils(Channel client) throws ExecutionException, I
     }
 
     private void testWriteMultipleRegisters(Channel client) throws ExecutionException, InterruptedException {
-        RequestParam param = new RequestParam(UNIT_ID, TIMEOUT_MS);
+        RequestParam param = new RequestParam(UNIT_ID, TIMEOUT);
 
         ErrorInfo writeResult = client.writeMultipleRegisters(param, ushort(0), Arrays.asList(ushort(0xCAFE), ushort(21), ushort(0xFFFF))).toCompletableFuture().get();
         assertThat(writeResult.summary).isEqualTo(Status.OK);