Merge pull request #1 from NikolasK-source/development

Development

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.0.2)
+project(Modbus_TCP_client_shm LANGUAGES CXX VERSION 1.0.3)
 
 # settings
 set(Target "Modbus_TCP_client_shm")    # Executable name (without file extension!)

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Nikolas Koesling
+Copyright (c) 2021-2022 Nikolas Koesling
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/CMakeLists.txt

@@ -4,12 +4,14 @@
 target_sources(${Target} PRIVATE main.cpp)
 target_sources(${Target} PRIVATE modbus_shm.cpp)
 target_sources(${Target} PRIVATE Modbus_TCP_Slave.cpp)
+target_sources(${Target} PRIVATE license.cpp)
 
 
 # ---------------------------------------- header files (*.jpp, *.h, ...) ----------------------------------------------
 # ======================================================================================================================
 target_sources(${Target} PRIVATE modbus_shm.hpp)
 target_sources(${Target} PRIVATE Modbus_TCP_Slave.hpp)
+target_sources(${Target} PRIVATE license.hpp)
 
 
 

src/Modbus_TCP_Slave.cpp

@@ -1,3 +1,8 @@
+/*
+ * Copyright (C) 2021-2022 Nikolas Koesling <[email protected]>.
+ * This program is free software. You can redistribute it and/or modify it under the terms of the MIT License.
+ */
+
 #include "Modbus_TCP_Slave.hpp"
 
 #include <stdexcept>

src/Modbus_TCP_Slave.hpp

@@ -1,3 +1,8 @@
+/*
+ * Copyright (C) 2021-2022 Nikolas Koesling <[email protected]>.
+ * This program is free software. You can redistribute it and/or modify it under the terms of the MIT License.
+ */
+
 #pragma once
 
 #include <modbus/modbus.h>
@@ -9,7 +14,7 @@ namespace TCP {
 //! Modbus TCP 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
     int               socket = -1;     //!< socket of the modbus connection
@@ -23,7 +28,7 @@ class Slave {
      */
     explicit Slave(const std::string &ip      = "0.0.0.0",
                    short unsigned int port    = 502,
-                   modbus_mapping_t * mapping = nullptr);
+                   modbus_mapping_t  *mapping = nullptr);
 
     /*! \brief destroy the modbus slave
      *

src/license.hpp

@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2022 Nikolas Koesling <[email protected]>.
+ * This program is free software. You can redistribute it and/or modify it under the terms of the MIT License.
+ */
+
+#pragma once
+
+#include <ostream>
+
+/**
+ * \brief print licences
+ * @param o output stream used to print licenses
+ */
+void print_licenses(std::ostream &o);

src/main.cpp

@@ -1,3 +1,8 @@
+/*
+ * Copyright (C) 2021-2022 Nikolas Koesling <[email protected]>.
+ * This program is free software. You can redistribute it and/or modify it under the terms of the MIT License.
+ */
+
 #include <csignal>
 #include <cxxopts.hpp>
 #include <filesystem>
@@ -7,6 +12,7 @@
 #include <unistd.h>
 
 #include "Modbus_TCP_Slave.hpp"
+#include "license.hpp"
 #include "modbus_shm.hpp"
 
 //! terminate flag
@@ -83,7 +89,9 @@ int main(int argc, char **argv) {
                          ("h,help",
                           "print usage")
                          ("version",
-                          "print version information");
+                          "print version information")
+                         ("license",
+                          "show licences");
     // clang-format on
 
     // parse arguments
@@ -111,29 +119,6 @@ int main(int argc, char **argv) {
         std::cout << "This application uses the following libraries:" << std::endl;
         std::cout << "  - cxxopts by jarro2783 (https://github.com/jarro2783/cxxopts)" << std::endl;
         std::cout << "  - libmodbus by Stéphane Raimbault (https://github.com/stephane/libmodbus)" << std::endl;
-        std::cout << std::endl;
-        std::cout << std::endl;
-        std::cout << "MIT License:" << std::endl;
-        std::cout << std::endl;
-        std::cout << "Copyright (c) 2021 Nikolas Koesling" << std::endl;
-        std::cout << std::endl;
-        std::cout << "Permission is hereby granted, free of charge, to any person obtaining a copy" << std::endl;
-        std::cout << "of this software and associated documentation files (the \"Software\"), to deal" << std::endl;
-        std::cout << "in the Software without restriction, including without limitation the rights" << std::endl;
-        std::cout << "to use, copy, modify, merge, publish, distribute, sublicense, and/or sell" << std::endl;
-        std::cout << "copies of the Software, and to permit persons to whom the Software is" << std::endl;
-        std::cout << "furnished to do so, subject to the following conditions:" << std::endl;
-        std::cout << std::endl;
-        std::cout << "The above copyright notice and this permission notice shall be included in all" << std::endl;
-        std::cout << "copies or substantial portions of the Software." << std::endl;
-        std::cout << std::endl;
-        std::cout << "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR" << std::endl;
-        std::cout << "IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY," << std::endl;
-        std::cout << "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE" << std::endl;
-        std::cout << "AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER" << std::endl;
-        std::cout << "LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM," << std::endl;
-        std::cout << "OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE" << std::endl;
-        std::cout << "SOFTWARE." << std::endl;
         exit(EX_OK);
     }
 
@@ -143,6 +128,12 @@ int main(int argc, char **argv) {
         exit(EX_OK);
     }
 
+    // print licenses
+    if (args.count("license")) {
+        print_licenses(std::cout);
+        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

@@ -1,7 +1,11 @@
+/*
+ * Copyright (C) 2021-2022 Nikolas Koesling <[email protected]>.
+ * This program is free software. You can redistribute it and/or modify it under the terms of the MIT License.
+ */
+
 #include "modbus_shm.hpp"
 
 #include <fcntl.h>
-#include <iostream>
 #include <stdexcept>
 #include <sys/mman.h>
 #include <system_error>

src/modbus_shm.hpp

@@ -1,3 +1,8 @@
+/*
+ * Copyright (C) 2021-2022 Nikolas Koesling <[email protected]>.
+ * This program is free software. You can redistribute it and/or modify it under the terms of the MIT License.
+ */
+
 #pragma once
 
 #include "modbus/modbus.h"
@@ -21,7 +26,7 @@ class Shm_Mapping {
         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