Skip to content

Commit f617718

Browse files
zfieldszfields
committed
chore: clean examples
- Remove/replace deprecated API calls - Minimize file inclusions - Fix whitespace
1 parent cf66030 commit f617718

15 files changed

+50
-31
lines changed

‎examples/ArduinoIoTCloud-Advanced/ArduinoIoTCloud-Advanced.ino

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
- https://github.com/arduino-libraries/ArduinoIoTCloud#what
1111
*/
1212

13+
#include <ArduinoIoTCloud.h>
14+
15+
#include "arduino_secrets.h"
1316
#include "thingProperties.h"
1417

1518
void setup() {

‎examples/ArduinoIoTCloud-Advanced/arduino_secrets.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <Arduino_ConnectionHandler.h>
1+
#include <AIoTC_Config.h>
22

33
/* A complete list of supported boards with WiFi is available here:
44
* https://github.com/arduino-libraries/ArduinoIoTCloud/#what
@@ -8,7 +8,7 @@
88
#define SECRET_PASS "YOUR_WIFI_PASSWORD"
99
#endif
1010

11-
/* ESP8266 ESP32*/
11+
/* ESP8266 ESP32 */
1212
#if defined(BOARD_HAS_SECRET_KEY)
1313
#define SECRET_DEVICE_KEY "my-device-password"
1414
#endif

‎examples/ArduinoIoTCloud-Advanced/thingProperties.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include <ArduinoIoTCloud.h>
22
#include <Arduino_ConnectionHandler.h>
3+
34
#include "arduino_secrets.h"
45

56
#if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \
@@ -24,13 +25,13 @@ void initProperties() {
2425
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
2526
#endif
2627
#if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB) || defined(BOARD_HAS_ETHERNET) || defined(BOARD_HAS_CATM1_NBIOT)
27-
ArduinoCloud.addProperty(switchButton, WRITE, ON_CHANGE, onSwitchButtonChange);
28-
ArduinoCloud.addProperty(location, READ, ON_CHANGE);
29-
ArduinoCloud.addProperty(color, READWRITE, ON_CHANGE, onColorChange);
28+
ArduinoCloud.addProperty(switchButton, Permission::Write).onUpdate(onSwitchButtonChange);
29+
ArduinoCloud.addProperty(location, Permission::Read).publishOnChange(0.0f);
30+
ArduinoCloud.addProperty(color, Permission::ReadWrite).onUpdate(onColorChange);
3031
#elif defined(BOARD_HAS_LORA)
31-
ArduinoCloud.addProperty(switchButton, 1, WRITE, ON_CHANGE, onSwitchButtonChange);
32-
ArduinoCloud.addProperty(location, 2, READ, ON_CHANGE);
33-
ArduinoCloud.addProperty(color, 3, READWRITE, ON_CHANGE, onColorChange);
32+
ArduinoCloud.addProperty(switchButton, 1, Permission::Write).onUpdate(onSwitchButtonChange);
33+
ArduinoCloud.addProperty(location, 2, Permission::Read).publishOnChange(0.0f);
34+
ArduinoCloud.addProperty(color, 3, Permission::ReadWrite).onUpdate(onColorChange);
3435
#endif
3536
}
3637

‎examples/ArduinoIoTCloud-Basic/ArduinoIoTCloud-Basic.ino

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
- https://github.com/arduino-libraries/ArduinoIoTCloud#what
1515
*/
1616

17+
#include <ArduinoIoTCloud.h>
18+
19+
#include "arduino_secrets.h"
1720
#include "thingProperties.h"
1821

1922
#if !defined(LED_BUILTIN) && !defined(ARDUINO_NANO_ESP32)

‎examples/ArduinoIoTCloud-Basic/arduino_secrets.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <Arduino_ConnectionHandler.h>
1+
#include <AIoTC_Config.h>
22

33
/* A complete list of supported boards with WiFi is available here:
44
* https://github.com/arduino-libraries/ArduinoIoTCloud/#what
@@ -8,7 +8,7 @@
88
#define SECRET_PASS "YOUR_WIFI_PASSWORD"
99
#endif
1010

11-
/* ESP8266 ESP32*/
11+
/* ESP8266 ESP32 */
1212
#if defined(BOARD_HAS_SECRET_KEY)
1313
#define SECRET_DEVICE_KEY "my-device-password"
1414
#endif

‎examples/ArduinoIoTCloud-Basic/thingProperties.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include <ArduinoIoTCloud.h>
22
#include <Arduino_ConnectionHandler.h>
3+
34
#include "arduino_secrets.h"
45

56
#if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \
@@ -27,9 +28,9 @@ void initProperties() {
2728
ArduinoCloud.addProperty(potentiometer, Permission::Read).publishOnChange(10);
2829
ArduinoCloud.addProperty(seconds, Permission::Read).publishOnChange(1);
2930
#elif defined(BOARD_HAS_LORA)
30-
ArduinoCloud.addProperty(led, 1, READWRITE, ON_CHANGE, onLedChange);
31-
ArduinoCloud.addProperty(potentiometer, 2, READ, ON_CHANGE);
32-
ArduinoCloud.addProperty(seconds, 3, READ, 5 * MINUTES);
31+
ArduinoCloud.addProperty(led, 1, Permission::ReadWrite).onUpdate(onLedChange);
32+
ArduinoCloud.addProperty(potentiometer, 2, Permission::Read).publishOnChange(10);
33+
ArduinoCloud.addProperty(seconds, 3, Permission::Read).publishEvery(5 * MINUTES);
3334
#endif
3435
}
3536

‎examples/ArduinoIoTCloud-Callbacks/ArduinoIoTCloud-Callbacks.ino

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
- https://github.com/arduino-libraries/ArduinoIoTCloud#what
2727
*/
2828

29+
#include <ArduinoIoTCloud.h>
30+
31+
#include "arduino_secrets.h"
2932
#include "thingProperties.h"
3033

3134
void setup() {

‎examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <Arduino_ConnectionHandler.h>
1+
#include <AIoTC_Config.h>
22

33
/* A complete list of supported boards with WiFi is available here:
44
* https://github.com/arduino-libraries/ArduinoIoTCloud/#what
@@ -8,7 +8,7 @@
88
#define SECRET_PASS "YOUR_WIFI_PASSWORD"
99
#endif
1010

11-
/* ESP8266 ESP32*/
11+
/* ESP8266 ESP32 */
1212
#if defined(BOARD_HAS_SECRET_KEY)
1313
#define SECRET_DEVICE_KEY "my-device-password"
1414
#endif

‎examples/ArduinoIoTCloud-Callbacks/thingProperties.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include <ArduinoIoTCloud.h>
22
#include <Arduino_ConnectionHandler.h>
3+
34
#include "arduino_secrets.h"
45

56
#if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \

‎examples/ArduinoIoTCloud-DeferredOTA/ArduinoIoTCloud-DeferredOTA.ino

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
- https://github.com/arduino-libraries/ArduinoIoTCloud/#ota
1717
*/
1818

19+
#include <ArduinoIoTCloud.h>
20+
21+
#include "arduino_secrets.h"
1922
#include "thingProperties.h"
2023

2124
#if !defined(LED_BUILTIN) && !defined(ARDUINO_NANO_ESP32)
@@ -39,7 +42,7 @@ bool ask_user_via_serial() {
3942
if (Serial.available()) {
4043
char c = Serial.read();
4144
if (c == 'y' || c == 'Y') {
42-
return true;
45+
return true;
4346
}
4447
}
4548
return false;

‎examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <Arduino_ConnectionHandler.h>
1+
#include <AIoTC_Config.h>
22

33
/* A complete list of supported boards with WiFi is available here:
44
* https://github.com/arduino-libraries/ArduinoIoTCloud/#what
@@ -8,7 +8,7 @@
88
#define SECRET_PASS "YOUR_WIFI_PASSWORD"
99
#endif
1010

11-
/* ESP8266 ESP32*/
11+
/* ESP8266 ESP32 */
1212
#if defined(BOARD_HAS_SECRET_KEY)
1313
#define SECRET_DEVICE_KEY "my-device-password"
1414
#endif

‎examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include <ArduinoIoTCloud.h>
22
#include <Arduino_ConnectionHandler.h>
3+
34
#include "arduino_secrets.h"
45

56
#if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_ETHERNET))

‎examples/ArduinoIoTCloud-Schedule/ArduinoIoTCloud-Schedule.ino

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
77
*/
88

9+
#include <ArduinoIoTCloud.h>
10+
11+
#include "arduino_secrets.h"
912
#include "thingProperties.h"
1013

1114
#if !defined(LED_BUILTIN) && !defined(ARDUINO_NANO_ESP32)
@@ -206,7 +209,7 @@ void loop() {
206209
if(daily.isActive()) {
207210
Serial.println("Daily schedule is active");
208211
}
209-
212+
210213
/* Activate LED when the weekly schedule is active */
211214
digitalWrite(LED_BUILTIN, weekly.isActive());
212215

@@ -219,5 +222,4 @@ void loop() {
219222
if(yearly.isActive()) {
220223
Serial.println("Yearly schedule is active");
221224
}
222-
223225
}

‎examples/ArduinoIoTCloud-Schedule/arduino_secrets.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <Arduino_ConnectionHandler.h>
1+
#include <AIoTC_Config.h>
22

33
/* A complete list of supported boards with WiFi is available here:
44
* https://github.com/arduino-libraries/ArduinoIoTCloud/#what
@@ -8,7 +8,7 @@
88
#define SECRET_PASS "YOUR_WIFI_PASSWORD"
99
#endif
1010

11-
/* ESP8266 ESP32*/
11+
/* ESP8266 ESP32 */
1212
#if defined(BOARD_HAS_SECRET_KEY)
1313
#define SECRET_DEVICE_KEY "my-device-password"
1414
#endif

‎examples/ArduinoIoTCloud-Schedule/thingProperties.h

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include <ArduinoIoTCloud.h>
22
#include <Arduino_ConnectionHandler.h>
3+
34
#include "arduino_secrets.h"
45

56
#if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \
@@ -28,16 +29,16 @@ void initProperties() {
2829
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
2930
#endif
3031
#if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB) || defined(BOARD_HAS_ETHERNET) || defined(BOARD_HAS_CATM1_NBIOT)
31-
ArduinoCloud.addProperty(switchButton, WRITE, ON_CHANGE);
32-
ArduinoCloud.addProperty(oneShot, READWRITE, ON_CHANGE);
33-
ArduinoCloud.addProperty(minute, READWRITE, ON_CHANGE);
34-
ArduinoCloud.addProperty(hourly, READWRITE, ON_CHANGE);
35-
ArduinoCloud.addProperty(daily, READWRITE, ON_CHANGE);
36-
ArduinoCloud.addProperty(weekly, READWRITE, ON_CHANGE);
37-
ArduinoCloud.addProperty(monthly, READWRITE, ON_CHANGE);
38-
ArduinoCloud.addProperty(yearly, READWRITE, ON_CHANGE);
32+
ArduinoCloud.addProperty(switchButton, Permission::Write).onUpdate(nullptr);
33+
ArduinoCloud.addProperty(oneShot, Permission::ReadWrite).onUpdate(nullptr);
34+
ArduinoCloud.addProperty(minute, Permission::ReadWrite).onUpdate(nullptr);
35+
ArduinoCloud.addProperty(hourly, Permission::ReadWrite).onUpdate(nullptr);
36+
ArduinoCloud.addProperty(daily, Permission::ReadWrite).onUpdate(nullptr);
37+
ArduinoCloud.addProperty(weekly, Permission::ReadWrite).onUpdate(nullptr);
38+
ArduinoCloud.addProperty(monthly, Permission::ReadWrite).onUpdate(nullptr);
39+
ArduinoCloud.addProperty(yearly, Permission::ReadWrite).onUpdate(nullptr);
3940
#elif defined(BOARD_HAS_LORA)
40-
ArduinoCloud.addProperty(switchButton, 1, WRITE, ON_CHANGE);
41+
ArduinoCloud.addProperty(switchButton, 1, Permission::Write).onUpdate(nullptr);
4142
#endif
4243
}
4344

0 commit comments

Comments
 (0)