Merging ASCII Support Branch into Master

.gitignore

@@ -25,7 +25,7 @@ Makefile.in
 /libtool
 /ltmain.sh
 /missing
-/libmodbus.pc
+/libmodbusepsi.pc
 /stamp-h1
 /*.sublime-*
 /.vscode

AUTHORS

@@ -5,4 +5,5 @@ oldfaber <oldfaber@gmail.com>
 Hannu Vuolasaho <vuokkosetae@gmail.com> - CLA
 Michael Heimpold <mhei@heimpold.de> - CLA
 Jimmy Bergström <jimmy@ekontroll.com> - CLA
-Jakob Bysewski <kontakt@jbysewski.de> - CLA
+Jakob Bysewski <kontakt@jbysewski.de> - CLA
+Pascal Jean <epsilonrt@gmail.com>

Makefile.am

@@ -3,9 +3,9 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_MAKEFLAGS = --no-print-directory
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libmodbus.pc
-EXTRA_DIST = libmodbus.pc.in
-CLEANFILES += libmodbus.pc
+pkgconfig_DATA = libmodbusepsi.pc
+EXTRA_DIST = libmodbusepsi.pc.in
+CLEANFILES += libmodbusepsi.pc
 
 dist_doc_DATA = MIGRATION README.md
 

README.md

@@ -41,7 +41,7 @@ You can change installation directory with prefix option, eg. `./configure
 properly set up on your system (*/etc/ld.so.conf.d*) and library cache is up to
 date (run `ldconfig` as root if required).
 
-The library provides a *libmodbus.pc* file to use with `pkg-config` to ease your
+The library provides a *libmodbusepsi.pc* file to use with `pkg-config` to ease your
 program compilation and linking.
 
 If you want to compile with Microsoft Visual Studio, you need to install

configure.ac

@@ -13,7 +13,7 @@
 #
 m4_define([libmodbus_version_major], [3])
 m4_define([libmodbus_version_minor], [1])
-m4_define([libmodbus_version_micro], [6])
+m4_define([libmodbus_version_micro], [10])
 
 m4_define([libmodbus_release_status],
     [m4_if(m4_eval(libmodbus_version_minor % 2), [1], [snapshot], [release])])
@@ -22,10 +22,10 @@ m4_define([libmodbus_version],
     [libmodbus_version_major.libmodbus_version_minor.libmodbus_version_micro])
 
 AC_PREREQ([2.63])
-AC_INIT([libmodbus],
+AC_INIT([libmodbusepsi],
         [libmodbus_version],
-        [https://github.com/stephane/libmodbus/issues],
-        [libmodbus],
+        [https://github.com/epsilonrt/libmodbus/issues],
+        [libmodbusepsi],
         [http://libmodbus.org/])
 AC_CONFIG_SRCDIR([src/modbus.c])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -159,13 +159,13 @@ AC_CONFIG_FILES([
         src/win32/modbus.dll.manifest
         tests/Makefile
         doc/Makefile
-        libmodbus.pc
+        libmodbusepsi.pc
 ])
 
 AC_OUTPUT
 AC_MSG_RESULT([
         $PACKAGE $VERSION
-        ===============
+        =========================
 
         prefix:                 ${prefix}
         sysconfdir:             ${sysconfdir}

doc/Makefile.am

@@ -19,27 +19,29 @@ TXT3 = \
         modbus_mapping_new_start_address.txt \
         modbus_mask_write_register.txt \
         modbus_new_rtu.txt \
-        modbus_new_tcp_pi.txt \
         modbus_new_tcp.txt \
+        modbus_new_tcp_pi.txt \
         modbus_read_bits.txt \
         modbus_read_input_bits.txt \
         modbus_read_input_registers.txt \
         modbus_read_registers.txt \
-        modbus_receive_confirmation.txt \
         modbus_receive.txt \
-        modbus_reply_exception.txt \
+        modbus_receive_confirmation.txt \
         modbus_reply.txt \
+        modbus_reply_exception.txt \
         modbus_report_slave_id.txt \
-        modbus_rtu_get_serial_mode.txt \
-        modbus_rtu_set_serial_mode.txt \
-        modbus_rtu_get_rts.txt \
-        modbus_rtu_set_rts.txt \
-        modbus_rtu_set_custom_rts.txt \
-        modbus_rtu_get_rts_delay.txt \
-        modbus_rtu_set_rts_delay.txt \
         modbus_send_raw_request.txt \
-        modbus_set_bits_from_bytes.txt \
+        modbus_serial_get_rts.txt \
+        modbus_serial_get_rts_delay.txt \
+        modbus_serial_get_serial_mode.txt \
+        modbus_serial_set_custom_rts.txt \
+        modbus_serial_set_rts.txt \
+        modbus_serial_set_rts_delay.txt \
+        modbus_serial_set_serial_mode.txt \
+        modbus_serial_get_recv_filter.txt \
+        modbus_serial_set_recv_filter.txt \
         modbus_set_bits_from_byte.txt \
+        modbus_set_bits_from_bytes.txt \
         modbus_set_byte_timeout.txt \
         modbus_set_debug.txt \
         modbus_set_error_recovery.txt \
@@ -53,14 +55,15 @@ TXT3 = \
         modbus_set_socket.txt \
         modbus_strerror.txt \
         modbus_tcp_accept.txt \
-        modbus_tcp_pi_accept.txt \
         modbus_tcp_listen.txt \
+        modbus_tcp_pi_accept.txt \
         modbus_tcp_pi_listen.txt \
         modbus_write_and_read_registers.txt \
-        modbus_write_bits.txt \
         modbus_write_bit.txt \
         modbus_write_registers.txt \
-        modbus_write_register.txt
+        modbus_write_register.txt \
+        modbus_write_bits.txt
+
 TXT7 = libmodbus.txt
 
 EXTRA_DIST = asciidoc.conf $(TXT3) $(TXT7)

doc/libmodbus.txt

@@ -11,7 +11,7 @@ SYNOPSIS
 --------
 *#include <modbus.h>*
 
-*cc* \`pkg-config --cflags --libs libmodbus` 'files'
+*cc* \`pkg-config --cflags --libs libmodbusepsi` 'files'
 
 
 DESCRIPTION
@@ -75,14 +75,16 @@ Create a Modbus RTU context::
     linkmb:modbus_new_rtu[3]
 
 
-Set the serial mode::
-    linkmb:modbus_rtu_get_serial_mode[3]
-    linkmb:modbus_rtu_set_serial_mode[3]
-    linkmb:modbus_rtu_get_rts[3]
-    linkmb:modbus_rtu_set_rts[3]
-    linkmb:modbus_rtu_set_custom_rts[3]
-    linkmb:modbus_rtu_get_rts_delay[3]
-    linkmb:modbus_rtu_set_rts_delay[3]
+Set the low-level behaviour of the serial communication::
+    linkmb:modbus_serial_set_rts[3]
+    linkmb:modbus_serial_get_rts[3]
+    linkmb:modbus_serial_set_custom_rts[3]
+    linkmb:modbus_serial_get_rts_delay[3]
+    linkmb:modbus_serial_set_rts_delay[3]
+    linkmb:modbus_serial_set_serial_mode[3]
+    linkmb:modbus_serial_get_serial_mode[3]
+    modbus_rtu_set_serial_mode (deprecated)
+    modbus_rtu_get_serial_mode (deprecated)
 
 
 TCP (IPv4) Context