Skip to content
This repository was archived by the owner on Feb 9, 2022. It is now read-only.

Commit 089b453

Browse files
khoih-progkhoih-prog
authored
v1.6.0 to use ESP8266 core v3.0.0
### Major Releases v1.6.0 1. Fix AP connect issue caused by **breaking ESP8266 core v3.0.0**. Caused by multiple core changes, but the new solution results a better and faster connection to AP. 2. Fix SSL issue caused by breaking ESP8266 core v3.0.0. Now the better **BearSSL** is used in both ESP32 and ESP8266 to replace the ESP8266 deprecated `axTLS`. Check [Remove axTLS from code and documentation #7437](esp8266/Arduino#7437) 3. Fix the `BLYNK_INFO_DEVICE`displaying the generic ESP8266 board with Blynk logo. Caused by new ESP8266 core changes of `build.board`. For example from `ESP8266_NODEMCU` in core v2.7.4 to `ESP8266_NODEMCU_ESP12E` in core v3.0.0 4. Fix many warnings only displayed in new core ESP8266 v3.0.0 5. Make code compatible for either new ESP8266 core v3.0.0+ or ealier cores v2.7.4-
1 parent bbb0183 commit 089b453

File tree

24 files changed

+164
-34
lines changed

24 files changed

+164
-34
lines changed

‎examples/Async_AM2315_ESP32_SSL/Async_AM2315_ESP32_SSL.ino

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Based on and modified from Blynk library v0.6.1 (https://github.com/blynkkk/blynk-library/releases)
99
Built by Khoi Hoang (https://github.com/khoih-prog/Blynk_Async_WM)
1010
Licensed under MIT license
11-
Version: 1.5.0
11+
Version: 1.6.0
1212
1313
Version Modified By Date Comments
1414
------- ----------- ---------- -----------
@@ -24,6 +24,7 @@
2424
Fix SSL issue with Blynk Cloud Server
2525
1.4.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32
2626
1.5.0 K Hoang 25/04/2021 Enable scan of WiFi networks for selection in Configuration Portal
27+
1.6.0 K Hoang 19/05/2021 Fix AP connect and SSL issues caused by breaking ESP8266 core v3.0.0
2728
********************************************************************************************************************************/
2829

2930
#include "defines.h"

‎examples/Async_AM2315_ESP8266/Async_AM2315_ESP8266.ino

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Based on and modified from Blynk library v0.6.1 (https://github.com/blynkkk/blynk-library/releases)
99
Built by Khoi Hoang (https://github.com/khoih-prog/Blynk_Async_WM)
1010
Licensed under MIT license
11-
Version: 1.5.0
11+
Version: 1.6.0
1212
1313
Version Modified By Date Comments
1414
------- ----------- ---------- -----------
@@ -24,11 +24,24 @@
2424
Fix SSL issue with Blynk Cloud Server
2525
1.4.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32
2626
1.5.0 K Hoang 25/04/2021 Enable scan of WiFi networks for selection in Configuration Portal
27+
1.6.0 K Hoang 19/05/2021 Fix AP connect and SSL issues caused by breaking ESP8266 core v3.0.0
2728
********************************************************************************************************************************/
2829

2930
#include "defines.h"
3031

31-
#include <Ticker.h>
32+
///////////////////////////////////////////////////////////////////
33+
#if ( USING_ESP8266_CORE_VERSION >= 30000 )
34+
// Only to deal with ESP8266 core v3.0.0 warning in Ticker library
35+
#pragma GCC diagnostic push
36+
#pragma GCC diagnostic ignored "-Wcast-function-type"
37+
38+
#include <Ticker.h>
39+
#pragma GCC diagnostic pop
40+
#else
41+
#include <Ticker.h>
42+
#endif
43+
///////////////////////////////////////////////////////////////////
44+
3245
#include <Wire.h>
3346
#include <Adafruit_AM2315.h> // To install Adafruit AM2315 library
3447

@@ -143,6 +156,7 @@ void setup()
143156
#endif
144157

145158
#if USE_BLYNK_WM
159+
Serial.println(ESP8266_CORE_VERSION);
146160
Serial.println(BLYNK_ASYNC_WM_VERSION);
147161
Serial.println(ESP_DOUBLE_RESET_DETECTOR_VERSION);
148162
#endif

‎examples/Async_Blynk_WM_Template/Async_Blynk_WM_Template.ino

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Based on and modified from Blynk library v0.6.1 (https://github.com/blynkkk/blynk-library/releases)
1111
Built by Khoi Hoang (https://github.com/khoih-prog/Blynk_Async_WM)
1212
Licensed under MIT license
13-
Version: 1.5.0
13+
Version: 1.6.0
1414
1515
Version Modified By Date Comments
1616
------- ----------- ---------- -----------
@@ -26,6 +26,7 @@
2626
Fix SSL issue with Blynk Cloud Server
2727
1.4.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32
2828
1.5.0 K Hoang 25/04/2021 Enable scan of WiFi networks for selection in Configuration Portal
29+
1.6.0 K Hoang 19/05/2021 Fix AP connect and SSL issues caused by breaking ESP8266 core v3.0.0
2930
********************************************************************************************************************************/
3031

3132
// Sketch uses Arduino IDE-selected ESP32 and ESP8266 to select compile choices
@@ -524,6 +525,10 @@ bool heartbeatLEDon = false; // this lets me use the same routine for the turn-o
524525
Serial.println();
525526

526527
#if USE_WM
528+
#if ESP8266
529+
Serial.println(ESP8266_CORE_VERSION);
530+
#endif
531+
527532
Serial.println(BLYNK_ASYNC_WM_VERSION);
528533
Serial.println(ESP_DOUBLE_RESET_DETECTOR_VERSION);
529534
#endif

‎examples/Async_DHT11ESP32/Async_DHT11ESP32.ino

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Based on and modified from Blynk library v0.6.1 (https://github.com/blynkkk/blynk-library/releases)
99
Built by Khoi Hoang (https://github.com/khoih-prog/Blynk_Async_WM)
1010
Licensed under MIT license
11-
Version: 1.5.0
11+
Version: 1.6.0
1212
1313
Version Modified By Date Comments
1414
------- ----------- ---------- -----------
@@ -24,6 +24,7 @@
2424
Fix SSL issue with Blynk Cloud Server
2525
1.4.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32
2626
1.5.0 K Hoang 25/04/2021 Enable scan of WiFi networks for selection in Configuration Portal
27+
1.6.0 K Hoang 19/05/2021 Fix AP connect and SSL issues caused by breaking ESP8266 core v3.0.0
2728
********************************************************************************************************************************/
2829

2930
#include "defines.h"

‎examples/Async_DHT11ESP32_SSL/Async_DHT11ESP32_SSL.ino

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Based on and modified from Blynk library v0.6.1 (https://github.com/blynkkk/blynk-library/releases)
99
Built by Khoi Hoang (https://github.com/khoih-prog/Blynk_Async_WM)
1010
Licensed under MIT license
11-
Version: 1.5.0
11+
Version: 1.6.0
1212
1313
Version Modified By Date Comments
1414
------- ----------- ---------- -----------
@@ -24,6 +24,7 @@
2424
Fix SSL issue with Blynk Cloud Server
2525
1.4.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32
2626
1.5.0 K Hoang 25/04/2021 Enable scan of WiFi networks for selection in Configuration Portal
27+
1.6.0 K Hoang 19/05/2021 Fix AP connect and SSL issues caused by breaking ESP8266 core v3.0.0
2728
********************************************************************************************************************************/
2829

2930
#include "defines.h"

‎examples/Async_DHT11ESP8266/Async_DHT11ESP8266.ino

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Based on and modified from Blynk library v0.6.1 (https://github.com/blynkkk/blynk-library/releases)
99
Built by Khoi Hoang (https://github.com/khoih-prog/Blynk_Async_WM)
1010
Licensed under MIT license
11-
Version: 1.5.0
11+
Version: 1.6.0
1212
1313
Version Modified By Date Comments
1414
------- ----------- ---------- -----------
@@ -24,11 +24,24 @@
2424
Fix SSL issue with Blynk Cloud Server
2525
1.4.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32
2626
1.5.0 K Hoang 25/04/2021 Enable scan of WiFi networks for selection in Configuration Portal
27+
1.6.0 K Hoang 19/05/2021 Fix AP connect and SSL issues caused by breaking ESP8266 core v3.0.0
2728
********************************************************************************************************************************/
2829

2930
#include "defines.h"
3031

31-
#include <Ticker.h>
32+
///////////////////////////////////////////////////////////////////
33+
#if ( USING_ESP8266_CORE_VERSION >= 30000 )
34+
// Only to deal with ESP8266 core v3.0.0 warning in Ticker library
35+
#pragma GCC diagnostic push
36+
#pragma GCC diagnostic ignored "-Wcast-function-type"
37+
38+
#include <Ticker.h>
39+
#pragma GCC diagnostic pop
40+
#else
41+
#include <Ticker.h>
42+
#endif
43+
///////////////////////////////////////////////////////////////////
44+
3245
#include <DHT.h> // https://github.com/adafruit/DHT-sensor-library
3346

3447
DHT dht(DHT_PIN, DHT_TYPE);
@@ -128,6 +141,7 @@ void setup()
128141
#endif
129142

130143
#if USE_BLYNK_WM
144+
Serial.println(ESP8266_CORE_VERSION);
131145
Serial.println(BLYNK_ASYNC_WM_VERSION);
132146
Serial.println(ESP_DOUBLE_RESET_DETECTOR_VERSION);
133147
#endif

‎examples/Async_DHT11ESP8266_Debug/Async_DHT11ESP8266_Debug.ino

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Based on and modified from Blynk library v0.6.1 (https://github.com/blynkkk/blynk-library/releases)
99
Built by Khoi Hoang (https://github.com/khoih-prog/Blynk_Async_WM)
1010
Licensed under MIT license
11-
Version: 1.5.0
11+
Version: 1.6.0
1212
1313
Version Modified By Date Comments
1414
------- ----------- ---------- -----------
@@ -24,10 +24,23 @@
2424
Fix SSL issue with Blynk Cloud Server
2525
1.4.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32
2626
1.5.0 K Hoang 25/04/2021 Enable scan of WiFi networks for selection in Configuration Portal
27+
1.6.0 K Hoang 19/05/2021 Fix AP connect and SSL issues caused by breaking ESP8266 core v3.0.0
2728
********************************************************************************************************************************/
2829
#include "defines.h"
2930

30-
#include <Ticker.h>
31+
///////////////////////////////////////////////////////////////////
32+
#if ( USING_ESP8266_CORE_VERSION >= 30000 )
33+
// Only to deal with ESP8266 core v3.0.0 warning in Ticker library
34+
#pragma GCC diagnostic push
35+
#pragma GCC diagnostic ignored "-Wcast-function-type"
36+
37+
#include <Ticker.h>
38+
#pragma GCC diagnostic pop
39+
#else
40+
#include <Ticker.h>
41+
#endif
42+
///////////////////////////////////////////////////////////////////
43+
3144
#include <DHT.h> // https://github.com/adafruit/DHT-sensor-library
3245

3346
DHT dht(DHT_PIN, DHT_TYPE);
@@ -128,6 +141,7 @@ void setup()
128141
#endif
129142

130143
#if USE_BLYNK_WM
144+
Serial.println(ESP8266_CORE_VERSION);
131145
Serial.println(BLYNK_ASYNC_WM_VERSION);
132146
Serial.println(ESP_DOUBLE_RESET_DETECTOR_VERSION);
133147
#endif

‎examples/Async_DHT11ESP8266_SSL/Async_DHT11ESP8266_SSL.ino

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Based on and modified from Blynk library v0.6.1 (https://github.com/blynkkk/blynk-library/releases)
99
Built by Khoi Hoang (https://github.com/khoih-prog/Blynk_Async_WM)
1010
Licensed under MIT license
11-
Version: 1.5.0
11+
Version: 1.6.0
1212
1313
Version Modified By Date Comments
1414
------- ----------- ---------- -----------
@@ -24,11 +24,24 @@
2424
Fix SSL issue with Blynk Cloud Server
2525
1.4.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32
2626
1.5.0 K Hoang 25/04/2021 Enable scan of WiFi networks for selection in Configuration Portal
27+
1.6.0 K Hoang 19/05/2021 Fix AP connect and SSL issues caused by breaking ESP8266 core v3.0.0
2728
********************************************************************************************************************************/
2829

2930
#include "defines.h"
3031

31-
#include <Ticker.h>
32+
///////////////////////////////////////////////////////////////////
33+
#if ( USING_ESP8266_CORE_VERSION >= 30000 )
34+
// Only to deal with ESP8266 core v3.0.0 warning in Ticker library
35+
#pragma GCC diagnostic push
36+
#pragma GCC diagnostic ignored "-Wcast-function-type"
37+
38+
#include <Ticker.h>
39+
#pragma GCC diagnostic pop
40+
#else
41+
#include <Ticker.h>
42+
#endif
43+
///////////////////////////////////////////////////////////////////
44+
3245
#include <DHT.h> // https://github.com/adafruit/DHT-sensor-library
3346

3447
DHT dht(DHT_PIN, DHT_TYPE);
@@ -128,6 +141,7 @@ void setup()
128141
#endif
129142

130143
#if USE_BLYNK_WM
144+
Serial.println(ESP8266_CORE_VERSION);
131145
Serial.println(BLYNK_ASYNC_WM_VERSION);
132146
Serial.println(ESP_DOUBLE_RESET_DETECTOR_VERSION);
133147
#endif

‎examples/Async_ESP32WM_Config/Async_ESP32WM_Config.ino

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Based on and modified from Blynk library v0.6.1 (https://github.com/blynkkk/blynk-library/releases)
99
Built by Khoi Hoang (https://github.com/khoih-prog/Blynk_Async_WM)
1010
Licensed under MIT license
11-
Version: 1.5.0
11+
Version: 1.6.0
1212
1313
Version Modified By Date Comments
1414
------- ----------- ---------- -----------
@@ -24,6 +24,7 @@
2424
Fix SSL issue with Blynk Cloud Server
2525
1.4.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32
2626
1.5.0 K Hoang 25/04/2021 Enable scan of WiFi networks for selection in Configuration Portal
27+
1.6.0 K Hoang 19/05/2021 Fix AP connect and SSL issues caused by breaking ESP8266 core v3.0.0
2728
********************************************************************************************************************************/
2829

2930
#include "defines.h"

‎examples/Async_ESP32WM_ForcedConfig/Async_ESP32WM_ForcedConfig.ino

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Based on and modified from Blynk library v0.6.1 (https://github.com/blynkkk/blynk-library/releases)
99
Built by Khoi Hoang (https://github.com/khoih-prog/Blynk_Async_WM)
1010
Licensed under MIT license
11-
Version: 1.5.0
11+
Version: 1.6.0
1212
1313
Version Modified By Date Comments
1414
------- ----------- ---------- -----------
@@ -24,6 +24,7 @@
2424
Fix SSL issue with Blynk Cloud Server
2525
1.4.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32
2626
1.5.0 K Hoang 25/04/2021 Enable scan of WiFi networks for selection in Configuration Portal
27+
1.6.0 K Hoang 19/05/2021 Fix AP connect and SSL issues caused by breaking ESP8266 core v3.0.0
2728
********************************************************************************************************************************/
2829

2930
#include "defines.h"

‎examples/Async_ESP32WM_MRD_Config/Async_ESP32WM_MRD_Config.ino

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Based on and modified from Blynk library v0.6.1 (https://github.com/blynkkk/blynk-library/releases)
99
Built by Khoi Hoang (https://github.com/khoih-prog/Blynk_Async_WM)
1010
Licensed under MIT license
11-
Version: 1.5.0
11+
Version: 1.6.0
1212
1313
Version Modified By Date Comments
1414
------- ----------- ---------- -----------
@@ -24,6 +24,7 @@
2424
Fix SSL issue with Blynk Cloud Server
2525
1.4.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32
2626
1.5.0 K Hoang 25/04/2021 Enable scan of WiFi networks for selection in Configuration Portal
27+
1.6.0 K Hoang 19/05/2021 Fix AP connect and SSL issues caused by breaking ESP8266 core v3.0.0
2728
********************************************************************************************************************************/
2829

2930
#include "defines.h"

‎examples/Async_ESP32WM_MRD_ForcedConfig/Async_ESP32WM_MRD_ForcedConfig.ino

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Based on and modified from Blynk library v0.6.1 (https://github.com/blynkkk/blynk-library/releases)
99
Built by Khoi Hoang (https://github.com/khoih-prog/Blynk_Async_WM)
1010
Licensed under MIT license
11-
Version: 1.5.0
11+
Version: 1.6.0
1212
1313
Version Modified By Date Comments
1414
------- ----------- ---------- -----------
@@ -24,6 +24,7 @@
2424
Fix SSL issue with Blynk Cloud Server
2525
1.4.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32
2626
1.5.0 K Hoang 25/04/2021 Enable scan of WiFi networks for selection in Configuration Portal
27+
1.6.0 K Hoang 19/05/2021 Fix AP connect and SSL issues caused by breaking ESP8266 core v3.0.0
2728
********************************************************************************************************************************/
2829

2930
#include "defines.h"

‎examples/Async_ESP8266WM_Config/Async_ESP8266WM_Config.ino

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
Based on and modified from Blynk library v0.6.1 (https://github.com/blynkkk/blynk-library/releases)
99
Built by Khoi Hoang (https://github.com/khoih-prog/Blynk_Async_WM)
1010
Licensed under MIT license
11-
Version: 1.5.0
11+
Version: 1.6.0
1212
1313
Version Modified By Date Comments
1414
------- ----------- ---------- -----------
@@ -24,13 +24,26 @@
2424
Fix SSL issue with Blynk Cloud Server
2525
1.4.1 K Hoang 24/04/2021 Fix issue of custom Blynk port (different from 8080 or 9443) not working on ESP32
2626
1.5.0 K Hoang 25/04/2021 Enable scan of WiFi networks for selection in Configuration Portal
27+
1.6.0 K Hoang 19/05/2021 Fix AP connect and SSL issues caused by breaking ESP8266 core v3.0.0
2728
********************************************************************************************************************************/
2829

2930
#include "defines.h"
3031
#include "Credentials.h"
3132
#include "dynamicParams.h"
3233

33-
#include <Ticker.h>
34+
///////////////////////////////////////////////////////////////////
35+
#if ( USING_ESP8266_CORE_VERSION >= 30000 )
36+
// Only to deal with ESP8266 core v3.0.0 warning in Ticker library
37+
#pragma GCC diagnostic push
38+
#pragma GCC diagnostic ignored "-Wcast-function-type"
39+
40+
#include <Ticker.h>
41+
#pragma GCC diagnostic pop
42+
#else
43+
#include <Ticker.h>
44+
#endif
45+
///////////////////////////////////////////////////////////////////
46+
3447
#include <DHT.h> // https://github.com/adafruit/DHT-sensor-library
3548

3649
DHT dht(DHT_PIN, DHT_TYPE);
@@ -135,6 +148,7 @@ void setup()
135148
Serial.print(F(" without SSL on ")); Serial.println(ARDUINO_BOARD);
136149
#endif
137150

151+
Serial.println(ESP8266_CORE_VERSION);
138152
Serial.println(BLYNK_ASYNC_WM_VERSION);
139153
Serial.println(ESP_DOUBLE_RESET_DETECTOR_VERSION);
140154

‎examples/Async_ESP8266WM_Config/defines.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@
9090
//////////////////////////////////////////
9191
// Those above #define's must be placed before #include <BlynkSimpleEsp8266_Async_WM.h>
9292

93-
//#define USE_SSL true
94-
#define USE_SSL false
93+
#define USE_SSL true
94+
//#define USE_SSL false
9595

9696
#if USE_SSL
9797
#include <BlynkSimpleEsp8266_SSL_Async_WM.h> //https://github.com/khoih-prog/Blynk_Async_WM

0 commit comments

Comments
 (0)