stephane · frodete · Mar 31, 2016 · Mar 30, 2016 · Apr 27, 2016 · Apr 25, 2016
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@ Makefile.in
 /build-aux
 /config.*
 /configure
+/configure.scan
 /depcomp
 /install-sh
 /libtool

diff --git a/AUTHORS b/AUTHORS
@@ -5,3 +5,4 @@ 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
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,29 @@
+How Do I Submit A Good Bug Report?
+----------------------------------
+
+Please, don't send direct emails to Stéphane Raimbault unless you want
+commercial support.
+
+Take care to read the documentation at http://libmodbus.org/documentation/.
+
+- *Be sure it's a bug before creating an issue*, in doubt, post a message on
+  https://groups.google.com/forum/#!forum/libmodbus or send an email to
+  libmodbus@googlegroups.com
+
+- *Use a clear and decriptive title* for the issue to identify
+
+- *Which version of libmodbus are you using?* you can obtain this information
+from your package manager or by running `pkg-config --modversion libmodbus`.
+You can provide the sha1 of the commit if you have fetched the code with `git`.
+
+- *Which operating system are you using?*
+
+- *Describe the exact steps which reproduce the problem* in as many details as
+possible. For example, the software/equipement which runs the Modbus server, how
+the clients are connected (TCP, RTU, ASCII) and the source code you are using.
+
+- *Enable the debug mode*, libmodbus provides a function to display the content
+of the Modbus messages and it's very convenient to analyze issues
+(http://libmodbus.org/docs/latest/modbus_set_debug.html).
+
+Good bug reports provide right and quick fixes!
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -0,0 +1,13 @@
+### libmodbus version
+
+### Operating system
+
+### Description of the Modbus network (server, client, links, etc)
+
+### Expected behavior
+
+### Actual behavior
+
+### Steps to reproduce the behavior (commands or source code)
+
+### libmodbus output with debug mode enabled
diff --git a/Makefile.am b/Makefile.am
@@ -9,4 +9,8 @@ CLEANFILES += libmodbus.pc
 
 dist_doc_DATA = MIGRATION README.md
 
-SUBDIRS = src tests doc
+SUBDIRS = src doc
+
+if BUILD_TESTS
+SUBDIRS += tests
+endif
diff --git a/NEWS b/NEWS
@@ -1,8 +1,20 @@
-libmodbus 3.1.3 (XXXX-XX-XX)
+libmodbus 3.1.3 (2016-05-11)
 ============================
 
-- Introduce offsets in modbus mappings.
-- Add some more macros for data manipulation.
+- New bswap macros for Max OSX by Jakob Bysewski.
+- Fix "wildcard address" in TCP IPv6 by Shoichi Sakane.
+- Introduce offsets in modbus mappings with modbus_mapping_new_start_address.
+  Thanks to Michael Heimpold and Stéphane Raimbault.
+- Fix address range in random-test-client.
+  Thanks to Martin Galvan.
+- Add an option to disable tests compilation by Yegor Yefremov.
+- Define MSG_DONTWAIT to MSG_NONBLOCK on AIX (#294).
+  Thanks to Fabrice Cantos.
+- Fix building when byteswap.h is not defined by Tomasz Mon.
+- Add some more macros for data manipulation and documentation.
+- Remove duplicate install of modbus.h (closes #290).
+  Thanks to Daniel Sutcliffe.
+- Move MIGRATION and README.md to dist_doc_DATA target.
 - Change order of few functions in modbus RTU code.
 - Add entries for modbus_rtu_[get|set]_delay in documentation index.
 - Implemented runtime configurable RTS delay by Jimmy Bergström.
@@ -12,7 +24,7 @@ libmodbus 3.1.3 (XXXX-XX-XX)
 - Added ILLEGAL_DATA_ADDRESS tests for modbus_write_register[|s].
   Thanks to Andrey Skvortsov.
 - Update documentation of modbus_rtu_set_rts
-- fix rts signal switch time by Hiromasa Ihara.
+- Fix rts signal switch time by Hiromasa Ihara.
 - Improve new_rtu and set_slave documentation (related to #276).
 - Fix late check of ctx in modbus_reply[|_exception] (closes #269).
 - Wait the server for 1 second before running tests (help Travis).

diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ The library provides a *libmodbus.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
-<http://code.google.com/p/msinttypes/> to fill the absence of stdint.h.
+<https://github.com/chemeris/msinttypes> to fill the absence of stdint.h.
 
 To compile under Windows, install [MinGW](http://www.mingw.org/) and MSYS then
 select the common packages (gcc, automake, libtool, etc). The directory
@@ -59,13 +59,14 @@ automake libtool`.
 Documentation
 -------------
 
+The documentation is available [online](http://libmodbus.org/documentation) or
+as manual pages after installation.
+
 The documentation is based on
 [AsciiDoc](http://www.methods.co.nz/asciidoc/).  Only man pages are built
 by default with `make` command, you can run `make htmldoc` in *docs* directory
 to generate HTML files.
 
-The documentation is also available [online](http://libmodbus.org/documentation).
-
 Testing
 -------
 
@@ -83,21 +84,7 @@ By default, all TCP unit tests will be executed (see --help for options).
 
 It's also possible to run the unit tests with `make check`.
 
-Report a Bug
-------------
-
-Before reporting a bug, take care to read the documentation (RTFM!) and to
-provide enough information:
-
-1. libmodbus version
-2. OS/environment/architecture
-3. libmodbus backend (TCP, RTU, IPv6)
-3. Modbus messages when running in debug mode (`man modbus_set_debug`)
-
-To report your problem, you can:
-
-* fill a bug report on the issue tracker <http://github.com/stephane/libmodbus/issues>.
-* or send an email to the libmodbus mailing list [libmodbus@googlegroups.com](https://groups.google.com/forum/#!forum/libmodbus).
+To report a bug or to contribute
+--------------------------------
 
-If your prefer live talk when your're looking for help or to offer contribution,
-there is also a channel called #libmodbus on Freenode.
+See [CONTRIBUTING](CONTRIBUTING.md) document.
diff --git a/configure.ac b/configure.ac
@@ -13,7 +13,7 @@
 #
 m4_define([libmodbus_version_major], [3])
 m4_define([libmodbus_version_minor], [1])
-m4_define([libmodbus_version_micro], [2])
+m4_define([libmodbus_version_micro], [3])
 
 m4_define([libmodbus_release_status],
     [m4_if(m4_eval(libmodbus_version_minor % 2), [1], [snapshot], [release])])
@@ -57,13 +57,17 @@ AC_CANONICAL_HOST
 
 # OS check
 os_win32="false"
+os_cygwin="false"
 os_qnx="false"
 case "${host_os}" in
       *mingw32*)
     os_win32="true"
   ;;
       *nto-qnx*)
     os_qnx="true"
+  ;;
+      *cygwin*)
+    os_cygwin="true"
   ;;
 esac
 AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "true")
@@ -110,7 +114,6 @@ AC_C_INLINE
 
 # libtool
 AC_PROG_CXX
-AC_PROG_RANLIB
 
 # Various types
 AC_TYPE_INT64_T
@@ -120,11 +123,13 @@ AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
 AC_TYPE_UINT8_T
 
-# Required for getaddrinfo (TCP PI - IPv6)
-AC_CHECK_HEADERS([winsock2.h], HAVE_WINSOCK2_H=yes)
-if test "x$HAVE_WINSOCK2_H" = "xyes"; then
-   LIBS="$LIBS -lws2_32"
-   AC_SUBST(LIBS)
+if test "$os_cygwin" = "false"; then
+    # Required for getaddrinfo (TCP IP - IPv6)
+    AC_CHECK_HEADERS([winsock2.h], HAVE_WINSOCK2_H=yes)
+    if test "x$HAVE_WINSOCK2_H" = "xyes"; then
+        LIBS="$LIBS -lws2_32"
+    AC_SUBST(LIBS)
+    fi
 fi
 
 # Check for RS485 support (Linux kernel version 2.6.28+)
@@ -141,6 +146,13 @@ my_CFLAGS="-Wall \
 -Wformat-security"
 AC_SUBST([my_CFLAGS])
 
+# Build options
+AC_ARG_ENABLE(tests,
+	AS_HELP_STRING([--disable-tests],
+	[Build tests (default: yes)]),,
+	[enable_tests=yes])
+AM_CONDITIONAL(BUILD_TESTS, [test $enable_tests != no])
+
 AC_CONFIG_HEADERS([config.h tests/unit-test.h])
 AC_CONFIG_FILES([
         Makefile
@@ -167,4 +179,5 @@ AC_MSG_RESULT([
         ldflags:                ${LDFLAGS}
 
         documentation:          ${ac_libmodbus_build_doc}
+        tests:                  ${enable_tests}
 ])
diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -15,7 +15,7 @@ TXT3 = \
         modbus_get_socket.txt \
         modbus_mapping_free.txt \
         modbus_mapping_new.txt \
-        modbus_mapping_offset_new.txt \
+        modbus_mapping_new_start_address.txt \
         modbus_mask_write_register.txt \
         modbus_new_rtu.txt \
         modbus_new_tcp_pi.txt \
@@ -26,6 +26,7 @@ TXT3 = \
         modbus_read_registers.txt \
         modbus_receive_confirmation.txt \
         modbus_receive.txt \
+        modbus_reply_callback.txt \
         modbus_reply_exception.txt \
         modbus_reply.txt \
         modbus_report_slave_id.txt \

diff --git a/doc/libmodbus.txt b/doc/libmodbus.txt
@@ -162,10 +162,17 @@ Handling of bits and bytes::
     linkmb:modbus_get_byte_from_bits[3]
 
 Set or get float numbers::
-    linkmb:modbus_get_float[3]
-    linkmb:modbus_set_float[3]
+    linkmb:modbus_get_float_abcd[3]
+    linkmb:modbus_set_float_abcd[3]
+    linkmb:modbus_get_float_badc[3]
+    linkmb:modbus_set_float_badc[3]
+    linkmb:modbus_get_float_cdab[3]
+    linkmb:modbus_set_float_cdab[3]
     linkmb:modbus_get_float_dcba[3]
     linkmb:modbus_set_float_dcba[3]
+    linkmb:modbus_get_float[3] (deprecated)
+    linkmb:modbus_set_float[3] (deprecated)
+
 
 
 Connection
@@ -228,6 +235,7 @@ Receive::
 
 Reply::
      linkmb:modbus_reply[3]
+     linkmb:modbus_reply_callback[3]
      linkmb:modbus_reply_exception[3]
 
 

diff --git a/doc/modbus_mapping_new.txt b/doc/modbus_mapping_new.txt
@@ -18,8 +18,9 @@ The *modbus_mapping_new()* function shall allocate four arrays to store bits,
 input bits, registers and inputs registers. The pointers are stored in
 modbus_mapping_t structure. All values of the arrays are initialized to zero.
 
-This function is equivalent to a call of the _modbus_mapping_offset_new()_ function
-with all offsets set to zero.
+This function is equivalent to a call of the
+linkmb:modbus_mapping_new_start_address[3] function with all start addresses to
+`0`.
 
 If it isn't necessary to allocate an array for a specific type of data, you can
 pass the zero value in argument, the associated pointer will be NULL.
@@ -59,6 +60,7 @@ if (mb_mapping == NULL) {
 SEE ALSO
 --------
 linkmb:modbus_mapping_free[3]
+linkmb:modbus_mapping_new_start_address[3]
 
 
 AUTHORS

diff --git a/doc/modbus_mapping_new_start_address.txt b/doc/modbus_mapping_new_start_address.txt
@@ -0,0 +1,81 @@
+modbus_mapping_new_start_address(3)
+===================================
+
+
+NAME
+----
+modbus_mapping_new_start_address - allocate four arrays of bits and registers accessible from their starting addresses
+
+
+SYNOPSIS
+--------
+*modbus_mapping_t* modbus_mapping_new_start_address(int 'start_bits', int 'nb_bits',
+                                                    int 'start_input_bits', int 'nb_input_bits',
+                                                    int 'start_registers', int 'nb_registers',
+                                                    int 'start_input_registers', int 'nb_input_registers');*
+
+
+DESCRIPTION
+-----------
+The _modbus_mapping_new_start_address()_ function shall allocate four arrays to
+store bits, input bits, registers and inputs registers. The pointers are stored
+in modbus_mapping_t structure. All values of the arrays are initialized to zero.
+
+The different starting adresses make it possible to place the mapping at any
+address in each address space. This way, you can give access to values stored
+at high adresses without allocating memory from the address zero, for eg. to
+make available registers from 10000 to 10009, you can use:
+
+[source,c]
+-------------------
+mb_mapping = modbus_mapping_offset_start_address(0, 0, 0, 0, 10000, 10, 0, 0);
+-------------------
+
+With this code, only 10 registers (`uint16_t`) are allocated.
+
+If it isn't necessary to allocate an array for a specific type of data, you can
+pass the zero value in argument, the associated pointer will be NULL.
+
+This function is convenient to handle requests in a Modbus server/slave.
+
+
+RETURN VALUE
+------------
+The _modbus_mapping_offset_new()_ function shall return the new allocated structure if
+successful. Otherwise it shall return NULL and set errno.
+
+
+ERRORS
+------
+ENOMEM::
+Not enough memory
+
+
+EXAMPLE
+-------
+[source,c]
+-------------------
+/* The first value of each array is accessible at the defined address.
+   The end address is ADDRESS + NB - 1. */
+mb_mapping = modbus_mapping_offset_start_address(BITS_ADDRESS, BITS_NB,
+                                INPUT_BITS_ADDRESS, INPUT_BITS_NB,
+                                REGISTERS_ADDRESS, REGISTERS_NB,
+                                INPUT_REGISTERS_ADDRESS, INPUT_REGISTERS_NB);
+if (mb_mapping == NULL) {
+    fprintf(stderr, "Failed to allocate the mapping: %s\n",
+            modbus_strerror(errno));
+    modbus_free(ctx);
+    return -1;
+}
+-------------------
+
+SEE ALSO
+--------
+linkmb:modbus_mapping_new[3]
+linkmb:modbus_mapping_free[3]
+
+
+AUTHORS
+-------
+The libmodbus documentation was written by Stéphane Raimbault
+<stephane.raimbault@gmail.com>