diff --git a/sonoff/_changelog.ino b/sonoff/_changelog.ino index 230a541b7..d9044fcae 100644 --- a/sonoff/_changelog.ino +++ b/sonoff/_changelog.ino @@ -2,7 +2,8 @@ * Change web Configure Module GPIO drop down list order for better readability * Fix showing Period Power in energy threshold messages * Fix ButtonRetain to not use default topic for clearing retain messages (#3737) - * Add sleep to Nova Fitness SDS01X sensor (#2841, #3724) + * Add sleep to Nova Fitness SDS01X sensor (#2841, #3724, #3749) + * Add Analog input AD0 enabled to sonoff-sensors.bin (#3756, #3757) * * 6.2.1.2 20180906 * Fix KNX PA exception. Regression from 6.2.1 buffer overflow caused by subStr() (#3700, #3710) diff --git a/sonoff/xdrv_99_debug.ino b/sonoff/xdrv_99_debug.ino index 8a167511c..3cd2e69c5 100644 --- a/sonoff/xdrv_99_debug.ino +++ b/sonoff/xdrv_99_debug.ino @@ -182,6 +182,7 @@ void CpuLoadLoop() #if defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) // All version before core 2.4.2 +// https://github.com/esp8266/Arduino/issues/2557 extern "C" { #include @@ -190,7 +191,6 @@ extern "C" { void DebugFreeMem() { -// https://github.com/esp8266/Arduino/issues/2557 register uint32_t *sp asm("a1"); // snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_DEBUG "FreeRam %d, FreeStack %d, UnmodifiedStack %d (%s)"), @@ -213,7 +213,6 @@ extern "C" { void DebugFreeMem() { -// https://github.com/esp8266/Arduino/issues/2557 register uint32_t *sp asm("a1"); snprintf_P(log_data, sizeof(log_data), PSTR(D_LOG_DEBUG "FreeRam %d, FreeStack %d (%s)"), diff --git a/sonoff/xdsp_05_epaper.ino b/sonoff/xdsp_05_epaper.ino index 59a08584b..91eb747f2 100644 --- a/sonoff/xdsp_05_epaper.ino +++ b/sonoff/xdsp_05_epaper.ino @@ -188,7 +188,7 @@ boolean Xdsp05(byte function) if (FUNC_DISPLAY_INIT_DRIVER == function) { EpdInitDriver(); } - else if (XDSP_04 == Settings.display_model) { + else if (XDSP_05 == Settings.display_model) { if (!dsp_color) { dsp_color = COLORED; }