From f9a0ed958e85ce5159570190260917f02db735c1 Mon Sep 17 00:00:00 2001 From: pennam Date: Mon, 1 Aug 2022 13:53:06 +0200 Subject: [PATCH 1/7] Use link to README.md instead of list supported boards --- .../ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino | 8 +------- examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino | 8 +------- .../ArduinoIoTCloud-Callbacks.ino | 8 +------- .../ArduinoIoTCloud-DeferredOTA.ino | 5 +---- .../ArduinoIoTCloud-Schedule/ArduinoIoTCloud-Schedule.ino | 7 +------ .../ArduinoIoTCloud_Travis_CI.ino | 5 +---- 6 files changed, 6 insertions(+), 35 deletions(-) diff --git a/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino b/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino index 247860cff..22ba8c295 100644 --- a/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino +++ b/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino @@ -2,13 +2,7 @@ This sketch demonstrates how to use more complex cloud data types such as a colour or coordinates. This sketch is compatible with: - - MKR 1000 - - MKR WiFi 1010 - - MKR GSM 1400 - - MKR NB 1500 - - MKR WAN 1300/1310 - - Nano 33 IoT - - ESP8266 + - https://github.com/arduino-libraries/ArduinoIoTCloud#what */ #include "arduino_secrets.h" diff --git a/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino b/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino index 097afb6f3..d772c2d83 100644 --- a/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino +++ b/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino @@ -11,13 +11,7 @@ only after a value is sent to Cloud. This sketch is compatible with: - - MKR 1000 - - MKR WiFi 1010 - - MKR GSM 1400 - - MKR NB 1500 - - MKR WAN 1300/1310 - - Nano 33 IoT - - ESP8266 + - https://github.com/arduino-libraries/ArduinoIoTCloud#what */ #include "arduino_secrets.h" diff --git a/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino b/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino index 27c9d8f4d..dcd7f2fa5 100644 --- a/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino +++ b/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino @@ -23,13 +23,7 @@ only after a value is sent to Cloud. This sketch is compatible with: - - MKR 1000 - - MKR WiFi 1010 - - MKR GSM 1400 - - MKR NB 1500 - - MKR WAN 1300/1310 - - Nano 33 IoT - - ESP8266 + - https://github.com/arduino-libraries/ArduinoIoTCloud#what */ #include "arduino_secrets.h" diff --git a/examples/ArduinoIoTCloud-DeferredOTA/ArduinoIoTCloud-DeferredOTA.ino b/examples/ArduinoIoTCloud-DeferredOTA/ArduinoIoTCloud-DeferredOTA.ino index bd5b6a4d2..7aa206637 100644 --- a/examples/ArduinoIoTCloud-DeferredOTA/ArduinoIoTCloud-DeferredOTA.ino +++ b/examples/ArduinoIoTCloud-DeferredOTA/ArduinoIoTCloud-DeferredOTA.ino @@ -10,10 +10,7 @@ * ask_user_via_serial callback will read user input from serial to apply or postpone OTA update This sketch is compatible with: - - MKR WiFi 1010 - - Nano 33 IoT - - Portenta - - Nano RP2040 + - https://github.com/arduino-libraries/ArduinoIoTCloud/#ota */ #include "arduino_secrets.h" diff --git a/examples/ArduinoIoTCloud-Schedule/ArduinoIoTCloud-Schedule.ino b/examples/ArduinoIoTCloud-Schedule/ArduinoIoTCloud-Schedule.ino index 3c97e49f4..1897481de 100644 --- a/examples/ArduinoIoTCloud-Schedule/ArduinoIoTCloud-Schedule.ino +++ b/examples/ArduinoIoTCloud-Schedule/ArduinoIoTCloud-Schedule.ino @@ -2,12 +2,7 @@ This sketch demonstrates how to use the cloud schedule variable type. This sketch is compatible with the following boards: - - MKR 1000 - - MKR WiFi 1010 - - MKR GSM 1400 - - MKR NB 1500 - - Nano 33 IoT - - ESP8266 + - https://github.com/arduino-libraries/ArduinoIoTCloud#what */ #include "arduino_secrets.h" diff --git a/examples/utility/ArduinoIoTCloud_Travis_CI/ArduinoIoTCloud_Travis_CI.ino b/examples/utility/ArduinoIoTCloud_Travis_CI/ArduinoIoTCloud_Travis_CI.ino index d74f9bc66..729cc9098 100644 --- a/examples/utility/ArduinoIoTCloud_Travis_CI/ArduinoIoTCloud_Travis_CI.ino +++ b/examples/utility/ArduinoIoTCloud_Travis_CI/ArduinoIoTCloud_Travis_CI.ino @@ -4,10 +4,7 @@ Arduino IoT Cloud API. This sketch is compatible with: - - MKR 1000 - - MKR WIFI 1010 - - MKR GSM 1400 - - MKR WAN 1300/1310 + - https://github.com/arduino-libraries/ArduinoIoTCloud#what */ #include "arduino_secrets.h" From c3f2c201cab4760d94e9908aee029da75607b99f Mon Sep 17 00:00:00 2001 From: pennam Date: Mon, 1 Aug 2022 14:09:26 +0200 Subject: [PATCH 2/7] Use generic define BOARD_ESP to check build options --- examples/ArduinoIoTCloud-Advanced/arduino_secrets.h | 5 +++-- examples/ArduinoIoTCloud-Advanced/thingProperties.h | 2 +- examples/ArduinoIoTCloud-Basic/arduino_secrets.h | 2 +- examples/ArduinoIoTCloud-Basic/thingProperties.h | 2 +- examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h | 5 +++-- examples/ArduinoIoTCloud-Callbacks/thingProperties.h | 2 +- .../ArduinoIoTCloud-DeferredOTA/arduino_secrets.h | 5 +++-- .../ArduinoIoTCloud-DeferredOTA/thingProperties.h | 2 +- examples/ArduinoIoTCloud-Schedule/arduino_secrets.h | 5 +++-- examples/ArduinoIoTCloud-Schedule/thingProperties.h | 2 +- .../ArduinoIoTCloud_Travis_CI/arduino_secrets.h | 6 ++++++ .../ArduinoIoTCloud_Travis_CI/thingProperties.h | 12 +++++++++++- 12 files changed, 35 insertions(+), 15 deletions(-) diff --git a/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h b/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h index fc0b0661e..7adeb4426 100644 --- a/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h @@ -1,3 +1,4 @@ +#include #include /* MKR1000, MKR WiFi 1010 */ @@ -6,8 +7,8 @@ #define SECRET_PASS "YOUR_WIFI_PASSWORD" #endif -/* ESP8266 */ -#if defined(BOARD_ESP8266) +/* ESP8266 ESP32*/ +#if defined(BOARD_ESP) #define SECRET_DEVICE_KEY "my-device-password" #endif diff --git a/examples/ArduinoIoTCloud-Advanced/thingProperties.h b/examples/ArduinoIoTCloud-Advanced/thingProperties.h index eff1564b7..b723c7bb1 100644 --- a/examples/ArduinoIoTCloud-Advanced/thingProperties.h +++ b/examples/ArduinoIoTCloud-Advanced/thingProperties.h @@ -11,7 +11,7 @@ CloudLocation location; CloudColor color; void initProperties() { -#if defined(BOARD_ESP8266) +#if defined(BOARD_ESP) 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 fc0b0661e..66ec8d9ad 100644 --- a/examples/ArduinoIoTCloud-Basic/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Basic/arduino_secrets.h @@ -7,7 +7,7 @@ #endif /* ESP8266 */ -#if defined(BOARD_ESP8266) +#if defined(BOARD_ESP) #define SECRET_DEVICE_KEY "my-device-password" #endif diff --git a/examples/ArduinoIoTCloud-Basic/thingProperties.h b/examples/ArduinoIoTCloud-Basic/thingProperties.h index 5d3de1619..5ff715d8f 100644 --- a/examples/ArduinoIoTCloud-Basic/thingProperties.h +++ b/examples/ArduinoIoTCloud-Basic/thingProperties.h @@ -18,7 +18,7 @@ int potentiometer; int seconds; void initProperties() { -#if defined(BOARD_ESP8266) +#if defined(BOARD_ESP) 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 fc0b0661e..7adeb4426 100644 --- a/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h @@ -1,3 +1,4 @@ +#include #include /* MKR1000, MKR WiFi 1010 */ @@ -6,8 +7,8 @@ #define SECRET_PASS "YOUR_WIFI_PASSWORD" #endif -/* ESP8266 */ -#if defined(BOARD_ESP8266) +/* ESP8266 ESP32*/ +#if defined(BOARD_ESP) #define SECRET_DEVICE_KEY "my-device-password" #endif diff --git a/examples/ArduinoIoTCloud-Callbacks/thingProperties.h b/examples/ArduinoIoTCloud-Callbacks/thingProperties.h index 4eda5314a..aaebcb8f7 100644 --- a/examples/ArduinoIoTCloud-Callbacks/thingProperties.h +++ b/examples/ArduinoIoTCloud-Callbacks/thingProperties.h @@ -13,7 +13,7 @@ #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" void initProperties() { -#if defined(BOARD_ESP8266) +#if defined(BOARD_ESP) 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 fc0b0661e..7adeb4426 100644 --- a/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h @@ -1,3 +1,4 @@ +#include #include /* MKR1000, MKR WiFi 1010 */ @@ -6,8 +7,8 @@ #define SECRET_PASS "YOUR_WIFI_PASSWORD" #endif -/* ESP8266 */ -#if defined(BOARD_ESP8266) +/* ESP8266 ESP32*/ +#if defined(BOARD_ESP) #define SECRET_DEVICE_KEY "my-device-password" #endif diff --git a/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h b/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h index 2f84ea4f3..ac3128cb4 100644 --- a/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h +++ b/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h @@ -16,7 +16,7 @@ void onLedChange(); bool led; void initProperties() { -#if defined(BOARD_ESP8266) +#if defined(BOARD_ESP) 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 fc0b0661e..7adeb4426 100644 --- a/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h @@ -1,3 +1,4 @@ +#include #include /* MKR1000, MKR WiFi 1010 */ @@ -6,8 +7,8 @@ #define SECRET_PASS "YOUR_WIFI_PASSWORD" #endif -/* ESP8266 */ -#if defined(BOARD_ESP8266) +/* ESP8266 ESP32*/ +#if defined(BOARD_ESP) #define SECRET_DEVICE_KEY "my-device-password" #endif diff --git a/examples/ArduinoIoTCloud-Schedule/thingProperties.h b/examples/ArduinoIoTCloud-Schedule/thingProperties.h index 63231a700..6e868527f 100644 --- a/examples/ArduinoIoTCloud-Schedule/thingProperties.h +++ b/examples/ArduinoIoTCloud-Schedule/thingProperties.h @@ -15,7 +15,7 @@ CloudSchedule monthly; CloudSchedule yearly; void initProperties() { -#if defined(BOARD_ESP8266) +#if defined(BOARD_ESP) 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 020482cfc..7adeb4426 100644 --- a/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h +++ b/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h @@ -1,3 +1,4 @@ +#include #include /* MKR1000, MKR WiFi 1010 */ @@ -6,6 +7,11 @@ #define SECRET_PASS "YOUR_WIFI_PASSWORD" #endif +/* ESP8266 ESP32*/ +#if defined(BOARD_ESP) + #define SECRET_DEVICE_KEY "my-device-password" +#endif + /* MKR GSM 1400 */ #if defined(BOARD_HAS_GSM) #define SECRET_PIN "" diff --git a/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h b/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h index c21820265..5ef88ea40 100644 --- a/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h +++ b/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h @@ -13,6 +13,13 @@ #error "Arduino IoT Cloud currently only supports MKR1000, MKR WiFi 1010, MKR WAN 1300/1310, MKR NB 1500 and MKR GSM 1400" #endif +/****************************************************************************** + DEFINES + ******************************************************************************/ + +#define THING_ID "ARDUINO_IOT_CLOUD_THING_ID" +#define BOARD_ID "ARDUINO_IOT_CLOUD_BOARD_ID" + /****************************************************************************** GLOBAL CONSTANTS ******************************************************************************/ @@ -72,7 +79,10 @@ void onStringPropertyChange(); ******************************************************************************/ #if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined (BOARD_HAS_NB) void initProperties() { - +#if defined(BOARD_ESP) + ArduinoCloud.setBoardId(BOARD_ID); + ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY); +#endif ArduinoCloud.addProperty(bool_property_1, READWRITE, 1 * SECONDS); ArduinoCloud.addProperty(int_property_1, READ, 2 * MINUTES); ArduinoCloud.addProperty(float_property_1, WRITE, 3 * HOURS); From c9219f14045e043fed3e3d7beed183c1f9094c3f Mon Sep 17 00:00:00 2001 From: pennam Date: Mon, 1 Aug 2022 14:34:03 +0200 Subject: [PATCH 3/7] Use link to README.md insteaf of an hardcoded list of boards with WiFi --- examples/ArduinoIoTCloud-Advanced/arduino_secrets.h | 4 +++- examples/ArduinoIoTCloud-Basic/arduino_secrets.h | 5 ++++- examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h | 4 +++- examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h | 4 +++- examples/ArduinoIoTCloud-Schedule/arduino_secrets.h | 4 +++- examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h | 4 +++- 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h b/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h index 7adeb4426..b47db48fc 100644 --- a/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h @@ -1,7 +1,9 @@ #include #include -/* MKR1000, MKR WiFi 1010 */ +/* A complete list of supported boards with WiFi is available here: + * 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" diff --git a/examples/ArduinoIoTCloud-Basic/arduino_secrets.h b/examples/ArduinoIoTCloud-Basic/arduino_secrets.h index 66ec8d9ad..56df949db 100644 --- a/examples/ArduinoIoTCloud-Basic/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Basic/arduino_secrets.h @@ -1,6 +1,9 @@ +#include #include -/* MKR1000, MKR WiFi 1010 */ +/* A complete list of supported boards with WiFi is available here: + * 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" diff --git a/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h b/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h index 7adeb4426..b47db48fc 100644 --- a/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h @@ -1,7 +1,9 @@ #include #include -/* MKR1000, MKR WiFi 1010 */ +/* A complete list of supported boards with WiFi is available here: + * 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" diff --git a/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h b/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h index 7adeb4426..b47db48fc 100644 --- a/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h @@ -1,7 +1,9 @@ #include #include -/* MKR1000, MKR WiFi 1010 */ +/* A complete list of supported boards with WiFi is available here: + * 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" diff --git a/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h b/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h index 7adeb4426..b47db48fc 100644 --- a/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h @@ -1,7 +1,9 @@ #include #include -/* MKR1000, MKR WiFi 1010 */ +/* A complete list of supported boards with WiFi is available here: + * 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" diff --git a/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h b/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h index 7adeb4426..b47db48fc 100644 --- a/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h +++ b/examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h @@ -1,7 +1,9 @@ #include #include -/* MKR1000, MKR WiFi 1010 */ +/* A complete list of supported boards with WiFi is available here: + * 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" From 0552d79fcd555ed6b67abf6bdbcdb819584904e9 Mon Sep 17 00:00:00 2001 From: pennam Date: Mon, 1 Aug 2022 15:16:12 +0200 Subject: [PATCH 4/7] Show supported board list url when building for unsupported board --- examples/ArduinoIoTCloud-Advanced/thingProperties.h | 8 ++++++++ examples/ArduinoIoTCloud-Basic/thingProperties.h | 2 +- examples/ArduinoIoTCloud-Callbacks/thingProperties.h | 2 +- examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h | 2 +- examples/ArduinoIoTCloud-Schedule/thingProperties.h | 8 ++++++++ .../utility/ArduinoIoTCloud_Travis_CI/thingProperties.h | 2 +- 6 files changed, 20 insertions(+), 4 deletions(-) diff --git a/examples/ArduinoIoTCloud-Advanced/thingProperties.h b/examples/ArduinoIoTCloud-Advanced/thingProperties.h index b723c7bb1..2cabfa557 100644 --- a/examples/ArduinoIoTCloud-Advanced/thingProperties.h +++ b/examples/ArduinoIoTCloud-Advanced/thingProperties.h @@ -1,6 +1,14 @@ #include #include +#if defined(BOARD_HAS_WIFI) +#elif defined(BOARD_HAS_GSM) +#elif defined(BOARD_HAS_LORA) +#elif defined(BOARD_HAS_NB) +#else + #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" +#endif + #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" void onSwitchButtonChange(); diff --git a/examples/ArduinoIoTCloud-Basic/thingProperties.h b/examples/ArduinoIoTCloud-Basic/thingProperties.h index 5ff715d8f..ed4b0c18d 100644 --- a/examples/ArduinoIoTCloud-Basic/thingProperties.h +++ b/examples/ArduinoIoTCloud-Basic/thingProperties.h @@ -6,7 +6,7 @@ #elif defined(BOARD_HAS_LORA) #elif defined(BOARD_HAS_NB) #else - #error "Arduino IoT Cloud currently only supports MKR1000, MKR WiFi 1010, MKR WAN 1300/1310, MKR NB 1500 and MKR GSM 1400" + #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" #endif #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" diff --git a/examples/ArduinoIoTCloud-Callbacks/thingProperties.h b/examples/ArduinoIoTCloud-Callbacks/thingProperties.h index aaebcb8f7..615251d47 100644 --- a/examples/ArduinoIoTCloud-Callbacks/thingProperties.h +++ b/examples/ArduinoIoTCloud-Callbacks/thingProperties.h @@ -6,7 +6,7 @@ #elif defined(BOARD_HAS_LORA) #elif defined(BOARD_HAS_NB) #else - #error "Arduino IoT Cloud currently only supports MKR1000, MKR WiFi 1010, MKR WAN 1300/1310, MKR NB 1500 and MKR GSM 1400" + #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" #endif /* BOARD_ID is only required if you are using an ESP8266 */ diff --git a/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h b/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h index ac3128cb4..34f63725f 100644 --- a/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h +++ b/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h @@ -6,7 +6,7 @@ #elif defined(BOARD_HAS_LORA) #elif defined(BOARD_HAS_NB) #else - #error "Arduino IoT Cloud currently only supports MKR1000, MKR WiFi 1010, MKR WAN 1300/1310, MKR NB 1500 and MKR GSM 1400" + #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" #endif #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" diff --git a/examples/ArduinoIoTCloud-Schedule/thingProperties.h b/examples/ArduinoIoTCloud-Schedule/thingProperties.h index 6e868527f..864068979 100644 --- a/examples/ArduinoIoTCloud-Schedule/thingProperties.h +++ b/examples/ArduinoIoTCloud-Schedule/thingProperties.h @@ -1,6 +1,14 @@ #include #include +#if defined(BOARD_HAS_WIFI) +#elif defined(BOARD_HAS_GSM) +#elif defined(BOARD_HAS_LORA) +#elif defined(BOARD_HAS_NB) +#else + #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" +#endif + #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" void onSwitchButtonChange(); diff --git a/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h b/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h index 5ef88ea40..7705e3d10 100644 --- a/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h +++ b/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h @@ -10,7 +10,7 @@ #elif defined(BOARD_HAS_LORA) #elif defined(BOARD_HAS_NB) #else - #error "Arduino IoT Cloud currently only supports MKR1000, MKR WiFi 1010, MKR WAN 1300/1310, MKR NB 1500 and MKR GSM 1400" + #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" #endif /****************************************************************************** From 4bad038f4760fd5e9cb06efc571352babfd51241 Mon Sep 17 00:00:00 2001 From: pennam Date: Thu, 3 Nov 2022 12:06:23 +0100 Subject: [PATCH 5/7] Remove includes from thingProperties.h --- examples/ArduinoIoTCloud-Advanced/thingProperties.h | 3 --- examples/ArduinoIoTCloud-Basic/thingProperties.h | 3 --- examples/ArduinoIoTCloud-Callbacks/thingProperties.h | 3 --- examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h | 3 --- examples/ArduinoIoTCloud-Schedule/thingProperties.h | 3 --- .../utility/ArduinoIoTCloud_Travis_CI/thingProperties.h | 7 ------- 6 files changed, 22 deletions(-) diff --git a/examples/ArduinoIoTCloud-Advanced/thingProperties.h b/examples/ArduinoIoTCloud-Advanced/thingProperties.h index 2cabfa557..0ce3c7eca 100644 --- a/examples/ArduinoIoTCloud-Advanced/thingProperties.h +++ b/examples/ArduinoIoTCloud-Advanced/thingProperties.h @@ -1,6 +1,3 @@ -#include -#include - #if defined(BOARD_HAS_WIFI) #elif defined(BOARD_HAS_GSM) #elif defined(BOARD_HAS_LORA) diff --git a/examples/ArduinoIoTCloud-Basic/thingProperties.h b/examples/ArduinoIoTCloud-Basic/thingProperties.h index ed4b0c18d..dd25617bf 100644 --- a/examples/ArduinoIoTCloud-Basic/thingProperties.h +++ b/examples/ArduinoIoTCloud-Basic/thingProperties.h @@ -1,6 +1,3 @@ -#include -#include - #if defined(BOARD_HAS_WIFI) #elif defined(BOARD_HAS_GSM) #elif defined(BOARD_HAS_LORA) diff --git a/examples/ArduinoIoTCloud-Callbacks/thingProperties.h b/examples/ArduinoIoTCloud-Callbacks/thingProperties.h index 615251d47..66ada9342 100644 --- a/examples/ArduinoIoTCloud-Callbacks/thingProperties.h +++ b/examples/ArduinoIoTCloud-Callbacks/thingProperties.h @@ -1,6 +1,3 @@ -#include -#include - #if defined(BOARD_HAS_WIFI) #elif defined(BOARD_HAS_GSM) #elif defined(BOARD_HAS_LORA) diff --git a/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h b/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h index 34f63725f..0282a5505 100644 --- a/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h +++ b/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h @@ -1,6 +1,3 @@ -#include -#include - #if defined(BOARD_HAS_WIFI) #elif defined(BOARD_HAS_GSM) #elif defined(BOARD_HAS_LORA) diff --git a/examples/ArduinoIoTCloud-Schedule/thingProperties.h b/examples/ArduinoIoTCloud-Schedule/thingProperties.h index 864068979..70758d826 100644 --- a/examples/ArduinoIoTCloud-Schedule/thingProperties.h +++ b/examples/ArduinoIoTCloud-Schedule/thingProperties.h @@ -1,6 +1,3 @@ -#include -#include - #if defined(BOARD_HAS_WIFI) #elif defined(BOARD_HAS_GSM) #elif defined(BOARD_HAS_LORA) diff --git a/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h b/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h index 7705e3d10..d137fd214 100644 --- a/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h +++ b/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h @@ -1,10 +1,3 @@ -/****************************************************************************** - INCLUDE - ******************************************************************************/ - -#include -#include - #if defined(BOARD_HAS_WIFI) #elif defined(BOARD_HAS_GSM) #elif defined(BOARD_HAS_LORA) From c1582252cfc8cb117bfb18293f06da91f79d9b69 Mon Sep 17 00:00:00 2001 From: pennam Date: Thu, 3 Nov 2022 12:11:14 +0100 Subject: [PATCH 6/7] Remove thing_id leftover --- examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h b/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h index d137fd214..eed3d0f87 100644 --- a/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h +++ b/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h @@ -10,7 +10,6 @@ DEFINES ******************************************************************************/ -#define THING_ID "ARDUINO_IOT_CLOUD_THING_ID" #define BOARD_ID "ARDUINO_IOT_CLOUD_BOARD_ID" /****************************************************************************** From dfb452afa1836ef171874a792020fd24db2caf82 Mon Sep 17 00:00:00 2001 From: pennam Date: Thu, 3 Nov 2022 12:18:56 +0100 Subject: [PATCH 7/7] Define BOARD_ID only for ESP boards --- examples/ArduinoIoTCloud-Advanced/thingProperties.h | 4 +++- examples/ArduinoIoTCloud-Basic/thingProperties.h | 4 +++- examples/ArduinoIoTCloud-Callbacks/thingProperties.h | 5 +++-- examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h | 4 +++- examples/ArduinoIoTCloud-Schedule/thingProperties.h | 4 +++- examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h | 4 +++- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/examples/ArduinoIoTCloud-Advanced/thingProperties.h b/examples/ArduinoIoTCloud-Advanced/thingProperties.h index 0ce3c7eca..425ce073b 100644 --- a/examples/ArduinoIoTCloud-Advanced/thingProperties.h +++ b/examples/ArduinoIoTCloud-Advanced/thingProperties.h @@ -6,7 +6,9 @@ #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" #endif -#define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" +#if defined(BOARD_ESP) + #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" +#endif void onSwitchButtonChange(); void onColorChange(); diff --git a/examples/ArduinoIoTCloud-Basic/thingProperties.h b/examples/ArduinoIoTCloud-Basic/thingProperties.h index dd25617bf..8d9eea34b 100644 --- a/examples/ArduinoIoTCloud-Basic/thingProperties.h +++ b/examples/ArduinoIoTCloud-Basic/thingProperties.h @@ -6,7 +6,9 @@ #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" #endif -#define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" +#if defined(BOARD_ESP) + #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" +#endif void onLedChange(); diff --git a/examples/ArduinoIoTCloud-Callbacks/thingProperties.h b/examples/ArduinoIoTCloud-Callbacks/thingProperties.h index 66ada9342..d739e85d2 100644 --- a/examples/ArduinoIoTCloud-Callbacks/thingProperties.h +++ b/examples/ArduinoIoTCloud-Callbacks/thingProperties.h @@ -6,8 +6,9 @@ #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" #endif -/* BOARD_ID is only required if you are using an ESP8266 */ -#define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" +#if defined(BOARD_ESP) + #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" +#endif void initProperties() { #if defined(BOARD_ESP) diff --git a/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h b/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h index 0282a5505..8b68b1bdc 100644 --- a/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h +++ b/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h @@ -6,7 +6,9 @@ #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" #endif -#define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" +#if defined(BOARD_ESP) + #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" +#endif void onLedChange(); diff --git a/examples/ArduinoIoTCloud-Schedule/thingProperties.h b/examples/ArduinoIoTCloud-Schedule/thingProperties.h index 70758d826..5ef3bf6c1 100644 --- a/examples/ArduinoIoTCloud-Schedule/thingProperties.h +++ b/examples/ArduinoIoTCloud-Schedule/thingProperties.h @@ -6,7 +6,9 @@ #error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what" #endif -#define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" +#if defined(BOARD_ESP) + #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" +#endif void onSwitchButtonChange(); diff --git a/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h b/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h index eed3d0f87..89bfada2f 100644 --- a/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h +++ b/examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h @@ -10,7 +10,9 @@ DEFINES ******************************************************************************/ -#define BOARD_ID "ARDUINO_IOT_CLOUD_BOARD_ID" +#if defined(BOARD_ESP) + #define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" +#endif /****************************************************************************** GLOBAL CONSTANTS