Fix tokens generation and WiFi reconnection issues.

mobizt · Feb 7, 2023 · d0e97a0 · d0e97a0
1 parent 25046b4
commit d0e97a0
Show file tree

Hide file tree

Showing 62 changed files with 174 additions and 1,046 deletions.
diff --git a/examples/Authentications/LegacyTokenAuthen/LegacyTokenAuthen.ino b/examples/Authentications/LegacyTokenAuthen/LegacyTokenAuthen.ino
@@ -21,7 +21,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/Authentications/ReAuthenticate/ReAuthenticate.ino b/examples/Authentications/ReAuthenticate/ReAuthenticate.ino
@@ -19,7 +19,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/Authentications/SignInAsAdmin/AccessTokenFile/AccessTokenFile.ino b/examples/Authentications/SignInAsAdmin/AccessTokenFile/AccessTokenFile.ino
@@ -33,7 +33,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/Authentications/SignInAsGuest/AnonymousSignin/AnonymousSignin.ino b/examples/Authentications/SignInAsGuest/AnonymousSignin/AnonymousSignin.ino
@@ -27,7 +27,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/Authentications/SignInAsUser/CustomToken/CustomToken.ino b/examples/Authentications/SignInAsUser/CustomToken/CustomToken.ino
@@ -29,7 +29,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/Authentications/SignInAsUser/CustomTokenFile/CustomTokenFile.ino b/examples/Authentications/SignInAsUser/CustomTokenFile/CustomTokenFile.ino
@@ -29,7 +29,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/Authentications/SignInAsUser/EmailPassword/EmailPassword.ino b/examples/Authentications/SignInAsUser/EmailPassword/EmailPassword.ino
@@ -30,7 +30,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/Authentications/SignInWithAccessToken/SignInWithAccessToken.ino b/examples/Authentications/SignInWithAccessToken/SignInWithAccessToken.ino
@@ -19,7 +19,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/Authentications/SignInWithCustomToken/SignInWithCustomToken.ino b/examples/Authentications/SignInWithCustomToken/SignInWithCustomToken.ino
@@ -19,7 +19,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/Authentications/SignInWithIDToken/SignInWithIDToken.ino b/examples/Authentications/SignInWithIDToken/SignInWithIDToken.ino
@@ -18,7 +18,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/Authentications/SignInWithRefreshAccessToken/SignInWithRefreshAccessToken.ino b/examples/Authentications/SignInWithRefreshAccessToken/SignInWithRefreshAccessToken.ino
@@ -19,7 +19,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/Authentications/SignInWithRefreshIDToken/SignInWithRefreshIDToken.ino b/examples/Authentications/SignInWithRefreshIDToken/SignInWithRefreshIDToken.ino
@@ -19,7 +19,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/Authentications/TestMode/TestMode.ino b/examples/Authentications/TestMode/TestMode.ino
@@ -19,7 +19,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/Authentications/UserManagement/ResetPassword/ResetPassword.ino b/examples/Authentications/UserManagement/ResetPassword/ResetPassword.ino
@@ -21,7 +21,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/Authentications/UserManagement/SendVerification/SendVerification.ino b/examples/Authentications/UserManagement/SendVerification/SendVerification.ino
@@ -25,7 +25,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/Authentications/UserManagement/Signup/Signup.ino b/examples/Authentications/UserManagement/Signup/Signup.ino
@@ -24,7 +24,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/BackupRestore/Flash/Flash.ino b/examples/BackupRestore/Flash/Flash.ino
@@ -18,7 +18,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/BackupRestore/SD/SD.ino b/examples/BackupRestore/SD/SD.ino
@@ -21,7 +21,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/Basic/Basic.ino b/examples/Basic/Basic.ino
@@ -17,7 +17,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/BasicCert/BasicCert.ino b/examples/BasicCert/BasicCert.ino
@@ -17,7 +17,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/BasicEthernet/BasicEthernet.ino b/examples/BasicEthernet/BasicEthernet.ino
@@ -102,9 +102,15 @@ void setupFirebase()
     config.token_status_callback = tokenStatusCallback; // see addons/TokenHelper.h
 
     /* Assign the pointer to Ethernet module lwip interface */
+#if defined(ENABLE_ESP8266_ENC28J60_ETH)
     config.spi_ethernet_module.enc28j60 = &eth;
-    // config.spi_ethernet_module.w5100 = &eth;
-    // config.spi_ethernet_module.w5500 = &eth;
+#endif
+#if defined(ENABLE_ESP8266_W5100_ETH)
+    config.spi_ethernet_module.w5100 = &eth;
+#endif
+#if defined(ENABLE_ESP8266_W5500_ETH)
+    config.spi_ethernet_module.w5500 = &eth;
+#endif
 
     // Or use legacy authenticate method
     // config.database_url = DATABASE_URL;

diff --git a/examples/Blob/Blob.ino b/examples/Blob/Blob.ino
@@ -18,7 +18,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/Blynk/Blynk.ino b/examples/Blynk/Blynk.ino
@@ -18,7 +18,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/DataChangesListener/Callback/Callback.ino b/examples/DataChangesListener/Callback/Callback.ino
@@ -15,7 +15,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif
@@ -192,7 +192,7 @@ void loop()
 
   // Firebase.ready() should be called repeatedly to handle authentication tasks.
 
-#if defined(PICO_RP2040)
+#if defined(ARDUINO_RASPBERRY_PI_PICO_W)
   Firebase.runStream();
 #endif
 

diff --git a/examples/DataChangesListener/MultiPath/MultiPath.ino b/examples/DataChangesListener/MultiPath/MultiPath.ino
@@ -16,7 +16,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif
@@ -205,7 +205,7 @@ void loop()
 
   // Firebase.ready() should be called repeatedly to handle authentication tasks.
 
-#if defined(PICO_RP2040)
+#if defined(ARDUINO_RASPBERRY_PI_PICO_W)
   Firebase.runStream();
 #endif
 

diff --git a/examples/DataChangesListener/NoCallback/NoCallback.ino b/examples/DataChangesListener/NoCallback/NoCallback.ino
@@ -16,7 +16,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/DataChangesListener/SingleDataObject/SingleDataObject.ino b/examples/DataChangesListener/SingleDataObject/SingleDataObject.ino
@@ -16,7 +16,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/DataFilter/DataFilter.ino b/examples/DataFilter/DataFilter.ino
@@ -18,7 +18,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/DataRetaining/DataRetaining.ino b/examples/DataRetaining/DataRetaining.ino
@@ -18,7 +18,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/DatabaseRules/DatabaseRules.ino b/examples/DatabaseRules/DatabaseRules.ino
@@ -18,7 +18,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/DownloadFileOTA/DownloadFileOTA.ino b/examples/DownloadFileOTA/DownloadFileOTA.ino
@@ -18,7 +18,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/ETag/ETag.ino b/examples/ETag/ETag.ino
@@ -19,7 +19,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/FastSend/FastSend.ino b/examples/FastSend/FastSend.ino
@@ -18,7 +18,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/File/Flash/Flash.ino b/examples/File/Flash/Flash.ino
@@ -18,7 +18,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/File/SD/SD.ino b/examples/File/SD/SD.ino
@@ -21,7 +21,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/FireSense/AnalogRead/AnalogRead.ino b/examples/FireSense/AnalogRead/AnalogRead.ino
@@ -70,7 +70,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/FireSense/AutomaticPlantWatering/AutomaticPlantWatering.ino b/examples/FireSense/AutomaticPlantWatering/AutomaticPlantWatering.ino
@@ -75,7 +75,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/FireSense/Blink/Blink.ino b/examples/FireSense/Blink/Blink.ino
@@ -68,7 +68,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/FireSense/Sensors/Sensors.ino b/examples/FireSense/Sensors/Sensors.ino
@@ -64,7 +64,7 @@
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
 #include <FirebaseESP8266.h>
-#elif defined(PICO_RP2040)
+#elif defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #include <FirebaseESP8266.h>
 #endif

diff --git a/examples/FirebaseJson/Client/ArduinoMQTT/ArduinoMQTT.ino b/examples/FirebaseJson/Client/ArduinoMQTT/ArduinoMQTT.ino
@@ -19,7 +19,7 @@
 #include <WiFi101.h>
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>
-#elif defined(ESP32) || defined(PICO_RP2040)
+#elif defined(ESP32) || defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #endif
 

diff --git a/examples/FirebaseJson/Client/Firebase/Firebase.ino b/examples/FirebaseJson/Client/Firebase/Firebase.ino
@@ -11,7 +11,7 @@
  */
 
 #include <Arduino.h>
-#if defined(ESP32) || defined(PICO_RP2040)
+#if defined(ESP32) || defined(ARDUINO_RASPBERRY_PI_PICO_W)
 #include <WiFi.h>
 #elif defined(ESP8266)
 #include <ESP8266WiFi.h>