Skip to content

Commit a2988fb

Browse files
committed
Renaming member variable 'Thing' to '_thing' to be overall consitent with member variable naming
1 parent c3e047b commit a2988fb

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

src/ArduinoIoTCloud.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ void ArduinoIoTCloudClass::addPropertyReal(ArduinoCloudProperty& property, Strin
5252
}
5353

5454
if (seconds == ON_CHANGE) {
55-
Thing.addPropertyReal(property, name, permission, tag).publishOnChange(minDelta, DEFAULT_MIN_TIME_BETWEEN_UPDATES_MILLIS).onUpdate(fn).onSync(synFn);
55+
_thing.addPropertyReal(property, name, permission, tag).publishOnChange(minDelta, DEFAULT_MIN_TIME_BETWEEN_UPDATES_MILLIS).onUpdate(fn).onSync(synFn);
5656
} else {
57-
Thing.addPropertyReal(property, name, permission, tag).publishEvery(seconds).onUpdate(fn).onSync(synFn);
57+
_thing.addPropertyReal(property, name, permission, tag).publishEvery(seconds).onUpdate(fn).onSync(synFn);
5858
}
5959
}
6060

@@ -77,7 +77,7 @@ ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(bool& property, Stri
7777
ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(bool& property, String name, int tag, Permission const permission)
7878
{
7979
ArduinoCloudProperty* p = new CloudWrapperBool(property);
80-
return Thing.addPropertyReal(*p, name, permission, tag);
80+
return _thing.addPropertyReal(*p, name, permission, tag);
8181
}
8282

8383
void ArduinoIoTCloudClass::addPropertyReal(float& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
@@ -99,7 +99,7 @@ ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(float& property, Str
9999
ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(float& property, String name, int tag, Permission const permission)
100100
{
101101
ArduinoCloudProperty* p = new CloudWrapperFloat(property);
102-
return Thing.addPropertyReal(*p, name, permission, tag);
102+
return _thing.addPropertyReal(*p, name, permission, tag);
103103
}
104104

105105
void ArduinoIoTCloudClass::addPropertyReal(int& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
@@ -121,7 +121,7 @@ ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(int& property, Strin
121121
ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(int& property, String name, int tag, Permission const permission)
122122
{
123123
ArduinoCloudProperty* p = new CloudWrapperInt(property);
124-
return Thing.addPropertyReal(*p, name, permission, tag);
124+
return _thing.addPropertyReal(*p, name, permission, tag);
125125
}
126126

127127
void ArduinoIoTCloudClass::addPropertyReal(String& property, String name, permissionType permission_type, long seconds, void(*fn)(void), float minDelta, void(*synFn)(ArduinoCloudProperty & property))
@@ -143,7 +143,7 @@ ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(String& property, St
143143
ArduinoCloudProperty& ArduinoIoTCloudClass::addPropertyReal(String& property, String name, int tag, Permission const permission)
144144
{
145145
ArduinoCloudProperty* p = new CloudWrapperString(property);
146-
return Thing.addPropertyReal(*p, name, permission, tag);
146+
return _thing.addPropertyReal(*p, name, permission, tag);
147147
}
148148

149149
/******************************************************************************

src/ArduinoIoTCloud.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class ArduinoIoTCloudClass
132132

133133
ArduinoIoTConnectionStatus _iotStatus = ArduinoIoTConnectionStatus::IDLE;
134134

135-
ArduinoCloudThing Thing;
135+
ArduinoCloudThing _thing;
136136

137137
OnCloudEventCallback _on_sync_event_callback = NULL;
138138
OnCloudEventCallback _on_connect_event_callback = NULL;

src/ArduinoIoTCloudLPWAN.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ int ArduinoIoTCloudLPWAN::begin(ConnectionHandler& connection, bool retry) {
6565
_retryEnable = retry;
6666
_maxNumRetry = 5;
6767
_intervalRetry = 1000;
68-
Thing.begin();
68+
_thing.begin();
6969
return 1;
7070
}
7171

7272
void ArduinoIoTCloudLPWAN::update() {
7373
// Check if a primitive property wrapper is locally changed
74-
Thing.updateTimestampOnLocallyChangedProperties();
74+
_thing.updateTimestampOnLocallyChangedProperties();
7575

7676
if(connectionCheck() != ArduinoIoTConnectionStatus::CONNECTED) return;
7777

@@ -82,7 +82,7 @@ void ArduinoIoTCloudLPWAN::update() {
8282
msgBuf[i++] = _connection->read();
8383
}
8484

85-
Thing.decode(msgBuf, sizeof(msgBuf));
85+
_thing.decode(msgBuf, sizeof(msgBuf));
8686
}
8787

8888

@@ -186,7 +186,7 @@ int ArduinoIoTCloudLPWAN::writeProperties(const byte data[], int length) {
186186

187187
void ArduinoIoTCloudLPWAN::sendPropertiesToCloud() {
188188
uint8_t data[DEFAULT_CBOR_LORA_MSG_SIZE];
189-
int const length = Thing.encode(data, sizeof(data), true);
189+
int const length = _thing.encode(data, sizeof(data), true);
190190
if (length > 0) {
191191
writeProperties(data, length);
192192
}

src/ArduinoIoTCloudTCP.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort) {
125125
_dataTopicOut = getTopic_dataout();
126126
_dataTopicIn = getTopic_datain();
127127

128-
Thing.begin();
129-
Thing.registerGetTimeCallbackFunc(getTime);
128+
_thing.begin();
129+
_thing.registerGetTimeCallbackFunc(getTime);
130130
return 1;
131131
}
132132

@@ -161,7 +161,7 @@ bool ArduinoIoTCloudTCP::disconnect() {
161161

162162
void ArduinoIoTCloudTCP::update() {
163163
// Check if a primitive property wrapper is locally changed
164-
Thing.updateTimestampOnLocallyChangedProperties();
164+
_thing.updateTimestampOnLocallyChangedProperties();
165165

166166
if(checkPhyConnection() != NetworkConnectionState::CONNECTED) return;
167167
if(checkCloudConnection() != ArduinoIoTConnectionStatus::CONNECTED) return;
@@ -236,18 +236,18 @@ void ArduinoIoTCloudTCP::handleMessage(int length) {
236236
CloudSerial.appendStdin((uint8_t*)bytes, length);
237237
}
238238
if (_dataTopicIn == topic) {
239-
Thing.decode((uint8_t*)bytes, length);
239+
_thing.decode((uint8_t*)bytes, length);
240240
}
241241
if ((_shadowTopicIn == topic) && _syncStatus == ArduinoIoTSynchronizationStatus::SYNC_STATUS_WAIT_FOR_CLOUD_VALUES) {
242-
Thing.decode((uint8_t*)bytes, length, true);
242+
_thing.decode((uint8_t*)bytes, length, true);
243243
sendPropertiesToCloud();
244244
_syncStatus = ArduinoIoTSynchronizationStatus::SYNC_STATUS_VALUES_PROCESSED;
245245
}
246246
}
247247

248248
void ArduinoIoTCloudTCP::sendPropertiesToCloud() {
249249
uint8_t data[MQTT_TRANSMIT_BUFFER_SIZE];
250-
int const length = Thing.encode(data, sizeof(data));
250+
int const length = _thing.encode(data, sizeof(data));
251251
if (length > 0)
252252
{
253253
/* If properties have been encoded store them in the back-up buffer

0 commit comments

Comments
 (0)