adjust all defines and function call to libmodbus-ascii-support

Author: Karl Herbig

CMakeLists.txt

@@ -123,7 +123,7 @@ check_symbol_exists(TIOCSRS485 sys/ioctl.h MODBUSPP_HAVE_TIOCRS485)
 check_symbol_exists(TIOCM_RTS sys/ioctl.h MODBUSPP_HAVE_TIOCM_RTS)
 
 list(APPEND CMAKE_REQUIRED_LIBRARIES ${LIBMODBUS_NAME})
-check_symbol_exists(modbus_rtu_set_recv_filter ${LIBMODBUS_NAME}/modbus-rtu.h MODBUSPP_HAVE_RTU_MULTI_SLAVES)
+check_symbol_exists(modbus_serial_set_recv_filter ${LIBMODBUS_NAME}/modbus-serial.h MODBUSPP_HAVE_SERIAL_MULTI_SLAVES)
 
 configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
                 ${CMAKE_CURRENT_BINARY_DIR}/config.h @ONLY)
@@ -308,7 +308,7 @@ if (CPACK_GENERATOR STREQUAL "DEB")
   set(CPACK_DEBIAN_DEV_PACKAGE_NAME "libmodbuspp-dev")
   set(CPACK_COMPONENT_DEV_DESCRIPTION "${CPACK_DEBIAN_LIB_PACKAGE_NAME} - ${PROJECT_DESCRIPTION} (development files)\n${PROJECT_DESCRIPTION_TEXT}\n  This package provides the development files.")
   set(CPACK_DEBIAN_DEV_FILE_NAME "lib${PROJECT_NAME}-dev_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
-  set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "${CPACK_DEBIAN_LIB_PACKAGE_NAME} (= ${CPACK_PACKAGE_VERSION}),pkg-config,git-core,${LIBMODBUSDEV_PACKAGE} (>= ${LIBMODBUS_VERSION})")
+  set(CPACK_DEBIAN_DEV_PACKAGE_DEPENDS "${CPACK_DEBIAN_LIB_PACKAGE_NAME} (= ${CPACK_PACKAGE_VERSION}),pkg-fconfig,git-core,${LIBMODBUSDEV_PACKAGE} (>= ${LIBMODBUS_VERSION})")
   set(CPACK_DEBIAN_DEV_PACKAGE_SECTION "libdevel")
   #set(CPACK_PACKAGE_DESCRIPTION_FILE "${MODBUSPP_SRC_DIR}/doc/README-deb.md")
 

README.md

@@ -299,7 +299,7 @@ _"Filter on the Modbus unit identifier (slave) in RTU mode to avoid useless CRC
 To benefit from the routing capacity of the Router and Server classes in RTU, 
 you must therefore use the fork of libmodbus named **libmodbusepsi**.  
 In this fork released from the [piduino](http://apt.piduino.org) 
-repository, filtering can be disabled (with _modbus_rtu_set_recv_filter()_).    
+repository, filtering can be disabled (with _modbus_serial_set_recv_filter()_).    
 Thus, it is the Server class which performs this filtering (after checking the 
 CRC therefore). Effectively, this has the effect of loading the microprocessor, 
 but, at present, the computing power of our machines is such that it does not 

config.h.in

@@ -19,6 +19,6 @@
 #include "version.h"
 #cmakedefine01 MODBUSPP_HAVE_TIOCRS485
 #cmakedefine01 MODBUSPP_HAVE_TIOCM_RTS
-#cmakedefine01 MODBUSPP_HAVE_RTU_MULTI_SLAVES
+#cmakedefine01 MODBUSPP_HAVE_SERIAL_MULTI_SLAVES
 
 /* ========================================================================== */

include/modbuspp/global.h

@@ -105,9 +105,9 @@ namespace Modbus {
    * The @b RtsDown mode applies the same procedure but with an inverted RTS flag.
    */
   enum SerialRts {
-    RtsNone = MODBUS_RTU_RTS_NONE, ///< no use of the RTS.
-    RtsUp = MODBUS_RTU_RTS_UP, ///< RTS flag ON during communication, OFF outside.
-    RtsDown = MODBUS_RTU_RTS_DOWN, ///< RTS flag OFF during communication, ON outside.
+    RtsNone = MODBUS_SERIAL_RTS_NONE, ///< no use of the RTS.
+    RtsUp = MODBUS_SERIAL_RTS_UP, ///< RTS flag ON during communication, OFF outside.
+    RtsDown = MODBUS_SERIAL_RTS_DOWN, ///< RTS flag OFF during communication, ON outside.
     UnknownRts = Unknown   ///< Unknown RTS mode.
   };
 

src/rtulayer.cpp

@@ -104,7 +104,7 @@ namespace Modbus {
   SerialMode RtuLayer::serialMode() {
     PIMP_D (RtuLayer);
 
-    int m = modbus_rtu_get_serial_mode (d->ctx);
+    int m = modbus_serial_get_serial_mode (d->ctx);
     if (m != -1) {
       return static_cast<SerialMode> (m);
     }
@@ -115,14 +115,14 @@ namespace Modbus {
   bool RtuLayer::setSerialMode (SerialMode mode) {
     PIMP_D (RtuLayer);
 
-    return (modbus_rtu_set_serial_mode (d->ctx, static_cast<int> (mode)) != -1);
+    return (modbus_serial_set_serial_mode (d->ctx, static_cast<int> (mode)) != -1);
   }
 
   // ---------------------------------------------------------------------------
   SerialRts RtuLayer::rts() {
     PIMP_D (RtuLayer);
 
-    int r = modbus_rtu_get_rts (d->ctx);
+    int r = modbus_serial_get_rts (d->ctx);
     if (r != -1) {
 
       return static_cast<SerialRts> (r);
@@ -134,21 +134,21 @@ namespace Modbus {
   bool RtuLayer::setRts (SerialRts r) {
     PIMP_D (RtuLayer);
 
-    return (modbus_rtu_set_rts (d->ctx, static_cast<int> (r)) != -1);
+    return (modbus_serial_set_rts (d->ctx, static_cast<int> (r)) != -1);
   }
 
   // ---------------------------------------------------------------------------
   int RtuLayer::rtsDelay() {
     PIMP_D (RtuLayer);
 
-    return modbus_rtu_get_rts_delay (d->ctx);
+    return modbus_serial_get_rts_delay (d->ctx);
   }
 
   // ---------------------------------------------------------------------------
   bool RtuLayer::setRtsDelay (int delay) {
     PIMP_D (RtuLayer);
 
-    return (modbus_rtu_set_rts_delay (d->ctx, delay) != -1);
+    return (modbus_serial_set_rts_delay (d->ctx, delay) != -1);
   }
 
   // ---------------------------------------------------------------------------
@@ -308,7 +308,7 @@ namespace Modbus {
         "Unable to create RTU Modbus Backend("
         + port + "," + settings + ")\n" + lastError());
     }
-    oneByteTime = modbus_rtu_get_rts_delay (ctx);
+    oneByteTime = modbus_serial_get_rts_delay (ctx);
   }
 }
 

src/server.cpp

@@ -252,9 +252,9 @@ namespace Modbus {
                                     const std::string & settings) {
 
     Device::Private::setBackend (net, connection, settings);
-#if MODBUSPP_HAVE_RTU_MULTI_SLAVES
+#if MODBUSPP_HAVE_SERIAL_MULTI_SLAVES
     if (net == Rtu) {
-      modbus_rtu_set_recv_filter (ctx(), FALSE);
+      modbus_serial_set_recv_filter (ctx(), FALSE);
     }
 #endif
   }