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

Commit 5dd6a7f

Browse files
khoih-progkhoih-prog
authored
v1.10.0 to fix multiple-definitions linker error
### Releases v1.10.0 1. Fix `multiple-definitions` linker error and weird bug related to `src_cpp`. Check [Different behaviour using the src_cpp or src_h lib #80](#80)
1 parent e58e12f commit 5dd6a7f

File tree

28 files changed

+1327
-69
lines changed

28 files changed

+1327
-69
lines changed

‎examples/Async_AutoConnect/Async_AutoConnect.ino

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
#error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting.
1919
#endif
2020

21-
#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.9.8"
21+
#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.10.0"
22+
#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1010000
2223

2324
// Use from 0 to 4. Higher number, more debugging messages and memory usage.
2425
#define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3
@@ -245,7 +246,8 @@ IPAddress APStaticIP = IPAddress(192, 168, 100, 1);
245246
IPAddress APStaticGW = IPAddress(192, 168, 100, 1);
246247
IPAddress APStaticSN = IPAddress(255, 255, 255, 0);
247248

248-
#include <ESPAsync_WiFiManager.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
249+
#include <ESPAsync_WiFiManager.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
250+
#include <ESPAsync_WiFiManager-Impl.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
249251

250252
#define HTTP_PORT 80
251253

@@ -589,11 +591,13 @@ void setup()
589591
Serial.println(" on " + String(ARDUINO_BOARD));
590592
Serial.println(ESP_ASYNC_WIFIMANAGER_VERSION);
591593

592-
if ( String(ESP_ASYNC_WIFIMANAGER_VERSION) < ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET )
594+
#if defined(ESP_ASYNC_WIFIMANAGER_VERSION_INT)
595+
if (ESP_ASYNC_WIFIMANAGER_VERSION_INT < ESP_ASYNC_WIFIMANAGER_VERSION_MIN)
593596
{
594597
Serial.print("Warning. Must use this example on Version later than : ");
595598
Serial.println(ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET);
596599
}
600+
#endif
597601

598602
if (FORMAT_FILESYSTEM)
599603
FileFS.format();

‎examples/Async_AutoConnectWithFSParameters/Async_AutoConnectWithFSParameters.ino

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
#error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting.
2020
#endif
2121

22-
#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.9.8"
22+
#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.10.0"
23+
#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1010000
2324

2425
// Use from 0 to 4. Higher number, more debugging messages and memory usage.
2526
#define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3
@@ -260,7 +261,8 @@ IPAddress APStaticIP = IPAddress(192, 168, 100, 1);
260261
IPAddress APStaticGW = IPAddress(192, 168, 100, 1);
261262
IPAddress APStaticSN = IPAddress(255, 255, 255, 0);
262263

263-
#include <ESPAsync_WiFiManager.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
264+
#include <ESPAsync_WiFiManager.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
265+
#include <ESPAsync_WiFiManager-Impl.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
264266

265267
#define HTTP_PORT 80
266268

@@ -798,11 +800,13 @@ void setup()
798800
Serial.print(F(" on ")); Serial.println(ARDUINO_BOARD);
799801
Serial.println(ESP_ASYNC_WIFIMANAGER_VERSION);
800802

801-
if ( String(ESP_ASYNC_WIFIMANAGER_VERSION) < ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET )
803+
#if defined(ESP_ASYNC_WIFIMANAGER_VERSION_INT)
804+
if (ESP_ASYNC_WIFIMANAGER_VERSION_INT < ESP_ASYNC_WIFIMANAGER_VERSION_MIN)
802805
{
803806
Serial.print("Warning. Must use this example on Version later than : ");
804807
Serial.println(ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET);
805808
}
809+
#endif
806810

807811
if (FORMAT_FILESYSTEM)
808812
FileFS.format();

‎examples/Async_AutoConnectWithFSParametersAndCustomIP/Async_AutoConnectWithFSParametersAndCustomIP.ino

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
#error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting.
2020
#endif
2121

22-
#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.9.8"
22+
#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.10.0"
23+
#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1010000
2324

2425
// Use from 0 to 4. Higher number, more debugging messages and memory usage.
2526
#define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3
@@ -257,7 +258,8 @@ IPAddress APStaticIP = IPAddress(192, 168, 100, 1);
257258
IPAddress APStaticGW = IPAddress(192, 168, 100, 1);
258259
IPAddress APStaticSN = IPAddress(255, 255, 255, 0);
259260

260-
#include <ESPAsync_WiFiManager.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
261+
#include <ESPAsync_WiFiManager.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
262+
#include <ESPAsync_WiFiManager-Impl.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
261263

262264
#define HTTP_PORT 80
263265

@@ -640,11 +642,13 @@ void setup()
640642
Serial.print(F(" on ")); Serial.println(ARDUINO_BOARD);
641643
Serial.println(ESP_ASYNC_WIFIMANAGER_VERSION);
642644

643-
if ( String(ESP_ASYNC_WIFIMANAGER_VERSION) < ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET )
645+
#if defined(ESP_ASYNC_WIFIMANAGER_VERSION_INT)
646+
if (ESP_ASYNC_WIFIMANAGER_VERSION_INT < ESP_ASYNC_WIFIMANAGER_VERSION_MIN)
644647
{
645648
Serial.print("Warning. Must use this example on Version later than : ");
646649
Serial.println(ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET);
647650
}
651+
#endif
648652

649653
//clean FS, for testing
650654
//FileFS.format();

‎examples/Async_AutoConnectWithFeedback/Async_AutoConnectWithFeedback.ino

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
#error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting.
1919
#endif
2020

21-
#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.9.8"
21+
#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.10.0"
22+
#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1010000
2223

2324
// Use from 0 to 4. Higher number, more debugging messages and memory usage.
2425
#define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3
@@ -249,7 +250,8 @@ IPAddress APStaticIP = IPAddress(192, 168, 100, 1);
249250
IPAddress APStaticGW = IPAddress(192, 168, 100, 1);
250251
IPAddress APStaticSN = IPAddress(255, 255, 255, 0);
251252

252-
#include <ESPAsync_WiFiManager.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
253+
#include <ESPAsync_WiFiManager.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
254+
#include <ESPAsync_WiFiManager-Impl.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
253255

254256
#define HTTP_PORT 80
255257

@@ -602,11 +604,13 @@ void setup()
602604
Serial.print(F(" on ")); Serial.println(ARDUINO_BOARD);
603605
Serial.println(ESP_ASYNC_WIFIMANAGER_VERSION);
604606

605-
if ( String(ESP_ASYNC_WIFIMANAGER_VERSION) < ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET )
607+
#if defined(ESP_ASYNC_WIFIMANAGER_VERSION_INT)
608+
if (ESP_ASYNC_WIFIMANAGER_VERSION_INT < ESP_ASYNC_WIFIMANAGER_VERSION_MIN)
606609
{
607610
Serial.print("Warning. Must use this example on Version later than : ");
608611
Serial.println(ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET);
609612
}
613+
#endif
610614

611615
if (FORMAT_FILESYSTEM)
612616
FileFS.format();

‎examples/Async_AutoConnectWithFeedbackLED/Async_AutoConnectWithFeedbackLED.ino

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
#error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting.
2020
#endif
2121

22-
#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.9.8"
22+
#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.10.0"
23+
#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1010000
2324

2425
// Use from 0 to 4. Higher number, more debugging messages and memory usage.
2526
#define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3
@@ -253,7 +254,8 @@ IPAddress APStaticIP = IPAddress(192, 168, 100, 1);
253254
IPAddress APStaticGW = IPAddress(192, 168, 100, 1);
254255
IPAddress APStaticSN = IPAddress(255, 255, 255, 0);
255256

256-
#include <ESPAsync_WiFiManager.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
257+
#include <ESPAsync_WiFiManager.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
258+
#include <ESPAsync_WiFiManager-Impl.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
257259

258260
#define HTTP_PORT 80
259261

@@ -629,11 +631,13 @@ void setup()
629631
Serial.print(F(" on ")); Serial.println(ARDUINO_BOARD);
630632
Serial.println(ESP_ASYNC_WIFIMANAGER_VERSION);
631633

632-
if ( String(ESP_ASYNC_WIFIMANAGER_VERSION) < ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET )
634+
#if defined(ESP_ASYNC_WIFIMANAGER_VERSION_INT)
635+
if (ESP_ASYNC_WIFIMANAGER_VERSION_INT < ESP_ASYNC_WIFIMANAGER_VERSION_MIN)
633636
{
634637
Serial.print("Warning. Must use this example on Version later than : ");
635638
Serial.println(ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET);
636639
}
640+
#endif
637641

638642
if (FORMAT_FILESYSTEM)
639643
FileFS.format();

‎examples/Async_AutoConnect_ESP32_minimal/Async_AutoConnect_ESP32_minimal.ino

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
#if !(defined(ESP32) )
88
#error This code is intended to run on the ESP32 platform! Please check your Tools->Board setting.
99
#endif
10-
#include <ESPAsync_WiFiManager.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
10+
#include <ESPAsync_WiFiManager.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
11+
#include <ESPAsync_WiFiManager-Impl.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
1112
AsyncWebServer webServer(80);
1213
#if !( USING_ESP32_S2 || USING_ESP32_C3 )
1314
DNSServer dnsServer;

‎examples/Async_AutoConnect_ESP8266_minimal/Async_AutoConnect_ESP8266_minimal.ino

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
#if !( defined(ESP8266) )
88
#error This code is intended to run on ESP8266 platform! Please check your Tools->Board setting.
99
#endif
10-
#include <ESPAsync_WiFiManager.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
10+
#include <ESPAsync_WiFiManager.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
11+
#include <ESPAsync_WiFiManager-Impl.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
1112
AsyncWebServer webServer(80);
1213
DNSServer dnsServer;
1314

‎examples/Async_ConfigOnDRD_ESP32_minimal/Async_ConfigOnDRD_ESP32_minimal.ino

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#error This code is intended to run on the ESP32 platform! Please check your Tools->Board setting.
1616
#endif
1717
#include <ESPAsync_WiFiManager.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
18+
#include <ESPAsync_WiFiManager-Impl.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
1819
#define DRD_TIMEOUT 10
1920
#define DRD_ADDRESS 0
2021
#include <ESP_DoubleResetDetector.h> //https://github.com/khoih-prog/ESP_DoubleResetDetector

‎examples/Async_ConfigOnDRD_ESP8266_minimal/Async_ConfigOnDRD_ESP8266_minimal.ino

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#error This code is intended to run on the ESP8266 platform! Please check your Tools->Board setting.
1212
#endif
1313
#include <ESPAsync_WiFiManager.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
14+
#include <ESPAsync_WiFiManager-Impl.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
1415
#define DRD_TIMEOUT 10
1516
#define DRD_ADDRESS 0
1617
#include <ESP_DoubleResetDetector.h> //https://github.com/khoih-prog/ESP_DoubleResetDetector

‎examples/Async_ConfigOnDRD_FS_MQTT_Ptr/Async_ConfigOnDRD_FS_MQTT_Ptr.ino

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
#error This code is intended to run on the ESP8266 or ESP32 platform! Please check your Tools->Board setting.
3232
#endif
3333

34-
#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.9.8"
34+
#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET "ESPAsync_WiFiManager v1.10.0"
35+
#define ESP_ASYNC_WIFIMANAGER_VERSION_MIN 1010000
3536

3637
// Use from 0 to 4. Higher number, more debugging messages and memory usage.
3738
#define _ESPASYNC_WIFIMGR_LOGLEVEL_ 3
@@ -363,7 +364,8 @@ IPAddress APStaticIP = IPAddress(192, 168, 100, 1);
363364
IPAddress APStaticGW = IPAddress(192, 168, 100, 1);
364365
IPAddress APStaticSN = IPAddress(255, 255, 255, 0);
365366

366-
#include <ESPAsync_WiFiManager.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
367+
#include <ESPAsync_WiFiManager.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
368+
#include <ESPAsync_WiFiManager-Impl.h> //https://github.com/khoih-prog/ESPAsync_WiFiManager
367369

368370
#define HTTP_PORT 80
369371

@@ -1239,11 +1241,13 @@ void setup()
12391241
Serial.println(ESP_ASYNC_WIFIMANAGER_VERSION);
12401242
Serial.println(ESP_DOUBLE_RESET_DETECTOR_VERSION);
12411243

1242-
if ( String(ESP_ASYNC_WIFIMANAGER_VERSION) < ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET )
1244+
#if defined(ESP_ASYNC_WIFIMANAGER_VERSION_INT)
1245+
if (ESP_ASYNC_WIFIMANAGER_VERSION_INT < ESP_ASYNC_WIFIMANAGER_VERSION_MIN)
12431246
{
12441247
Serial.print("Warning. Must use this example on Version later than : ");
12451248
Serial.println(ESP_ASYNC_WIFIMANAGER_VERSION_MIN_TARGET);
12461249
}
1250+
#endif
12471251

12481252
Serial.setDebugOutput(false);
12491253

0 commit comments

Comments
 (0)