Fixed issue 'Action value updates - Not Following Defined Register and Byte Order'

Author: serhmarch

src/core/sdk/mbcore.cpp

@@ -457,14 +457,15 @@ QList<quint8> toUnitsList(const QString &unitsStr, bool *ok)
     return lu;
 }
 
-void changeByteOrder(char *data, int len)
+void changeByteOrder(void *data, int len)
 {
+    char *d = reinterpret_cast<char*>(data);
     for (int i = 0; i < len/2; i++)
     {
         int n = 2*i, n1 = 2*i+1;
-        char v = data[n];
-        data[n] = data[n1];
-        data[n1] = v;
+        char v = d[n];
+        d[n] = d[n1];
+        d[n1] = v;
     }
 }
 

src/core/sdk/mbcore.h

@@ -515,7 +515,7 @@ MB_EXPORT QString toUnitsString(const QList<quint8> units);
 
 MB_EXPORT QList<quint8> toUnitsList(const QString &unitsStr, bool *ok = nullptr);
 
-MB_EXPORT void changeByteOrder(char *data, int len);
+MB_EXPORT void changeByteOrder(void *data, int len);
 
 inline void swapRegisters32(void *buff)
 {

src/server/runtime/server_runaction.cpp

@@ -30,6 +30,8 @@ mbServerRunAction::mbServerRunAction(const MBSETTINGS &settings)
     m_device  = reinterpret_cast<mbServerDevice*>(settings.value(sAction.device).value<void*>());
     m_address = mb::toAddress(settings.value(sAction.address).toInt());
     m_period  = settings.value(sAction.period).toInt();
+    m_byteOrder = mb::enumDataOrderValue(settings.value(sAction.byteOrder), mb::LessSignifiedFirst);
+    m_registerOrder = mb::enumDataOrderValue(settings.value(sAction.registerOrder), mb::LessSignifiedFirst);
 }
 
 mbServerRunAction::~mbServerRunAction()
@@ -47,6 +49,24 @@ void mbServerRunAction::setValue(const QVariant &value)
     m_device->setValue(address(), dataType(), value);
 }
 
+void mbServerRunAction::trySwap(void *d, int size)
+{
+    // TODO: resolve this conditions in compiling stage
+    if ((size > 1) && (m_byteOrder == mb::MostSignifiedFirst))
+        mb::changeByteOrder(d, size);
+    switch (size)
+    {
+    case 4:
+        if (m_registerOrder == mb::MostSignifiedFirst)
+            mb::swapRegisters32(d);
+        break;
+    case 8:
+        if (m_registerOrder == mb::MostSignifiedFirst)
+            mb::swapRegisters64(d);
+        break;
+    }
+}
+
 int mbServerRunAction::init(qint64 time)
 {
     m_last = time;

src/server/runtime/server_runaction.h

@@ -44,6 +44,7 @@ class mbServerRunAction
     inline int period() const { return m_period; }
     QVariant value() const;
     void setValue(const QVariant &value);
+    void trySwap(void *d, int size);
 
 public:
     virtual int init(qint64 time);
@@ -55,10 +56,10 @@ class mbServerRunAction
     mb::Address m_address;
     int m_period;
     qint64 m_last;
-
+    mb::DataOrder m_byteOrder;
+    mb::DataOrder m_registerOrder;
 };
 
-
 template <typename T>
 class mbServerRunActionT : public mbServerRunAction
 {
@@ -84,7 +85,10 @@ class mbServerRunActionIncrement : public mbServerRunActionT<T>
         {
             QVariant v = this->value();
             T t = v.value<T>();
-            this->setValue(t + m_increment);
+            trySwap(&t, sizeof(t));
+            t += m_increment;
+            trySwap(&t, sizeof(t));
+            this->setValue(t);
             this->m_last = time;
         }
         return 0;
@@ -116,6 +120,7 @@ class mbServerRunActionSine : public mbServerRunActionT<T>
         {
             qreal x = static_cast<qreal>(time-m_phaseShift)/m_sinePeriod;
             T v = static_cast<T>(m_amplitude*qSin(x*2*M_PI)+m_verticalShift);
+            trySwap(&v, sizeof(v));
             this->setValue(v);
             this->m_last = time;
         }
@@ -147,6 +152,7 @@ class mbServerRunActionRandom : public mbServerRunActionT<T>
         {
             qreal x = static_cast<qreal>(RAND_MAX-qrand())/static_cast<qreal>(RAND_MAX); // koef is [0;1]
             T v = static_cast<T>(x*m_range+m_min);
+            trySwap(&v, sizeof(v));
             this->setValue(v);
             this->m_last = time;
         }