more options

added OTA optional settings

Author: jaminNZx

ESP8266-Power-Monitor.ino

@@ -1,13 +1,19 @@
+#ifdef DEBUG
+#define BLYNK_PRINT Serial
+#endif
 #define BLYNK_MAX_READBYTES 512
 /****************************************************************************/
-#include <ArduinoOTA.h>
+
 #include <ESP8266WiFi.h>
 #include <BlynkSimpleEsp8266.h>
 #include <Wire.h>
 #include <Adafruit_INA219.h>
 #include <SimpleTimer.h>
 #include "wifi_credentials.h"
 #include "settings.h"
+#ifdef OTA_UPDATES
+#include <ArduinoOTA.h>
+#endif
 /****************************************************************************/
 SimpleTimer timer;
 Adafruit_INA219 ina219;
@@ -237,7 +243,7 @@ void countdownResetConCallback() {
   energyPrevious = 0;
 }
 
-// RESET PEAKS (short) & RESET CONSUMTION (long) 
+// RESET PEAKS (short) & RESET CONSUMTION (long)
 BLYNK_WRITE(vPIN_BUTTON_RESET_MAX) {
   if (param.asInt()) {
     Blynk.virtualWrite(vPIN_VOLTAGE_PEAK, "--- V");
@@ -287,6 +293,7 @@ void stopwatchCounter() {
   Blynk.virtualWrite(vPIN_ENERGY_TIME, days + hours_o + hours + mins_o + mins + secs_o + secs);
 }
 
+#ifdef FIXED_ENERGY_PRICE
 // This section is for setting the kWh price from your electric company.
 // I use a SPOT rate which means I need to update it all the time.
 // If you know your set price per kWh (in cents), then enter the price in settings: FIXED_ENERGY_PRICE
@@ -297,6 +304,7 @@ BLYNK_WRITE(vPIN_ENERGY_API) {
   energyPrice = param.asFloat();
   Blynk.virtualWrite(vPIN_ENERGY_PRICE, String(energyPrice, 4) + String('c') );
 }
+#endif
 
 // the functions for the split-task timers.
 // required to keep the little ESP8266 from disconnections
@@ -317,17 +325,17 @@ void setup() {
   Serial.begin(115200);
   WiFi.mode(WIFI_STA);
   // CONNECT TO BLYNK
-#if defined(USE_LOCAL_SERVER)
+#ifdef USE_LOCAL_SERVER
   Blynk.begin(AUTH, WIFI_SSID, WIFI_PASS, SERVER);
 #else
   Blynk.begin(AUTH, WIFI_SSID, WIFI_PASS, );
 #endif
   while (Blynk.connect() == false) {}
-
+#ifdef OTA_UPDATES
   // SETUP OVER THE AIR UPDATES
   ArduinoOTA.setHostname(OTA_HOSTNAME);
   ArduinoOTA.begin();
-
+#endif
   // START INA219
   ina219.begin();
 
@@ -348,7 +356,7 @@ void setup() {
   Blynk.virtualWrite(vPIN_BUTTON_AUTORANGE, 1);
 
   // Check for fixed energy price and update global 'energyPrice'
-#if defined(FIXED_ENERGY_PRICE)
+#ifdef FIXED_ENERGY_PRICE
   // else set fixed price with configured price
   energyPrice = FIXED_ENERGY_PRICE;
   Blynk.virtualWrite(vPIN_ENERGY_PRICE, String(FIXED_ENERGY_PRICE, 4) + String('c') );
@@ -362,6 +370,8 @@ void setup() {
 void loop() {
   // the loop... dont touch or add to this!
   Blynk.run();
+#ifdef OTA_UPDATES
   ArduinoOTA.handle();
+#endif
   timer.run();
 }

settings.h

@@ -1,16 +1,17 @@
 /**************************************************************
- *
- *                          Settings
- *
+
+                            Settings
+
  **************************************************************/
 /*
      Blynk Auth Code
 */
-  #define AUTH                      "9739e5f9d95941c99ca2b96526e70d5e"
+#define AUTH                      "9739e5f9d95941c99ca2b96526e70d5e"
 /*
    Over The Air Hostname
 */
-  #define OTA_HOSTNAME              "POWER-MONITOR"
+#define OTA_UPDATES
+#define OTA_HOSTNAME              "POWER-MONITOR"
 /*
    Local Server Settings (uncomment to use local server)
 */
@@ -19,11 +20,11 @@
 /*
    Energy Cost per kWh in cents. (comment out to use API method)
 */
-//#define FIXED_ENERGY_PRICE        9.934
+//#define FIXED_ENERGY_PRICE          9.934
 #define ENERGY_API                  "http://192.168.1.2:3000/"
 /*
-   Value Average Settings. 
-   Set the number of samples to take for the average values. 
+   Value Average Settings.
+   Set the number of samples to take for the average values.
    Value = Seconds (default 5 seconds)
 */
 #define AVG_DEPTH_VOLTAGE           5
@@ -32,22 +33,22 @@
 /*
    Virtual Pins - Base
 */
-#define vPIN_VOLTAGE_REAL           V1 
-#define vPIN_VOLTAGE_AVG            V2 
-#define vPIN_VOLTAGE_PEAK           V3 
+#define vPIN_VOLTAGE_REAL           V1
+#define vPIN_VOLTAGE_AVG            V2
+#define vPIN_VOLTAGE_PEAK           V3
 
 #define vPIN_CURRENT_REAL           V4
-#define vPIN_CURRENT_AVG            V5 
+#define vPIN_CURRENT_AVG            V5
 #define vPIN_CURRENT_PEAK           V6
 
 #define vPIN_GRAPH                  V7
 
 #define vPIN_POWER_REAL             V8
-#define vPIN_POWER_AVG              V9   
+#define vPIN_POWER_AVG              V9
 #define vPIN_POWER_PEAK             V10
 
 #define vPIN_ENERGY_USED            V11
-#define vPIN_ENERGY_COST            V12 
+#define vPIN_ENERGY_COST            V12
 #define vPIN_ENERGY_PRICE           V13
 #define vPIN_ENERGY_API             V14
 #define vPIN_ENERGY_TIME            V15
@@ -56,5 +57,8 @@
 #define vPIN_BUTTON_HOLD            V17
 #define vPIN_BUTTON_RESET_AVG       V18
 #define vPIN_BUTTON_RESET_MAX       V19
-
+/*
+  Debugging
+*/
+#define DEBUG