Fix energy monitor
This commit is contained in:
@@ -90,8 +90,6 @@ bool relayControl = false;
|
||||
|
||||
void setup() {
|
||||
|
||||
Serial.begin(74880);
|
||||
|
||||
// WiFiManager intialization.
|
||||
WiFiManager wifi;
|
||||
|
||||
@@ -124,6 +122,9 @@ bool relayControl = false;
|
||||
//Call timer setup from timer.h
|
||||
timerSetup();
|
||||
|
||||
Serial.flush();
|
||||
Serial.begin( 4800 );
|
||||
|
||||
// Switch LED off to signal initialization complete.
|
||||
digitalWrite( LED, HIGH );
|
||||
|
||||
@@ -131,9 +132,9 @@ bool relayControl = false;
|
||||
|
||||
if (EEPROM.read(0) == 1 && returnConfigVersion() == configVersion) { //If flagged in EEPROM; we load our current position
|
||||
configLoad();
|
||||
Serial.println("Pass Config Version Check");
|
||||
//Serial.println("Pass Config Version Check");
|
||||
} else {
|
||||
Serial.println("Fail Config Version Check, Reseting To Default");
|
||||
//Serial.println("Fail Config Version Check, Reseting To Default");
|
||||
configSave();
|
||||
|
||||
}
|
||||
@@ -141,9 +142,11 @@ bool relayControl = false;
|
||||
}
|
||||
|
||||
void loop() {
|
||||
|
||||
|
||||
if (timer(1000,2) == true) {
|
||||
sendBlynk();
|
||||
Serial.println(temp.cur);
|
||||
//Serial.println(temp.cur);
|
||||
}
|
||||
|
||||
if (isFirstRun == true) {
|
||||
@@ -151,7 +154,6 @@ void loop() {
|
||||
Blynk.virtualWrite(V55,temp.offset);
|
||||
Blynk.virtualWrite(V57,cooldownPeriod);
|
||||
}
|
||||
|
||||
|
||||
isFirstRun = false;
|
||||
|
||||
|
||||
+6
-6
@@ -284,7 +284,7 @@ void configSave() {
|
||||
i+=sizeof(cooldownPeriod);
|
||||
|
||||
EEPROM.commit();
|
||||
Serial.println("Config Saved");
|
||||
//Serial.println("Config Saved");
|
||||
}
|
||||
|
||||
|
||||
@@ -300,12 +300,12 @@ void configLoad() {
|
||||
EEPROM.get(i,cooldownPeriod);
|
||||
i+=sizeof(cooldownPeriod);
|
||||
|
||||
Serial.println("Config Loaded");
|
||||
//Serial.println("Config Loaded");
|
||||
|
||||
Serial.println(temp.target);
|
||||
Serial.println(temp.offset);
|
||||
Serial.println(temp.unit);
|
||||
Serial.println(cooldownPeriod);
|
||||
//Serial.println(temp.target);
|
||||
//Serial.println(temp.offset);
|
||||
//Serial.println(temp.unit);
|
||||
//Serial.println(cooldownPeriod);
|
||||
}
|
||||
|
||||
byte returnConfigVersion() {
|
||||
|
||||
@@ -38,8 +38,8 @@ bool timer(unsigned long _interval,int _id) { //_interval in millis, _id in coun
|
||||
if (millisCount(1,_id) >= _interval) {
|
||||
millisCount(0,_id);
|
||||
return true;
|
||||
Serial.print("Timer: "); Serial.print(_id); Serial.print(" ");
|
||||
Serial.println("True");
|
||||
//Serial.print("Timer: "); Serial.print(_id); Serial.print(" ");
|
||||
//Serial.println("True");
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user