Skip to content

Commit d49b5d4

Browse files
committed
Renaming ArduinoCloudThing into CBORDecoder and turn it into a purely static class
1 parent c754099 commit d49b5d4

7 files changed

+154
-187
lines changed

src/ArduinoIoTCloud.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
#include "AIoTC_Const.h"
3131

32-
#include "cbor/ArduinoCloudThing.h"
32+
#include "cbor/CBORDecoder.h"
3333

3434
#include "property/Property.h"
3535
#include "property/PropertyContainer.h"
@@ -146,7 +146,6 @@ class ArduinoIoTCloudClass
146146
inline ArduinoIoTConnectionStatus getIoTStatus() { return _iot_status; }
147147

148148
ConnectionHandler * _connection = nullptr;
149-
ArduinoCloudThing _thing;
150149
PropertyContainer _property_container;
151150
ArduinoIoTConnectionStatus _iot_status = ArduinoIoTConnectionStatus::IDLE;
152151

src/ArduinoIoTCloudLPWAN.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ int ArduinoIoTCloudLPWAN::begin(ConnectionHandler& connection, bool retry)
5858
{
5959
_connection = &connection;
6060
_retryEnable = retry;
61-
_thing.begin(&_property_container);
6261
return 1;
6362
}
6463

@@ -93,7 +92,7 @@ void ArduinoIoTCloudLPWAN::update()
9392
msgBuf[i++] = _connection->read();
9493
}
9594

96-
_thing.decode(msgBuf, sizeof(msgBuf));
95+
CBORDecoder::decode(_property_container, msgBuf, sizeof(msgBuf));
9796
}
9897

9998
sendPropertiesToCloud();

src/ArduinoIoTCloudTCP.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort)
134134
_dataTopicIn = getTopic_datain();
135135
_ota_topic_in = getTopic_ota_in();
136136

137-
_thing.begin(&_property_container);
138-
139137
printConnectionStatus(_iot_status);
140138

141139
return 1;
@@ -269,10 +267,10 @@ void ArduinoIoTCloudTCP::handleMessage(int length)
269267
CloudSerial.appendStdin((uint8_t*)bytes, length);
270268
}
271269
if (_dataTopicIn == topic) {
272-
_thing.decode((uint8_t*)bytes, length);
270+
CBORDecoder::decode(_property_container, (uint8_t*)bytes, length);
273271
}
274272
if ((_shadowTopicIn == topic) && _syncStatus == ArduinoIoTSynchronizationStatus::SYNC_STATUS_WAIT_FOR_CLOUD_VALUES) {
275-
_thing.decode((uint8_t*)bytes, length, true);
273+
CBORDecoder::decode(_property_container, (uint8_t*)bytes, length, true);
276274
sendPropertiesToCloud();
277275
_syncStatus = ArduinoIoTSynchronizationStatus::SYNC_STATUS_VALUES_PROCESSED;
278276
}

src/cbor/ArduinoCloudThing.h

-111
This file was deleted.

0 commit comments

Comments
 (0)