Diff: Services/SmartPlugService.cpp

Revision:

3:aaa92c61931a

Parent:

2:6db5c9a2894c

--- a/Services/SmartPlugService.cpp	Wed Jul 08 07:25:11 2015 +0000
+++ b/Services/SmartPlugService.cpp	Mon Jul 13 13:14:34 2015 +0000
@@ -36,12 +36,7 @@
         system.updateData();
     }
     else if(params->handle == relayChar.getValueHandle())
-    {//like stack
-            printf("SmartPlugService::onDataWritten params->len = %d\r\n",params->len);
-            for(int i=0;i<params->len;i++)
-            {
-                printf("data = 0x%08x\r\n",params->data[i]);
-            }
+    {
             system.onRelayWrite(params->data);
     }
 }
@@ -54,7 +49,7 @@
     updatePower(sp->getPower());
     updatePowerFactor(sp->getPowerFactor());
     updateEnergy(sp->getEnergy());
-    updateRelay(&sp->getRelay());
+    updateRelay(sp->getRelay());
 }
 
 void SmartPlugService::updateVoltage(uint32_t v)
@@ -106,18 +101,7 @@
 {
     if (ble.getGapState().connected) 
     {   
-        if(relay->getState())
-        {
-            led = 0;
-            printf("Open\r\n");
-        }
-        else
-        {
-            led = 1;
-            printf("Close\r\n");
-        }
         relayValue.updateData(relay);
-        //convert(relayValue.getDataPointer(),*relayValue.getDataPointer());
         ble.updateCharacteristicValue(relayChar.getValueHandle(),relayValue.getDataPointer(),
         relayValue.getLenBytes());
     }