From 0eb2b5a6afa24deb0a27a29363924fd7e9452517 Mon Sep 17 00:00:00 2001 From: pennam Date: Mon, 22 Apr 2024 16:59:31 +0200 Subject: [PATCH] Examples: Avoid SECRET_PASS redefinition on Portenta H7 --- examples/ArduinoIoTCloud-Advanced/arduino_secrets.h | 4 ++-- examples/ArduinoIoTCloud-Advanced/thingProperties.h | 2 +- examples/ArduinoIoTCloud-Basic/arduino_secrets.h | 4 ++-- examples/ArduinoIoTCloud-Basic/thingProperties.h | 2 +- examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h | 4 ++-- examples/ArduinoIoTCloud-Callbacks/thingProperties.h | 2 +- examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h | 4 ++-- examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h | 2 +- examples/ArduinoIoTCloud-Schedule/arduino_secrets.h | 4 ++-- examples/ArduinoIoTCloud-Schedule/thingProperties.h | 2 +- examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h | 4 ++-- examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h b/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h index 7e5face72..44a9e21d2 100644 --- 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 index 8d8269307..43187104d 100644 --- 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 index 7e5face72..44a9e21d2 100644 --- 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 index 2792236e2..4193b440b 100644 --- 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 index 7e5face72..44a9e21d2 100644 --- 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 index daed69097..8f2b5055e 100644 --- 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 index 177e1770b..e784c4413 100644 --- 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 index 1aa4b1be3..cb89dabac 100644 --- 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 index 7e5face72..44a9e21d2 100644 --- 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 index b6c3abb05..8d2d7dfc6 100644 --- 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 index 2f6069225..2ae0cefa6 100644 --- 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 index 55b83771d..36604ebf7 100644 --- 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)