Basic makefiles and debianization

.gitignore

@@ -0,0 +1,4 @@
+debian/files
+debian/modbus-utils*
+modbus_client/modbus_client
+modbus_server/modbus_server

Jenkinsfile

@@ -0,0 +1,2 @@
+buildDebSbuild defaultTargets: 'bullseye-armhf bullseye-host',
+               repos: ['release', 'devTools']

Makefile

@@ -0,0 +1,28 @@
+prefix=/usr
+
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+       CC=gcc
+else
+       CC=$(DEB_HOST_GNU_TYPE)-gcc
+endif
+
+CC_FLAGS=-I../common -I/usr/include/modbus -L../common -lmodbus
+
+all: client server
+
+client:
+	$(MAKE) -C modbus_client
+
+server:
+	$(MAKE) -C modbus_server
+
+install: $(BIN_NAME)
+	$(MAKE) -C modbus_client install
+	$(MAKE) -C modbus_server install
+
+
+clean:
+	$(MAKE) -C modbus_client clean
+	$(MAKE) -C modbus_server clean
+
+.PHONY: install clean all

README.md

@@ -9,17 +9,9 @@ Both apps are linked with libmodbus library. After repository is pulled do the f
 compilation
 ===========
 
-#assumes you are in a root of the repository
-#go to libmodbus dir and compile it
-cd ./libmodbus
-./configure
-./make
-#as a result *.so libraries are in export ./src/.libs/ directory
-
-#get back to the root
-cd ..
-gcc ./modbus_client/modbus_client.c -I./common -I./libmodbus/src/ -L./libmodbus/src/.libs/ -lmodbus -o mbClient
-gcc ./modbus_server/modbus_server.c -I./common -I./libmodbus/src/ -L./libmodbus/src/.libs/ -lmodbus -o mbServer
+```sh
+make
+```
 
 running
 =======

common/mbu-common.h

@@ -55,7 +55,7 @@ int setRtuParam(void *backend, char c, char *value) {
     switch (c) {
     case 'b': {
         rtuParams->baud = getInt(value, &ok);
-        if (0 != ok) {
+        if (0 == ok) {
             printf("Baudrate is invalid %s", value);
             ok = 0;
         }

debian/changelog

@@ -0,0 +1,71 @@
+modbus-utils (1.2.8) stable; urgency=medium
+
+  * Build deb package for amd64 platform, no functional changes
+
+ -- Nikolay Korotkiy <[email protected]>  Mon, 03 Apr 2022 15:35:00 +0400
+
+modbus-utils (1.2.7) stable; urgency=medium
+
+  * fix IP address parse in arguments
+
+ -- Nikita Maslov <[email protected]>  Thu, 12 Jan 2023 21:03:16 +0600
+
+modbus-utils (1.2.6) stable; urgency=medium
+
+  * Fix response timeout option handled incorrectly
+
+ -- Nikolay Korotkiy <[email protected]>  Wed, 30 Nov 2022 19:51:00 +0400
+
+modbus-utils (1.2.5) stable; urgency=medium
+
+  * rebuild of 1.2.4 for Debian bullseye (without source change)
+  * Makefile: make pkg-config work with multi-arch (for sbuild support)
+
+ -- Nikita Maslov <[email protected]>  Fri, 29 Jul 2022 18:34:14 +0300
+
+modbus-utils (1.2.4) stable; urgency=medium
+
+  * added check if any value is passed to write function
+  * improved parsing args for port
+
+ -- Vladimir Romanov <[email protected]>  Sun, 27 Jan 2018 18:33:12 +0300
+
+modbus-utils (1.2.3) stable; urgency=medium
+
+  * disable annoying "timeout is set" information message
+
+ -- Evgeny Boger <[email protected]>  Wed, 21 Dec 2016 14:24:32 +0300
+
+modbus-utils (1.2.2) stable; urgency=medium
+
+  * exit with EXIT_FAILURE in case Modbus request is failed
+
+ -- Evgeny Boger <[email protected]>  Wed, 21 Dec 2016 13:16:41 +0300
+
+modbus-utils (1.2.1) stable; urgency=medium
+
+  * fix timeout handling
+
+ -- Evgeny Boger <[email protected]>  Wed, 22 Jul 2015 22:53:15 +0300
+
+modbus-utils (1.2) stable; urgency=medium
+
+  * fix baud rate handling
+
+ -- Evgeny Boger <[email protected]>  Thu, 09 Jul 2015 19:55:45 +0300
+
+modbus-utils (1.1) wheezy; urgency=low
+
+  * Add set-rd-address.sh script
+  * Fix ReadDiscreteInput function
+  (was) Ivan Shvedunov <[email protected]>  Wed, 06 Aug 2014 10:15:01 +0400
+
+ -- Evgeny Boger <[email protected]>  Wed, 06 Aug 2014 10:15:01 +0400
+
+modbus-utils (1.0) wheezy; urgency=low
+
+  * Initial debianization using https://github.com/Krzysztow/modbus-utils
+
+ -- Evgeny Boger <[email protected]>  Tue, 29 Apr 2014 01:59:04 +0400
+
+

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -0,0 +1,11 @@
+Source: modbus-utils
+Maintainer: Evgeny Boger <[email protected]>
+Section: misc
+Priority: optional
+Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), pkg-config, libmodbus-dev
+
+Package: modbus-utils
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libmodbus5
+Description: Modbus client and server command line tools based on libmodbus

debian/modbus-utils.dirs

@@ -0,0 +1,2 @@
+usr/bin
+usr/share/man/man1

debian/rules

@@ -0,0 +1,3 @@
+#!/usr/bin/make -f
+%:
+	dh $@

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

modbus_client/Makefile

@@ -0,0 +1,24 @@
+prefix=/usr
+BIN_NAME=modbus_client
+
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+       CC=gcc
+else
+       CC=$(DEB_HOST_GNU_TYPE)-gcc
+endif
+
+CC_FLAGS=-I../common `PKG_CONFIG_PATH=/usr/lib/$(DEB_HOST_GNU_TYPE)/pkgconfig pkg-config --libs --cflags libmodbus`
+
+$(BIN_NAME): modbus_client.c
+	$(CC) modbus_client.c $(CC_FLAGS) -o $(BIN_NAME)
+
+
+install: $(BIN_NAME)
+	install -Dm0755 $(BIN_NAME) -t $(DESTDIR)$(prefix)/bin
+
+clean:
+	-@rm $(BIN_NAME)
+.PHONY: install clean all
+
+
+

modbus_client/modbus_client.c

@@ -51,6 +51,8 @@ int main(int argc, char **argv)
     int c;
     int ok;
 
+    int gotData = 0; //Data_to_write existance flag
+    int raw_data = 0; //While parsing not keyword args
     int debug = 0;
     BackendParams *backend = 0;
     int slaveAddr = 1;
@@ -153,7 +155,6 @@ int main(int argc, char **argv)
                 printUsage(argv[0]);
                 exit(EXIT_FAILURE);
             }
-            printf("Timeout set to %d\r\n", timeout_ms);
         }
             break;
 
@@ -194,14 +195,11 @@ int main(int argc, char **argv)
     if (1 == startReferenceAt0) {
         startAddr--;
     }
-
     //choose write data type
     switch (fType) {
     case(ReadCoils):
-        wDataType = Data8Array;
-        break;
     case(ReadDiscreteInput):
-        wDataType = DataInt;
+        wDataType = Data8Array;
         break;
     case(ReadHoldingRegisters):
     case(ReadInputRegisters):
@@ -256,8 +254,11 @@ int main(int argc, char **argv)
     if (1 == debug && 1 == isWriteFunction)
         printf("Data to write: ");
     if (optind < argc) {
+
         while (optind < argc) {
-            if (0 == hasDevice) {
+	    raw_data = getInt(argv[optind], &ok);
+            if (0 == hasDevice && (ok == 0 || //Portname couldn't consist of only numbers
+                                   NULL != strchr(argv[optind], '.'))) { // but IP address fits in sscanf()
                 if (0 != backend) {
                     if (Rtu == backend->type) {
                         RtuBackend *rtuP = (RtuBackend*)backend;
@@ -271,21 +272,24 @@ int main(int argc, char **argv)
                     }
                 }
             }
-            else {//setting write data buffer
+            else {//Got int as data => setting write data buffer
                 switch (wDataType) {
                 case (DataInt):
-                    data.dataInt = getInt(argv[optind], 0);
+                    data.dataInt = raw_data;
+                    gotData = 1;
                     if (debug)
                         printf("0x%x", data.dataInt);
                     break;
                 case (Data8Array): {
-                    data.data8[wDataIdx] = getInt(argv[optind], 0);
+                    data.data8[wDataIdx] = raw_data;
+                    gotData = 1;
                     if (debug)
                         printf("0x%02x ", data.data8[wDataIdx]);
                 }
                     break;
                 case (Data16Array): {
-                    data.data16[wDataIdx] = getInt(argv[optind], 0);
+                    data.data16[wDataIdx] = raw_data;
+                    gotData = 1;
                     if (debug)
                         printf("0x%04x ", data.data16[wDataIdx]);
                 }
@@ -296,14 +300,28 @@ int main(int argc, char **argv)
             optind++;
         }
     }
-    if (1 == debug && 1 == isWriteFunction)
-        printf("\n");
+
+    if (isWriteFunction == 1){
+    	if (gotData == 0) {
+		printf("\nSeems you are using a write function\nDon't forget to specify the value!\n");
+		exit(EXIT_FAILURE);}
+    	if (debug == 1)
+    		printf("\n");
+    }
 
     //create modbus context, and preapare it
     modbus_t *ctx = backend->createCtxt(backend);
     modbus_set_debug(ctx, debug);
     modbus_set_slave(ctx, slaveAddr);
 
+    struct timeval response_timeout;
+    response_timeout.tv_sec = timeout_ms / 1000;
+    response_timeout.tv_usec = (timeout_ms % 1000) * 1000;
+    #if LIBMODBUS_VERSION_CHECK(3, 1, 2)
+        modbus_set_response_timeout(ctx, response_timeout.tv_sec, response_timeout.tv_usec);
+    #else
+        modbus_set_response_timeout(ctx, &response_timeout);
+    #endif
     //issue the request
     int ret = -1;
     if (modbus_connect(ctx) == -1) {
@@ -317,8 +335,7 @@ int main(int argc, char **argv)
             ret = modbus_read_bits(ctx, startAddr, readWriteNo, data.data8);
             break;
         case(ReadDiscreteInput):
-            printf("ReadDiscreteInput: not implemented yet!\n");
-            wDataType = DataInt;
+            ret = modbus_read_input_bits(ctx, startAddr, readWriteNo, data.data8);
             break;
         case(ReadHoldingRegisters):
             ret = modbus_read_registers(ctx, startAddr, readWriteNo, data.data16);
@@ -344,8 +361,9 @@ int main(int argc, char **argv)
             exit(EXIT_FAILURE);
         }
     }
+    uint8_t success = (ret == readWriteNo);
 
-    if (ret == readWriteNo) {//success
+    if (success) {
         if (isWriteFunction)
             printf("SUCCESS: written %d elements!\n", readWriteNo);
         else {
@@ -387,5 +405,5 @@ int main(int argc, char **argv)
         break;
     }
 
-    exit(EXIT_SUCCESS);
+    exit(success ? EXIT_SUCCESS : EXIT_FAILURE);
 }

modbus_server/Makefile

@@ -0,0 +1,24 @@
+prefix=/usr
+BIN_NAME=modbus_server
+
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+       CC=gcc
+else
+       CC=$(DEB_HOST_GNU_TYPE)-gcc
+endif
+
+CC_FLAGS=-I../common `PKG_CONFIG_PATH=/usr/lib/$(DEB_HOST_GNU_TYPE)/pkgconfig pkg-config --libs --cflags libmodbus`
+
+$(BIN_NAME):
+	$(CC) modbus_server.c $(CC_FLAGS) -o $(BIN_NAME)
+
+
+install: $(BIN_NAME)
+	install -Dm0755 $(BIN_NAME) -t $(DESTDIR)$(prefix)/bin
+
+clean:
+	-@rm $(BIN_NAME)
+.PHONY: install clean all
+
+
+