From 9f79ca81ebf0bb36e1fbe53c73c26d642219afa5 Mon Sep 17 00:00:00 2001
From: SeungChul Lee <john.lee@hardkernel.com>
Date: Mon, 28 May 2018 09:20:32 +0900
Subject: [PATCH] Fix indent
---
src/smartpower2.ino | 703 ++++++++++++++++++++++----------------------
1 file changed, 355 insertions(+), 348 deletions(-)
diff --git a/src/smartpower2.ino b/src/smartpower2.ino
index 0a7ff82..eb9f6a7 100644
--- a/src/smartpower2.ino
+++ b/src/smartpower2.ino
@@ -71,7 +71,6 @@ WebSocketsServer webSocket = WebSocketsServer(81);
IPAddress ip = IPAddress(192, 168, 4, 1);
SimpleTimer timer;
-SimpleTimer timer2;
// lcd slave address are 0x27 or 0x3f
LiquidCrystal_I2C lcd(0x27, 16, 2);
@@ -94,12 +93,20 @@ void setup() {
pinMode(BTN_ONOFF, INPUT);
attachInterrupt(digitalPinToInterrupt(BTN_ONOFF), pinChanged, CHANGE);
- for(uint8_t t = 4; t > 0; t--) {
+ for (uint8_t t = 4; t > 0; t--) {
USE_SERIAL.printf("[SETUP] BOOT WAIT %d...\n\r", t);
USE_SERIAL.flush();
delay(1000);
}
+ USE_SERIAL.println("");
+ USE_SERIAL.println("##############################");
+ USE_SERIAL.printf("SmartPower2 v");
+ USE_SERIAL.print(FWversion);
+ USE_SERIAL.println(" (Serial Interface)");
+ USE_SERIAL.println("##############################");
+ USE_SERIAL.println("");
+
SPIFFS.begin();
{
Dir dir = SPIFFS.openDir("/");
@@ -107,15 +114,15 @@ void setup() {
String fileName = dir.fileName();
size_t fileSize = dir.fileSize();
USE_SERIAL.printf("FS File: %s, size: %s\n\r",
- fileName.c_str(), formatBytes(fileSize).c_str());
+ fileName.c_str(), formatBytes(fileSize).c_str());
}
USE_SERIAL.printf("\n\r");
}
initSmartPower();
- lcd_status();
+ lcd_status();
- webserver_init();
+ webserver_init();
timerId = timer.setInterval(1000, handler);
@@ -132,37 +139,37 @@ void loop() {
if (logServer.hasClient())
{
- // A connection attempt is being made
- USE_SERIAL.printf("A connection attempt is being made.\n");
-
- if (!logClient)
- {
- // This is the first client to connect
- logClient = logServer.available();
-
- USE_SERIAL.printf("This is the first client to connect.\n");
- }
- else
- {
- if (!logClient.connected())
+ // A connection attempt is being made
+ USE_SERIAL.printf("A connection attempt is being made.\n");
+
+ if (!logClient)
{
- // A previous client has disconnected.
- // Connect the new client.
- logClient.stop();
- logClient = logServer.available();
+ // This is the first client to connect
+ logClient = logServer.available();
- USE_SERIAL.printf("A previous client has disconnected.\n");
+ USE_SERIAL.printf("This is the first client to connect.\n");
}
else
{
- // A client connection is already in use.
- // Drop the new connection attempt.
- WiFiClient tempClient = logServer.available();
- tempClient.stop();
-
- USE_SERIAL.printf("A client connection is already in use.\n");
+ if (!logClient.connected())
+ {
+ // A previous client has disconnected.
+ // Connect the new client.
+ logClient.stop();
+ logClient = logServer.available();
+
+ USE_SERIAL.printf("A previous client has disconnected.\n");
+ }
+ else
+ {
+ // A client connection is already in use.
+ // Drop the new connection attempt.
+ WiFiClient tempClient = logServer.available();
+ tempClient.stop();
+
+ USE_SERIAL.printf("A client connection is already in use.\n");
+ }
}
- }
}
@@ -187,9 +194,9 @@ void webserver_init(void)
server->on("/list", HTTP_GET, handleFileList);
//use it to load content from SPIFFS
- server->onNotFound([](){
- if(!handleFileRead(server->uri()))
- server->send(404, "text/plain", "FileNotFound");
+ server->onNotFound([]() {
+ if (!handleFileRead(server->uri()))
+ server->send(404, "text/plain", "FileNotFound");
});
server->begin();
@@ -197,26 +204,26 @@ void webserver_init(void)
}
//format bytes
-String formatBytes(size_t bytes){
- if (bytes < 1024){
- return String(bytes)+"B";
- } else if(bytes < (1024 * 1024)){
- return String(bytes/1024.0)+"KB";
- } else if(bytes < (1024 * 1024 * 1024)){
- return String(bytes/1024.0/1024.0)+"MB";
+String formatBytes(size_t bytes) {
+ if (bytes < 1024) {
+ return String(bytes) + "B";
+ } else if (bytes < (1024 * 1024)) {
+ return String(bytes / 1024.0) + "KB";
+ } else if (bytes < (1024 * 1024 * 1024)) {
+ return String(bytes / 1024.0 / 1024.0) + "MB";
} else {
- return String(bytes/1024.0/1024.0/1024.0)+"GB";
+ return String(bytes / 1024.0 / 1024.0 / 1024.0) + "GB";
}
}
String getContentType(String filename) {
- if(server->hasArg("download")) return "application/octet-stream";
- else if(filename.endsWith(".htm")) return "text/html";
- else if(filename.endsWith(".html")) return "text/html";
- else if(filename.endsWith(".js")) return "application/javascript";
- else if(filename.endsWith(".css")) return "text/css";
- else if(filename.endsWith(".gif")) return "image/gif";
- else if(filename.endsWith(".ico")) return "image/x-icon";
+ if (server->hasArg("download")) return "application/octet-stream";
+ else if (filename.endsWith(".htm")) return "text/html";
+ else if (filename.endsWith(".html")) return "text/html";
+ else if (filename.endsWith(".js")) return "application/javascript";
+ else if (filename.endsWith(".css")) return "text/css";
+ else if (filename.endsWith(".gif")) return "image/gif";
+ else if (filename.endsWith(".ico")) return "image/x-icon";
return "text/plain";
}
@@ -229,7 +236,7 @@ bool handleFileRead(String path) {
String pathWithGz = path + ".gz";
if (SPIFFS.exists(pathWithGz) || SPIFFS.exists(path)) {
if (SPIFFS.exists(pathWithGz))
- path += ".gz";
+ path += ".gz";
File file = SPIFFS.open(path, "r");
size_t sent = server->streamFile(file, contentType);
file.close();
@@ -240,19 +247,22 @@ bool handleFileRead(String path) {
}
void handleFileList() {
- if(!server->hasArg("dir")) {server->send(500, "text/plain", "BAD ARGS"); return;}
+ if (!server->hasArg("dir")) {
+ server->send(500, "text/plain", "BAD ARGS");
+ return;
+ }
String path = server->arg("dir");
Serial.println("handleFileList: " + path);
Dir dir = SPIFFS.openDir(path);
path = String();
String output = "[";
- while(dir.next()) {
+ while (dir.next()) {
File entry = dir.openFile("r");
if (output != "[") output += ',';
bool isDir = false;
output += "{\"type\":\"";
- output += (isDir)?"dir":"file";
+ output += (isDir) ? "dir" : "file";
output += "\",\"name\":\"";
output += String(entry.name()).substring(1);
output += "\"}";
@@ -265,78 +275,78 @@ void handleFileList() {
void handleClientData(uint8_t num, String data)
{
- Serial.println(data);
+ //Serial.println(data);
switch (data.charAt(0)) {
- case PAGE_STATE:
- client_sp2[num].page = data.charAt(1)-48;
- sendStatus(num, data.charAt(1)-48);
- break;
- case CMD_ONOFF:
- onoff = data.substring(1).toInt();
- if (onoff) {
- volt = watt = ampere = watth = 0;
- }
- digitalWrite(POWER, onoff);
- digitalWrite(POWERLED, LOW);
- send_data_to_clients(String(CMD_ONOFF) + onoff, HOME, num);
- break;
- case SET_VOLTAGE:
- setVoltage = data.substring(1).toFloat();
- mcp4652_write(WRITE_WIPER0, quadraticRegression(setVoltage));
- send_data_to_clients(String(SET_VOLTAGE) + setVoltage, HOME, num);
- break;
- case SET_DEFAULT_VOLTAGE: {
- File f = SPIFFS.open("/txt/settings.txt", "r+");
- f.seek(0, SeekSet);
- f.findUntil("voltage", "\n\r");
- f.seek(1, SeekCur);
- f.print(setVoltage);
- f.close();
- break;
- }
- case SET_AUTORUN: {
- if (autorun == data.substring(1).toInt()) {
- break;
- }
- autorun = data.substring(1).toInt();
-
- File f = SPIFFS.open("/txt/settings.txt", "r+");
- f.seek(0, SeekSet);
- f.findUntil("autorun", "\n\r");
- f.seek(1, SeekCur);
- f.print(autorun);
- f.close();
-
- send_data_to_clients(String(SET_AUTORUN) + autorun, SETTINGS, num);
- break;
- }
- case SAVE_NETWORKS: {
- String _ssid = data.substring(1, data.indexOf(','));
- data.remove(1, data.indexOf(','));
- String _ipaddr = data.substring(1, data.indexOf(','));
- data.remove(1, data.indexOf(','));
- String _password = data.substring(1, data.indexOf(','));
- if ((String(ssid) != _ssid) || (ip.toString() != _ipaddr) ||
- (String(password) != _password)) {
- File f = SPIFFS.open("/js/settings.js", "w");
- f.println("ssid=\"" + _ssid + "\"");
- f.println("ipaddr=\"" + _ipaddr + "\"");
- f.println("passwd=\"" + _password + "\"");
- f.flush();
- f.close();
- readNetworkConfig();
- for (int i = 0; i < 5; i++) {
- if (client_sp2[i].connected && client_sp2[i].page && (num != i))
- sendStatus(i, 1);
- }
- }
- break;
- }
- case MEASUREWATTHOUR:
- measureWh = data.substring(1).toInt();
- send_data_to_clients(String(MEASUREWATTHOUR) + measureWh, HOME, num);
- break;
- }
+ case PAGE_STATE:
+ client_sp2[num].page = data.charAt(1) - 48;
+ sendStatus(num, data.charAt(1) - 48);
+ break;
+ case CMD_ONOFF:
+ onoff = data.substring(1).toInt();
+ if (onoff) {
+ volt = watt = ampere = watth = 0;
+ }
+ digitalWrite(POWER, onoff);
+ digitalWrite(POWERLED, LOW);
+ send_data_to_clients(String(CMD_ONOFF) + onoff, HOME, num);
+ break;
+ case SET_VOLTAGE:
+ setVoltage = data.substring(1).toFloat();
+ mcp4652_write(WRITE_WIPER0, quadraticRegression(setVoltage));
+ send_data_to_clients(String(SET_VOLTAGE) + setVoltage, HOME, num);
+ break;
+ case SET_DEFAULT_VOLTAGE: {
+ File f = SPIFFS.open("/txt/settings.txt", "r+");
+ f.seek(0, SeekSet);
+ f.findUntil("voltage", "\n\r");
+ f.seek(1, SeekCur);
+ f.print(setVoltage);
+ f.close();
+ break;
+ }
+ case SET_AUTORUN: {
+ if (autorun == data.substring(1).toInt()) {
+ break;
+ }
+ autorun = data.substring(1).toInt();
+
+ File f = SPIFFS.open("/txt/settings.txt", "r+");
+ f.seek(0, SeekSet);
+ f.findUntil("autorun", "\n\r");
+ f.seek(1, SeekCur);
+ f.print(autorun);
+ f.close();
+
+ send_data_to_clients(String(SET_AUTORUN) + autorun, SETTINGS, num);
+ break;
+ }
+ case SAVE_NETWORKS: {
+ String _ssid = data.substring(1, data.indexOf(','));
+ data.remove(1, data.indexOf(','));
+ String _ipaddr = data.substring(1, data.indexOf(','));
+ data.remove(1, data.indexOf(','));
+ String _password = data.substring(1, data.indexOf(','));
+ if ((String(ssid) != _ssid) || (ip.toString() != _ipaddr) ||
+ (String(password) != _password)) {
+ File f = SPIFFS.open("/js/settings.js", "w");
+ f.println("ssid=\"" + _ssid + "\"");
+ f.println("ipaddr=\"" + _ipaddr + "\"");
+ f.println("passwd=\"" + _password + "\"");
+ f.flush();
+ f.close();
+ readNetworkConfig();
+ for (int i = 0; i < 5; i++) {
+ if (client_sp2[i].connected && client_sp2[i].page && (num != i))
+ sendStatus(i, 1);
+ }
+ }
+ break;
+ }
+ case MEASUREWATTHOUR:
+ measureWh = data.substring(1).toInt();
+ send_data_to_clients(String(MEASUREWATTHOUR) + measureWh, HOME, num);
+ break;
+ }
}
void fs_init(void)
@@ -361,28 +371,28 @@ void fs_init(void)
}
void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght) {
- switch(type) {
- case WStype_DISCONNECTED :
- USE_SERIAL.printf("[%u] Disconnected!\n\r", num);
- client_sp2[num].connected = 0;
- connectedWeb = 0;
- break;
- case WStype_CONNECTED : {
- IPAddress ip = webSocket.remoteIP(num);
- USE_SERIAL.printf("[%u] Connected from %d.%d.%d.%d url: %s\n\r",
- num, ip[0], ip[1], ip[2], ip[3], payload);
- client_sp2[num].connected = 1;
- connectedWeb = 1;
- break;
- }
- case WStype_TEXT : {
- handleClientData(num, String((char *)&payload[0]));
- break;
- }
- case WStype_BIN :
- USE_SERIAL.printf("[%u] get binary lenght: %u\n\r", num, lenght);
- hexdump(payload, lenght);
- break;
+ switch (type) {
+ case WStype_DISCONNECTED :
+ USE_SERIAL.printf("[%u] Disconnected!\n\r", num);
+ client_sp2[num].connected = 0;
+ connectedWeb = 0;
+ break;
+ case WStype_CONNECTED : {
+ IPAddress ip = webSocket.remoteIP(num);
+ USE_SERIAL.printf("[%u] Connected from %d.%d.%d.%d url: %s\n\r",
+ num, ip[0], ip[1], ip[2], ip[3], payload);
+ client_sp2[num].connected = 1;
+ connectedWeb = 1;
+ break;
+ }
+ case WStype_TEXT : {
+ handleClientData(num, String((char *)&payload[0]));
+ break;
+ }
+ case WStype_BIN :
+ USE_SERIAL.printf("[%u] get binary lenght: %u\n\r", num, lenght);
+ hexdump(payload, lenght);
+ break;
}
}
@@ -429,38 +439,38 @@ void readNetworkConfig(void)
bool isFirstBoot()
{
- File f = SPIFFS.open("/txt/settings.txt", "r");
-
- f.seek(0, SeekSet);
- f.findUntil("firstboot", "\n\r");
- f.seek(1, SeekCur);
- int value = f.readStringUntil('\n').toInt();
-
- bool result;
- if (value)
- {
- result = true;
- }
- else
- {
- result = false;
- }
-
- f.close();
-
- return result;
+ File f = SPIFFS.open("/txt/settings.txt", "r");
+
+ f.seek(0, SeekSet);
+ f.findUntil("firstboot", "\n\r");
+ f.seek(1, SeekCur);
+ int value = f.readStringUntil('\n').toInt();
+
+ bool result;
+ if (value)
+ {
+ result = true;
+ }
+ else
+ {
+ result = false;
+ }
+
+ f.close();
+
+ return result;
}
void initSmartPower(void)
{
if (isFirstBoot())
{
- fs_init();
+ fs_init();
}
else
{
- readHWSettings();
- readNetworkConfig();
+ readHWSettings();
+ readNetworkConfig();
}
onoff = !autorun;
@@ -478,69 +488,69 @@ void initSmartPower(void)
unsigned char lcdSlaveAddr;
int lcd_available(void)
{
- Wire.beginTransmission(0x27);
- if (!Wire.endTransmission()) {
- lcdSlaveAddr = 0x27;
- return lcdSlaveAddr;
- } else {
- Wire.beginTransmission(0x3f);
- if (!Wire.endTransmission()) {
- lcdSlaveAddr = 0x3f;
- return lcdSlaveAddr;
- }
- }
-
- lcdSlaveAddr = 0;
-
- return 0;
+ Wire.beginTransmission(0x27);
+ if (!Wire.endTransmission()) {
+ lcdSlaveAddr = 0x27;
+ return lcdSlaveAddr;
+ } else {
+ Wire.beginTransmission(0x3f);
+ if (!Wire.endTransmission()) {
+ lcdSlaveAddr = 0x3f;
+ return lcdSlaveAddr;
+ }
+ }
+
+ lcdSlaveAddr = 0;
+
+ return 0;
}
void lcd_status(void)
{
- if (lcd_available() > 0) {
- if (!connectedLCD) {
- lcd = LiquidCrystal_I2C(lcdSlaveAddr, 16, 2);
- lcd.init();
- lcd.backlight();
- connectedLCD = 1;
- }
- } else {
- connectedLCD = 0;
- }
+ if (lcd_available() > 0) {
+ if (!connectedLCD) {
+ lcd = LiquidCrystal_I2C(lcdSlaveAddr, 16, 2);
+ lcd.init();
+ lcd.backlight();
+ connectedLCD = 1;
+ }
+ } else {
+ connectedLCD = 0;
+ }
}
void printPower_LCD(void)
{
- double rwatth;
- lcd.setCursor(0, 0);
- lcd.print(volt, 3);
- lcd.print(" V ");
- lcd.print(ampere, 3);
- lcd.print(" A ");
-
- lcd.setCursor(0, 1);
- if (watt < 10) {
- lcd.print(watt, 3);
- } else {
- lcd.print(watt, 2);
- }
- lcd.print(" W ");
-
- rwatth = watth/3600;
- if (rwatth < 10) {
- lcd.print(rwatth, 3);
- lcd.print(" ");
- } else if (rwatth < 100) {
- lcd.print(rwatth, 2);
- lcd.print(" ");
- } else if (rwatth < 1000) {
- lcd.print(rwatth, 1);
- lcd.print(" ");
- } else {
- lcd.print(rwatth/1000, 0);
- lcd.print(" K");
- }
- lcd.print("Wh ");
+ double rwatth;
+ lcd.setCursor(0, 0);
+ lcd.print(volt, 3);
+ lcd.print(" V ");
+ lcd.print(ampere, 3);
+ lcd.print(" A ");
+
+ lcd.setCursor(0, 1);
+ if (watt < 10) {
+ lcd.print(watt, 3);
+ } else {
+ lcd.print(watt, 2);
+ }
+ lcd.print(" W ");
+
+ rwatth = watth / 3600;
+ if (rwatth < 10) {
+ lcd.print(rwatth, 3);
+ lcd.print(" ");
+ } else if (rwatth < 100) {
+ lcd.print(rwatth, 2);
+ lcd.print(" ");
+ } else if (rwatth < 1000) {
+ lcd.print(rwatth, 1);
+ lcd.print(" ");
+ } else {
+ lcd.print(rwatth / 1000, 0);
+ lcd.print(" K");
+ }
+ lcd.print("Wh ");
}
uint8_t cnt_ssid;
@@ -549,68 +559,68 @@ int8_t cursor_ssid;
int8_t cursor_ip;
void printInfo_LCD(void)
{
- String str;
- int i;
- cnt_ssid = String(ssid).length();
- lcd.setCursor(0, 0);
- lcd.print("SSID:");
- str = String(ssid);
- if (cnt_ssid < MAX_LCD_SSID_LENGTH) {
- lcd.print(str);
- for (i = 0; i < MAX_LCD_SSID_LENGTH; i++) {
- lcd.print(" ");
- }
- } else {
- if ((cursor_ssid - 5) == cnt_ssid) {
- cursor_ssid = 0;
- }
- lcd.print(str.substring(cursor_ssid++));
- if ((cnt_ssid - cursor_ssid) < MAX_LCD_SSID_LENGTH - 5) {
- if (cnt_ssid < cursor_ssid) {
- for (i = 0; i < 6 - (cursor_ssid - cnt_ssid); i++)
- lcd.print(" ");
- } else {
- lcd.print(" ");
- }
- lcd.print(str);
- } else if ((cnt_ssid - cursor_ssid) < MAX_LCD_SSID_LENGTH) {
- for (i = 0; i < MAX_LCD_SSID_LENGTH - (cnt_ssid - cursor_ssid); i++)
- lcd.print(" ");
- }
- }
-
- lcd.setCursor(0, 1);
- lcd.print("IP:");
- cnt_ip = ip.toString().length();
- if (cnt_ip < MAX_LCD_IP_LENGTH) {
- lcd.print(ip.toString());
- for (i = 0; i < MAX_LCD_IP_LENGTH - cnt_ip; i++)
- lcd.print(" ");
- } else {
- if ((cursor_ip - 5) == cnt_ip) {
- cursor_ip = 0;
- }
- lcd.print(ip.toString().substring(cursor_ip++));
- if ((cnt_ip - cursor_ip) < MAX_LCD_IP_LENGTH - 5) {
- if (cnt_ip < cursor_ip) {
- for (i = 0; i < 6 - (cursor_ip - cnt_ip); i++)
- lcd.print(" ");
- } else {
- lcd.print(" ");
- }
- lcd.print(ip.toString());
- } else if((cnt_ip - cursor_ip) < MAX_LCD_IP_LENGTH) {
- for (i = 0; i < MAX_LCD_IP_LENGTH - (cnt_ip - cursor_ip); i++)
- lcd.print(" ");
- }
- }
+ String str;
+ int i;
+ cnt_ssid = String(ssid).length();
+ lcd.setCursor(0, 0);
+ lcd.print("SSID:");
+ str = String(ssid);
+ if (cnt_ssid < MAX_LCD_SSID_LENGTH) {
+ lcd.print(str);
+ for (i = 0; i < MAX_LCD_SSID_LENGTH; i++) {
+ lcd.print(" ");
+ }
+ } else {
+ if ((cursor_ssid - 5) == cnt_ssid) {
+ cursor_ssid = 0;
+ }
+ lcd.print(str.substring(cursor_ssid++));
+ if ((cnt_ssid - cursor_ssid) < MAX_LCD_SSID_LENGTH - 5) {
+ if (cnt_ssid < cursor_ssid) {
+ for (i = 0; i < 6 - (cursor_ssid - cnt_ssid); i++)
+ lcd.print(" ");
+ } else {
+ lcd.print(" ");
+ }
+ lcd.print(str);
+ } else if ((cnt_ssid - cursor_ssid) < MAX_LCD_SSID_LENGTH) {
+ for (i = 0; i < MAX_LCD_SSID_LENGTH - (cnt_ssid - cursor_ssid); i++)
+ lcd.print(" ");
+ }
+ }
+
+ lcd.setCursor(0, 1);
+ lcd.print("IP:");
+ cnt_ip = ip.toString().length();
+ if (cnt_ip < MAX_LCD_IP_LENGTH) {
+ lcd.print(ip.toString());
+ for (i = 0; i < MAX_LCD_IP_LENGTH - cnt_ip; i++)
+ lcd.print(" ");
+ } else {
+ if ((cursor_ip - 5) == cnt_ip) {
+ cursor_ip = 0;
+ }
+ lcd.print(ip.toString().substring(cursor_ip++));
+ if ((cnt_ip - cursor_ip) < MAX_LCD_IP_LENGTH - 5) {
+ if (cnt_ip < cursor_ip) {
+ for (i = 0; i < 6 - (cursor_ip - cnt_ip); i++)
+ lcd.print(" ");
+ } else {
+ lcd.print(" ");
+ }
+ lcd.print(ip.toString());
+ } else if ((cnt_ip - cursor_ip) < MAX_LCD_IP_LENGTH) {
+ for (i = 0; i < MAX_LCD_IP_LENGTH - (cnt_ip - cursor_ip); i++)
+ lcd.print(" ");
+ }
+ }
}
void readPower(void)
{
- volt = ina231_read_voltage();
- watt = ina231_read_power();
- ampere = ina231_read_current();
+ volt = ina231_read_voltage();
+ watt = ina231_read_power();
+ ampere = ina231_read_current();
}
void wifi_connection_status(void)
@@ -619,12 +629,12 @@ void wifi_connection_status(void)
if (connectedWeb) {
D4state = !D4state;
} else {
- D4state = LOW;
- }
+ D4state = LOW;
+ }
} else {
- D4state = HIGH;
+ D4state = HIGH;
}
- digitalWrite(D4, D4state);
+ digitalWrite(D4, D4state);
}
double a = 0.0000006562;
@@ -634,8 +644,8 @@ int quadraticRegression(double volt)
{
double d;
double root;
- d = b * b -a*(c-volt);
- root = (-b + sqrt(d))/a;
+ d = b * b - a * (c - volt);
+ root = (-b + sqrt(d)) / a;
if (root < 0) {
root = 0;
} else if (root > 255) {
@@ -682,15 +692,15 @@ void pinChanged()
void readSystemReset()
{
- if (!digitalRead(BTN_ONOFF) && (btnPress == 1)) {
- if (resetCnt++ > 5) {
- USE_SERIAL.println("System Reset!!");
- fs_init();
- resetCnt = 0;
- }
- } else {
- resetCnt = 0;
- }
+ if (!digitalRead(BTN_ONOFF) && (btnPress == 1)) {
+ if (resetCnt++ > 5) {
+ USE_SERIAL.println("System Reset!!");
+ fs_init();
+ resetCnt = 0;
+ }
+ } else {
+ resetCnt = 0;
+ }
}
void sendStatus(uint8_t num, uint8_t page)
@@ -703,7 +713,7 @@ void sendStatus(uint8_t num, uint8_t page)
} else if (page) {
webSocket.sendTXT(num, String(SET_AUTORUN) + autorun);
webSocket.sendTXT(num, String(SAVE_NETWORKS) + String(ssid) + "," +
- ip.toString() + "," + String(password));
+ ip.toString() + "," + String(password));
}
}
@@ -725,58 +735,55 @@ void send_data_to_clients(String str, uint8_t page, uint8_t num)
void handler(void)
{
- if (onoff == ON) {
- digitalWrite(POWERLED, D1state = !D1state);
- if (connectedLCD || connectedWeb || logClient) {
- readPower();
- }
- }
-
- if (connectedLCD) {
- if (onoff == ON)
- printPower_LCD();
- else if (onoff == OFF)
- printInfo_LCD();
- }
-
- if (btnChanged) {
- if (onoff == OFF) {
- watt = volt = ampere = watth = 0;
- }
- if (connectedWeb) {
- send_data_to_clients(String(CMD_ONOFF) + onoff, HOME);
- measureWh = !onoff;
- }
- btnChanged = 0;
- }
-
- if (connectedWeb) {
- if (onoff == ON) {
- String data = String(DATA_PVI);
- data += String(watt, 3) + "," + String(volt, 3) + "," + String(ampere, 3);
- if (measureWh) {
- watth += watt;
- }
- data += "," + String(watth/3600, 3);
- send_data_to_clients(data, HOME);
- }
- }
-
- if (logClient && logClient.connected())
- {
- // Report the log info
- String data = String(volt, 3) + "," + String(ampere, 3) + "," +
- String(watt, 3) + "," + String(watth/3600, 3) + "\r\n";
-
- logClient.write(data.c_str());
-
- while(logClient.available())
+ if (onoff == ON) {
+ digitalWrite(POWERLED, D1state = !D1state);
+ }
+
+ if (connectedLCD) {
+ if (onoff == ON)
+ printPower_LCD();
+ else if (onoff == OFF)
+ printInfo_LCD();
+ }
+
+ if (btnChanged) {
+ if (onoff == OFF) {
+ watt = volt = ampere = watth = 0;
+ }
+ if (connectedWeb) {
+ send_data_to_clients(String(CMD_ONOFF) + onoff, HOME);
+ measureWh = !onoff;
+ }
+ btnChanged = 0;
+ }
+
+ if (connectedWeb) {
+ if (onoff == ON) {
+ String data = String(DATA_PVI);
+ data += String(watt, 3) + "," + String(volt, 3) + "," + String(ampere, 3);
+ if (measureWh) {
+ watth += watt;
+ }
+ data += "," + String(watth / 3600, 3);
+ send_data_to_clients(data, HOME);
+ }
+ }
+
+ if (logClient && logClient.connected())
{
- logClient.read();
+ // Report the log info
+ String data = String(volt, 3) + "," + String(ampere, 3) + "," +
+ String(watt, 3) + "," + String(watth / 3600, 3) + "\r\n";
+
+ logClient.write(data.c_str());
+
+ while (logClient.available())
+ {
+ logClient.read();
+ }
}
- }
- lcd_status();
- wifi_connection_status();
- readSystemReset();
+ lcd_status();
+ wifi_connection_status();
+ readSystemReset();
}
--
GitLab