Skip to content

Commit bd8de84

Browse files
pennampennam
committed
examples: use HAS_TCP or HAS_LORA to reduce maintenance efforts
1 parent e57ab50 commit bd8de84

File tree

5 files changed

+19
-24
lines changed

5 files changed

+19
-24
lines changed

‎examples/ArduinoIoTCloud-Advanced/thingProperties.h

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
#include <Arduino_ConnectionHandler.h>
33
#include "arduino_secrets.h"
44

5-
#if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \
6-
defined(BOARD_HAS_NB) || defined(BOARD_HAS_ETHERNET) || defined(BOARD_HAS_CATM1_NBIOT))
7-
#error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
5+
#if !(defined(HAS_TCP) || defined(HAS_LORA))
6+
#error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
87
#endif
98

109
#if defined(BOARD_HAS_SECRET_KEY)
@@ -23,11 +22,11 @@ void initProperties() {
2322
ArduinoCloud.setBoardId(BOARD_ID);
2423
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
2524
#endif
26-
#if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB) || defined(BOARD_HAS_ETHERNET) || defined(BOARD_HAS_CATM1_NBIOT)
25+
#if defined(HAS_TCP)
2726
ArduinoCloud.addProperty(switchButton, Permission::Write).onUpdate(onSwitchButtonChange);
2827
ArduinoCloud.addProperty(location, Permission::Read).publishOnChange(0.0f);
2928
ArduinoCloud.addProperty(color, Permission::ReadWrite).onUpdate(onColorChange);
30-
#elif defined(BOARD_HAS_LORA)
29+
#elif defined(HAS_LORA)
3130
ArduinoCloud.addProperty(switchButton, 1, Permission::Write).onUpdate(onSwitchButtonChange);
3231
ArduinoCloud.addProperty(location, 2, Permission::Read).publishOnChange(0.0f);
3332
ArduinoCloud.addProperty(color, 3, Permission::ReadWrite).onUpdate(onColorChange);

‎examples/ArduinoIoTCloud-Basic/thingProperties.h

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
#include <Arduino_ConnectionHandler.h>
33
#include "arduino_secrets.h"
44

5-
#if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \
6-
defined(BOARD_HAS_NB) || defined(BOARD_HAS_ETHERNET) || defined(BOARD_HAS_CATM1_NBIOT))
7-
#error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
5+
#if !(defined(HAS_TCP) || defined(HAS_LORA))
6+
#error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
87
#endif
98

109
#if defined(BOARD_HAS_SECRET_KEY)
@@ -22,11 +21,11 @@ void initProperties() {
2221
ArduinoCloud.setBoardId(BOARD_ID);
2322
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
2423
#endif
25-
#if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB) || defined(BOARD_HAS_ETHERNET) || defined(BOARD_HAS_CATM1_NBIOT)
24+
#if defined(HAS_TCP)
2625
ArduinoCloud.addProperty(led, Permission::Write).onUpdate(onLedChange);
2726
ArduinoCloud.addProperty(potentiometer, Permission::Read).publishOnChange(10);
2827
ArduinoCloud.addProperty(seconds, Permission::Read).publishOnChange(1);
29-
#elif defined(BOARD_HAS_LORA)
28+
#elif defined(HAS_LORA)
3029
ArduinoCloud.addProperty(led, 1, Permission::ReadWrite).onUpdate(onLedChange);
3130
ArduinoCloud.addProperty(potentiometer, 2, Permission::Read).publishOnChange(10);
3231
ArduinoCloud.addProperty(seconds, 3, Permission::Read).publishEvery(5 * MINUTES);

‎examples/ArduinoIoTCloud-Callbacks/thingProperties.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
#include <Arduino_ConnectionHandler.h>
33
#include "arduino_secrets.h"
44

5-
#if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \
6-
defined(BOARD_HAS_NB) || defined(BOARD_HAS_ETHERNET) || defined(BOARD_HAS_CATM1_NBIOT))
7-
#error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
5+
#if !(defined(HAS_TCP) || defined(HAS_LORA))
6+
#error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
87
#endif
98

109
#if defined(BOARD_HAS_SECRET_KEY)

‎examples/ArduinoIoTCloud-Schedule/thingProperties.h

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
#include <Arduino_ConnectionHandler.h>
33
#include "arduino_secrets.h"
44

5-
#if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \
6-
defined(BOARD_HAS_NB) || defined(BOARD_HAS_ETHERNET) || defined(BOARD_HAS_CATM1_NBIOT))
7-
#error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
5+
#if !(defined(HAS_TCP) || defined(HAS_LORA))
6+
#error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
87
#endif
98

109
#if defined(BOARD_HAS_SECRET_KEY)
@@ -27,7 +26,7 @@ void initProperties() {
2726
ArduinoCloud.setBoardId(BOARD_ID);
2827
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
2928
#endif
30-
#if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB) || defined(BOARD_HAS_ETHERNET) || defined(BOARD_HAS_CATM1_NBIOT)
29+
#if defined(HAS_TCP)
3130
ArduinoCloud.addProperty(switchButton, Permission::Write);
3231
ArduinoCloud.addProperty(oneShot, Permission::ReadWrite);
3332
ArduinoCloud.addProperty(minute, Permission::ReadWrite);
@@ -36,7 +35,7 @@ void initProperties() {
3635
ArduinoCloud.addProperty(weekly, Permission::ReadWrite);
3736
ArduinoCloud.addProperty(monthly, Permission::ReadWrite);
3837
ArduinoCloud.addProperty(yearly, Permission::ReadWrite);
39-
#elif defined(BOARD_HAS_LORA)
38+
#elif defined(HAS_LORA)
4039
ArduinoCloud.addProperty(switchButton, 1, Permission::Write);
4140
#endif
4241
}

‎examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h

+5-6
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
#include <Arduino_ConnectionHandler.h>
33
#include "arduino_secrets.h"
44

5-
#if !(defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_LORA) || \
6-
defined(BOARD_HAS_NB) || defined(BOARD_HAS_ETHERNET) || defined(BOARD_HAS_CATM1_NBIOT))
7-
#error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
5+
#if !(defined(HAS_TCP) || defined(HAS_LORA))
6+
#error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
87
#endif
98

109
/******************************************************************************
@@ -15,7 +14,7 @@
1514
#define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
1615
#endif
1716

18-
#if defined(BOARD_HAS_LORA)
17+
#if defined(HAS_LORA)
1918
#define THING_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
2019
#endif
2120

@@ -85,7 +84,7 @@ void onStringPropertyChange();
8584
/******************************************************************************
8685
FUNCTIONS
8786
******************************************************************************/
88-
#if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined (BOARD_HAS_NB) || defined (BOARD_HAS_CATM1_NBIOT)
87+
#if defined(HAS_TCP)
8988
void initProperties() {
9089
#if defined(BOARD_HAS_SECRET_KEY)
9190
ArduinoCloud.setBoardId(BOARD_ID);
@@ -118,7 +117,7 @@ void initProperties() {
118117
ArduinoCloud.addProperty(str_property_8, Permission::ReadWrite).publishEvery(1 * SECONDS).onSync(DEVICE_WINS);
119118
}
120119

121-
#elif defined(BOARD_HAS_LORA)
120+
#elif defined(HAS_LORA)
122121
void initProperties() {
123122
ArduinoCloud.setThingId(THING_ID);
124123

0 commit comments

Comments
 (0)