Skip to content

Commit 1ad8158

Browse files
fabik111fabik111
committed
apply Astyle
1 parent 5599540 commit 1ad8158

File tree

5 files changed

+701
-710
lines changed

5 files changed

+701
-710
lines changed

‎src/ArduinoIoTCloud.h

Lines changed: 80 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <ArduinoCloudThing.h>
2626

2727
#include <Arduino_DebugUtils.h>
28-
#include "types/CloudWrapperBool.h"
28+
#include "types/CloudWrapperBool.h"
2929
#include "types/CloudWrapperFloat.h"
3030
#include "types/CloudWrapperInt.h"
3131
#include "types/CloudWrapperString.h"
@@ -69,8 +69,8 @@ typedef void (*OnCloudEventCallback)(void * /* arg */);
6969
class ArduinoIoTCloudClass {
7070

7171
public:
72-
static const int TIMEOUT_FOR_LASTVALUES_SYNC = 10000;
73-
/*Public Virtual Functions*/
72+
static const int TIMEOUT_FOR_LASTVALUES_SYNC = 10000;
73+
/*Public Virtual Functions*/
7474
virtual int connect() = 0;
7575
virtual bool disconnect() = 0;
7676

@@ -79,32 +79,32 @@ class ArduinoIoTCloudClass {
7979
virtual void update(CallbackFunc onSyncCompleteCallback) __attribute__((deprecated)) = 0; /* Attention: Function is deprecated - use 'addCallback(ArduinoIoTCloudConnectionEvent::SYNC, &onSync)' for adding a onSyncCallback instead */
8080

8181
virtual int connected() = 0;
82-
83-
virtual void connectionCheck() = 0;
8482

85-
virtual void printDebugInfo() = 0;
83+
virtual void connectionCheck() = 0;
84+
85+
virtual void printDebugInfo() = 0;
8686

8787
inline void setThingId(String const thing_id) {
8888
_thing_id = thing_id;
8989
};
90-
90+
9191
inline String getThingId() const {
9292
return _thing_id;
9393
};
9494

95-
inline String getDeviceId() const {
96-
return _device_id;
97-
};
95+
inline String getDeviceId() const {
96+
return _device_id;
97+
};
9898

99-
#define addProperty( v, ...) addPropertyReal(v, #v, __VA_ARGS__)
99+
#define addProperty( v, ...) addPropertyReal(v, #v, __VA_ARGS__)
100100

101101
static unsigned long const DEFAULT_MIN_TIME_BETWEEN_UPDATES_MILLIS = 500; /* Data rate throttled to 2 Hz */
102102

103-
void addPropertyReal(ArduinoCloudProperty & property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(ArduinoCloudProperty & property) = CLOUD_WINS) {
104-
addPropertyReal( property, name, -1, permission_type, seconds, fn, minDelta, synFn);
105-
}
103+
void addPropertyReal(ArduinoCloudProperty & property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(ArduinoCloudProperty & property) = CLOUD_WINS) {
104+
addPropertyReal(property, name, -1, permission_type, seconds, fn, minDelta, synFn);
105+
}
106106

107-
void addPropertyReal( ArduinoCloudProperty& property, String name, int tag, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(ArduinoCloudProperty& property) = CLOUD_WINS ) {
107+
void addPropertyReal(ArduinoCloudProperty& property, String name, int tag, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(ArduinoCloudProperty& property) = CLOUD_WINS) {
108108
Permission permission = Permission::ReadWrite;
109109
if (permission_type == READ) {
110110
permission = Permission::Read;
@@ -121,139 +121,139 @@ class ArduinoIoTCloudClass {
121121
}
122122
}
123123

124-
void addPropertyReal(bool& property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(ArduinoCloudProperty & property) = CLOUD_WINS) {
125-
addPropertyReal( property, name, -1, permission_type, seconds, fn, minDelta, synFn);
126-
}
124+
void addPropertyReal(bool& property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(ArduinoCloudProperty & property) = CLOUD_WINS) {
125+
addPropertyReal(property, name, -1, permission_type, seconds, fn, minDelta, synFn);
126+
}
127127

128-
void addPropertyReal( bool& property, String name, int tag, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(ArduinoCloudProperty & property) = CLOUD_WINS) {
128+
void addPropertyReal(bool& property, String name, int tag, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(ArduinoCloudProperty & property) = CLOUD_WINS) {
129129
ArduinoCloudProperty *p = new CloudWrapperBool(property);
130130
addPropertyReal(*p, name, tag, permission_type, seconds, fn, minDelta, synFn);
131131
}
132-
ArduinoCloudProperty& addPropertyReal(bool& property, String name, Permission const permission) {
133-
return addPropertyReal(property, name, -1, permission);
134-
}
132+
ArduinoCloudProperty& addPropertyReal(bool& property, String name, Permission const permission) {
133+
return addPropertyReal(property, name, -1, permission);
134+
}
135135
ArduinoCloudProperty& addPropertyReal(bool& property, String name, int tag, Permission const permission) {
136136
ArduinoCloudProperty *p = new CloudWrapperBool(property);
137137
return Thing.addPropertyReal(*p, name, permission, tag);
138138
}
139139

140-
void addPropertyReal(float& property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(ArduinoCloudProperty & property) = CLOUD_WINS) {
141-
addPropertyReal(property, name, -1, permission_type, seconds, fn, minDelta, synFn);
142-
}
140+
void addPropertyReal(float& property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(ArduinoCloudProperty & property) = CLOUD_WINS) {
141+
addPropertyReal(property, name, -1, permission_type, seconds, fn, minDelta, synFn);
142+
}
143143

144-
void addPropertyReal( float& property, String name, int tag, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(ArduinoCloudProperty & property) = CLOUD_WINS) {
144+
void addPropertyReal(float& property, String name, int tag, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(ArduinoCloudProperty & property) = CLOUD_WINS) {
145145
ArduinoCloudProperty *p = new CloudWrapperFloat(property);
146146
addPropertyReal(*p, name, tag, permission_type, seconds, fn, minDelta, synFn);
147147
}
148148

149-
ArduinoCloudProperty& addPropertyReal(float& property, String name, Permission const permission) {
150-
return addPropertyReal( property, name, -1, permission);
151-
}
149+
ArduinoCloudProperty& addPropertyReal(float& property, String name, Permission const permission) {
150+
return addPropertyReal(property, name, -1, permission);
151+
}
152152

153-
ArduinoCloudProperty& addPropertyReal( float& property, String name, int tag, Permission const permission ) {
153+
ArduinoCloudProperty& addPropertyReal(float& property, String name, int tag, Permission const permission) {
154154
ArduinoCloudProperty *p = new CloudWrapperFloat(property);
155155
return Thing.addPropertyReal(*p, name, permission, tag);
156156
}
157157

158-
void addPropertyReal(int& property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0, void(*synFn)(ArduinoCloudProperty & property) = CLOUD_WINS) {
159-
addPropertyReal(property, name, -1, permission_type, seconds,fn,minDelta,synFn);
160-
}
158+
void addPropertyReal(int& property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0, void(*synFn)(ArduinoCloudProperty & property) = CLOUD_WINS) {
159+
addPropertyReal(property, name, -1, permission_type, seconds, fn, minDelta, synFn);
160+
}
161161

162-
void addPropertyReal( int& property, String name, int tag, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0, void(*synFn)(ArduinoCloudProperty & property) = CLOUD_WINS) {
162+
void addPropertyReal(int& property, String name, int tag, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0, void(*synFn)(ArduinoCloudProperty & property) = CLOUD_WINS) {
163163
ArduinoCloudProperty *p = new CloudWrapperInt(property);
164164
addPropertyReal(*p, name, tag, permission_type, seconds, fn, minDelta, synFn);
165165
}
166166

167-
ArduinoCloudProperty& addPropertyReal(int& property, String name, Permission const permission) {
168-
return addPropertyReal(property, name, -1, permission);
169-
}
167+
ArduinoCloudProperty& addPropertyReal(int& property, String name, Permission const permission) {
168+
return addPropertyReal(property, name, -1, permission);
169+
}
170170

171-
ArduinoCloudProperty& addPropertyReal( int& property, String name, int tag, Permission const permission) {
171+
ArduinoCloudProperty& addPropertyReal(int& property, String name, int tag, Permission const permission) {
172172
ArduinoCloudProperty *p = new CloudWrapperInt(property);
173-
return Thing.addPropertyReal(*p, name, permission, tag);
173+
return Thing.addPropertyReal(*p, name, permission, tag);
174174
}
175175

176-
void addPropertyReal(String& property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(ArduinoCloudProperty & property) = CLOUD_WINS) {
177-
addPropertyReal( property, name, -1, permission_type, seconds, fn, minDelta, synFn);
178-
}
176+
void addPropertyReal(String& property, String name, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(ArduinoCloudProperty & property) = CLOUD_WINS) {
177+
addPropertyReal(property, name, -1, permission_type, seconds, fn, minDelta, synFn);
178+
}
179179

180-
void addPropertyReal( String& property, String name, int tag, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(ArduinoCloudProperty & property) = CLOUD_WINS) {
180+
void addPropertyReal(String& property, String name, int tag, permissionType permission_type = READWRITE, long seconds = ON_CHANGE, void(*fn)(void) = NULL, float minDelta = 0.0f, void(*synFn)(ArduinoCloudProperty & property) = CLOUD_WINS) {
181181
ArduinoCloudProperty *p = new CloudWrapperString(property);
182182
addPropertyReal(*p, name, tag, permission_type, seconds, fn, minDelta, synFn);
183183
}
184184

185-
ArduinoCloudProperty& addPropertyReal(String& property, String name, Permission const permission) {
186-
return addPropertyReal(property, name, -1, permission);
187-
}
185+
ArduinoCloudProperty& addPropertyReal(String& property, String name, Permission const permission) {
186+
return addPropertyReal(property, name, -1, permission);
187+
}
188188

189189
ArduinoCloudProperty& addPropertyReal(String& property, String name, int tag, Permission const permission) {
190190
ArduinoCloudProperty *p = new CloudWrapperString(property);
191191
return Thing.addPropertyReal(*p, name, permission, tag);
192192
}
193193

194194
void addCallback(ArduinoIoTCloudEvent const event, OnCloudEventCallback callback) {
195-
switch (event) {
196-
case ArduinoIoTCloudEvent::SYNC: _on_sync_event_callback = callback; break;
197-
case ArduinoIoTCloudEvent::CONNECT: _on_connect_event_callback = callback; break;
198-
case ArduinoIoTCloudEvent::DISCONNECT: _on_disconnect_event_callback = callback; break;
199-
}
200-
};
195+
switch (event) {
196+
case ArduinoIoTCloudEvent::SYNC: _on_sync_event_callback = callback; break;
197+
case ArduinoIoTCloudEvent::CONNECT: _on_connect_event_callback = callback; break;
198+
case ArduinoIoTCloudEvent::DISCONNECT: _on_disconnect_event_callback = callback; break;
199+
}
200+
};
201201

202202
protected:
203-
203+
204204
virtual int writeStdout(const byte data[], int length) = 0;
205205
virtual int writeProperties(const byte data[], int length) = 0;
206206
virtual int writeShadowOut(const byte data[], int length) = 0;
207207

208-
209-
208+
209+
210210

211211
ArduinoIoTConnectionStatus getIoTStatus() {
212212
return _iotStatus;
213213
}
214214

215215
ArduinoIoTConnectionStatus _iotStatus = ArduinoIoTConnectionStatus::IDLE;
216-
217216

218-
217+
218+
219219
ArduinoIoTSynchronizationStatus _syncStatus = ArduinoIoTSynchronizationStatus::SYNC_STATUS_SYNCHRONIZED;
220220

221-
222-
String _device_id = "";
223-
String _thing_id = "";
224-
221+
222+
String _device_id = "";
223+
String _thing_id = "";
224+
225225

226226
ArduinoCloudThing Thing;
227-
227+
228228
int _lastSyncRequestTickTime = 0;
229229

230-
OnCloudEventCallback _on_sync_event_callback = NULL;
231-
OnCloudEventCallback _on_connect_event_callback = NULL;
232-
OnCloudEventCallback _on_disconnect_event_callback = NULL;
230+
OnCloudEventCallback _on_sync_event_callback = NULL;
231+
OnCloudEventCallback _on_connect_event_callback = NULL;
232+
OnCloudEventCallback _on_disconnect_event_callback = NULL;
233233

234234
static void execCloudEventCallback(OnCloudEventCallback & callback, void * callback_arg) {
235-
if (callback) {
236-
(*callback)(callback_arg);
237-
}
238-
}
235+
if (callback) {
236+
(*callback)(callback_arg);
237+
}
238+
}
239239
static void printConnectionStatus(ArduinoIoTConnectionStatus status) {
240-
switch (status) {
241-
case ArduinoIoTConnectionStatus::IDLE: Debug.print(DBG_INFO, "Arduino IoT Cloud Connection status: IDLE"); break;
242-
case ArduinoIoTConnectionStatus::ERROR: Debug.print(DBG_ERROR, "Arduino IoT Cloud Connection status: ERROR"); break;
243-
case ArduinoIoTConnectionStatus::CONNECTING: Debug.print(DBG_INFO, "Arduino IoT Cloud Connection status: CONNECTING"); break;
244-
case ArduinoIoTConnectionStatus::RECONNECTING: Debug.print(DBG_INFO, "Arduino IoT Cloud Connection status: RECONNECTING"); break;
245-
case ArduinoIoTConnectionStatus::CONNECTED: Debug.print(DBG_INFO, "Arduino IoT Cloud Connection status: CONNECTED"); break;
246-
case ArduinoIoTConnectionStatus::DISCONNECTED: Debug.print(DBG_ERROR, "Arduino IoT Cloud Connection status: DISCONNECTED"); break;
247-
}
248-
}
240+
switch (status) {
241+
case ArduinoIoTConnectionStatus::IDLE: Debug.print(DBG_INFO, "Arduino IoT Cloud Connection status: IDLE"); break;
242+
case ArduinoIoTConnectionStatus::ERROR: Debug.print(DBG_ERROR, "Arduino IoT Cloud Connection status: ERROR"); break;
243+
case ArduinoIoTConnectionStatus::CONNECTING: Debug.print(DBG_INFO, "Arduino IoT Cloud Connection status: CONNECTING"); break;
244+
case ArduinoIoTConnectionStatus::RECONNECTING: Debug.print(DBG_INFO, "Arduino IoT Cloud Connection status: RECONNECTING"); break;
245+
case ArduinoIoTConnectionStatus::CONNECTED: Debug.print(DBG_INFO, "Arduino IoT Cloud Connection status: CONNECTED"); break;
246+
case ArduinoIoTConnectionStatus::DISCONNECTED: Debug.print(DBG_ERROR, "Arduino IoT Cloud Connection status: DISCONNECTED"); break;
247+
}
248+
}
249249
};
250250

251251
#if defined(ARDUINO_SAMD_MKRGSM1400) || defined(ARDUINO_SAMD_MKRWIFI1010) || defined(ARDUINO_SAMD_MKR1000) || defined(ARDUINO_SAMD_NANO_33_IOT)
252252
#include "ArduinoIoTCloudTCP.h"
253-
253+
254254
#elif defined(ARDUINO_SAMD_MKRWAN1300) || defined(ARDUINO_SAMD_MKRWAN1310)
255255
#include "ArduinoIoTCloudLPWAN.h"
256-
256+
257257
#endif
258258

259259
#endif

0 commit comments

Comments
 (0)