From ab43cf37e55aac8004217556f15acfba7d8495cf Mon Sep 17 00:00:00 2001 From: "Zachary J. Fields" Date: Sat, 17 Feb 2024 18:03:31 -0600 Subject: [PATCH 1/2] chore: clean examples - Remove/replace deprecated API calls - Minimize file inclusions - Fix whitespace --- .../ArduinoIoTCloud-Advanced.ino | 3 +++ .../arduino_secrets.h | 4 ++-- .../thingProperties.h | 13 +++++++------ .../ArduinoIoTCloud-Basic.ino | 3 +++ .../ArduinoIoTCloud-Basic/arduino_secrets.h | 4 ++-- .../ArduinoIoTCloud-Basic/thingProperties.h | 7 ++++--- .../ArduinoIoTCloud-Callbacks.ino | 3 +++ .../arduino_secrets.h | 4 ++-- .../thingProperties.h | 1 + .../ArduinoIoTCloud-DeferredOTA.ino | 5 ++++- .../arduino_secrets.h | 4 ++-- .../thingProperties.h | 1 + .../ArduinoIoTCloud-Schedule.ino | 6 ++++-- .../arduino_secrets.h | 4 ++-- .../thingProperties.h | 19 ++++++++++--------- 15 files changed, 50 insertions(+), 31 deletions(-) diff --git a/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino b/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino index 4f45a395d..c99e84c88 100644 --- a/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino +++ b/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino @@ -10,6 +10,9 @@ - https://github.com/arduino-libraries/ArduinoIoTCloud#what */ +#include + +#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 2f6069225..7cd2dd0dc 100644 --- a/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h @@ -1,4 +1,4 @@ -#include +#include /* A complete list of supported boards with WiFi is available here: * https://github.com/arduino-libraries/ArduinoIoTCloud/#what @@ -8,7 +8,7 @@ #define SECRET_PASS "YOUR_WIFI_PASSWORD" #endif -/* ESP8266 ESP32*/ +/* ESP8266 ESP32 */ #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 09f965452..a8853e904 100644 --- a/examples/ArduinoIoTCloud-Advanced/thingProperties.h +++ b/examples/ArduinoIoTCloud-Advanced/thingProperties.h @@ -1,5 +1,6 @@ #include #include + #include "arduino_secrets.h" #if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \ @@ -24,13 +25,13 @@ void initProperties() { ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY); #endif #if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB) || defined(BOARD_HAS_ETHERNET) || defined(BOARD_HAS_CATM1_NBIOT) - ArduinoCloud.addProperty(switchButton, WRITE, ON_CHANGE, onSwitchButtonChange); - ArduinoCloud.addProperty(location, READ, ON_CHANGE); - ArduinoCloud.addProperty(color, READWRITE, ON_CHANGE, onColorChange); + ArduinoCloud.addProperty(switchButton, Permission::Write).onUpdate(onSwitchButtonChange); + ArduinoCloud.addProperty(location, Permission::Read).publishOnChange(0.0f); + ArduinoCloud.addProperty(color, Permission::ReadWrite).onUpdate(onColorChange); #elif defined(BOARD_HAS_LORA) - ArduinoCloud.addProperty(switchButton, 1, WRITE, ON_CHANGE, onSwitchButtonChange); - ArduinoCloud.addProperty(location, 2, READ, ON_CHANGE); - ArduinoCloud.addProperty(color, 3, READWRITE, ON_CHANGE, onColorChange); + ArduinoCloud.addProperty(switchButton, 1, Permission::Write).onUpdate(onSwitchButtonChange); + ArduinoCloud.addProperty(location, 2, Permission::Read).publishOnChange(0.0f); + ArduinoCloud.addProperty(color, 3, Permission::ReadWrite).onUpdate(onColorChange); #endif } diff --git a/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino b/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino index cb146900d..000200054 100644 --- a/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino +++ b/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino @@ -14,6 +14,9 @@ - https://github.com/arduino-libraries/ArduinoIoTCloud#what */ +#include + +#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 2f6069225..7cd2dd0dc 100644 --- a/examples/ArduinoIoTCloud-Basic/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Basic/arduino_secrets.h @@ -1,4 +1,4 @@ -#include +#include /* A complete list of supported boards with WiFi is available here: * https://github.com/arduino-libraries/ArduinoIoTCloud/#what @@ -8,7 +8,7 @@ #define SECRET_PASS "YOUR_WIFI_PASSWORD" #endif -/* ESP8266 ESP32*/ +/* ESP8266 ESP32 */ #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 b6025d89f..101abbef4 100644 --- a/examples/ArduinoIoTCloud-Basic/thingProperties.h +++ b/examples/ArduinoIoTCloud-Basic/thingProperties.h @@ -1,5 +1,6 @@ #include #include + #include "arduino_secrets.h" #if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \ @@ -27,9 +28,9 @@ void initProperties() { ArduinoCloud.addProperty(potentiometer, Permission::Read).publishOnChange(10); ArduinoCloud.addProperty(seconds, Permission::Read).publishOnChange(1); #elif defined(BOARD_HAS_LORA) - ArduinoCloud.addProperty(led, 1, READWRITE, ON_CHANGE, onLedChange); - ArduinoCloud.addProperty(potentiometer, 2, READ, ON_CHANGE); - ArduinoCloud.addProperty(seconds, 3, READ, 5 * MINUTES); + ArduinoCloud.addProperty(led, 1, Permission::ReadWrite).onUpdate(onLedChange); + ArduinoCloud.addProperty(potentiometer, 2, Permission::Read).publishOnChange(10); + ArduinoCloud.addProperty(seconds, 3, Permission::Read).publishEvery(5 * MINUTES); #endif } diff --git a/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino b/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino index c01153d9b..d410e2169 100644 --- a/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino +++ b/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino @@ -26,6 +26,9 @@ - https://github.com/arduino-libraries/ArduinoIoTCloud#what */ +#include + +#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 2f6069225..7cd2dd0dc 100644 --- a/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h @@ -1,4 +1,4 @@ -#include +#include /* A complete list of supported boards with WiFi is available here: * https://github.com/arduino-libraries/ArduinoIoTCloud/#what @@ -8,7 +8,7 @@ #define SECRET_PASS "YOUR_WIFI_PASSWORD" #endif -/* ESP8266 ESP32*/ +/* ESP8266 ESP32 */ #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 daed69097..d84fd1e57 100644 --- a/examples/ArduinoIoTCloud-Callbacks/thingProperties.h +++ b/examples/ArduinoIoTCloud-Callbacks/thingProperties.h @@ -1,5 +1,6 @@ #include #include + #include "arduino_secrets.h" #if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \ diff --git a/examples/ArduinoIoTCloud-DeferredOTA/ArduinoIoTCloud-DeferredOTA.ino b/examples/ArduinoIoTCloud-DeferredOTA/ArduinoIoTCloud-DeferredOTA.ino index bbe58c373..c4d179f62 100644 --- a/examples/ArduinoIoTCloud-DeferredOTA/ArduinoIoTCloud-DeferredOTA.ino +++ b/examples/ArduinoIoTCloud-DeferredOTA/ArduinoIoTCloud-DeferredOTA.ino @@ -16,6 +16,9 @@ - https://github.com/arduino-libraries/ArduinoIoTCloud/#ota */ +#include + +#include "arduino_secrets.h" #include "thingProperties.h" #if !defined(LED_BUILTIN) && !defined(ARDUINO_NANO_ESP32) @@ -39,7 +42,7 @@ bool ask_user_via_serial() { if (Serial.available()) { char c = Serial.read(); if (c == 'y' || c == 'Y') { - return true; + return true; } } return false; diff --git a/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h b/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h index b745cf215..a065e92e8 100644 --- a/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h @@ -1,4 +1,4 @@ -#include +#include /* A complete list of supported boards with WiFi is available here: * https://github.com/arduino-libraries/ArduinoIoTCloud/#what @@ -8,7 +8,7 @@ #define SECRET_PASS "YOUR_WIFI_PASSWORD" #endif -/* ESP8266 ESP32*/ +/* ESP8266 ESP32 */ #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 1aa4b1be3..d2e523fbe 100644 --- a/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h +++ b/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h @@ -1,5 +1,6 @@ #include #include + #include "arduino_secrets.h" #if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_ETHERNET)) diff --git a/examples/ArduinoIoTCloud-Schedule/ArduinoIoTCloud-Schedule.ino b/examples/ArduinoIoTCloud-Schedule/ArduinoIoTCloud-Schedule.ino index 9adb83378..76be35130 100644 --- a/examples/ArduinoIoTCloud-Schedule/ArduinoIoTCloud-Schedule.ino +++ b/examples/ArduinoIoTCloud-Schedule/ArduinoIoTCloud-Schedule.ino @@ -6,6 +6,9 @@ */ +#include + +#include "arduino_secrets.h" #include "thingProperties.h" #if !defined(LED_BUILTIN) && !defined(ARDUINO_NANO_ESP32) @@ -206,7 +209,7 @@ void loop() { if(daily.isActive()) { Serial.println("Daily schedule is active"); } - + /* Activate LED when the weekly schedule is active */ digitalWrite(LED_BUILTIN, weekly.isActive()); @@ -219,5 +222,4 @@ void loop() { if(yearly.isActive()) { Serial.println("Yearly schedule is active"); } - } diff --git a/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h b/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h index 2f6069225..7cd2dd0dc 100644 --- a/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h @@ -1,4 +1,4 @@ -#include +#include /* A complete list of supported boards with WiFi is available here: * https://github.com/arduino-libraries/ArduinoIoTCloud/#what @@ -8,7 +8,7 @@ #define SECRET_PASS "YOUR_WIFI_PASSWORD" #endif -/* ESP8266 ESP32*/ +/* ESP8266 ESP32 */ #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 69a47186e..2fe16af9a 100644 --- a/examples/ArduinoIoTCloud-Schedule/thingProperties.h +++ b/examples/ArduinoIoTCloud-Schedule/thingProperties.h @@ -1,5 +1,6 @@ #include #include + #include "arduino_secrets.h" #if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \ @@ -28,16 +29,16 @@ void initProperties() { ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY); #endif #if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB) || defined(BOARD_HAS_ETHERNET) || defined(BOARD_HAS_CATM1_NBIOT) - ArduinoCloud.addProperty(switchButton, WRITE, ON_CHANGE); - ArduinoCloud.addProperty(oneShot, READWRITE, ON_CHANGE); - ArduinoCloud.addProperty(minute, READWRITE, ON_CHANGE); - ArduinoCloud.addProperty(hourly, READWRITE, ON_CHANGE); - ArduinoCloud.addProperty(daily, READWRITE, ON_CHANGE); - ArduinoCloud.addProperty(weekly, READWRITE, ON_CHANGE); - ArduinoCloud.addProperty(monthly, READWRITE, ON_CHANGE); - ArduinoCloud.addProperty(yearly, READWRITE, ON_CHANGE); + ArduinoCloud.addProperty(switchButton, Permission::Write).onUpdate(nullptr); + ArduinoCloud.addProperty(oneShot, Permission::ReadWrite).onUpdate(nullptr); + ArduinoCloud.addProperty(minute, Permission::ReadWrite).onUpdate(nullptr); + ArduinoCloud.addProperty(hourly, Permission::ReadWrite).onUpdate(nullptr); + ArduinoCloud.addProperty(daily, Permission::ReadWrite).onUpdate(nullptr); + ArduinoCloud.addProperty(weekly, Permission::ReadWrite).onUpdate(nullptr); + ArduinoCloud.addProperty(monthly, Permission::ReadWrite).onUpdate(nullptr); + ArduinoCloud.addProperty(yearly, Permission::ReadWrite).onUpdate(nullptr); #elif defined(BOARD_HAS_LORA) - ArduinoCloud.addProperty(switchButton, 1, WRITE, ON_CHANGE); + ArduinoCloud.addProperty(switchButton, 1, Permission::Write).onUpdate(nullptr); #endif } From 8ae88fce78168ff3a640b2c8cdb30b7ed47a7186 Mon Sep 17 00:00:00 2001 From: "Zachary J. Fields" Date: Fri, 15 Mar 2024 08:00:17 -0500 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Mattia Pennasilico --- .../ArduinoIoTCloud-Advanced.ino | 3 --- .../arduino_secrets.h | 2 +- .../thingProperties.h | 1 - .../ArduinoIoTCloud-Basic.ino | 3 --- .../ArduinoIoTCloud-Basic/arduino_secrets.h | 2 +- .../ArduinoIoTCloud-Basic/thingProperties.h | 1 - .../ArduinoIoTCloud-Callbacks.ino | 3 --- .../arduino_secrets.h | 2 +- .../thingProperties.h | 1 - .../ArduinoIoTCloud-DeferredOTA.ino | 3 --- .../arduino_secrets.h | 2 +- .../thingProperties.h | 1 - .../ArduinoIoTCloud-Schedule.ino | 3 --- .../arduino_secrets.h | 2 +- .../thingProperties.h | 19 +++++++++---------- 15 files changed, 14 insertions(+), 34 deletions(-) diff --git a/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino b/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino index c99e84c88..4f45a395d 100644 --- a/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino +++ b/examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino @@ -10,9 +10,6 @@ - https://github.com/arduino-libraries/ArduinoIoTCloud#what */ -#include - -#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 7cd2dd0dc..7e5face72 100644 --- a/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Advanced/arduino_secrets.h @@ -1,4 +1,4 @@ -#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 a8853e904..8d8269307 100644 --- a/examples/ArduinoIoTCloud-Advanced/thingProperties.h +++ b/examples/ArduinoIoTCloud-Advanced/thingProperties.h @@ -1,6 +1,5 @@ #include #include - #include "arduino_secrets.h" #if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \ diff --git a/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino b/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino index 000200054..cb146900d 100644 --- a/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino +++ b/examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino @@ -14,9 +14,6 @@ - https://github.com/arduino-libraries/ArduinoIoTCloud#what */ -#include - -#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 7cd2dd0dc..7e5face72 100644 --- a/examples/ArduinoIoTCloud-Basic/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Basic/arduino_secrets.h @@ -1,4 +1,4 @@ -#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 101abbef4..2792236e2 100644 --- a/examples/ArduinoIoTCloud-Basic/thingProperties.h +++ b/examples/ArduinoIoTCloud-Basic/thingProperties.h @@ -1,6 +1,5 @@ #include #include - #include "arduino_secrets.h" #if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \ diff --git a/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino b/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino index d410e2169..c01153d9b 100644 --- a/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino +++ b/examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino @@ -26,9 +26,6 @@ - https://github.com/arduino-libraries/ArduinoIoTCloud#what */ -#include - -#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 7cd2dd0dc..7e5face72 100644 --- a/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h @@ -1,4 +1,4 @@ -#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 d84fd1e57..daed69097 100644 --- a/examples/ArduinoIoTCloud-Callbacks/thingProperties.h +++ b/examples/ArduinoIoTCloud-Callbacks/thingProperties.h @@ -1,6 +1,5 @@ #include #include - #include "arduino_secrets.h" #if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \ diff --git a/examples/ArduinoIoTCloud-DeferredOTA/ArduinoIoTCloud-DeferredOTA.ino b/examples/ArduinoIoTCloud-DeferredOTA/ArduinoIoTCloud-DeferredOTA.ino index c4d179f62..7d6b775c3 100644 --- a/examples/ArduinoIoTCloud-DeferredOTA/ArduinoIoTCloud-DeferredOTA.ino +++ b/examples/ArduinoIoTCloud-DeferredOTA/ArduinoIoTCloud-DeferredOTA.ino @@ -16,9 +16,6 @@ - https://github.com/arduino-libraries/ArduinoIoTCloud/#ota */ -#include - -#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 a065e92e8..177e1770b 100644 --- a/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h @@ -1,4 +1,4 @@ -#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 d2e523fbe..1aa4b1be3 100644 --- a/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h +++ b/examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h @@ -1,6 +1,5 @@ #include #include - #include "arduino_secrets.h" #if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_ETHERNET)) diff --git a/examples/ArduinoIoTCloud-Schedule/ArduinoIoTCloud-Schedule.ino b/examples/ArduinoIoTCloud-Schedule/ArduinoIoTCloud-Schedule.ino index 76be35130..d24569196 100644 --- a/examples/ArduinoIoTCloud-Schedule/ArduinoIoTCloud-Schedule.ino +++ b/examples/ArduinoIoTCloud-Schedule/ArduinoIoTCloud-Schedule.ino @@ -6,9 +6,6 @@ */ -#include - -#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 7cd2dd0dc..7e5face72 100644 --- a/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h +++ b/examples/ArduinoIoTCloud-Schedule/arduino_secrets.h @@ -1,4 +1,4 @@ -#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 2fe16af9a..b6c3abb05 100644 --- a/examples/ArduinoIoTCloud-Schedule/thingProperties.h +++ b/examples/ArduinoIoTCloud-Schedule/thingProperties.h @@ -1,6 +1,5 @@ #include #include - #include "arduino_secrets.h" #if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \ @@ -29,16 +28,16 @@ void initProperties() { ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY); #endif #if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB) || defined(BOARD_HAS_ETHERNET) || defined(BOARD_HAS_CATM1_NBIOT) - ArduinoCloud.addProperty(switchButton, Permission::Write).onUpdate(nullptr); - ArduinoCloud.addProperty(oneShot, Permission::ReadWrite).onUpdate(nullptr); - ArduinoCloud.addProperty(minute, Permission::ReadWrite).onUpdate(nullptr); - ArduinoCloud.addProperty(hourly, Permission::ReadWrite).onUpdate(nullptr); - ArduinoCloud.addProperty(daily, Permission::ReadWrite).onUpdate(nullptr); - ArduinoCloud.addProperty(weekly, Permission::ReadWrite).onUpdate(nullptr); - ArduinoCloud.addProperty(monthly, Permission::ReadWrite).onUpdate(nullptr); - ArduinoCloud.addProperty(yearly, Permission::ReadWrite).onUpdate(nullptr); + ArduinoCloud.addProperty(switchButton, Permission::Write); + ArduinoCloud.addProperty(oneShot, Permission::ReadWrite); + ArduinoCloud.addProperty(minute, Permission::ReadWrite); + ArduinoCloud.addProperty(hourly, Permission::ReadWrite); + ArduinoCloud.addProperty(daily, Permission::ReadWrite); + ArduinoCloud.addProperty(weekly, Permission::ReadWrite); + ArduinoCloud.addProperty(monthly, Permission::ReadWrite); + ArduinoCloud.addProperty(yearly, Permission::ReadWrite); #elif defined(BOARD_HAS_LORA) - ArduinoCloud.addProperty(switchButton, 1, Permission::Write).onUpdate(nullptr); + ArduinoCloud.addProperty(switchButton, 1, Permission::Write); #endif }