version 0.1.0

Author: NikolasK-source

CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13.4 FATAL_ERROR)
 # ======================================================================================================================
 
 # project
-project(Modbus_RTU_client_shm LANGUAGES CXX VERSION 0.0.1)
+project(Modbus_RTU_client_shm LANGUAGES CXX VERSION 0.1.0)
 
 # settings
 set(Target "Modbus_RTU_client_shm")    # Executable name (without file extension!)
@@ -24,8 +24,6 @@ option(OPTIMIZE_FOR_ARCHITECTURE "enable optimizations for specified architectur
 option(LTO_ENABLED "enable interprocedural and link time optimizations" ON)
 option(COMPILER_EXTENSIONS "enable compiler specific C++ extensions" OFF)
 
-
-
 # ======================================================================================================================
 # ======================================================================================================================
 
@@ -55,6 +53,10 @@ set_target_properties(${Target} PROPERTIES
         CXX_EXTENSIONS ${COMPILER_EXTENSIONS}
     )
 
+# project version and name
+target_compile_definitions(${Target} PUBLIC "PROJECT_VERSION=\"${CMAKE_PROJECT_VERSION}\"")
+target_compile_definitions(${Target} PUBLIC "PROJECT_NAME=\"${CMAKE_PROJECT_NAME}\"")
+
 # options that are valid for gcc and clang
 function(commonopts)
     # more debugging information

src/Modbus_RTU_Slave.cpp

@@ -16,7 +16,7 @@ Slave::Slave(const std::string &device,
              int                baud,
              bool               rs232,
              bool               rs485,
-             modbus_mapping_t * mapping) {
+             modbus_mapping_t  *mapping) {
     // create modbus object
     modbus = modbus_new_rtu(device.c_str(), baud, parity, data_bits, stop_bits);
     if (modbus == nullptr) {

src/Modbus_RTU_Slave.hpp

@@ -9,7 +9,7 @@ namespace RTU {
 //! Modbus RTU slave
 class Slave {
 private:
-    modbus_t *        modbus;          //!< modbus object (see libmodbus library)
+    modbus_t         *modbus;          //!< modbus object (see libmodbus library)
     modbus_mapping_t *mapping;         //!< modbus data object (see libmodbus library)
     bool              delete_mapping;  //!< indicates whether the mapping object was created by this instance
 
@@ -34,7 +34,7 @@ class Slave {
                    int                baud,
                    bool               rs232,
                    bool               rs485,
-                   modbus_mapping_t * mapping = nullptr);
+                   modbus_mapping_t  *mapping = nullptr);
 
     /*! \brief destroy the modbus slave
      *

src/main.cpp

@@ -72,6 +72,7 @@ int main(int argc, char **argv) {
             "ai-registers", "number of analog input registers", cxxopts::value<std::size_t>()->default_value("65536"));
     options.add_options()("m,monitor", "output all incoming and outgoing packets to stdout");
     options.add_options()("h,help", "print usage");
+    options.add_options()("version", "print version information");
     // clang-format on
 
     // parse arguments
@@ -125,6 +126,12 @@ int main(int argc, char **argv) {
         exit(EX_OK);
     }
 
+    // print version
+    if (args.count("version")) {
+        std::cout << PROJECT_NAME << ' ' << PROJECT_VERSION << std::endl;
+        exit(EX_OK);
+    }
+
     // check arguments
     if (args["do-registers"].as<std::size_t>() > 0x10000) {
         std::cerr << "to many do_registers (maximum: 65536)." << std::endl;

src/modbus_shm.cpp

@@ -43,7 +43,7 @@ Shm_Mapping::Shm_Mapping(std::size_t        nb_bits,
     shm_data[AI].name = prefix + "AI";
 
     // create and map shm objects
-    for (std::size_t i = 0; i < reg_index_t::__SIZE__; ++i) {
+    for (std::size_t i = 0; i < reg_index_t::REG_COUNT; ++i) {
         auto &shm = shm_data[i];
 
         // create shm object
@@ -76,7 +76,7 @@ Shm_Mapping::Shm_Mapping(std::size_t        nb_bits,
 
 Shm_Mapping::~Shm_Mapping() {
     // unmap and delete shm objects
-    for (std::size_t i = 0; i < reg_index_t::__SIZE__; ++i) {
+    for (std::size_t i = 0; i < reg_index_t::REG_COUNT; ++i) {
         auto &shm = shm_data[i];
         if (shm.addr) {
             if (munmap(shm.addr, shm.size)) { perror(("Failed to unmap shared memory '" + shm.name + '\'').c_str()); }

src/modbus_shm.hpp

@@ -14,21 +14,21 @@ namespace shm {
  */
 class Shm_Mapping {
 private:
-    enum reg_index_t : std::size_t { DO, DI, AO, AI, __SIZE__ };
+    enum reg_index_t : std::size_t { DO, DI, AO, AI, REG_COUNT };
 
     //! data for a shared memory object
     struct shm_data_t {
         std::string name = std::string();  //!< name of the object
         int         fd   = -1;             //!< file descriptor
         std::size_t size;                  //!< size in bytes
-        void *      addr = nullptr;        //!< mapped address
+        void       *addr = nullptr;        //!< mapped address
     };
 
     //! modbus lib storage object
     modbus_mapping_t mapping {};
 
     //! info for all shared memory objects
-    std::array<shm_data_t, reg_index_t::__SIZE__> shm_data;
+    std::array<shm_data_t, reg_index_t::REG_COUNT> shm_data;
 
 public:
     /*! \brief creates a new modbus_mapping_t. Like modbus_mapping_new(), but creates shared memory objects to store its