Merge pull request #32 from NikolasK-source/main

update to v1.5.2

Author: NikolasK-source

CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13.4 FATAL_ERROR)
 # ======================================================================================================================
 
 # project
-project(Modbus_TCP_client_shm LANGUAGES CXX VERSION 1.5.0)
+project(Modbus_TCP_client_shm LANGUAGES CXX VERSION 1.5.2)
 
 # settings
 set(Target "modbus-tcp-client-shm")    # Executable name (without file extension!)

LICENSE

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2022 Nikolas Koesling <nikolas@koesling.info>.
- * This program is free software. You can redistribute it and/or modify it under the terms of the MIT License.
+ * This program is free software. You can redistribute it and/or modify it under the terms of the GPLv3 License.
  */
 
 #include "Modbus_TCP_Client_poll.hpp"
@@ -198,6 +198,8 @@ void Client_Poll::set_debug(bool debug) {
         const std::string error_msg = modbus_strerror(errno);
         throw std::runtime_error("failed to enable modbus debugging mode: " + error_msg);
     }
+
+    this->debug = debug;
 }
 
 struct timeout_t {
@@ -222,7 +224,7 @@ void Client_Poll::set_byte_timeout(double timeout) {
 
     if (ret != 0) {
         const std::string error_msg = modbus_strerror(errno);
-        throw std::runtime_error("modbus_receive failed: " + error_msg + ' ' + std::to_string(errno));
+        throw std::runtime_error("modbus_set_byte_timeout failed: " + error_msg + ' ' + std::to_string(errno));
     }
 }
 
@@ -232,7 +234,7 @@ void Client_Poll::set_response_timeout(double timeout) {
 
     if (ret != 0) {
         const std::string error_msg = modbus_strerror(errno);
-        throw std::runtime_error("modbus_receive failed: " + error_msg + ' ' + std::to_string(errno));
+        throw std::runtime_error("modbus_set_response_timeout failed: " + error_msg + ' ' + std::to_string(errno));
     }
 }
 
@@ -380,6 +382,7 @@ Client_Poll::run_t Client_Poll::run(int signal_fd, bool reconnect, int timeout)
 
                 uint8_t query[MODBUS_TCP_MAX_ADU_LENGTH];
                 int     rc = modbus_receive(modbus, query);
+                if (debug) std::cout.flush();
 
                 if (rc > 0) {
                     const auto CLIENT_ID = query[6];
@@ -409,6 +412,7 @@ Client_Poll::run_t Client_Poll::run(int signal_fd, bool reconnect, int timeout)
 
                     int ret = modbus_reply(modbus, query, rc, mapping);
                     if (semaphore && semaphore->is_acquired()) semaphore->post();
+                    if (debug) std::cout.flush();
 
                     if (ret == -1) {
                         std::cerr << Print_Time::iso << " ERROR: modbus_reply failed: " << modbus_strerror(errno)

src/Modbus_TCP_Client_poll.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2022 Nikolas Koesling <nikolas@koesling.info>.
- * This program is free software. You can redistribute it and/or modify it under the terms of the MIT License.
+ * This program is free software. You can redistribute it and/or modify it under the terms of the GPLv3 License.
  */
 #pragma once
 
@@ -28,6 +28,8 @@ class Client_Poll {
     const std::size_t          max_clients;
     std::vector<struct pollfd> poll_fds;
 
+    bool debug = false;  //!< modbus debugging enabled
+
     modbus_t *modbus;  //!< modbus object (see libmodbus library)
     modbus_mapping_t
             *mappings[MAX_CLIENT_IDS];  //!< modbus data objects (one per possible client id) (see libmodbus library)

src/Modbus_TCP_Client_poll.hpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2022 Nikolas Koesling <nikolas@koesling.info>.
- * This program is free software. You can redistribute it and/or modify it under the terms of the MIT License.
+ * This program is free software. You can redistribute it and/or modify it under the terms of the GPLv3 License.
  */
 
 #include "Print_Time.hpp"

src/Print_Time.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2022 Nikolas Koesling <nikolas@koesling.info>.
- * This program is free software. You can redistribute it and/or modify it under the terms of the MIT License.
+ * This program is free software. You can redistribute it and/or modify it under the terms of the GPLv3 License.
  */
 
 #pragma once

src/Print_Time.hpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2022 Nikolas Koesling <nikolas@koesling.info>.
- * This program is free software. You can redistribute it and/or modify it under the terms of the MIT License.
+ * This program is free software. You can redistribute it and/or modify it under the terms of the GPLv3 License.
  */
 
 #pragma once
@@ -11,4 +11,4 @@
  * \brief print licences
  * @param o output stream used to print licenses
  */
-void print_licenses(std::ostream &o);
+void print_licenses(std::ostream &o, bool full);

src/license.cpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2021-2022 Nikolas Koesling <nikolas@koesling.info>.
- * This program is free software. You can redistribute it and/or modify it under the terms of the MIT License.
+ * This program is free software. You can redistribute it and/or modify it under the terms of the GPLv3 License.
  */
 
 #include <atomic>
@@ -176,7 +176,8 @@ int main(int argc, char **argv) {
                           cxxopts::value<std::string>()->default_value("0640"));
     options.add_options()("h,help", "print usage");
     options.add_options()("version", "print version information");
-    options.add_options()("license", "show licences");
+    options.add_options()("license", "show licences (short)");
+    options.add_options()("license-full", "show licences (full license text)");
 
     // parse arguments
     cxxopts::ParseResult args;
@@ -221,7 +222,12 @@ int main(int argc, char **argv) {
 
     // print licenses
     if (args.count("license")) {
-        print_licenses(std::cout);
+        print_licenses(std::cout, false);
+        return EX_OK;
+    }
+
+    if (args.count("license-full")) {
+        print_licenses(std::cout, true);
         return EX_OK;
     }
 

src/license.hpp

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2021-2022 Nikolas Koesling <nikolas@koesling.info>.
- * This program is free software. You can redistribute it and/or modify it under the terms of the MIT License.
+ * This program is free software. You can redistribute it and/or modify it under the terms of the GPLv3 License.
  */
 
 #include "modbus_shm.hpp"