Skip to content

Commit ed42b6a

Browse files
pennampennam
committed
examples: fix username/password secure element logic
1 parent 2c59002 commit ed42b6a

File tree

14 files changed

+43
-37
lines changed

14 files changed

+43
-37
lines changed

‎examples/ArduinoIoTCloud-Advanced/arduino_secrets.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#endif
1010

1111
/* ESP8266 ESP32 */
12-
#if defined(BOARD_HAS_SECRET_KEY)
12+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
1313
#define SECRET_DEVICE_KEY "my-device-password"
1414
#endif
1515

‎examples/ArduinoIoTCloud-Advanced/thingProperties.h

+6-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
77
#endif
88

9-
#if defined(BOARD_HAS_SECRET_KEY)
9+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
1010
#define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
1111
#endif
1212

@@ -22,14 +22,15 @@ CloudLocation location;
2222
CloudColor color;
2323

2424
void initProperties() {
25-
#if defined(BOARD_HAS_SECRET_KEY)
26-
ArduinoCloud.setBoardId(BOARD_ID);
27-
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
28-
#endif
2925
#if defined(HAS_TCP)
3026
ArduinoCloud.addProperty(switchButton, Permission::Write).onUpdate(onSwitchButtonChange);
3127
ArduinoCloud.addProperty(location, Permission::Read).publishOnChange(0.0f);
3228
ArduinoCloud.addProperty(color, Permission::ReadWrite).onUpdate(onColorChange);
29+
30+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
31+
ArduinoCloud.setBoardId(BOARD_ID);
32+
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
33+
#endif
3334
#elif defined(HAS_LORA)
3435
ArduinoCloud.addProperty(switchButton, 1, Permission::Write).onUpdate(onSwitchButtonChange);
3536
ArduinoCloud.addProperty(location, 2, Permission::Read).publishOnChange(0.0f);

‎examples/ArduinoIoTCloud-Basic/arduino_secrets.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
* https://github.com/arduino-libraries/ArduinoIoTCloud/#what
55
*/
66
#if defined(BOARD_HAS_WIFI)
7-
#define SECRET_WIFI_SSID "YOUR_WIFI_NETWORK_NAME"
8-
#define SECRET_WIFI_PASS "YOUR_WIFI_PASSWORD"
7+
#define SECRET_WIFI_SSID "-_-"
8+
#define SECRET_WIFI_PASS "smea86861518"
99
#endif
1010

1111
/* ESP8266 ESP32 */
12-
#if defined(BOARD_HAS_SECRET_KEY)
12+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
1313
#define SECRET_DEVICE_KEY "my-device-password"
1414
#endif
1515

‎examples/ArduinoIoTCloud-Basic/thingProperties.h

+6-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
77
#endif
88

9-
#if defined(BOARD_HAS_SECRET_KEY)
9+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
1010
#define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
1111
#endif
1212

@@ -21,14 +21,15 @@ int potentiometer;
2121
int seconds;
2222

2323
void initProperties() {
24-
#if defined(BOARD_HAS_SECRET_KEY)
25-
ArduinoCloud.setBoardId(BOARD_ID);
26-
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
27-
#endif
2824
#if defined(HAS_TCP)
2925
ArduinoCloud.addProperty(led, Permission::Write).onUpdate(onLedChange);
3026
ArduinoCloud.addProperty(potentiometer, Permission::Read).publishOnChange(10);
3127
ArduinoCloud.addProperty(seconds, Permission::Read).publishOnChange(1);
28+
29+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
30+
ArduinoCloud.setBoardId(BOARD_ID);
31+
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
32+
#endif
3233
#elif defined(HAS_LORA)
3334
ArduinoCloud.addProperty(led, 1, Permission::ReadWrite).onUpdate(onLedChange);
3435
ArduinoCloud.addProperty(potentiometer, 2, Permission::Read).publishOnChange(10);

‎examples/ArduinoIoTCloud-BlockForOTA/arduino_secrets.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#endif
1010

1111
/* ESP8266 ESP32 */
12-
#if defined(BOARD_HAS_SECRET_KEY)
12+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
1313
#define SECRET_DEVICE_KEY "my-device-password"
1414
#endif
1515

‎examples/ArduinoIoTCloud-BlockForOTA/thingProperties.h

+6-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
77
#endif
88

9-
#if defined(BOARD_HAS_SECRET_KEY)
9+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
1010
#define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
1111
#endif
1212

@@ -21,14 +21,15 @@ int potentiometer;
2121
int seconds;
2222

2323
void initProperties() {
24-
#if defined(BOARD_HAS_SECRET_KEY)
25-
ArduinoCloud.setBoardId(BOARD_ID);
26-
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
27-
#endif
2824
#if defined(HAS_TCP)
2925
ArduinoCloud.addProperty(led, Permission::Write).onUpdate(onLedChange);
3026
ArduinoCloud.addProperty(potentiometer, Permission::Read).publishOnChange(10);
3127
ArduinoCloud.addProperty(seconds, Permission::Read).publishOnChange(1);
28+
29+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
30+
ArduinoCloud.setBoardId(BOARD_ID);
31+
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
32+
#endif
3233
#elif defined(HAS_LORA)
3334
ArduinoCloud.addProperty(led, 1, Permission::ReadWrite).onUpdate(onLedChange);
3435
ArduinoCloud.addProperty(potentiometer, 2, Permission::Read).publishOnChange(10);

‎examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#endif
1010

1111
/* ESP8266 ESP32 */
12-
#if defined(BOARD_HAS_SECRET_KEY)
12+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
1313
#define SECRET_DEVICE_KEY "my-device-password"
1414
#endif
1515

‎examples/ArduinoIoTCloud-Callbacks/thingProperties.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
77
#endif
88

9-
#if defined(BOARD_HAS_SECRET_KEY)
9+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
1010
#define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
1111
#endif
1212

@@ -15,11 +15,12 @@
1515
#endif
1616

1717
void initProperties() {
18-
#if defined(BOARD_HAS_SECRET_KEY)
18+
#if defined(HAS_TCP)
19+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
1920
ArduinoCloud.setBoardId(BOARD_ID);
2021
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
2122
#endif
22-
#if defined(BOARD_HAS_LORA)
23+
#elif defined(HAS_LORA)
2324
ArduinoCloud.setThingId(THING_ID);
2425
#endif
2526
}

‎examples/ArduinoIoTCloud-DeferredOTA/arduino_secrets.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#endif
1010

1111
/* ESP8266 ESP32 */
12-
#if defined(BOARD_HAS_SECRET_KEY)
12+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
1313
#define SECRET_DEVICE_KEY "my-device-password"
1414
#endif
1515

‎examples/ArduinoIoTCloud-DeferredOTA/thingProperties.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
77
#endif
88

9-
#if defined(BOARD_HAS_SECRET_KEY)
9+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
1010
#define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
1111
#endif
1212

@@ -15,11 +15,12 @@ void onLedChange();
1515
bool led;
1616

1717
void initProperties() {
18-
#if defined(BOARD_HAS_SECRET_KEY)
18+
#if defined(HAS_TCP)
19+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
1920
ArduinoCloud.setBoardId(BOARD_ID);
2021
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
2122
#endif
22-
23+
#endif
2324
ArduinoCloud.addProperty(led, Permission::Write).onUpdate(onLedChange);
2425
}
2526

‎examples/ArduinoIoTCloud-Schedule/arduino_secrets.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#endif
1010

1111
/* ESP8266 ESP32 */
12-
#if defined(BOARD_HAS_SECRET_KEY)
12+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
1313
#define SECRET_DEVICE_KEY "my-device-password"
1414
#endif
1515

‎examples/ArduinoIoTCloud-Schedule/thingProperties.h

+6-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#error "Please check Arduino IoT Cloud supported boards list: https://github.com/arduino-libraries/ArduinoIoTCloud/#what"
77
#endif
88

9-
#if defined(BOARD_HAS_SECRET_KEY)
9+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
1010
#define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
1111
#endif
1212

@@ -26,10 +26,6 @@ CloudSchedule monthly;
2626
CloudSchedule yearly;
2727

2828
void initProperties() {
29-
#if defined(BOARD_HAS_SECRET_KEY)
30-
ArduinoCloud.setBoardId(BOARD_ID);
31-
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
32-
#endif
3329
#if defined(HAS_TCP)
3430
ArduinoCloud.addProperty(switchButton, Permission::Write);
3531
ArduinoCloud.addProperty(oneShot, Permission::ReadWrite);
@@ -39,6 +35,11 @@ void initProperties() {
3935
ArduinoCloud.addProperty(weekly, Permission::ReadWrite);
4036
ArduinoCloud.addProperty(monthly, Permission::ReadWrite);
4137
ArduinoCloud.addProperty(yearly, Permission::ReadWrite);
38+
39+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
40+
ArduinoCloud.setBoardId(BOARD_ID);
41+
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
42+
#endif
4243
#elif defined(HAS_LORA)
4344
ArduinoCloud.addProperty(switchButton, 1, Permission::Write);
4445

‎examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#endif
1010

1111
/* ESP8266 ESP32*/
12-
#if defined(BOARD_HAS_SECRET_KEY)
12+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
1313
#define SECRET_DEVICE_KEY "my-device-password"
1414
#endif
1515

‎examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
DEFINES
1111
******************************************************************************/
1212

13-
#if defined(BOARD_HAS_SECRET_KEY)
13+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
1414
#define BOARD_ID "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
1515
#endif
1616

@@ -86,7 +86,7 @@ void onStringPropertyChange();
8686
******************************************************************************/
8787
#if defined(HAS_TCP)
8888
void initProperties() {
89-
#if defined(BOARD_HAS_SECRET_KEY)
89+
#if !defined(BOARD_HAS_SECURE_ELEMENT)
9090
ArduinoCloud.setBoardId(BOARD_ID);
9191
ArduinoCloud.setSecretDeviceKey(SECRET_DEVICE_KEY);
9292
#endif

0 commit comments

Comments
 (0)