diff --git a/code/espurna/config/hardware.h b/code/espurna/config/hardware.h index fe35cd67..5b64f19a 100644 --- a/code/espurna/config/hardware.h +++ b/code/espurna/config/hardware.h @@ -876,6 +876,34 @@ #define ECH1560_MISO_PIN 5 #define ECH1560_INVERTED 0 +// ----------------------------------------------------------------------------- +// ESPLive +// https://github.com/ManCaveMade/ESP-Live +// ----------------------------------------------------------------------------- + +#elif defined(ESPLIVE) + + // Info + #define MANUFACTURER "ManCave Made" + #define DEVICE "ESPLIVE" + + // Buttons + #define BUTTON1_PIN 4 + #define BUTTON2_PIN 5 + + #define BUTTON1_MODE BUTTON_PUSHBUTTON | BUTTON_DEFAULT_HIGH + #define BUTTON2_MODE BUTTON_PUSHBUTTON | BUTTON_DEFAULT_HIGH + + #define BUTTON1_RELAY 1 + #define BUTTON2_RELAY 2 + + // Relays + #define RELAY1_PIN 12 + #define RELAY2_PIN 13 + + #define RELAY1_TYPE RELAY_TYPE_NORMAL + #define RELAY2_TYPE RELAY_TYPE_NORMAL + // ----------------------------------------------------------------------------- // Unknown hardware // ----------------------------------------------------------------------------- diff --git a/code/espurna/config/sensors.h b/code/espurna/config/sensors.h index a3498dfc..7aab200b 100644 --- a/code/espurna/config/sensors.h +++ b/code/espurna/config/sensors.h @@ -74,12 +74,14 @@ //-------------------------------------------------------------------------------- #ifndef DS18B20_SUPPORT -#define DS18B20_SUPPORT 0 +#define DS18B20_SUPPORT 1 #endif -#define DS18B20_PIN 14 -#define DS18B20_UPDATE_INTERVAL 60000 +#define DS18B20_PIN 2 +#define DS18B20_UPDATE_INTERVAL 5000 #define DS18B20_TEMPERATURE_TOPIC "temperature" +//Will only send MQTT update if the value has changed by this amount (0.0 sends every interval) +#define DS18B20_UPDATE_ON_CHANGE 1.0 //-------------------------------------------------------------------------------- // Internal power montior diff --git a/code/espurna/ds18b20.ino b/code/espurna/ds18b20.ino index ebe98160..a93b5f5c 100644 --- a/code/espurna/ds18b20.ino +++ b/code/espurna/ds18b20.ino @@ -51,6 +51,10 @@ void dsLoop() { // Check if we should read new data static unsigned long last_update = 0; static bool requested = false; + + static double last_temperature = 0.0; + bool send_update = false; + if ((millis() - last_update > DS18B20_UPDATE_INTERVAL) || (last_update == 0)) { if (!requested) { ds18b20.requestTemperatures(); @@ -80,6 +84,12 @@ void dsLoop() { DEBUG_MSG_P(PSTR("[DS18B20] Error reading sensor\n")); } else { + + //If the new temperature is different from the last + if (fabs(t - last_temperature) >= DS18B20_UPDATE_ON_CHANGE) { + last_temperature = t; + send_update = true; + } _dsTemperature = t; @@ -95,17 +105,19 @@ void dsLoop() { getDSTemperatureStr(), (_dsIsConnected ? ((tmpUnits == TMP_CELSIUS) ? "ºC" : "ºF") : "")); - // Send MQTT messages - mqttSend(getSetting("dsTmpTopic", DS18B20_TEMPERATURE_TOPIC).c_str(), _dsTemperatureStr); + if (send_update) { + // Send MQTT messages + mqttSend(getSetting("dsTmpTopic", DS18B20_TEMPERATURE_TOPIC).c_str(), _dsTemperatureStr); - // Send to Domoticz - #if DOMOTICZ_SUPPORT - domoticzSend("dczTmpIdx", 0, _dsTemperatureStr); - #endif + // Send to Domoticz + #if DOMOTICZ_SUPPORT + domoticzSend("dczTmpIdx", 0, _dsTemperatureStr); + #endif - #if INFLUXDB_SUPPORT - influxDBSend(getSetting("dsTmpTopic", DS18B20_TEMPERATURE_TOPIC).c_str(), _dsTemperatureStr); - #endif + #if INFLUXDB_SUPPORT + influxDBSend(getSetting("dsTmpTopic", DS18B20_TEMPERATURE_TOPIC).c_str(), _dsTemperatureStr); + #endif + } // Update websocket clients #if WEB_SUPPORT @@ -113,7 +125,7 @@ void dsLoop() { snprintf_P(buffer, sizeof(buffer), PSTR("{\"dsVisible\": 1, \"dsTmp\": %s, \"tmpUnits\": %d}"), getDSTemperatureStr(), tmpUnits); wsSend(buffer); #endif - + } } diff --git a/code/espurna/espurna.ino b/code/espurna/espurna.ino index 24d95adc..0921e868 100644 --- a/code/espurna/espurna.ino +++ b/code/espurna/espurna.ino @@ -2,7 +2,7 @@ ESPurna -Copyright (C) 2016-2017 by Xose Pérez +Copyright (C) 2016-2017 by Xose Pérez This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -43,6 +43,11 @@ void hardwareSetup() { SPIFFS.begin(); #endif + #if defined(ESPLIVE) + //The ESPLive has an ADC MUX which needs to be configured. + pinMode(16, OUTPUT); + digitalWrite(16, HIGH); //Defualt CT input (pin B, solder jumper B) + #endif } void hardwareLoop() { diff --git a/code/espurna/hardware.ino b/code/espurna/hardware.ino index d11f6a7d..7ede77d7 100644 --- a/code/espurna/hardware.ino +++ b/code/espurna/hardware.ino @@ -442,6 +442,18 @@ void hwUpwardsCompatibility() { setSetting("board", 38); + #elif defined(ESPLIVE) + + setSetting("board", 39); + setSetting("btnGPIO", 1, 4); + setSetting("btnGPIO", 2, 5); + setSetting("btnRelay", 1, 1); + setSetting("btnRelay", 2, 2); + setSetting("relayGPIO", 1, 12); + setSetting("relayGPIO", 2, 13); + setSetting("relayType", 1, RELAY_TYPE_NORMAL); + setSetting("relayType", 2, RELAY_TYPE_NORMAL); + #else #error "UNSUPPORTED HARDWARE!" diff --git a/code/platformio.ini b/code/platformio.ini index 912b203b..0b2c4750 100644 --- a/code/platformio.ini +++ b/code/platformio.ini @@ -886,6 +886,28 @@ upload_port = "192.168.4.1" upload_flags = --auth=fibonacci --port 8266 monitor_baud = 115200 +[env:esplive] +platform = espressif8266 +framework = arduino +board = d1_mini +lib_deps = ${common.lib_deps} +lib_ignore = ${common.lib_ignore} +build_flags = ${common.build_flags} -DESPLIVE +upload_speed = 460800 +monitor_baud = 115200 + +[env:esplive-ota] +platform = espressif8266 +framework = arduino +board = d1_mini +lib_deps = ${common.lib_deps} +lib_ignore = ${common.lib_ignore} +build_flags = ${common.build_flags} -DESPLIVE +upload_speed = 460800 +upload_port = "192.168.4.1" +upload_flags = --auth=fibonacci --port 8266 +monitor_baud = 115200 + # ------------------------------------------------------------------------------ # GENERIC OTA ENVIRONMENTS # ------------------------------------------------------------------------------