From d34c500984fbeffeb390ea4502f755210c75b57f Mon Sep 17 00:00:00 2001 From: pennam Date: Wed, 31 Jan 2024 10:18:46 +0100 Subject: [PATCH 1/4] Examples: make examples build on cloud web editor --- .../ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino | 1 - examples/ArduinoIoTCloud-Advanced/arduino_secrets.h | 3 --- examples/ArduinoIoTCloud-Advanced/thingProperties.h | 4 ++++ examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino | 1 - examples/ArduinoIoTCloud-Basic/arduino_secrets.h | 3 --- examples/ArduinoIoTCloud-Basic/thingProperties.h | 4 ++++ .../ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino | 1 - examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h | 3 --- examples/ArduinoIoTCloud-Callbacks/thingProperties.h | 4 ++++ .../ArduinoIoTCloud-DeferredOTA.ino | 1 - examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h | 3 --- examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h | 4 ++++ .../ArduinoIoTCloud-Schedule/ArduinoIoTCloud-Schedule.ino | 1 - examples/ArduinoIoTCloud-Schedule/arduino_secrets.h | 3 --- examples/ArduinoIoTCloud-Schedule/thingProperties.h | 4 ++++ 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino b/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino index a026d6297..e958594c2 100644 --- a/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino +++ b/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino @@ -10,7 +10,6 @@ - https://github.com/arduino-libraries/ArduinoIoTCloud#what */ -#include "arduino_secrets.h" #include "thingProperties.h" void setup() { diff --git a/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h b/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h index fc43514f9..3d464a477 100644 --- a/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h @@ -1,6 +1,3 @@ -#include -#include - /* A complete list of supported boards with WiFi is available here: * https://github.com/arduino-libraries/ArduinoIoTCloud/#what */ diff --git a/examples/ArduinoIoTCloud-Advanced/thingProperties.h b/examples/ArduinoIoTCloud-Advanced/thingProperties.h index 97ffee9d6..09f965452 100644 --- a/examples/ArduinoIoTCloud-Advanced/thingProperties.h +++ b/examples/ArduinoIoTCloud-Advanced/thingProperties.h @@ -1,3 +1,7 @@ +#include +#include +#include "arduino_secrets.h" + #if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \ defined(BOARD_HAS_NB) || defined(BOARD_HAS_ETHERNET) || defined(BOARD_HAS_CATM1_NBIOT)) #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" diff --git a/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino b/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino index ba4162baf..426c4da5a 100644 --- a/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino +++ b/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino @@ -14,7 +14,6 @@ - https://github.com/arduino-libraries/ArduinoIoTCloud#what */ -#include "arduino_secrets.h" #include "thingProperties.h" #if !defined(LED_BUILTIN) && !defined(ARDUINO_NANO_ESP32) diff --git a/examples/ArduinoIoTCloud-Basic/arduino_secrets.h b/examples/ArduinoIoTCloud-Basic/arduino_secrets.h index fc43514f9..3d464a477 100644 --- a/examples/ArduinoIoTCloud-Basic/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Basic/arduino_secrets.h @@ -1,6 +1,3 @@ -#include -#include - /* A complete list of supported boards with WiFi is available here: * https://github.com/arduino-libraries/ArduinoIoTCloud/#what */ diff --git a/examples/ArduinoIoTCloud-Basic/thingProperties.h b/examples/ArduinoIoTCloud-Basic/thingProperties.h index 31d49b656..b6025d89f 100644 --- a/examples/ArduinoIoTCloud-Basic/thingProperties.h +++ b/examples/ArduinoIoTCloud-Basic/thingProperties.h @@ -1,3 +1,7 @@ +#include +#include +#include "arduino_secrets.h" + #if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \ defined(BOARD_HAS_NB) || defined(BOARD_HAS_ETHERNET) || defined(BOARD_HAS_CATM1_NBIOT)) #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" diff --git a/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino b/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino index 634464716..20b37f291 100644 --- a/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino +++ b/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino @@ -26,7 +26,6 @@ - https://github.com/arduino-libraries/ArduinoIoTCloud#what */ -#include "arduino_secrets.h" #include "thingProperties.h" void setup() { diff --git a/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h b/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h index fc43514f9..3d464a477 100644 --- a/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h @@ -1,6 +1,3 @@ -#include -#include - /* A complete list of supported boards with WiFi is available here: * https://github.com/arduino-libraries/ArduinoIoTCloud/#what */ diff --git a/examples/ArduinoIoTCloud-Callbacks/thingProperties.h b/examples/ArduinoIoTCloud-Callbacks/thingProperties.h index 59eff5857..daed69097 100644 --- a/examples/ArduinoIoTCloud-Callbacks/thingProperties.h +++ b/examples/ArduinoIoTCloud-Callbacks/thingProperties.h @@ -1,3 +1,7 @@ +#include +#include +#include "arduino_secrets.h" + #if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \ defined(BOARD_HAS_NB) || defined(BOARD_HAS_ETHERNET) || defined(BOARD_HAS_CATM1_NBIOT)) #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" diff --git a/examples/ArduinoIoTCloud-DeferredOTA/ArduinoIoTCloud-DeferredOTA.ino b/examples/ArduinoIoTCloud-DeferredOTA/ArduinoIoTCloud-DeferredOTA.ino index b39439b4a..bbe58c373 100644 --- a/examples/ArduinoIoTCloud-DeferredOTA/ArduinoIoTCloud-DeferredOTA.ino +++ b/examples/ArduinoIoTCloud-DeferredOTA/ArduinoIoTCloud-DeferredOTA.ino @@ -16,7 +16,6 @@ - https://github.com/arduino-libraries/ArduinoIoTCloud/#ota */ -#include "arduino_secrets.h" #include "thingProperties.h" #if !defined(LED_BUILTIN) && !defined(ARDUINO_NANO_ESP32) diff --git a/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h b/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h index 1b0bb7fcb..412b7db13 100644 --- a/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h @@ -1,6 +1,3 @@ -#include -#include - /* A complete list of supported boards with WiFi is available here: * https://github.com/arduino-libraries/ArduinoIoTCloud/#what */ diff --git a/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h b/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h index 525de5aa4..1aa4b1be3 100644 --- a/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h +++ b/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h @@ -1,3 +1,7 @@ +#include +#include +#include "arduino_secrets.h" + #if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_ETHERNET)) #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" #endif diff --git a/examples/ArduinoIoTCloud-Schedule/ArduinoIoTCloud-Schedule.ino b/examples/ArduinoIoTCloud-Schedule/ArduinoIoTCloud-Schedule.ino index 484548037..9adb83378 100644 --- a/examples/ArduinoIoTCloud-Schedule/ArduinoIoTCloud-Schedule.ino +++ b/examples/ArduinoIoTCloud-Schedule/ArduinoIoTCloud-Schedule.ino @@ -6,7 +6,6 @@ */ -#include "arduino_secrets.h" #include "thingProperties.h" #if !defined(LED_BUILTIN) && !defined(ARDUINO_NANO_ESP32) diff --git a/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h b/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h index fc43514f9..3d464a477 100644 --- a/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h @@ -1,6 +1,3 @@ -#include -#include - /* A complete list of supported boards with WiFi is available here: * https://github.com/arduino-libraries/ArduinoIoTCloud/#what */ diff --git a/examples/ArduinoIoTCloud-Schedule/thingProperties.h b/examples/ArduinoIoTCloud-Schedule/thingProperties.h index 4f03c20ce..69a47186e 100644 --- a/examples/ArduinoIoTCloud-Schedule/thingProperties.h +++ b/examples/ArduinoIoTCloud-Schedule/thingProperties.h @@ -1,3 +1,7 @@ +#include +#include +#include "arduino_secrets.h" + #if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \ defined(BOARD_HAS_NB) || defined(BOARD_HAS_ETHERNET) || defined(BOARD_HAS_CATM1_NBIOT)) #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" From fd69bce0cf845fa0b5834e55620cde876096a718 Mon Sep 17 00:00:00 2001 From: pennam Date: Thu, 1 Feb 2024 14:47:35 +0100 Subject: [PATCH 2/4] Examples: restore Arduino_ConnectionHandler.h include in the arduino_secrets.h files The reason is that this makes it easier for the user to understand the origin of the BOARD_HAS_* macros referenced in the file. --- examples/ArduinoIoTCloud-Advanced/arduino_secrets.h | 2 ++ examples/ArduinoIoTCloud-Basic/arduino_secrets.h | 2 ++ examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h | 2 ++ examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h | 2 ++ examples/ArduinoIoTCloud-Schedule/arduino_secrets.h | 2 ++ 5 files changed, 10 insertions(+) diff --git a/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h b/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h index 3d464a477..2f6069225 100644 --- a/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h @@ -1,3 +1,5 @@ +#include + /* A complete list of supported boards with WiFi is available here: * https://github.com/arduino-libraries/ArduinoIoTCloud/#what */ diff --git a/examples/ArduinoIoTCloud-Basic/arduino_secrets.h b/examples/ArduinoIoTCloud-Basic/arduino_secrets.h index 3d464a477..2f6069225 100644 --- a/examples/ArduinoIoTCloud-Basic/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Basic/arduino_secrets.h @@ -1,3 +1,5 @@ +#include + /* A complete list of supported boards with WiFi is available here: * https://github.com/arduino-libraries/ArduinoIoTCloud/#what */ diff --git a/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h b/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h index 3d464a477..2f6069225 100644 --- a/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h @@ -1,3 +1,5 @@ +#include + /* A complete list of supported boards with WiFi is available here: * https://github.com/arduino-libraries/ArduinoIoTCloud/#what */ diff --git a/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h b/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h index 412b7db13..b745cf215 100644 --- a/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h @@ -1,3 +1,5 @@ +#include + /* A complete list of supported boards with WiFi is available here: * https://github.com/arduino-libraries/ArduinoIoTCloud/#what */ diff --git a/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h b/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h index 3d464a477..2f6069225 100644 --- a/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h @@ -1,3 +1,5 @@ +#include + /* A complete list of supported boards with WiFi is available here: * https://github.com/arduino-libraries/ArduinoIoTCloud/#what */ From 03f46d2078ed04a19cae0fc1fd2a6d1a21ba717f Mon Sep 17 00:00:00 2001 From: pennam Date: Thu, 1 Feb 2024 14:50:43 +0100 Subject: [PATCH 3/4] Examples: fix ArduinoIoTCloud_Travis_CI following the same pattern --- .../ArduinoIoTCloud_Travis_CI/ArduinoIoTCloud_Travis_CI.ino | 1 - examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h | 1 - examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h | 4 ++++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/utility/ArduinoIoTCloud_Travis_CI/ArduinoIoTCloud_Travis_CI.ino b/examples/utility/ArduinoIoTCloud_Travis_CI/ArduinoIoTCloud_Travis_CI.ino index 6a971f629..8995da36f 100644 --- a/examples/utility/ArduinoIoTCloud_Travis_CI/ArduinoIoTCloud_Travis_CI.ino +++ b/examples/utility/ArduinoIoTCloud_Travis_CI/ArduinoIoTCloud_Travis_CI.ino @@ -12,7 +12,6 @@ - https://github.com/arduino-libraries/ArduinoIoTCloud#what */ -#include "arduino_secrets.h" #include "thingProperties.h" void setup() { diff --git a/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h b/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h index fc43514f9..2f6069225 100644 --- a/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h +++ b/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h @@ -1,4 +1,3 @@ -#include #include /* A complete list of supported boards with WiFi is available here: diff --git a/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h b/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h index a93e83052..3410978bd 100644 --- a/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h +++ b/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h @@ -1,3 +1,7 @@ +#include +#include +#include "arduino_secrets.h" + #if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \ defined(BOARD_HAS_NB) || defined(BOARD_HAS_ETHERNET) || defined(BOARD_HAS_CATM1_NBIOT)) #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" From 2f4a7568d7b84960ca85f1aa81ae1ace78695a74 Mon Sep 17 00:00:00 2001 From: pennam Date: Thu, 1 Feb 2024 15:01:11 +0100 Subject: [PATCH 4/4] Examples: add newline to improve formatting --- .../ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino | 4 ++-- examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino | 4 ++-- .../ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino | 4 ++-- .../ArduinoIoTCloud_Travis_CI/ArduinoIoTCloud_Travis_CI.ino | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino b/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino index e958594c2..4f45a395d 100644 --- a/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino +++ b/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino @@ -3,8 +3,8 @@ IMPORTANT: This sketch works with WiFi, GSM, NB, Ethernet and Lora enabled boards supported by Arduino IoT Cloud. - On a LoRa board, if it is configured as a class A device (default and preferred option), values from Cloud dashboard are received - only after a value is sent to Cloud. + On a LoRa board, if it is configured as a class A device (default and preferred option), + values from Cloud dashboard are received only after a value is sent to Cloud. The full list of compatible boards can be found here: - https://github.com/arduino-libraries/ArduinoIoTCloud#what diff --git a/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino b/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino index 426c4da5a..cb146900d 100644 --- a/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino +++ b/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino @@ -7,8 +7,8 @@ IMPORTANT: This sketch works with WiFi, GSM, NB, Ethernet and Lora enabled boards supported by Arduino IoT Cloud. - On a LoRa board, if it is configured as a class A device (default and preferred option), values from Cloud dashboard are received - only after a value is sent to Cloud. + On a LoRa board, if it is configured as a class A device (default and preferred option), + values from Cloud dashboard are received only after a value is sent to Cloud. The full list of compatible boards can be found here: - https://github.com/arduino-libraries/ArduinoIoTCloud#what diff --git a/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino b/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino index 20b37f291..c01153d9b 100644 --- a/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino +++ b/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino @@ -19,8 +19,8 @@ IMPORTANT: This sketch works with WiFi, GSM, NB, Ethernet and Lora enabled boards supported by Arduino IoT Cloud. - On a LoRa board, if it is configured as a class A device (default and preferred option), values from Cloud dashboard are received - only after a value is sent to Cloud. + On a LoRa board, if it is configured as a class A device (default and preferred option), + values from Cloud dashboard are received only after a value is sent to Cloud. The full list of compatible boards can be found here: - https://github.com/arduino-libraries/ArduinoIoTCloud#what diff --git a/examples/utility/ArduinoIoTCloud_Travis_CI/ArduinoIoTCloud_Travis_CI.ino b/examples/utility/ArduinoIoTCloud_Travis_CI/ArduinoIoTCloud_Travis_CI.ino index 8995da36f..575b55f49 100644 --- a/examples/utility/ArduinoIoTCloud_Travis_CI/ArduinoIoTCloud_Travis_CI.ino +++ b/examples/utility/ArduinoIoTCloud_Travis_CI/ArduinoIoTCloud_Travis_CI.ino @@ -5,8 +5,8 @@ IMPORTANT: This sketch works with WiFi, GSM, NB, Ethernet and Lora enabled boards supported by Arduino IoT Cloud. - On a LoRa board, if it is configured as a class A device (default and preferred option), values from Cloud dashboard are received - only after a value is sent to Cloud. + On a LoRa board, if it is configured as a class A device (default and preferred option), + values from Cloud dashboard are received only after a value is sent to Cloud. The full list of compatible boards can be found here: - https://github.com/arduino-libraries/ArduinoIoTCloud#what