Browse Source
Configuration changes, using ArduinoJson for AJAX responses, EmonLiteESP with custom reading callbacks
fastled
Xose Pérez
8 years ago
9 changed files with 564 additions and 462 deletions
Unified View
Diff Options
-
+98 -28code/data/index.html
-
+5 -1code/lib/DebounceEvent/DebounceEvent.cpp
-
+3 -2code/lib/DebounceEvent/DebounceEvent.h
-
+22 -6code/lib/EmonLiteESP/EmonLiteESP.cpp
-
+7 -2code/lib/EmonLiteESP/EmonLiteESP.h
-
+2 -0code/platformio.ini
-
+89 -0code/src/Config.cpp
-
+68 -0code/src/Config.h
-
+270 -423code/src/main.cpp
+ 98
- 28
code/data/index.html
View File
+ 5
- 1
code/lib/DebounceEvent/DebounceEvent.cpp
View File
+ 3
- 2
code/lib/DebounceEvent/DebounceEvent.h
View File
+ 22
- 6
code/lib/EmonLiteESP/EmonLiteESP.cpp
View File
+ 7
- 2
code/lib/EmonLiteESP/EmonLiteESP.h
View File
+ 2
- 0
code/platformio.ini
View File
+ 89
- 0
code/src/Config.cpp
View File
| @ -0,0 +1,89 @@ | |||||
| /* | |||||
| Config | |||||
| Configuration file | |||||
| */ | |||||
| #include "Config.h" | |||||
| #include "FS.h" | |||||
| bool ConfigClass::save() { | |||||
| File file = SPIFFS.open(CONFIG_PATH, "w"); | |||||
| if (file) { | |||||
| file.println("hostname=" + hostname); | |||||
| file.println("ssid0=" + ssid[0]); | |||||
| file.println("pass0=" + pass[0]); | |||||
| file.println("ssid1=" + ssid[1]); | |||||
| file.println("pass1=" + pass[1]); | |||||
| file.println("ssid2=" + ssid[2]); | |||||
| file.println("pass2=" + pass[2]); | |||||
| file.println("mqttServer=" + mqttServer); | |||||
| file.println("mqttPort=" + mqttPort); | |||||
| file.println("mqttTopic=" + mqttTopic); | |||||
| file.println("rfChannel=" + rfChannel); | |||||
| file.println("rfDevice=" + rfDevice); | |||||
| file.println("otaServer=" + otaServer); | |||||
| file.println("otaInterval=" + otaInterval); | |||||
| file.println("pwMainsVoltage=" + pwMainsVoltage); | |||||
| file.println("pwCurrentRatio=" + pwCurrentRatio); | |||||
| file.close(); | |||||
| return true; | |||||
| } | |||||
| return false; | |||||
| } | |||||
| bool ConfigClass::load() { | |||||
| if (SPIFFS.exists(CONFIG_PATH)) { | |||||
| #ifdef DEBUG | |||||
| Serial.println("Reading config file"); | |||||
| #endif | |||||
| // Read contents | |||||
| File file = SPIFFS.open(CONFIG_PATH, "r"); | |||||
| String content = file.readString(); | |||||
| file.close(); | |||||
| // Parse contents | |||||
| content.replace("\r\n", "\n"); | |||||
| content.replace("\r", "\n"); | |||||
| int start = 0; | |||||
| int end = content.indexOf("\n", start); | |||||
| while (end > 0) { | |||||
| String line = content.substring(start, end); | |||||
| if (line.startsWith("hostname=")) hostname = line.substring(9); | |||||
| else if (line.startsWith("ssid0=")) ssid[0] = line.substring(6); | |||||
| else if (line.startsWith("pass0=")) pass[0] = line.substring(6); | |||||
| else if (line.startsWith("ssid1=")) ssid[1] = line.substring(6); | |||||
| else if (line.startsWith("pass1=")) pass[1] = line.substring(6); | |||||
| else if (line.startsWith("ssid2=")) ssid[2] = line.substring(6); | |||||
| else if (line.startsWith("pass2=")) pass[2] = line.substring(6); | |||||
| else if (line.startsWith("mqttServer=")) mqttServer = line.substring(11); | |||||
| else if (line.startsWith("mqttPort=")) mqttPort = line.substring(9); | |||||
| else if (line.startsWith("mqttTopic=")) mqttTopic = line.substring(10); | |||||
| else if (line.startsWith("rfChannel=")) rfChannel = line.substring(10); | |||||
| else if (line.startsWith("rfDevice=")) rfDevice = line.substring(9); | |||||
| else if (line.startsWith("otaServer=")) otaServer = line.substring(10); | |||||
| else if (line.startsWith("otaInterval=")) otaInterval = line.substring(12); | |||||
| else if (line.startsWith("pwMainsVoltage=")) pwMainsVoltage = line.substring(15); | |||||
| else if (line.startsWith("pwCurrentRatio=")) pwCurrentRatio = line.substring(15); | |||||
| if (end < 0) break; | |||||
| start = end + 1; | |||||
| end = content.indexOf("\n", start); | |||||
| } | |||||
| return true; | |||||
| } | |||||
| return false; | |||||
| } | |||||
| ConfigClass config; | |||||
+ 68
- 0
code/src/Config.h
View File
| @ -0,0 +1,68 @@ | |||||
| /* | |||||
| Config | |||||
| Configuration file | |||||
| */ | |||||
| #ifndef Config_h | |||||
| #define Config_h | |||||
| #include "Arduino.h" | |||||
| // ----------------------------------------------------------------------------- | |||||
| // Defaults | |||||
| // ----------------------------------------------------------------------------- | |||||
| #define CONFIG_PATH "/.config" | |||||
| #define NETWORK_BUFFER 3 | |||||
| #define MQTT_SERVER "192.168.1.100" | |||||
| #define MQTT_PORT 1883 | |||||
| #define MQTT_TOPIC "/test/switch/{identifier}" | |||||
| #define AUTOOTA_SERVER "http://192.168.1.100" | |||||
| #define AUTOOTA_INTERVAL 600000 | |||||
| #define MAINS_VOLTAGE 230 | |||||
| #define CURRENT_RATIO 156 | |||||
| #define RF_CHANNEL 31 | |||||
| #define RF_DEVICE 1 | |||||
| // ----------------------------------------------------------------------------- | |||||
| // Class definition | |||||
| // ----------------------------------------------------------------------------- | |||||
| class ConfigClass { | |||||
| public: | |||||
| String hostname; | |||||
| String ssid[NETWORK_BUFFER]; | |||||
| String pass[NETWORK_BUFFER]; | |||||
| String mqttServer = MQTT_SERVER; | |||||
| String mqttPort = String(MQTT_PORT); | |||||
| String mqttTopic = MQTT_TOPIC; | |||||
| String mqttUser = ""; | |||||
| String mqttPassword = ""; | |||||
| String rfChannel = String(RF_CHANNEL); | |||||
| String rfDevice = String(RF_DEVICE); | |||||
| String otaServer = String(AUTOOTA_SERVER); | |||||
| String otaInterval = String(AUTOOTA_INTERVAL); | |||||
| String pwMainsVoltage = String(MAINS_VOLTAGE); | |||||
| String pwCurrentRatio = String(CURRENT_RATIO); | |||||
| bool save(); | |||||
| bool load(); | |||||
| }; | |||||
| extern ConfigClass config; | |||||
| #endif | |||||