Skip to content

Commit a4b00a8

Browse files
pennampennam
authored
Merge pull request #502 from pennam/cell-fix-examples
Add CellularConnectionHandler to library examples
2 parents 9166399 + bd8de84 commit a4b00a8

File tree

10 files changed

+44
-29
lines changed

10 files changed

+44
-29
lines changed

Diff for: ‎examples/ArduinoIoTCloud-Advanced/arduino_secrets.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
#endif
1515

1616
/* MKR GSM 1400 */ /* MKR NB 1500 */ /* Portenta CAT.M1/NB IoT GNSS Shield */
17-
#if defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB) || defined(BOARD_HAS_CATM1_NBIOT)
17+
/* Portenta H7 and C33 + Portenta Mid Carrier + 4G Module */
18+
#if defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB) || \
19+
defined(BOARD_HAS_CATM1_NBIOT) || defined(BOARD_HAS_CELLULAR)
1820
#define SECRET_PIN ""
1921
#define SECRET_APN ""
2022
#define SECRET_LOGIN ""

Diff for: ‎examples/ArduinoIoTCloud-Advanced/thingProperties.h

+6-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);
@@ -49,4 +48,6 @@ void initProperties() {
4948
//EthernetConnectionHandler ArduinoIoTPreferredConnection;
5049
/* Manual mode. It will fallback in DHCP mode if SECRET_OPTIONAL_IP is invalid or equal to "0.0.0.0" */
5150
EthernetConnectionHandler ArduinoIoTPreferredConnection(SECRET_OPTIONAL_IP, SECRET_OPTIONAL_DNS, SECRET_OPTIONAL_GATEWAY, SECRET_OPTIONAL_NETMASK);
51+
#elif defined(BOARD_HAS_CELLULAR)
52+
CellularConnectionHandler ArduinoIoTPreferredConnection(SECRET_PIN, SECRET_APN, SECRET_LOGIN, SECRET_PASS);
5253
#endif

Diff for: ‎examples/ArduinoIoTCloud-Basic/arduino_secrets.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
#endif
1515

1616
/* MKR GSM 1400 */ /* MKR NB 1500 */ /* Portenta CAT.M1/NB IoT GNSS Shield */
17-
#if defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB) || defined(BOARD_HAS_CATM1_NBIOT)
17+
/* Portenta H7 and C33 + Portenta Mid Carrier + 4G Module */
18+
#if defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB) || \
19+
defined(BOARD_HAS_CATM1_NBIOT) || defined(BOARD_HAS_CELLULAR)
1820
#define SECRET_PIN ""
1921
#define SECRET_APN ""
2022
#define SECRET_LOGIN ""

Diff for: ‎examples/ArduinoIoTCloud-Basic/thingProperties.h

+6-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);
@@ -48,4 +47,6 @@ void initProperties() {
4847
NBConnectionHandler ArduinoIoTPreferredConnection(SECRET_PIN, SECRET_APN, SECRET_LOGIN, SECRET_PASS);
4948
#elif defined(BOARD_HAS_CATM1_NBIOT)
5049
CatM1ConnectionHandler ArduinoIoTPreferredConnection(SECRET_PIN, SECRET_APN, SECRET_LOGIN, SECRET_PASS);
50+
#elif defined(BOARD_HAS_CELLULAR)
51+
CellularConnectionHandler ArduinoIoTPreferredConnection(SECRET_PIN, SECRET_APN, SECRET_LOGIN, SECRET_PASS);
5152
#endif

Diff for: ‎examples/ArduinoIoTCloud-Callbacks/arduino_secrets.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
#endif
1515

1616
/* MKR GSM 1400 */ /* MKR NB 1500 */ /* Portenta CAT.M1/NB IoT GNSS Shield */
17-
#if defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB) || defined(BOARD_HAS_CATM1_NBIOT)
17+
/* Portenta H7 and C33 + Portenta Mid Carrier + 4G Module */
18+
#if defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB) || \
19+
defined(BOARD_HAS_CATM1_NBIOT) || defined(BOARD_HAS_CELLULAR)
1820
#define SECRET_PIN ""
1921
#define SECRET_APN ""
2022
#define SECRET_LOGIN ""

Diff for: ‎examples/ArduinoIoTCloud-Callbacks/thingProperties.h

+4-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)
@@ -33,4 +32,6 @@ void initProperties() {
3332
//EthernetConnectionHandler ArduinoIoTPreferredConnection;
3433
/* Manual mode. It will fallback in DHCP mode if SECRET_OPTIONAL_IP is invalid or equal to "0.0.0.0" */
3534
EthernetConnectionHandler ArduinoIoTPreferredConnection(SECRET_OPTIONAL_IP, SECRET_OPTIONAL_DNS, SECRET_OPTIONAL_GATEWAY, SECRET_OPTIONAL_NETMASK);
35+
#elif defined(BOARD_HAS_CELLULAR)
36+
CellularConnectionHandler ArduinoIoTPreferredConnection(SECRET_PIN, SECRET_APN, SECRET_LOGIN, SECRET_PASS);
3637
#endif

Diff for: ‎examples/ArduinoIoTCloud-Schedule/arduino_secrets.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
#endif
1515

1616
/* MKR GSM 1400 */ /* MKR NB 1500 */ /* Portenta CAT.M1/NB IoT GNSS Shield */
17-
#if defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB) || defined(BOARD_HAS_CATM1_NBIOT)
17+
/* Portenta H7 and C33 + Portenta Mid Carrier + 4G Module */
18+
#if defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB) || \
19+
defined(BOARD_HAS_CATM1_NBIOT) || defined(BOARD_HAS_CELLULAR)
1820
#define SECRET_PIN ""
1921
#define SECRET_APN ""
2022
#define SECRET_LOGIN ""

Diff for: ‎examples/ArduinoIoTCloud-Schedule/thingProperties.h

+6-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
}
@@ -56,4 +55,6 @@ void initProperties() {
5655
//EthernetConnectionHandler ArduinoIoTPreferredConnection;
5756
/* Manual mode. It will fallback in DHCP mode if SECRET_OPTIONAL_IP is invalid or equal to "0.0.0.0" */
5857
EthernetConnectionHandler ArduinoIoTPreferredConnection(SECRET_OPTIONAL_IP, SECRET_OPTIONAL_DNS, SECRET_OPTIONAL_GATEWAY, SECRET_OPTIONAL_NETMASK);
58+
#elif defined(BOARD_HAS_CELLULAR)
59+
CellularConnectionHandler ArduinoIoTPreferredConnection(SECRET_PIN, SECRET_APN, SECRET_LOGIN, SECRET_PASS);
5960
#endif

Diff for: ‎examples/utility/ArduinoIoTCloud_Travis_CI/arduino_secrets.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
#endif
1515

1616
/* MKR GSM 1400 */ /* MKR NB 1500 */ /* Portenta CAT.M1/NB IoT GNSS Shield */
17-
#if defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB) || defined(BOARD_HAS_CATM1_NBIOT)
17+
/* Portenta H7 and C33 + Portenta Mid Carrier + 4G Module */
18+
#if defined(BOARD_HAS_GSM) || defined(BOARD_HAS_NB) || \
19+
defined(BOARD_HAS_CATM1_NBIOT) || defined(BOARD_HAS_CELLULAR)
1820
#define SECRET_PIN ""
1921
#define SECRET_APN ""
2022
#define SECRET_LOGIN ""

Diff for: ‎examples/utility/ArduinoIoTCloud_Travis_CI/thingProperties.h

+7-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

@@ -69,6 +68,8 @@ String str_property_8;
6968
//EthernetConnectionHandler ArduinoIoTPreferredConnection;
7069
/* Manual mode. It will fallback in DHCP mode if SECRET_OPTIONAL_IP is invalid or equal to "0.0.0.0" */
7170
EthernetConnectionHandler ArduinoIoTPreferredConnection(SECRET_OPTIONAL_IP, SECRET_OPTIONAL_DNS, SECRET_OPTIONAL_GATEWAY, SECRET_OPTIONAL_NETMASK);
71+
#elif defined(BOARD_HAS_CELLULAR)
72+
CellularConnectionHandler ArduinoIoTPreferredConnection(SECRET_PIN, SECRET_APN, SECRET_LOGIN, SECRET_PASS);
7273
#endif
7374

7475
/******************************************************************************
@@ -83,7 +84,7 @@ void onStringPropertyChange();
8384
/******************************************************************************
8485
FUNCTIONS
8586
******************************************************************************/
86-
#if defined(BOARD_HAS_WIFI) || defined(BOARD_HAS_GSM) || defined (BOARD_HAS_NB) || defined (BOARD_HAS_CATM1_NBIOT)
87+
#if defined(HAS_TCP)
8788
void initProperties() {
8889
#if defined(BOARD_HAS_SECRET_KEY)
8990
ArduinoCloud.setBoardId(BOARD_ID);
@@ -116,7 +117,7 @@ void initProperties() {
116117
ArduinoCloud.addProperty(str_property_8, Permission::ReadWrite).publishEvery(1 * SECONDS).onSync(DEVICE_WINS);
117118
}
118119

119-
#elif defined(BOARD_HAS_LORA)
120+
#elif defined(HAS_LORA)
120121
void initProperties() {
121122
ArduinoCloud.setThingId(THING_ID);
122123

0 commit comments

Comments
 (0)