Bluetooth Low Energy for Smart Plug
Dependencies: BLE_API mbed nRF51822
Diff: SmartPlug.h
- Revision:
- 3:aaa92c61931a
- Parent:
- 2:6db5c9a2894c
--- a/SmartPlug.h Wed Jul 08 07:25:11 2015 +0000 +++ b/SmartPlug.h Mon Jul 13 13:14:34 2015 +0000 @@ -48,13 +48,14 @@ class SmartPlug { public: - SmartPlug():voltage(0),current(0),power(0),powerFactor(0),energy(0) + bool isCounting; + + SmartPlug():isCounting(false),voltage(0),current(0),power(0),powerFactor(0),energy(0) { } uint32_t getVoltage() { - printf("in getVoltage in smartPlug\r\n"); return voltage; } @@ -78,9 +79,9 @@ return energy; } - Relay getRelay() + Relay* getRelay() { - return relay; + return &relay; } void setVoltage(uint32_t data) @@ -108,11 +109,18 @@ energy = data; } - void setRelay(const uint8_t *data) + void setRelay(uint8_t state,uint8_t hour, uint8_t min) { - relay.setState(data[0]>>7); - relay.setHrCounter(data[0]&0x0FFFFFFF); - relay.setMinCounter(data[1]); + relay.setState(state); + relay.setHrCounter(hour); + relay.setMinCounter(min); + printf("hour = %d,min = %d\r\n",hour,min); + if(hour != 0 || min != 0) + isCounting = true; + else if(state) + { + isCounting = false; + } } private: uint32_t voltage;