[dss-commits] r8911 - in dss/trunk: core/sim unix

[dss-commits at forum.digitalstrom.org]

Author: pstaehlin
Date: 2009-11-11 14:15:21 +0100 (Wed, 11 Nov 2009)
New Revision: 8911

Modified:
   dss/trunk/core/sim/dssim.cpp
   dss/trunk/unix/ds485proxy.cpp
Log:
The answer of energy meter value is 32 bit

Closes #213

Modified: dss/trunk/core/sim/dssim.cpp
===================================================================
--- dss/trunk/core/sim/dssim.cpp	2009-11-11 13:15:16 UTC (rev 8910)
+++ dss/trunk/core/sim/dssim.cpp	2009-11-11 13:15:21 UTC (rev 8911)
@@ -887,7 +887,7 @@
             case FunctionModulatorGetEnergyMeterValue:
               {
                 response = createResponse(cmdFrame, cmdNr);
-                response->getPayload().add<uint16_t>(0);
+                response->getPayload().add<uint32_t>(0);
                 distributeFrame(response);
               }
               break;

Modified: dss/trunk/unix/ds485proxy.cpp
===================================================================
--- dss/trunk/unix/ds485proxy.cpp	2009-11-11 13:15:16 UTC (rev 8910)
+++ dss/trunk/unix/ds485proxy.cpp	2009-11-11 13:15:21 UTC (rev 8911)
@@ -986,7 +986,7 @@
     }
     PayloadDissector pd(recFrame->getFrame()->getPayload());
     pd.get<uint8_t>(); // discard the function id
-    return pd.get<uint16_t>();
+    return pd.get<uint32_t>();
   } // getEnergyMeterValue
 
   bool DS485Proxy::getEnergyBorder(const int _modulatorID, int& _lower, int& _upper) {