Setting up new structure

Peter M. Groen
1 parent ea10dfe9
Showing 9 changed files with 42 additions and 240 deletions
include/modbus.h → include/imodbus.h
src/CMakeLists.txt
src/imodbusport.h
src/modbusbase.cpp → src/modbus.cpp
src/modbusbase.h → src/modbus.h
src/modbusrtu.cpp
src/modbusrtu.h
src/modbustcp.cpp
src/modbustcp.h
@@ -6,13 +6,14 @@ project_header(modbus-cpp)
 include(compiler)
+include_directories(
+    ${CMAKE_SOURCE_DIR}/include
+)
+
 set(SRC_LIST
-    ${CMAKE_CURRENT_SOURCE_DIR}/modbusbase.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/modbusbase.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/modbustcp.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/modbustcp.cpp
-    #${CMAKE_CURRENT_SOURCE_DIR}/modbusrtu.h
-    #${CMAKE_CURRENT_SOURCE_DIR}/modbusrtu.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/imodbusport.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/modbus.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/modbus.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/connectionconfig.h
     ${CMAKE_CURRENT_SOURCE_DIR}/connectionconfig.cpp
 )
+/*
+ *  Copyright (c) 2022 Peter M. Groen
+ *
+ *  This source code is licensed under the MIT license found in the
+ *  LICENSE file in the root directory of this source tree.
+ */
+#pragma once
+
+#include "connectionconfig.h"
+#include <vector>
+
+namespace osdev {
+namespace components {
+namespace modbus {
+
+class IModbusPort
+{
+public:
+    IModbusPort(const ConnectionConfig &con_config);
+    virtual ~IModbusPort() {}
+
+    // The standard device interface.
+    virtual bool Open() const = 0;
+    virtual bool Close() const = 0;
+    virtual int Read(uint8_t *buffer) const = 0;
+    virtual int Write(uint8_t *buffer, size_t length) const = 0;
+};
+
+}   /* End namespace modbus */
+}   /* End namespace components */
+}   /* End namespace osdev */
@@ -5,7 +5,7 @@
  *  LICENSE file in the root directory of this source tree.
  */
-#include "modbusbase.h"
+#include "modbus.h"
 using namespace osdev::components::modbus;
@@ -50,11 +50,11 @@ namespace components {
 namespace modbus {
 // Modbus base class. Providing all Modbus PDUs without transport implementation
-class ModbusBase
+class Modbus
 {
 public:
-    ModbusBase();
-    virtual ~ModbusBase();
+    Modbus();
+    virtual ~Modbus();
     // Pure virtuals. Override when inherited.
     virtual bool Connect() = 0;
-/*
- *  Copyright (c) 2022 Peter M. Groen
- *
- *  This source code is licensed under the MIT license found in the
- *  LICENSE file in the root directory of this source tree.
- */
-#include "modbusrtu.h"
-
-using namespace osdev::components::modbus;
-
-ModbusRTU::ModbusRTU()
-{
-
-}
-
-bool ModbusRTU::Connect()
-{
-
-}
-
-void ModbusRTU::Close()
-{
-
-}
-
-ssize_t ModbusRTU::modbusSend(uint8_t *to_send, size_t length)
-{
-
-}
-
-ssize_t ModbusRTU::modbusReceive(uint8_t *buffer) const
-{
-
-}
-/*
- *  Copyright (c) 2022 Peter M. Groen
- *
- *  This source code is licensed under the MIT license found in the
- *  LICENSE file in the root directory of this source tree.
- */
-#pragma once
-
-#include "modbusbase.h"
-
-namespace osdev {
-namespace components {
-namespace modbus {
-
-class ModbusRTU : public ModbusBase
-{
-public:
-    ModbusRTU();
-
-    // Pure virtuals. Override when inherited.
-    /*!
-     * \brief Connect
-     * \return
-     */
-    virtual bool Connect() override;
-
-    /*!
-     * \brief Close
-     */
-    virtual void Close() override;
-
-private:
-    /*!
-     * \brief modbusSend
-     * \param to_send
-     * \param length
-     * \return
-     */
-    virtual ssize_t modbusSend(uint8_t *to_send, size_t length) override;
-
-    /*!
-     * \brief modbusReceive
-     * \param buffer
-     * \return
-     */
-    virtual ssize_t modbusReceive(uint8_t *buffer) const override;
-};
-
-}   // End namespace modbus
-}   // End namespace components
-}   // End namespace osdev
-/*
- *  Copyright (c) 2022 Peter M. Groen
- *
- *  This source code is licensed under the MIT license found in the
- *  LICENSE file in the root directory of this source tree.
- */
-#include "modbustcp.h"
-
-using namespace osdev::components::modbus;
-
-ModbusTCP::ModbusTCP(const ConnectionConfig &port_configuration)
-{
-    setMaxMessageLength(260);   // Maximum Messagelength over TCP
-}
-
-bool ModbusTCP::Connect()
-{
-    if(m_host.empty() || m_port == 0)
-    {
-        LOG("Missing host and port");
-        return false;
-    }
-
-    m_socket = socket(AF_INET, SOCK_STREAM, 0);
-    if(!X_ISVALIDSOCKET(m_socket))
-    {
-        LOG("Errror Opening Socket");
-        return false;
-    }
-
-    struct timeval timeout {};
-    timeout.tv_sec  = 20;        // After 20 seconds connect() will timeout
-    timeout.tv_usec = 0;
-
-    setsockopt(m_socket, SOL_SOCKET, SO_SNDTIMEO, reinterpret_cast<const char *>(&timeout), sizeof(timeout));
-    setsockopt(m_socket, SOL_SOCKET, SO_RCVTIMEO, reinterpret_cast<const char *>(&timeout), sizeof(timeout));
-    m_server.sin_family = AF_INET;
-    m_server.sin_addr.s_addr = inet_addr(m_host.c_str());
-    m_server.sin_port = htons(m_port);
-
-    if(!X_ISCONNECTSUCCEED(connect(m_socket, reinterpret_cast<SOCKADDR *>(&m_server), sizeof(m_server))))
-    {
-        LOG("Connection Error");
-        return false;
-    }
-
-    ModbusBase::setConnected(true);
-    return true;
-}
-
-void ModbusTCP::Close()
-{
-    X_CLOSE_SOCKET(m_socket);
-}
-
-ssize_t ModbusTCP::modbusSend(uint8_t *to_send, size_t length)
-{
-    uint32_t message_id = getMessageId();
-    setMessageId(message_id++);
-
-    return send(m_socket, reinterpret_cast<const char *>(to_send), static_cast<size_t>(length), 0);
-}
-
-ssize_t ModbusTCP::modbusReceive(uint8_t *buffer) const
-{
-    return recv(m_socket, reinterpret_cast<char *>(buffer), getMaxMessageLength(), 0);
-}
-/*
- *  Copyright (c) 2022 Peter M. Groen
- *
- *  This source code is licensed under the MIT license found in the
- *  LICENSE file in the root directory of this source tree.
- */
-#pragma once
-
-#include "modbusbase.h"
-#include "connectionconfig.h"
-
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-namespace osdev {
-namespace components {
-namespace modbus {
-
-using X_SOCKET = int;
-using SOCKADDR = struct sockaddr;
-using SOCKADDR_IN = struct sockaddr_in;
-
-#define X_ISVALIDSOCKET(s) ((s) >= 0)
-#define X_CLOSE_SOCKET(s) close(s)
-#define X_ISCONNECTSUCCEED(s) ((s) >= 0)
-
-/*!
- * \brief The ModbusTCP class
- */
-class ModbusTCP : public ModbusBase
-{
-public:
-    /*!
-     * \brief ModbusTCP
-     * \param port_configuration
-     */
-    ModbusTCP(const ConnectionConfig &port_configuration);
-
-    // Pure virtuals. Override when inherited.
-    /*!
-     * \brief Connect
-     * \return
-     */
-    virtual bool Connect() override;
-
-    /*!
-     * \brief Close
-     */
-    virtual void Close() override;
-
-private:    // Methods
-    /*!
-     * \brief modbusSend
-     * \param to_send
-     * \param length
-     * \return
-     */
-    virtual ssize_t modbusSend(uint8_t *to_send, size_t length) override;
-
-    /*!
-     * \brief modbusReceive
-     * \param buffer
-     * \return
-     */
-    virtual ssize_t modbusReceive(uint8_t *buffer) const override;
-
-private:    // Members
-    uint16_t    m_port {};
-    std::string m_host{};
-    X_SOCKET    m_socket{};
-    SOCKADDR_IN m_server{};
-};
-
-}   // End namespace modbus
-}   // End namespace components
-}   // End namespace osdev