Skip to content

Commit 8ffff46

Browse files
committed
code finalized
1 parent a37f8cc commit 8ffff46

File tree

6 files changed

+4
-29
lines changed

6 files changed

+4
-29
lines changed

src/ArduinoIoTCloud.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,13 +249,11 @@ class ArduinoIoTCloudClass {
249249
};
250250

251251
#if defined(ARDUINO_SAMD_MKRGSM1400) || defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_SAMD_NANO_33_IOT)
252-
//#error HAS_TCP
253252
#include "ArduinoIoTCloudTCP.h"
254253
extern ArduinoIoTCloudTCP ArduinoCloud;
255254
#elif defined(ARDUINO_SAMD_MKRWAN1300) || defined(ARDUINO_SAMD_MKRWAN1310)
256-
//#error HAS_LORA
257255
#include "ArduinoIoTCloudLPWAN.h"
258-
//extern ArduinoIoTCloudLPWAN ArduinoCloud;
256+
extern ArduinoIoTCloudLPWAN ArduinoCloud;
259257
#endif
260258

261259
#endif

src/ArduinoIoTCloudLPWAN.cpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,7 @@
2020
#include<ArduinoIoTCloudLPWAN.h>
2121

2222
ArduinoIoTCloudLPWAN::ArduinoIoTCloudLPWAN() :
23-
_connection(NULL)
24-
{
25-
/*_thing_id = "";
26-
_lastSyncRequestTickTime = 0;
27-
_on_sync_event_callback(NULL);
28-
_on_connect_event_callback(NULL);
29-
_on_disconnect_event_callback(NULL);
30-
_device_id = "";*/
31-
}
23+
_connection(NULL){}
3224

3325
ArduinoIoTCloudLPWAN::~ArduinoIoTCloudLPWAN() {
3426
}
@@ -210,7 +202,7 @@ void ArduinoIoTCloudLPWAN::sendPropertiesToCloud() {
210202
writeProperties(data, length);
211203
}
212204
}
213-
//#error MULTIPLE_DEFINITION
205+
214206
ArduinoIoTCloudLPWAN ArduinoCloud;
215207

216208
#endif

src/ArduinoIoTCloudLPWAN.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
#ifndef ARDUINO_IOT_CLOUD_LPWAN_H
1919
#define ARDUINO_IOT_CLOUD_LPWAN_H
2020

21-
//#ifdef defined(ARDUINO_SAMD_MKRWAN1300) || defined(ARDUINO_SAMD_MKRWAN1310)
22-
2321
#include <ArduinoIoTCloud.h>
2422
#include <Arduino_ConnectionHandler.h>
2523

@@ -85,6 +83,5 @@ class ArduinoIoTCloudLPWAN : public ArduinoIoTCloudClass {
8583

8684
extern ArduinoIoTCloudLPWAN ArduinoCloud;
8785

88-
//#endif
8986

9087
#endif

src/ArduinoIoTCloudTCP.cpp

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,7 @@ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP():
7272
_dataTopicOut(""),
7373
_dataTopicIn(""),
7474
_otaTopic("")
75-
{
76-
/*_thing_id="";
77-
_lastSyncRequestTickTime=0;
78-
_on_sync_event_callback(NULL);
79-
_on_connect_event_callback(NULL);
80-
_on_disconnect_event_callback(NULL);
81-
_device_id="";*/
82-
}
75+
{}
8376

8477

8578
ArduinoIoTCloudTCP::~ArduinoIoTCloudTCP() {
@@ -446,7 +439,6 @@ void ArduinoIoTCloudTCP::printDebugInfo() {
446439
Debug.print(DBG_INFO, "MQTT Broker: %s:%d", _brokerAddress.c_str(), _brokerPort);
447440
}
448441

449-
//#error DEFINING_ARDUINOCLOUD2
450442
ArduinoIoTCloudTCP ArduinoCloud;
451443

452444
#endif

src/ArduinoIoTCloudTCP.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
#ifndef ARDUINO_IOT_CLOUD_TCP_H
1919
#define ARDUINO_IOT_CLOUD_TCP_H
2020

21-
//#ifdef defined(ARDUINO_SAMD_MKRGSM1400) || defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_SAMD_NANO_33_IOT)
22-
2321

2422
#include <ArduinoIoTCloud.h>
2523
#include <Arduino_ConnectionHandler.h>
@@ -143,6 +141,5 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
143141

144142
extern ArduinoIoTCloudTCP ArduinoCloud;
145143

146-
//#endif
147144

148145
#endif

src/ArduinoIoTCloud_Defines.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
defined(ARDUINO_SAMD_MKRNB1500)
2424
#define BOARD_HAS_ECCX08
2525
#define HAS_TCP
26-
//#error HAS_TCP_SET
2726
#endif
2827

2928
#if defined(ARDUINO_SAMD_MKRWAN1300) || defined(ARDUINO_SAMD_MKRWAN1310)

0 commit comments

Comments
 (0)