Skip to content
Snippets Groups Projects
Commit a30f32b5 authored by John Lee's avatar John Lee
Browse files

Add to initialize power variables

parent df84d671
No related branches found
No related tags found
No related merge requests found
...@@ -270,9 +270,11 @@ void handleClientData(uint8_t num, String data) ...@@ -270,9 +270,11 @@ void handleClientData(uint8_t num, String data)
break; break;
case CMD_ONOFF: case CMD_ONOFF:
onoff = data.substring(1).toInt(); onoff = data.substring(1).toInt();
if (onoff) {
volt = watt = ampere = watth = 0;
}
digitalWrite(POWER, onoff); digitalWrite(POWER, onoff);
digitalWrite(POWERLED, LOW); digitalWrite(POWERLED, LOW);
watth = 0;
send_data_to_clients(String(CMD_ONOFF) + onoff, HOME, num); send_data_to_clients(String(CMD_ONOFF) + onoff, HOME, num);
break; break;
case SET_VOLTAGE: case SET_VOLTAGE:
...@@ -683,7 +685,7 @@ void handler(void) ...@@ -683,7 +685,7 @@ void handler(void)
{ {
if (onoff == ON) { if (onoff == ON) {
digitalWrite(POWERLED, D1state = !D1state); digitalWrite(POWERLED, D1state = !D1state);
if (connectedLCD || connectedWeb) { if (connectedLCD || connectedWeb || logClient) {
readPower(); readPower();
} }
} }
...@@ -695,14 +697,18 @@ void handler(void) ...@@ -695,14 +697,18 @@ void handler(void)
printInfo_LCD(); printInfo_LCD();
} }
if (connectedWeb) {
if (btnChanged) { if (btnChanged) {
send_data_to_clients(String(CMD_ONOFF) + onoff, HOME);
if (onoff == OFF) { if (onoff == OFF) {
measureWh = 0; watt = volt = ampere = watth = 0;
}
if (connectedWeb) {
send_data_to_clients(String(CMD_ONOFF) + onoff, HOME);
measureWh = !onoff;
} }
btnChanged = 0; btnChanged = 0;
} }
if (connectedWeb) {
if (onoff == ON) { if (onoff == ON) {
String data = String(DATA_PVI); String data = String(DATA_PVI);
data += String(watt, 3) + "," + String(volt) + "," + String(ampere); data += String(watt, 3) + "," + String(volt) + "," + String(ampere);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment