Diff: SmartPlugBLE.h

Revision:

2:6db5c9a2894c

Parent:

0:25ad6eba7916

Child:

3:aaa92c61931a

--- a/SmartPlugBLE.h	Tue Jul 07 04:58:28 2015 +0000
+++ b/SmartPlugBLE.h	Wed Jul 08 07:25:11 2015 +0000
@@ -16,7 +16,7 @@
             ticker.attach(this,&SmartPlugBLE::periodicCallback, 1); // blink LED every second
         }    
             
-        void onRelayWrite(uint8_t *data)
+        void onRelayWrite(const uint8_t *data)
         {
             updateRelay(data);
             notifyObservers();
@@ -31,11 +31,11 @@
         {
             for(int i=0;i<observers.size();i++)
             {
-                observers[i].update((void*)&smartPlug);
+                observers[i]->updateObserver((void*)&smartPlug);
             }
         }
         
-        void addObserver(Observer o)
+        void addObserver(Observer* o)
         {
             observers.push_back(o);
         }
@@ -51,6 +51,7 @@
             smartPlug.setCurrent(smartPlug.getCurrent()+1);//(spComm.getCurrent());
             smartPlug.setPower(smartPlug.getPower()+1);//(spComm.getPower());
             smartPlug.setPowerFactor(smartPlug.getPowerFactor()+1);//(spComm.getPowerFactor());
+            smartPlug.setEnergy(smartPlug.getEnergy()+1);
             notifyObservers();
         }
         
@@ -60,7 +61,7 @@
         //DigitalOut led1;
         SPCommunication spComm;
         //BLECommunication bleComm;
-        vector<Observer> observers;
+        vector<Observer*> observers;
 };
 
 #endif
\ No newline at end of file