Skip to content

Commit cd98ce2

Browse files
committed
Revert "Use Cloud types to handle hidden properties"
This reverts commit 26cc0dd.
1 parent e34a56a commit cd98ce2

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

src/ArduinoIoTCloud.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class ArduinoIoTCloudClass
9292
bool setTimestamp(String const & prop_name, unsigned long const timestamp);
9393

9494
inline void setThingId (String const thing_id) { _thing_id = thing_id; };
95-
inline String & getThingId () { return _thing_id.getValue(); };
95+
inline String & getThingId () { return _thing_id; };
9696
inline void setDeviceId(String const device_id) { _device_id = device_id; };
9797
inline String & getDeviceId() { return _device_id; };
9898

@@ -157,10 +157,10 @@ class ArduinoIoTCloudClass
157157
PropertyContainer _thing_property_container;
158158
unsigned int _last_checked_property_index;
159159
TimeService & _time_service;
160-
CloudInt _tz_offset;
161-
CloudUnsignedInt _tz_dst_until;
162-
CloudString _thing_id;
163-
CloudString _lib_version;
160+
int _tz_offset;
161+
unsigned int _tz_dst_until;
162+
String _thing_id;
163+
String _lib_version;
164164

165165
void execCloudEventCallback(ArduinoIoTCloudEvent const event);
166166

src/ArduinoIoTCloudTCP.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -250,18 +250,18 @@ int ArduinoIoTCloudTCP::begin(bool const enable_watchdog, String brokerAddress,
250250
_deviceTopicOut = getTopic_deviceout();
251251
_deviceTopicIn = getTopic_devicein();
252252

253-
addPropertyToContainer(_device_property_container, _lib_version, "LIB_VERSION", Permission::Read, -1);
253+
addPropertyReal(_lib_version, _device_property_container, "LIB_VERSION", Permission::Read);
254254
#if OTA_ENABLED
255-
addPropertyToContainer(_device_property_container, _ota_cap, "OTA_CAP", Permission::Read, -1);
256-
addPropertyToContainer(_device_property_container, _ota_error, "OTA_ERROR", Permission::Read, -1);
257-
addPropertyToContainer(_device_property_container, _ota_img_sha256, "OTA_SHA256", Permission::Read, -1);
258-
addPropertyToContainer(_device_property_container, _ota_url, "OTA_URL", Permission::ReadWrite, -1);
259-
addPropertyToContainer(_device_property_container, _ota_req, "OTA_REQ", Permission::ReadWrite, -1);
255+
addPropertyReal(_ota_cap, _device_property_container, "OTA_CAP", Permission::Read);
256+
addPropertyReal(_ota_error, _device_property_container, "OTA_ERROR", Permission::Read);
257+
addPropertyReal(_ota_img_sha256, _device_property_container, "OTA_SHA256", Permission::Read);
258+
addPropertyReal(_ota_url, _device_property_container, "OTA_URL", Permission::ReadWrite);
259+
addPropertyReal(_ota_req, _device_property_container, "OTA_REQ", Permission::ReadWrite);
260260
#endif /* OTA_ENABLED */
261-
addPropertyToContainer(_device_property_container, _thing_id, "thing_id", Permission::ReadWrite, -1).onUpdate(setThingIdOutdated);
262261

263-
addPropertyToContainer(_thing_property_container, _tz_offset, "tz_offset", Permission::ReadWrite, -1).onSync(CLOUD_WINS).onUpdate(updateTimezoneInfo);
264-
addPropertyToContainer(_thing_property_container, _tz_dst_until, "tz_dst_until", Permission::ReadWrite, -1).onSync(CLOUD_WINS).onUpdate(updateTimezoneInfo);
262+
addPropertyReal(_tz_offset, _thing_property_container, "tz_offset", Permission::ReadWrite).onSync(CLOUD_WINS).onUpdate(updateTimezoneInfo);
263+
addPropertyReal(_tz_dst_until, _thing_property_container, "tz_dst_until", Permission::ReadWrite).onSync(CLOUD_WINS).onUpdate(updateTimezoneInfo);
264+
addPropertyReal(_thing_id, _device_property_container, "thing_id", Permission::ReadWrite).onUpdate(setThingIdOutdated);
265265

266266
#if OTA_STORAGE_PORTENTA_QSPI
267267
#define BOOTLOADER_ADDR (0x8000000)

src/ArduinoIoTCloudTCP.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,11 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
164164
bool _deviceSubscribedToThing;
165165

166166
#if OTA_ENABLED
167-
CloudBool _ota_cap;
168-
CloudInt _ota_error;
169-
CloudString _ota_img_sha256;
170-
CloudString _ota_url;
171-
CloudBool _ota_req;
167+
bool _ota_cap;
168+
int _ota_error;
169+
String _ota_img_sha256;
170+
String _ota_url;
171+
bool _ota_req;
172172
bool _ask_user_before_executing_ota;
173173
onOTARequestCallbackFunc _get_ota_confirmation;
174174
#endif /* OTA_ENABLED */

0 commit comments

Comments
 (0)