From 1194620ddee61a03763482bcaed3fa1d3e9fe8e7 Mon Sep 17 00:00:00 2001 From: pennam Date: Mon, 15 May 2023 09:51:36 +0200 Subject: [PATCH 1/2] Substitute BOARD_ESP with BOARD_HAS_SECRET_KEY --- examples/ArduinoIoTCloud-Advanced/arduino_secrets.h | 2 +- examples/ArduinoIoTCloud-Advanced/thingProperties.h | 4 ++-- examples/ArduinoIoTCloud-Basic/arduino_secrets.h | 2 +- examples/ArduinoIoTCloud-Basic/thingProperties.h | 4 ++-- examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h | 2 +- examples/ArduinoIoTCloud-Callbacks/thingProperties.h | 4 ++-- examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h | 2 +- examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h | 4 ++-- examples/ArduinoIoTCloud-Schedule/arduino_secrets.h | 2 +- examples/ArduinoIoTCloud-Schedule/thingProperties.h | 4 ++-- .../utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h | 2 +- .../utility/ArduinoIoTCloud_Travis_CI/thingProperties.h | 4 ++-- src/AIoTC_Config.h | 2 +- src/ArduinoIoTCloudTCP.cpp | 6 +++--- src/ArduinoIoTCloudTCP.h | 6 +++--- 15 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h b/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h index d1615135f..09ea8323a 100644 --- a/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h @@ -10,7 +10,7 @@ #endif /* ESP8266 ESP32*/ -#if defined(BOARD_ESP) +#if defined(BOARD_HAS_SECRET_KEY) #define SECRET_DEVICE_KEY "my-device-password" #endif diff --git a/examples/ArduinoIoTCloud-Advanced/thingProperties.h b/examples/ArduinoIoTCloud-Advanced/thingProperties.h index f8d7bb506..fd4b2ce69 100644 --- a/examples/ArduinoIoTCloud-Advanced/thingProperties.h +++ b/examples/ArduinoIoTCloud-Advanced/thingProperties.h @@ -7,7 +7,7 @@ #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" #endif -#if defined(BOARD_ESP) +#if defined(BOARD_HAS_SECRET_KEY) #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" #endif @@ -19,7 +19,7 @@ CloudLocation location; CloudColor color; void initProperties() { -#if defined(BOARD_ESP) +#if defined(BOARD_HAS_SECRET_KEY) ArduinoCloud.setBoardId(BOARD_ID); ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY); #endif diff --git a/examples/ArduinoIoTCloud-Basic/arduino_secrets.h b/examples/ArduinoIoTCloud-Basic/arduino_secrets.h index d1615135f..09ea8323a 100644 --- a/examples/ArduinoIoTCloud-Basic/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Basic/arduino_secrets.h @@ -10,7 +10,7 @@ #endif /* ESP8266 ESP32*/ -#if defined(BOARD_ESP) +#if defined(BOARD_HAS_SECRET_KEY) #define SECRET_DEVICE_KEY "my-device-password" #endif diff --git a/examples/ArduinoIoTCloud-Basic/thingProperties.h b/examples/ArduinoIoTCloud-Basic/thingProperties.h index e11eaf81f..b10ac85fc 100644 --- a/examples/ArduinoIoTCloud-Basic/thingProperties.h +++ b/examples/ArduinoIoTCloud-Basic/thingProperties.h @@ -7,7 +7,7 @@ #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" #endif -#if defined(BOARD_ESP) +#if defined(BOARD_HAS_SECRET_KEY) #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" #endif @@ -18,7 +18,7 @@ int potentiometer; int seconds; void initProperties() { -#if defined(BOARD_ESP) +#if defined(BOARD_HAS_SECRET_KEY) ArduinoCloud.setBoardId(BOARD_ID); ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY); #endif diff --git a/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h b/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h index d1615135f..09ea8323a 100644 --- a/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h @@ -10,7 +10,7 @@ #endif /* ESP8266 ESP32*/ -#if defined(BOARD_ESP) +#if defined(BOARD_HAS_SECRET_KEY) #define SECRET_DEVICE_KEY "my-device-password" #endif diff --git a/examples/ArduinoIoTCloud-Callbacks/thingProperties.h b/examples/ArduinoIoTCloud-Callbacks/thingProperties.h index d92788f98..f3de1a2ed 100644 --- a/examples/ArduinoIoTCloud-Callbacks/thingProperties.h +++ b/examples/ArduinoIoTCloud-Callbacks/thingProperties.h @@ -7,12 +7,12 @@ #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" #endif -#if defined(BOARD_ESP) +#if defined(BOARD_HAS_SECRET_KEY) #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" #endif void initProperties() { -#if defined(BOARD_ESP) +#if defined(BOARD_HAS_SECRET_KEY) ArduinoCloud.setBoardId(BOARD_ID); ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY); #endif diff --git a/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h b/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h index d1615135f..09ea8323a 100644 --- a/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h @@ -10,7 +10,7 @@ #endif /* ESP8266 ESP32*/ -#if defined(BOARD_ESP) +#if defined(BOARD_HAS_SECRET_KEY) #define SECRET_DEVICE_KEY "my-device-password" #endif diff --git a/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h b/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h index 94b3b0ece..1570e4a1b 100644 --- a/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h +++ b/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h @@ -7,7 +7,7 @@ #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" #endif -#if defined(BOARD_ESP) +#if defined(BOARD_HAS_SECRET_KEY) #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" #endif @@ -16,7 +16,7 @@ void onLedChange(); bool led; void initProperties() { -#if defined(BOARD_ESP) +#if defined(BOARD_HAS_SECRET_KEY) ArduinoCloud.setBoardId(BOARD_ID); ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY); #endif diff --git a/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h b/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h index d1615135f..09ea8323a 100644 --- a/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h @@ -10,7 +10,7 @@ #endif /* ESP8266 ESP32*/ -#if defined(BOARD_ESP) +#if defined(BOARD_HAS_SECRET_KEY) #define SECRET_DEVICE_KEY "my-device-password" #endif diff --git a/examples/ArduinoIoTCloud-Schedule/thingProperties.h b/examples/ArduinoIoTCloud-Schedule/thingProperties.h index 940cb5c26..22a185b9c 100644 --- a/examples/ArduinoIoTCloud-Schedule/thingProperties.h +++ b/examples/ArduinoIoTCloud-Schedule/thingProperties.h @@ -7,7 +7,7 @@ #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" #endif -#if defined(BOARD_ESP) +#if defined(BOARD_HAS_SECRET_KEY) #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" #endif @@ -23,7 +23,7 @@ CloudSchedule monthly; CloudSchedule yearly; void initProperties() { -#if defined(BOARD_ESP) +#if defined(BOARD_HAS_SECRET_KEY) ArduinoCloud.setBoardId(BOARD_ID); ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY); #endif diff --git a/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h b/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h index d1615135f..09ea8323a 100644 --- a/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h +++ b/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h @@ -10,7 +10,7 @@ #endif /* ESP8266 ESP32*/ -#if defined(BOARD_ESP) +#if defined(BOARD_HAS_SECRET_KEY) #define SECRET_DEVICE_KEY "my-device-password" #endif diff --git a/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h b/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h index eff3035bd..8a9ed4a28 100644 --- a/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h +++ b/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h @@ -11,7 +11,7 @@ DEFINES ******************************************************************************/ -#if defined(BOARD_ESP) +#if defined(BOARD_HAS_SECRET_KEY) #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" #endif @@ -79,7 +79,7 @@ void onStringPropertyChange(); ******************************************************************************/ #if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined (BOARD_HAS_NB) void initProperties() { -#if defined(BOARD_ESP) +#if defined(BOARD_HAS_SECRET_KEY) ArduinoCloud.setBoardId(BOARD_ID); ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY); #endif diff --git a/src/AIoTC_Config.h b/src/AIoTC_Config.h index 41abcb7d9..3cf486063 100644 --- a/src/AIoTC_Config.h +++ b/src/AIoTC_Config.h @@ -142,7 +142,7 @@ #endif #if defined(ARDUINO_ESP8266_ESP12) || defined(ARDUINO_ARCH_ESP32) || defined(ESP8266) || defined(ESP32) - #define BOARD_ESP + #define BOARD_HAS_SECRET_KEY #define HAS_TCP #endif diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp index 5d0dd8f57..7feeb308e 100644 --- a/src/ArduinoIoTCloudTCP.cpp +++ b/src/ArduinoIoTCloudTCP.cpp @@ -86,7 +86,7 @@ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP() #ifdef BOARD_HAS_ECCX08 , _sslClient(nullptr, ArduinoIoTCloudTrustAnchor, ArduinoIoTCloudTrustAnchor_NUM, getTime) #endif - #ifdef BOARD_ESP + #ifdef BOARD_HAS_SECRET_KEY , _password("") #endif , _mqttClient{nullptr} @@ -168,12 +168,12 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress, _sslClient.setClient(_connection->getClient()); #elif defined(BOARD_HAS_SE050) _sslClient.appendCustomCACert(AIoTSSCert); -#elif defined(BOARD_ESP) +#elif defined(BOARD_HAS_SECRET_KEY) _sslClient.setInsecure(); #endif _mqttClient.setClient(_sslClient); -#ifdef BOARD_ESP +#ifdef BOARD_HAS_SECRET_KEY _mqttClient.setUsernamePassword(getDeviceId(), _password); #endif _mqttClient.onMessage(ArduinoIoTCloudTCP::onMessage); diff --git a/src/ArduinoIoTCloudTCP.h b/src/ArduinoIoTCloudTCP.h index e8218c9e1..adc5c17e1 100644 --- a/src/ArduinoIoTCloudTCP.h +++ b/src/ArduinoIoTCloudTCP.h @@ -29,7 +29,7 @@ #ifdef BOARD_HAS_ECCX08 #include "tls/BearSSLClient.h" #include "tls/utility/CryptoUtil.h" -#elif defined(BOARD_ESP) +#elif defined(BOARD_HAS_SECRET_KEY) #include #elif defined(BOARD_HAS_SE050) #include "tls/utility/CryptoUtil.h" @@ -81,7 +81,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass #endif int begin(bool const enable_watchdog = true, String brokerAddress = DEFAULT_BROKER_ADDRESS_SECURE_AUTH, uint16_t brokerPort = DEFAULT_BROKER_PORT_SECURE_AUTH); - #ifdef BOARD_ESP + #ifdef BOARD_HAS_SECRET_KEY inline void setBoardId (String const device_id) { setDeviceId(device_id); } inline void setSecretDeviceKey(String const password) { _password = password; } #endif @@ -143,7 +143,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass ArduinoIoTCloudCertClass _cert; WiFiBearSSLClient _sslClient; CryptoUtil _crypto; - #elif defined(BOARD_ESP) + #elif defined(BOARD_HAS_SECRET_KEY) WiFiClientSecure _sslClient; String _password; #elif defined(BOARD_HAS_SE050) From 3df9d32d959c226550cd57f695db477d23ddc609 Mon Sep 17 00:00:00 2001 From: pennam Date: Wed, 7 Jun 2023 09:33:15 +0200 Subject: [PATCH 2/2] Restore BOARD_ESP to handle board specific configurations --- src/AIoTC_Config.h | 1 + src/ArduinoIoTCloudTCP.cpp | 2 +- src/ArduinoIoTCloudTCP.h | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/AIoTC_Config.h b/src/AIoTC_Config.h index 3cf486063..f7f28931f 100644 --- a/src/AIoTC_Config.h +++ b/src/AIoTC_Config.h @@ -142,6 +142,7 @@ #endif #if defined(ARDUINO_ESP8266_ESP12) || defined(ARDUINO_ARCH_ESP32) || defined(ESP8266) || defined(ESP32) + #define BOARD_ESP #define BOARD_HAS_SECRET_KEY #define HAS_TCP #endif diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp index 7feeb308e..402dbf4e6 100644 --- a/src/ArduinoIoTCloudTCP.cpp +++ b/src/ArduinoIoTCloudTCP.cpp @@ -168,7 +168,7 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress, _sslClient.setClient(_connection->getClient()); #elif defined(BOARD_HAS_SE050) _sslClient.appendCustomCACert(AIoTSSCert); -#elif defined(BOARD_HAS_SECRET_KEY) +#elif defined(BOARD_ESP) _sslClient.setInsecure(); #endif diff --git a/src/ArduinoIoTCloudTCP.h b/src/ArduinoIoTCloudTCP.h index adc5c17e1..8f6337b36 100644 --- a/src/ArduinoIoTCloudTCP.h +++ b/src/ArduinoIoTCloudTCP.h @@ -29,7 +29,7 @@ #ifdef BOARD_HAS_ECCX08 #include "tls/BearSSLClient.h" #include "tls/utility/CryptoUtil.h" -#elif defined(BOARD_HAS_SECRET_KEY) +#elif defined(BOARD_ESP) #include #elif defined(BOARD_HAS_SE050) #include "tls/utility/CryptoUtil.h" @@ -143,15 +143,18 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass ArduinoIoTCloudCertClass _cert; WiFiBearSSLClient _sslClient; CryptoUtil _crypto; - #elif defined(BOARD_HAS_SECRET_KEY) + #elif defined(BOARD_ESP) WiFiClientSecure _sslClient; - String _password; #elif defined(BOARD_HAS_SE050) ArduinoIoTCloudCertClass _cert; WiFiSSLSE050Client _sslClient; CryptoUtil _crypto; #endif + #if defined (BOARD_HAS_SECRET_KEY) + String _password; + #endif + MqttClient _mqttClient; String _deviceTopicOut;