[dss-commits] r8842 - dss/trunk/core

[dss-commits at forum.digitalstrom.org]

Author: rkoehler
Date: 2009-10-14 16:05:41 +0200 (Wed, 14 Oct 2009)
New Revision: 8842

Modified:
   dss/trunk/core/model.cpp
   dss/trunk/core/model.h
Log:
lightweighted energy calls for dSM (getCachedEnergyMeterValue)

Modified: dss/trunk/core/model.cpp
===================================================================
--- dss/trunk/core/model.cpp	2009-10-14 09:39:20 UTC (rev 8841)
+++ dss/trunk/core/model.cpp	2009-10-14 14:05:41 UTC (rev 8842)
@@ -1678,7 +1678,15 @@
     return m_EnergyMeterValue;
   } // getEnergyMeterValue
 
+  unsigned long Modulator::getCachedPowerConsumption() {
+    return m_PowerConsumption;
+  } // getPowerConsumption
 
+  unsigned long Modulator::getCachedEnergyMeterValue() {
+    return m_EnergyMeterValue;
+  } // getEnergyMeterValue
+
+  
   //================================================== Zone
 
   Zone::~Zone() {

Modified: dss/trunk/core/model.h
===================================================================
--- dss/trunk/core/model.h	2009-10-14 09:39:20 UTC (rev 8841)
+++ dss/trunk/core/model.h	2009-10-14 14:05:41 UTC (rev 8842)
@@ -551,6 +551,11 @@
     /** Returns the meter value in Wh */
     unsigned long getEnergyMeterValue();
 
+    /** Returns the last consumption in mW returned from dS485 Bus, but never request it*/
+    unsigned long getCachedPowerConsumption();
+    /** Returns the last meter value in Wh returned from dS485 Bus, but never request it*/
+    unsigned long getCachedEnergyMeterValue();
+    
     /** Returns the orange energy level */
     int getEnergyLevelOrange() const { return m_EnergyLevelOrange; }
     /** Returns the red energy level */