From 2ddfc16d6a728587bf503bfd283313a2fe6773e1 Mon Sep 17 00:00:00 2001 From: ArnieO Date: Sun, 23 Feb 2020 17:12:26 +0100 Subject: [PATCH 1/2] Updated comment for rgbled() function --- src/AmsToMqttBridge.ino | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino index a1be1c67..ae268926 100644 --- a/src/AmsToMqttBridge.ino +++ b/src/AmsToMqttBridge.ino @@ -271,19 +271,19 @@ void errorBlink() { switch(lastError) { case 0: if(lastErrorBlink - lastSuccessfulRead > 30000) { - rgb_led(RGB_RED, 2); // If no message received from AMS in 30 sec, blink once + rgb_led(1, 2); // If no message received from AMS in 30 sec, blink once return; } break; case 1: if(!config.getMqttHost().isEmpty() && mqtt.lastError() != 0) { - rgb_led(RGB_RED, 3); // If MQTT error, blink twice + rgb_led(1, 3); // If MQTT error, blink twice return; } break; case 2: if(WiFi.getMode() != WIFI_AP && WiFi.status() != WL_CONNECTED) { - rgb_led(RGB_RED, 4); // If WiFi not connected, blink three times + rgb_led(1, 4); // If WiFi not connected, blink three times return; } break; @@ -534,10 +534,11 @@ void sendMqttData(String data) } void rgb_led(int color, int mode) { -// Activate red and green LEDs +// Activate red and green LEDs if RGB LED is present (HAS_RGB_LED=1) +// If no RGB LED present (HAS_RGB_LED=0 or not defined), all output goes to ESP onboard LED // color: 1=red, 2=green, 3=yellow -// mode: 0=OFF, 1=ON, 2=Short blink -#ifndef HAS_RGB_LED +// mode: 0=OFF, 1=ON, >=2 -> Short blink(s), number of blinks: (mode - 1) +#ifndef HAS_RGB_LED #define LEDPIN_RGB_RED LED_PIN #define LEDPIN_RGB_GREEN LED_PIN #endif From 232b9c279dfaaed03057d2807ab29558f4956924 Mon Sep 17 00:00:00 2001 From: ArnieO Date: Mon, 24 Feb 2020 20:05:34 +0100 Subject: [PATCH 2/2] Optional Vcc calibration factor defined in *.ino --- src/AmsToMqttBridge.ino | 4 ---- src/HwTools.cpp | 6 +++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino index 99e98eb1..f1c41d5c 100644 --- a/src/AmsToMqttBridge.ino +++ b/src/AmsToMqttBridge.ino @@ -543,11 +543,7 @@ void rgb_led(int color, int mode) { // If no RGB LED present (HAS_RGB_LED=0 or not defined), all output goes to ESP onboard LED // color: 1=red, 2=green, 3=yellow // mode: 0=OFF, 1=ON, >=2 -> Short blink(s), number of blinks: (mode - 1) -<<<<<<< HEAD #ifndef HAS_RGB_LED -======= -#ifndef HAS_RGB_LED ->>>>>>> upstream/dev-v1.1.0 #define LEDPIN_RGB_RED LED_PIN #define LEDPIN_RGB_GREEN LED_PIN #endif diff --git a/src/HwTools.cpp b/src/HwTools.cpp index d88fcd6c..a0a3ba65 100644 --- a/src/HwTools.cpp +++ b/src/HwTools.cpp @@ -4,7 +4,11 @@ double HwTools::getVcc() { #if defined(ARDUINO_ESP8266_WEMOS_D1MINI) return (((double) ESP.getVcc()) / 900); // This board has a voltage divider on VCC. Yes, 900 is correct #elif defined(ESP8266) - return ((double) ESP.getVcc()) / 1024; + #if defined(ESP_VCC_CALIB_FACTOR) + return ((double) ESP.getVcc()) / 1024 * ESP_VCC_CALIB_FACTOR; + #else + return ((double) ESP.getVcc()) / 1024; + #endif #endif return -1; }