Implementing Modbus

Peter M. Groen
1 parent fed64770
Showing 6 changed files with 90 additions and 14 deletions
src/connectionconfig.h → include/connectionconfig.h
include/imodbus.h
include/request.h
src/CMakeLists.txt
src/modbus.cpp
src/modbus.h
+/*
+ *  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 "request.h"
+#include "connectionconfig.h"
+#include <vector>
+
+namespace osdev {
+namespace components {
+namespace modbus {
+
+class IModBus
+{
+public:
+    virtual ~IModBus() {}
+
+    virtual bool Open(const ConnectionConfig &connection_config) = 0;
+    virtual bool Close() = 0;
+    virtual std::vector<uint8_t> Read(const Request &request) = 0;
+    virtual std::vector<uint8_t> Write(const Request &request) = 0;
+};
+
+}   /* End namespace modbus */
+}   /* End namespace components */
+}   /* End namespace osdev */
@@ -111,25 +111,25 @@ public:
     /// @note never change the length of this vector.
     std::vector<uint8_t> getDataBuffer() const {return m_dataBuffer;}
-    /// @return Callbacks registered to call when new data is available.
-    /// @note Functionn pointer returns False if the device state is OFFLINE. True, otherwise.
-    std::vector<std::function<bool(Response)>> callbacks;
-
 private:
     /// Function code of this request.
-    FunctionCode            m_functionCode;
+    FunctionCode            m_functionCode = FunctionCode::FC_UNKNOWN;
     /// SlaveID of this request.
-    uint8_t                 m_slaveId;
+    uint8_t                 m_slaveId = 0;
     /// Start address of the register for this request
-    uint8_t                 m_startAddress;
+    uint8_t                 m_startAddress = 0x00;
     /// Amount of registers to read/write in this request
-    uint8_t                 m_numberOfRegisters;
+    uint8_t                 m_numberOfRegisters = 0x00;
     /// Data to send to the device; must be the same size as \ref m_numberOfItems.
-    std::vector<uint8_t>    m_dataBuffer;
+    std::vector<uint8_t>    m_dataBuffer = {};
+
+    /// @return Callbacks registered to call when new data is available.
+    /// @note Functionn pointer returns False if the device state is OFFLINE. True, otherwise.
+    std::vector<std::function<bool(Response)>> callbacks = {};
 };
 }   /* End namespace modbus */
@@ -19,7 +19,6 @@ set(SRC_LIST
     ${CMAKE_CURRENT_SOURCE_DIR}/modbustcp.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/modbusrtu.h
     ${CMAKE_CURRENT_SOURCE_DIR}/modbusrtu.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/connectionconfig.h
     ${CMAKE_CURRENT_SOURCE_DIR}/connectionconfig.cpp
 )
 #include "modbus.h"
+using namespace osdev::components::modbus;
+
 ModBus::ModBus()
 {
 }
+
+bool ModBus::Open(const ConnectionConfig &connection_config)
+{
+    (void)connection_config;
+
+    return true;
+}
+
+bool ModBus::Close()
+{
+    return true;
+}
+
+std::vector<uint8_t> ModBus::Read(const Request &request)
+{
+    (void)request;
+
+    return std::vector<uint8_t>();
+}
+
+std::vector<uint8_t> ModBus::Write(const Request &request)
+{
+    (void)request;
+
+    return std::vector<uint8_t>();
+}
-#ifndef MODBUS_H
-#define MODBUS_H
+/*
+ *  Copyright (c) 2023 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 "imodbus.h"
-class ModBus
+namespace osdev {
+namespace components {
+namespace modbus {
+
+class ModBus : public IModBus
 {
 public:
     ModBus();
+
+    virtual ~ModBus() {}
+
+    virtual bool Open(const ConnectionConfig &connection_config) override;
+    virtual bool Close() override;
+    virtual std::vector<uint8_t> Read(const Request &request) override;
+    virtual std::vector<uint8_t> Write(const Request &request) override;
 };
-#endif // MODBUS_H
+}   /* End namespace modbus */
+}   /* End namespace components */
+}   /* End namespace osdev */