Merge pull request #450 from pennam/wifi-pwd-fix

pennam · web-flow · commit cd09f04a5b38 · 2024-04-23T18:10:37.000+02:00
Examples: Avoid SECRET_PASS redefinition on Portenta H7
diff --git a/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h b/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h
@@ -4,8 +4,8 @@
  * https://github.com/arduino-libraries/ArduinoIoTCloud/#what
  */
 #if defined(BOARD_HAS_WIFI)
-  #define SECRET_SSID "YOUR_WIFI_NETWORK_NAME"
-  #define SECRET_PASS "YOUR_WIFI_PASSWORD"
+  #define SECRET_WIFI_SSID "YOUR_WIFI_NETWORK_NAME"
+  #define SECRET_WIFI_PASS "YOUR_WIFI_PASSWORD"
 #endif
 
 /* ESP8266 ESP32 */
diff --git a/examples/ArduinoIoTCloud-Advanced/thingProperties.h b/examples/ArduinoIoTCloud-Advanced/thingProperties.h
@@ -35,7 +35,7 @@ void initProperties() {
 }
 
 #if defined(BOARD_HAS_WIFI)
-  WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_SSID, SECRET_PASS);
+  WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_WIFI_SSID, SECRET_WIFI_PASS);
 #elif defined(BOARD_HAS_GSM)
   GSMConnectionHandler ArduinoIoTPreferredConnection(SECRET_PIN, SECRET_APN, SECRET_LOGIN, SECRET_PASS);
 #elif defined(BOARD_HAS_LORA)
diff --git a/examples/ArduinoIoTCloud-Basic/arduino_secrets.h b/examples/ArduinoIoTCloud-Basic/arduino_secrets.h
@@ -4,8 +4,8 @@
  * https://github.com/arduino-libraries/ArduinoIoTCloud/#what
  */
 #if defined(BOARD_HAS_WIFI)
-  #define SECRET_SSID "YOUR_WIFI_NETWORK_NAME"
-  #define SECRET_PASS "YOUR_WIFI_PASSWORD"
+  #define SECRET_WIFI_SSID "YOUR_WIFI_NETWORK_NAME"
+  #define SECRET_WIFI_PASS "YOUR_WIFI_PASSWORD"
 #endif
 
 /* ESP8266 ESP32 */
diff --git a/examples/ArduinoIoTCloud-Basic/thingProperties.h b/examples/ArduinoIoTCloud-Basic/thingProperties.h
@@ -39,7 +39,7 @@ void initProperties() {
   /* Manual mode. It will fallback in DHCP mode if SECRET_OPTIONAL_IP is invalid or equal to "0.0.0.0" */
   EthernetConnectionHandler ArduinoIoTPreferredConnection(SECRET_OPTIONAL_IP, SECRET_OPTIONAL_DNS, SECRET_OPTIONAL_GATEWAY, SECRET_OPTIONAL_NETMASK);
 #elif defined(BOARD_HAS_WIFI)
-  WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_SSID, SECRET_PASS);
+  WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_WIFI_SSID, SECRET_WIFI_PASS);
 #elif defined(BOARD_HAS_GSM)
   GSMConnectionHandler ArduinoIoTPreferredConnection(SECRET_PIN, SECRET_APN, SECRET_LOGIN, SECRET_PASS);
 #elif defined(BOARD_HAS_LORA)
diff --git a/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h b/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h
@@ -4,8 +4,8 @@
  * https://github.com/arduino-libraries/ArduinoIoTCloud/#what
  */
 #if defined(BOARD_HAS_WIFI)
-  #define SECRET_SSID "YOUR_WIFI_NETWORK_NAME"
-  #define SECRET_PASS "YOUR_WIFI_PASSWORD"
+  #define SECRET_WIFI_SSID "YOUR_WIFI_NETWORK_NAME"
+  #define SECRET_WIFI_PASS "YOUR_WIFI_PASSWORD"
 #endif
 
 /* ESP8266 ESP32 */
diff --git a/examples/ArduinoIoTCloud-Callbacks/thingProperties.h b/examples/ArduinoIoTCloud-Callbacks/thingProperties.h
@@ -19,7 +19,7 @@ void initProperties() {
 }
 
 #if defined(BOARD_HAS_WIFI)
-  WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_SSID, SECRET_PASS);
+  WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_WIFI_SSID, SECRET_WIFI_PASS);
 #elif defined(BOARD_HAS_GSM)
   GSMConnectionHandler ArduinoIoTPreferredConnection(SECRET_PIN, SECRET_APN, SECRET_LOGIN, SECRET_PASS);
 #elif defined(BOARD_HAS_LORA)
diff --git a/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h b/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h
@@ -4,8 +4,8 @@
  * https://github.com/arduino-libraries/ArduinoIoTCloud/#what
  */
 #if defined(BOARD_HAS_WIFI)
-  #define SECRET_SSID "YOUR_WIFI_NETWORK_NAME"
-  #define SECRET_PASS "YOUR_WIFI_PASSWORD"
+  #define SECRET_WIFI_SSID "YOUR_WIFI_NETWORK_NAME"
+  #define SECRET_WIFI_PASS "YOUR_WIFI_PASSWORD"
 #endif
 
 /* ESP8266 ESP32 */
diff --git a/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h b/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h
@@ -24,7 +24,7 @@ void initProperties() {
 }
 
 #if defined(BOARD_HAS_WIFI)
-  WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_SSID, SECRET_PASS);
+  WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_WIFI_SSID, SECRET_WIFI_PASS);
 #elif defined(BOARD_HAS_ETHERNET)
   /* DHCP mode */
   //EthernetConnectionHandler ArduinoIoTPreferredConnection;
diff --git a/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h b/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h
@@ -4,8 +4,8 @@
  * https://github.com/arduino-libraries/ArduinoIoTCloud/#what
  */
 #if defined(BOARD_HAS_WIFI)
-  #define SECRET_SSID "YOUR_WIFI_NETWORK_NAME"
-  #define SECRET_PASS "YOUR_WIFI_PASSWORD"
+  #define SECRET_WIFI_SSID "YOUR_WIFI_NETWORK_NAME"
+  #define SECRET_WIFI_PASS "YOUR_WIFI_PASSWORD"
 #endif
 
 /* ESP8266 ESP32 */
diff --git a/examples/ArduinoIoTCloud-Schedule/thingProperties.h b/examples/ArduinoIoTCloud-Schedule/thingProperties.h
@@ -42,7 +42,7 @@ void initProperties() {
 }
 
 #if defined(BOARD_HAS_WIFI)
-  WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_SSID, SECRET_PASS);
+  WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_WIFI_SSID, SECRET_WIFI_PASS);
 #elif defined(BOARD_HAS_GSM)
   GSMConnectionHandler ArduinoIoTPreferredConnection(SECRET_PIN, SECRET_APN, SECRET_LOGIN, SECRET_PASS);
 #elif defined(BOARD_HAS_LORA)
diff --git a/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h b/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h
@@ -4,8 +4,8 @@
  * https://github.com/arduino-libraries/ArduinoIoTCloud/#what
  */
 #if defined(BOARD_HAS_WIFI)
-  #define SECRET_SSID "YOUR_WIFI_NETWORK_NAME"
-  #define SECRET_PASS "YOUR_WIFI_PASSWORD"
+  #define SECRET_WIFI_SSID "YOUR_WIFI_NETWORK_NAME"
+  #define SECRET_WIFI_PASS "YOUR_WIFI_PASSWORD"
 #endif
 
 /* ESP8266 ESP32*/
diff --git a/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h b/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h
@@ -55,7 +55,7 @@ String str_property_7;
 String str_property_8;
 
 #if defined(BOARD_HAS_WIFI)
-  WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_SSID, SECRET_PASS);
+  WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_WIFI_SSID, SECRET_WIFI_PASS);
 #elif defined(BOARD_HAS_GSM)
   GSMConnectionHandler ArduinoIoTPreferredConnection(SECRET_PIN, SECRET_APN, SECRET_LOGIN, SECRET_PASS);
 #elif defined(BOARD_HAS_LORA)

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ void initProperties() {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`#if defined(BOARD_HAS_WIFI)`
`38`		`- WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_SSID, SECRET_PASS);`
	`38`	`+ WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_WIFI_SSID, SECRET_WIFI_PASS);`
`39`	`39`	`#elif defined(BOARD_HAS_GSM)`
`40`	`40`	`GSMConnectionHandler ArduinoIoTPreferredConnection(SECRET_PIN, SECRET_APN, SECRET_LOGIN, SECRET_PASS);`
`41`	`41`	`#elif defined(BOARD_HAS_LORA)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ void initProperties() {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`#if defined(BOARD_HAS_WIFI)`
`22`		`- WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_SSID, SECRET_PASS);`
	`22`	`+ WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_WIFI_SSID, SECRET_WIFI_PASS);`
`23`	`23`	`#elif defined(BOARD_HAS_GSM)`
`24`	`24`	`GSMConnectionHandler ArduinoIoTPreferredConnection(SECRET_PIN, SECRET_APN, SECRET_LOGIN, SECRET_PASS);`
`25`	`25`	`#elif defined(BOARD_HAS_LORA)`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ void initProperties() {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`#if defined(BOARD_HAS_WIFI)`
`27`		`- WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_SSID, SECRET_PASS);`
	`27`	`+ WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_WIFI_SSID, SECRET_WIFI_PASS);`
`28`	`28`	`#elif defined(BOARD_HAS_ETHERNET)`
`29`	`29`	`/* DHCP mode */`
`30`	`30`	`//EthernetConnectionHandler ArduinoIoTPreferredConnection;`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ void initProperties() {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`#if defined(BOARD_HAS_WIFI)`
`45`		`- WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_SSID, SECRET_PASS);`
	`45`	`+ WiFiConnectionHandler ArduinoIoTPreferredConnection(SECRET_WIFI_SSID, SECRET_WIFI_PASS);`
`46`	`46`	`#elif defined(BOARD_HAS_GSM)`
`47`	`47`	`GSMConnectionHandler ArduinoIoTPreferredConnection(SECRET_PIN, SECRET_APN, SECRET_LOGIN, SECRET_PASS);`
`48`	`48`	`#elif defined(BOARD_HAS_LORA)`