Implmenting ModbusBase class

Peter M. Groen
1 parent 77ba000d
Showing 7 changed files with 189 additions and 15 deletions
src/connectionconfig.cpp
src/connectionconfig.h
src/modbusbase.h
src/modbusrtu.cpp
src/modbusrtu.h
src/modbustcp.cpp
src/modbustcp.h
@@ -4,3 +4,11 @@
  *  This source code is licensed under the MIT license found in the
  *  LICENSE file in the root directory of this source tree.
  */
+#include "connectionconfig.h"
+
+using namespace osdev::components::modbus;
+
+ConnectionConfig::ConnectionConfig()
+{
+
+}
@@ -13,7 +13,7 @@ namespace modbus {
 class ConnectionConfig
 {
 public:
-    ConnectionConfig
+    ConnectionConfig();
 };
 }   // End namespace modbus
@@ -6,7 +6,9 @@
  */
 #pragma once
+#include <cstring>
 #include <string>
+#include <stdint.h>
 // Create a simple logger for console output during debugging.
 // TODO: Replace with a custom logger by using std::function
@@ -54,23 +56,12 @@ namespace modbus {
 class ModbusBase
 {
 public:
-    bool            err{};
-    int             err_no{};
-    std::string     m_error_msg;
-    
     ModbusBase();
     virtual ~ModbusBase();
-    /*! 
-     * Set slave id for this context 
-     * \param slave_id - The slave id this system is known under.
-     */
-    void    setSlaveId(int slave_id) { m_slaveId = slave_id; }
-
     // Pure virtuals. Override when inherited.
-    virtual bool Connect() const = 0;
+    virtual bool Connect() = 0;
     virtual void Close() = 0;
-    virtual bool isConnected() const = 0;
     // Modbus implementation(s)
     /*!
@@ -143,6 +134,23 @@ public:
      */
     int writeRegisters(uint16_t address, uint16_t amount, const uint16_t *value);
+    // Getters and Setters.
+    void                setConnected(bool connected = false){ m_connected = connected;}
+    bool                getConnected() const { return m_connected; }
+    void                setMessageId( uint32_t message_id ) { m_msg_id = message_id; }
+    uint32_t            getMessageId() const { return m_msg_id; }
+    void                setSlaveId(int slave_id){ m_slaveId = slave_id; }
+    int                 getSlaveId() const { return m_slaveId; }
+    void                setError(bool error, int error_number = 0, const std::string &error_message = std::string())
+    {
+        m_error = error;
+        m_error_number = error_number;
+        m_error_message = error_message;
+    }
+    bool                getError() const { return m_error; }
+    int                 getErrorNumber() const { return m_error_number; }
+    std::string         getErrorMessage() const { return m_error_message;}
+
 private:        // Methods
     /*!
      * Modbus Request Builder
@@ -201,6 +209,9 @@ private:        // Members (Giggity!)
     bool                m_connected{};
     uint32_t            m_msg_id{};
     int                 m_slaveId{};
+    bool                m_error{};
+    int                 m_error_number{};
+    std::string         m_error_message;
 };
@@ -12,3 +12,23 @@ 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
+{
+
+}
@@ -16,6 +16,34 @@ 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
@@ -8,7 +8,62 @@
 using namespace osdev::components::modbus;
-ModbusTCP::ModbusTCP()
+ModbusTCP::ModbusTCP(const ConnectionConfig &port_configuration)
+{
+
+}
+
+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()
+{
+
+}
+
+bool ModbusTCP::isConnected() const
+{
+
+}
+
+ssize_t ModbusTCP::modbusSend(uint8_t *to_send, size_t length)
+{
+
+}
+
+ssize_t ModbusTCP::modbusReceive(uint8_t *buffer) const
 {
 }
@@ -7,15 +7,67 @@
 #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)
+
 class ModbusTCP : public ModbusBase
 {
 public:
-    ModbusTCP();
+    /*!
+     * \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