simple functions transformed into "inline"

Author: epsilonrt

src/Modbus.cpp

@@ -74,69 +74,6 @@ word Modbus::reg (word address) {
   }
 }
 
-// INLINE --------------------
-void Modbus::addHreg (word offset, word value) {
-  this->addReg (offset + 40001, value);
-}
-
-bool Modbus::setHreg (word offset, word value) {
-  return setReg (offset + 40001, value);
-}
-
-word Modbus::hreg (word offset) {
-  return reg (offset + 40001);
-}
-
-#ifndef USE_HOLDING_REGISTERS_ONLY
-void Modbus::addCoil (word offset, bool value) {
-  this->addReg (offset + 1, value ? 0xFF00 : 0x0000);
-}
-
-void Modbus::addIsts (word offset, bool value) {
-  this->addReg (offset + 10001, value ? 0xFF00 : 0x0000);
-}
-
-void Modbus::addIreg (word offset, word value) {
-  this->addReg (offset + 30001, value);
-}
-
-bool Modbus::setCoil (word offset, bool value) {
-  return setReg (offset + 1, value ? 0xFF00 : 0x0000);
-}
-
-bool Modbus::setIsts (word offset, bool value) {
-  return setReg (offset + 10001, value ? 0xFF00 : 0x0000);
-}
-
-bool Modbus::setIreg (word offset, word value) {
-  return setReg (offset + 30001, value);
-}
-
-bool Modbus::coil (word offset) {
-  if (reg (offset + 1) == 0xFF00) {
-    return true;
-  }
-  else {
-    return false;
-  }
-}
-
-bool Modbus::ists (word offset) {
-  if (reg (offset + 10001) == 0xFF00) {
-    return true;
-  }
-  else {
-    return false;
-  }
-}
-
-word Modbus::ireg (word offset) {
-  return reg (offset + 30001);
-}
-#endif
-// INLINE --------------------
-
-
 void Modbus::receivePDU (byte * frame) {
   byte fcode  = frame[0];
   word field1 = (word) frame[1] << 8 | (word) frame[2];

src/Modbus.h

@@ -1,13 +1,14 @@
 /*
     Modbus.h - Header for Modbus Base Library
     Copyright (C) 2014 André Sarmento Barbosa
+    Copyright (C) 2023 Pascal JEAN aka epsilonrt
 */
 #include "Arduino.h"
 
 #pragma once
 
-#define MAX_REGS     32
-#define MAX_FRAME   128
+#define MAX_REGS     32 // Unused !
+#define MAX_FRAME   128 // Unused !
 //#define USE_HOLDING_REGISTERS_ONLY
 
 // Function Codes
@@ -102,21 +103,29 @@ class Modbus {
        @param offset register offset (PDU addressing: 0-9999)
        @param value default value
     */
-    void addHreg (word offset, word value = 0);
+    inline void addHreg (word offset, word value = 0) {
+      this->addReg (offset + 40001, value);
+    }
+
     /**
       @brief Change the value of a holding register
       This value will be returned when bus read, the master can also modify it.
       @param offset register offset (PDU addressing: 0-9999)
       @param value new value
       @return true, false if register not found.
     */
-    bool setHreg (word offset, word value);
+    inline bool setHreg (word offset, word value) {
+      return setReg (offset + 40001, value);
+    }
     /**
        @brief Return the value of a holding register
        @param offset register offset (PDU addressing: 0-9999)
        @return register value
     */
-    word hreg (word offset);
+    inline word hreg (word offset) {
+      return reg (offset + 40001);
+    }
+
     /**
          @brief Change the value of a holding register
          This value will be returned when bus read, the master can also modify it.
@@ -151,62 +160,79 @@ class Modbus {
        @param offset coil offset (PDU addressing: 0-9999)
        @param value default value
     */
-    void addCoil (word offset, bool value = false);
+    void addCoil (word offset, bool value = false) {
+      this->addReg (offset + 1, value ? 0xFF00 : 0x0000);
+    }
     /**
        @brief Add a discrete input
        @param offset input offset (PDU addressing: 0-9999)
        @param value default value
     */
-    void addIsts (word offset, bool value = false);
+    inline void addIsts (word offset, bool value = false) {
+      this->addReg (offset + 10001, value ? 0xFF00 : 0x0000);
+    }
     /**
        @brief Add a input register
        @param offset register offset (PDU addressing: 0-9999)
        @param value default value
     */
-    void addIreg (word offset, word value = 0);
+    inline void addIreg (word offset, word value = 0) {
+      this->addReg (offset + 30001, value);
+    }
     /**
        @brief Change the value of a coil
        This value will be returned when bus read, the master can also modify it.
        @param offset register offset (PDU addressing: 0-9999)
        @param value new value
        @return true, false if coil not found.
     */
-    bool setCoil (word offset, bool value);
+    inline bool setCoil (word offset, bool value) {
+      return setReg (offset + 1, value ? 0xFF00 : 0x0000);
+    }
     /**
        @brief Change the value of a discrete input
        This value will be returned when bus read,.
        @param offset input offset (PDU addressing: 0-9999)
        @param value new value
        @return true, false if input not found.
     */
-    bool setIsts (word offset, bool value);
+    inline bool setIsts (word offset, bool value) {
+      return setReg (offset + 10001, value ? 0xFF00 : 0x0000);
+    }
     /**
        @brief Change the value of an input register
        This value will be returned when bus read.
        @param offset register offset (PDU addressing: 0-9999)
        @param value new value
        @return true, false if register not found.
     */
-    bool setIreg (word offset, word value);
+    inline bool setIreg (word offset, word value) {
+      return setReg (offset + 30001, value);
+    }
     /**
        @brief Return the value of a coil
        @param offset register offset (PDU addressing: 0-9999)
        @return coil value
     */
-    bool coil (word offset);
+    inline bool coil (word offset) {
+      return (reg (offset + 1) == 0xFF00);
+    }
     /**
        @brief Return the value of a discrete input
        @param offset input offset (PDU addressing: 0-9999)
        @return input value
     */
-    bool ists (word offset);
+    inline bool ists (word offset) {
+      return (reg (offset + 10001) == 0xFF00);
+    }
     /**
        @brief Return the value of an input register
        @param offset register offset (PDU addressing: 0-9999)
        @return register value
     */
-    word ireg (word offset);
-
+    inline word ireg (word offset) {
+      return reg (offset + 30001);
+    }
     /**
        @brief Change the value of a coil
        This value will be returned when bus read, the master can also modify it.