add feature-flags for libs, to fit 512k esp-01 version.

include/DebugLog.h

@@ -16,16 +16,16 @@
 
 #include <Arduino.h>
 
-#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+#ifdef ENABLE_DEBUGLOG
 #include <CircularBuffer.h>
 #define DEBUG_LOG_HISTORY_SIZE 1024
-#endif
+#endif // ENABLE_DEBUGLOG
 
 class DebugLog {
 public:
-#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+#ifdef ENABLE_DEBUGLOG
     String getBuffer(void);
-#endif
+#endif // ENABLE_DEBUGLOG
     
     void write(char c);
     void print(String s);
@@ -38,11 +38,11 @@ public:
 private:
     void sendToTargets(String s);
     
-#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+#ifdef ENABLE_DEBUGLOG
     void addToBuffer(String s);
     
     CircularBuffer<char, DEBUG_LOG_HISTORY_SIZE> buffer;
-#endif
+#endif // ENABLE_DEBUGLOG
 };
 
 extern DebugLog debug;

include/sensors.h

@@ -14,15 +14,19 @@
 #ifndef __SENSORS_H__
 #define __SENSORS_H__
 
+float sht_temp(void);
+float sht_humid(void);
+extern bool found_sht;
+
+#ifdef ENABLE_BME280
 float bme1_temp(void);
 float bme2_temp(void);
 float bme1_humid(void);
 float bme2_humid(void);
 float bme1_pressure(void);
 float bme2_pressure(void);
-float sht_temp(void);
-float sht_humid(void);
-extern bool found_bme1, found_bme2, found_sht;
+extern bool found_bme1, found_bme2;
+#endif // ENABLE_BME280
 
 #ifdef ENABLE_CCS811
 float ccs1_eco2(void);

platformio.ini

@@ -14,6 +14,9 @@ board = esp01_1m
 framework = arduino
 build_flags =
   -DSENSOR_HOSTNAME_PREFIX=\"env-\"
+  -DENABLE_WEBSOCKETS
+  -DENABLE_DEBUGLOG
+  -DENABLE_BME280
   -DENABLE_CCS811
   -DENABLE_INFLUXDB_LOGGING
   -DENABLE_MQTT
@@ -27,12 +30,36 @@ lib_deps =
     https://github.com/rlogiacco/CircularBuffer
     https://github.com/Links2004/arduinoWebSockets
 
+[env:esp8266smallrelais]
+platform = espressif8266
+board = esp01
+framework = arduino
+build_flags =
+  -DSENSOR_HOSTNAME_PREFIX=\"relais-\"
+  -DENABLE_WEBSOCKETS
+  -DENABLE_DEBUGLOG
+  -DENABLE_BME280
+  -DENABLE_CCS811
+  -DRELAIS_SERIAL
+  -DENABLE_MQTT
+lib_deps =
+    Wire
+    Adafruit Unified Sensor
+    Adafruit BME280 Library
+    https://github.com/adafruit/Adafruit_CCS811
+    https://github.com/knolleary/pubsubclient.git#2d228f2f862a95846c65a8518c79f48dfc8f188c
+    https://github.com/rlogiacco/CircularBuffer
+    https://github.com/Links2004/arduinoWebSockets
+
 [env:esp8266relais]
 platform = espressif8266
 board = esp01_1m
 framework = arduino
 build_flags =
   -DSENSOR_HOSTNAME_PREFIX=\"relais-\"
+  -DENABLE_WEBSOCKETS
+  -DENABLE_DEBUGLOG
+  -DENABLE_BME280
   -DRELAIS_SERIAL
   -DENABLE_INFLUXDB_LOGGING
   -DENABLE_MQTT
@@ -55,6 +82,9 @@ monitor_port = /dev/ttyUSB1
 monitor_speed = 115200
 build_flags =
   -DSENSOR_HOSTNAME_PREFIX=\"env-\"
+  -DENABLE_WEBSOCKETS
+  -DENABLE_DEBUGLOG
+  -DENABLE_BME280
   -DENABLE_CCS811
   -DENABLE_INFLUXDB_LOGGING
   -DENABLE_MQTT
@@ -78,7 +108,10 @@ monitor_port = /dev/ttyUSB1
 monitor_speed = 115200
 build_flags =
   -DSENSOR_HOSTNAME_PREFIX=\"env-\"
+  -DENABLE_WEBSOCKETS
+  -DENABLE_DEBUGLOG
   -DMOISTURE_ADC_ESP32
+  -DENABLE_BME280
   -DENABLE_CCS811
   -DENABLE_INFLUXDB_LOGGING
   -DENABLE_MQTT
@@ -101,6 +134,7 @@ monitor_port = /dev/ttyACM0
 monitor_speed = 115200
 build_flags =
   -DSENSOR_HOSTNAME_PREFIX=\"env-\"
+  -DENABLE_BME280
   -DMOISTURE_ADC_ARDUINO
   -DENABLE_INFLUXDB_LOGGING
 lib_deps =

src/DebugLog.cpp

@@ -13,13 +13,12 @@
 
 #include <Arduino.h>
 
+#include "servers.h"
 #include "DebugLog.h"
 
 DebugLog debug;
 
-#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
-
-void wifi_send_websocket(String s);
+#ifdef ENABLE_DEBUGLOG
 
 String DebugLog::getBuffer(void) {
     String r;
@@ -40,10 +39,8 @@ void DebugLog::addToBuffer(String s) {
 void DebugLog::sendToTargets(String s) {
     Serial.print(s);
     
-#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
     s = "log:" + s;
     wifi_send_websocket(s);
-#endif
 }
 
 void DebugLog::write(char c) {
@@ -51,9 +48,9 @@ void DebugLog::write(char c) {
 }
 
 void DebugLog::print(String s) {
-#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+#ifdef ENABLE_DEBUGLOG
     addToBuffer(s);
-#endif
+#endif // ENABLE_DEBUGLOG
     
     sendToTargets(s);
 }

src/html.cpp

@@ -163,6 +163,8 @@ void handlePage(WiFiClient &client, int mode, int id) {
     
 #endif
 
+#ifdef ENABLE_BME280
+
     message += F("\n<p>\n");
     if (found_bme1) {
         message += F("BME280 Low:");
@@ -213,6 +215,8 @@ void handlePage(WiFiClient &client, int mode, int id) {
     }
     message += F("\n</p><hr>\n");
 
+#endif // ENABLE_BME280
+
     ARDUINO_SEND_PARTIAL_PAGE();
 
     message += F("\n<p>\n");
@@ -370,16 +374,16 @@ void handlePage(WiFiClient &client, int mode, int id) {
     message += String(millis() / 1000);
     message += F(" sec.</p>");
 
-#if ! defined(ARDUINO_ARCH_AVR)
+#ifdef ENABLE_DEBUGLOG
     message += F("<hr><p>Debug Log:</p>");
     message += F("<div class='log'><pre id='logbuf'>");
     message += debug.getBuffer();
     message += F("</pre></div>");
-#endif
+#endif // ENABLE_DEBUGLOG
 
     message += F("</body>");
 
-#if ! defined(ARDUINO_ARCH_AVR)
+#ifdef ENABLE_WEBSOCKETS
     message += F("<script type='text/javascript'>\n");
     message += F("var socket = new WebSocket('ws://' + window.location.hostname + ':81');\n");
     message += F("socket.onmessage = function(e) {");
@@ -394,7 +398,7 @@ void handlePage(WiFiClient &client, int mode, int id) {
     message += F("var hist = document.getElementsByClassName('log')[0];\n");
     message += F("hist.scrollTop = hist.scrollHeight;\n");
     message += F("</script>\n");
-#endif
+#endif // ENABLE_WEBSOCKETS
 
     message += F("</html>");
 

src/influx.cpp

@@ -96,6 +96,8 @@ void writeDatabase() {
     InfluxData measurement("");
 #endif
 
+#ifdef ENABLE_BME280
+
     if (found_bme1) {
 #if defined(ARDUINO_ARCH_AVR)
         measurement.clear();
@@ -148,6 +150,8 @@ void writeDatabase() {
         debug.println(F("Done!"));
     }
 
+#endif // ENABLE_BME280
+
     if (found_sht) {
 #if defined(ARDUINO_ARCH_AVR)
         measurement.clear();

src/mqtt.cpp

@@ -53,7 +53,11 @@ static void writeMQTT() {
         return;
     }
 
-    if (found_bme1) {
+    if (found_sht) {
+        mqtt.publish(SENSOR_LOCATION "/temperature", String(sht_temp()).c_str(), true);
+        mqtt.publish(SENSOR_LOCATION "/humidity", String(sht_humid()).c_str(), true);
+#ifdef ENABLE_BME280
+    } else if (found_bme1) {
         mqtt.publish(SENSOR_LOCATION "/temperature", String(bme1_temp()).c_str(), true);
         mqtt.publish(SENSOR_LOCATION "/humidity", String(bme1_humid()).c_str(), true);
         mqtt.publish(SENSOR_LOCATION "/pressure", String(bme1_pressure()).c_str(), true);
@@ -61,9 +65,7 @@ static void writeMQTT() {
         mqtt.publish(SENSOR_LOCATION "/temperature", String(bme2_temp()).c_str(), true);
         mqtt.publish(SENSOR_LOCATION "/humidity", String(bme2_humid()).c_str(), true);
         mqtt.publish(SENSOR_LOCATION "/pressure", String(bme2_pressure()).c_str(), true);
-    } else if (found_sht) {
-        mqtt.publish(SENSOR_LOCATION "/temperature", String(sht_temp()).c_str(), true);
-        mqtt.publish(SENSOR_LOCATION "/humidity", String(sht_humid()).c_str(), true);
+#endif // ENABLE_BME280
     }
 
 #ifdef ENABLE_CCS811
@@ -78,12 +80,22 @@ static void writeMQTT() {
 }
 
 static void mqttCallback(char* topic, byte* payload, unsigned int length) {
+    String ts(topic), ps;
+    for (unsigned int i = 0; i < length; i++) {
+        char c = payload[i];
+        ps += c;
+    }
+
+    debug.print(F("MQTT Rx @ \""));
+    debug.print(ts);
+    debug.print(F("\" = \""));
+    debug.print(ps);
+    debug.println(F("\""));
+
 #ifdef FEATURE_RELAIS
     int state = 0;
     int id = -1;
 
-    String ts(topic), ps((char *)payload);
-
     String our_topic(SENSOR_LOCATION);
     our_topic += "/";
 

src/sensors.cpp

@@ -13,9 +13,12 @@
 
 #include <Arduino.h>
 
-#include <Adafruit_BME280.h>
 #include <SHT2x.h>
 
+#ifdef ENABLE_BME280
+#include <Adafruit_BME280.h>
+#endif // ENABLE_BME280
+
 #ifdef ENABLE_CCS811
 #include <Adafruit_CCS811.h>
 #endif // ENABLE_CCS811
@@ -51,10 +54,12 @@ static SHT2x sht(SHT_I2C_ADDRESS, &Wire);
 
 #endif
 
+#ifdef ENABLE_BME280
 static Adafruit_BME280 bme1, bme2;
-
 bool found_bme1 = false;
 bool found_bme2 = false;
+#endif // ENABLE_BME280
+
 bool found_sht = false;
 
 #ifdef ENABLE_CCS811
@@ -69,6 +74,8 @@ int ccs2_error_code = 0;
 
 static unsigned long last_sensor_handle_time = 0;
 
+#ifdef ENABLE_BME280
+
 float bme1_temp(void) {
     while (1) {
         float a = bme1.readTemperature();
@@ -165,6 +172,8 @@ float bme2_pressure(void) {
     return 0.0;
 }
 
+#endif // ENABLE_BME280
+
 float sht_temp(void) {
     while (1) {
         float a = sht.GetTemperature() + config.sht_temp_off;
@@ -218,12 +227,14 @@ float ccs2_tvoc(void) {
 static void ccs_update() {
     if (found_ccs1) {
         if (ccs1.available()) {
-            if (found_bme1) {
+            if (found_sht) {
+                ccs1.setEnvironmentalData(sht_humid(), sht_temp());
+#ifdef ENABLE_BME280
+            } else if (found_bme1) {
                 ccs1.setEnvironmentalData(bme1_humid(), bme1_temp());
             } else if (found_bme2) {
                 ccs1.setEnvironmentalData(bme2_humid(), bme2_temp());
-            } else if (found_sht) {
-                ccs1.setEnvironmentalData(sht_humid(), sht_temp());
+#endif // ENABLE_BME280
             }
 
             ccs1_error_code = ccs1.readData();
@@ -233,12 +244,14 @@ static void ccs_update() {
 
     if (found_ccs2) {
         if (ccs2.available()) {
-            if (found_bme1) {
+            if (found_sht) {
+                ccs2.setEnvironmentalData(sht_humid(), sht_temp());
+#ifdef ENABLE_BME280
+            } else if (found_bme1) {
                 ccs2.setEnvironmentalData(bme1_humid(), bme1_temp());
             } else if (found_bme2) {
                 ccs2.setEnvironmentalData(bme2_humid(), bme2_temp());
-            } else if (found_sht) {
-                ccs2.setEnvironmentalData(sht_humid(), sht_temp());
+#endif // ENABLE_BME280
             }
 
             ccs2_error_code = ccs2.readData();
@@ -253,6 +266,8 @@ static void ccs_update() {
 void handleCalibrate() {
     bool diff = false;
 
+#ifdef ENABLE_BME280
+
     if (server.hasArg("bme1")) {
         diff = true;
         String off_string = server.arg("bme1");
@@ -269,6 +284,8 @@ void handleCalibrate() {
         config.bme2_temp_off = real_temp - meas_temp;
     }
 
+#endif // ENABLE_BME280
+
     if (server.hasArg("sht")) {
         diff = true;
         String off_string = server.arg("sht");
@@ -278,6 +295,7 @@ void handleCalibrate() {
     }
 
     if (diff) {
+#ifdef ENABLE_BME280
         if (found_bme1) {
             bme1.setTemperatureCompensation(config.bme1_temp_off);
         }
@@ -285,6 +303,7 @@ void handleCalibrate() {
         if (found_bme2) {
             bme2.setTemperatureCompensation(config.bme2_temp_off);
         }
+#endif // ENABLE_BME280
 
         mem_write(config);
         handlePage(42);
@@ -301,9 +320,11 @@ void initSensors() {
     debug.println(F("Wire2"));
     Wire2.begin(I2C_SDA_PIN, I2C_SCL_PIN);
 
+#ifdef ENABLE_BME280
     debug.println(F("BME"));
     found_bme1 = (!bme1.begin(BME_I2C_ADDRESS_1, &Wire2)) ? false : true;
     found_bme2 = (!bme2.begin(BME_I2C_ADDRESS_2, &Wire2)) ? false : true;
+#endif // ENABLE_BME280
 
 #ifdef ENABLE_CCS811
     debug.println(F("CCS"));
@@ -318,9 +339,11 @@ void initSensors() {
     Wire.begin();
 #endif
 
+#ifdef ENABLE_BME280
     debug.println(F("BME"));
     found_bme1 = (!bme1.begin(BME_I2C_ADDRESS_1, &Wire)) ? false : true;
     found_bme2 = (!bme2.begin(BME_I2C_ADDRESS_2, &Wire)) ? false : true;
+#endif // ENABLE_BME280
 
 #ifdef ENABLE_CCS811
     debug.println(F("CCS"));
@@ -333,6 +356,7 @@ void initSensors() {
     debug.println(F("SHT"));
     found_sht = sht.GetAlive();
 
+#ifdef ENABLE_BME280
     // initialize temperature offsets
     if (found_bme1) {
         bme1.setTemperatureCompensation(config.bme1_temp_off);
@@ -340,6 +364,7 @@ void initSensors() {
     if (found_bme2) {
         bme2.setTemperatureCompensation(config.bme2_temp_off);
     }
+#endif // ENABLE_BME280
 }
 
 void runSensors() {

src/servers.cpp

@@ -29,12 +29,15 @@
 
 #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
 
-#include <WebSocketsServer.h>
 #include "SimpleUpdater.h"
 
 UPDATE_WEB_SERVER server(80);
 SimpleUpdater updater;
+
+#ifdef ENABLE_WEBSOCKETS
+#include <WebSocketsServer.h>
 WebSocketsServer socket(81);
+#endif // ENABLE_WEBSOCKETS
 
 #elif defined(ARDUINO_ARCH_AVR)
 
@@ -57,11 +60,11 @@ WiFiServer server(80);
 
 static unsigned long last_server_handle_time = 0;
 
-#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
 void wifi_send_websocket(String s) {
+#ifdef ENABLE_WEBSOCKETS
     socket.broadcastTXT(s);
+#endif // ENABLE_WEBSOCKETS
 }
-#endif
 
 #ifdef FEATURE_RELAIS
 
@@ -143,7 +146,9 @@ void initServers(String hostname) {
 
     MDNS.addService("http", "tcp", 80);
 
+#ifdef ENABLE_WEBSOCKETS
     socket.begin();
+#endif // ENABLE_WEBSOCKETS
 #endif
 
     server.begin();
@@ -220,7 +225,9 @@ void runServers() {
         handleServers();
 
 #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
+#ifdef ENABLE_WEBSOCKETS
         socket.loop();
+#endif // ENABLE_WEBSOCKETS
 #endif
     }