Skip to content

Commit 9da8516

Browse files
authored
Merge pull request #327 from pennam/remove-thing-id-from-examples
Remove setThingId(THING_ID) from library examples
2 parents 44813a8 + dc03451 commit 9da8516

File tree

6 files changed

+0
-19
lines changed

6 files changed

+0
-19
lines changed

examples/ArduinoIoTCloud-Advanced/thingProperties.h

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#include <ArduinoIoTCloud.h>
22
#include <Arduino_ConnectionHandler.h>
33

4-
#define THING_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
54
#define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
65

76
void onSwitchButtonChange();
@@ -16,7 +15,6 @@ void initProperties() {
1615
ArduinoCloud.setBoardId(BOARD_ID);
1716
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
1817
#endif
19-
ArduinoCloud.setThingId(THING_ID);
2018
#if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB)
2119
ArduinoCloud.addProperty(switchButton, WRITE, ON_CHANGE, onSwitchButtonChange);
2220
ArduinoCloud.addProperty(location, READ, ON_CHANGE);

examples/ArduinoIoTCloud-Basic/thingProperties.h

-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#error "Arduino IoT Cloud currently only supports MKR1000, MKR WiFi 1010, MKR WAN 1300/1310, MKR NB 1500 and MKR GSM 1400"
1010
#endif
1111

12-
#define THING_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
1312
#define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
1413

1514
void onLedChange();
@@ -23,7 +22,6 @@ void initProperties() {
2322
ArduinoCloud.setBoardId(BOARD_ID);
2423
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
2524
#endif
26-
ArduinoCloud.setThingId(THING_ID);
2725
#if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB)
2826
ArduinoCloud.addProperty(led, Permission::Write).onUpdate(onLedChange);
2927
ArduinoCloud.addProperty(potentiometer, Permission::Read).publishOnChange(10);

examples/ArduinoIoTCloud-Callbacks/thingProperties.h

-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
#error "Arduino IoT Cloud currently only supports MKR1000, MKR WiFi 1010, MKR WAN 1300/1310, MKR NB 1500 and MKR GSM 1400"
1010
#endif
1111

12-
#define THING_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
13-
1412
/* BOARD_ID is only required if you are using an ESP8266 */
1513
#define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
1614

@@ -19,7 +17,6 @@ void initProperties() {
1917
ArduinoCloud.setBoardId(BOARD_ID);
2018
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
2119
#endif
22-
ArduinoCloud.setThingId(THING_ID);
2320
}
2421

2522
#if defined(BOARD_HAS_WIFI)

examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h

-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#error "Arduino IoT Cloud currently only supports MKR1000, MKR WiFi 1010, MKR WAN 1300/1310, MKR NB 1500 and MKR GSM 1400"
1010
#endif
1111

12-
#define THING_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
1312
#define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
1413

1514
void onLedChange();
@@ -21,7 +20,6 @@ void initProperties() {
2120
ArduinoCloud.setBoardId(BOARD_ID);
2221
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
2322
#endif
24-
ArduinoCloud.setThingId(THING_ID);
2523
#if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB)
2624
ArduinoCloud.addProperty(led, Permission::Write).onUpdate(onLedChange);
2725
#elif defined(BOARD_HAS_LORA)

examples/ArduinoIoTCloud-Schedule/thingProperties.h

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#include <ArduinoIoTCloud.h>
22
#include <Arduino_ConnectionHandler.h>
33

4-
#define THING_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
54
#define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
65

76
void onSwitchButtonChange();
@@ -20,7 +19,6 @@ void initProperties() {
2019
ArduinoCloud.setBoardId(BOARD_ID);
2120
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
2221
#endif
23-
ArduinoCloud.setThingId(THING_ID);
2422
#if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB)
2523
ArduinoCloud.addProperty(switchButton, WRITE, ON_CHANGE);
2624
ArduinoCloud.addProperty(oneShot, READWRITE, ON_CHANGE);

examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h

-8
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
#error "Arduino IoT Cloud currently only supports MKR1000, MKR WiFi 1010, MKR WAN 1300/1310, MKR NB 1500 and MKR GSM 1400"
1414
#endif
1515

16-
/******************************************************************************
17-
DEFINES
18-
******************************************************************************/
19-
20-
#define THING_ID "ARDUINO_IOT_CLOUD_THING_ID"
21-
2216
/******************************************************************************
2317
GLOBAL CONSTANTS
2418
******************************************************************************/
@@ -78,7 +72,6 @@ void onStringPropertyChange();
7872
******************************************************************************/
7973
#if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined (BOARD_HAS_NB)
8074
void initProperties() {
81-
ArduinoCloud.setThingId(THING_ID);
8275

8376
ArduinoCloud.addProperty(bool_property_1, READWRITE, 1 * SECONDS);
8477
ArduinoCloud.addProperty(int_property_1, READ, 2 * MINUTES);
@@ -109,7 +102,6 @@ void initProperties() {
109102

110103
#elif defined(BOARD_HAS_LORA)
111104
void initProperties() {
112-
ArduinoCloud.setThingId(THING_ID);
113105

114106
ArduinoCloud.addProperty(bool_property_1, 1, READWRITE, 1 * SECONDS);
115107
ArduinoCloud.addProperty(int_property_1, 2, READ, 2 * MINUTES);

0 commit comments

Comments
 (0)