Skip to content

Commit ef5657d

Browse files
aentingeraentinger
committed
Unifying brace style within all files
1 parent 9b53a41 commit ef5657d

6 files changed

+78
-47
lines changed

Diff for: ‎src/ArduinoIoTCloudLPWAN.cpp

+14-7
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,14 @@ ArduinoIoTCloudLPWAN::ArduinoIoTCloudLPWAN()
4747
* PUBLIC MEMBER FUNCTIONS
4848
******************************************************************************/
4949

50-
int ArduinoIoTCloudLPWAN::connect() {
50+
int ArduinoIoTCloudLPWAN::connect()
51+
{
5152
_connection->connect();
5253
return 1;
5354
}
5455

55-
bool ArduinoIoTCloudLPWAN::disconnect() {
56+
bool ArduinoIoTCloudLPWAN::disconnect()
57+
{
5658
_connection->disconnect();
5759
return true;
5860
}
@@ -62,14 +64,16 @@ int ArduinoIoTCloudLPWAN::connected()
6264
return (_connection->getStatus() == NetworkConnectionState::CONNECTED) ? 1 : 0;
6365
}
6466

65-
int ArduinoIoTCloudLPWAN::begin(ConnectionHandler& connection, bool retry) {
67+
int ArduinoIoTCloudLPWAN::begin(ConnectionHandler& connection, bool retry)
68+
{
6669
_connection = &connection;
6770
_retryEnable = retry;
6871
_thing.begin();
6972
return 1;
7073
}
7174

72-
void ArduinoIoTCloudLPWAN::update() {
75+
void ArduinoIoTCloudLPWAN::update()
76+
{
7377
// Check if a primitive property wrapper is locally changed
7478
_thing.updateTimestampOnLocallyChangedProperties();
7579

@@ -106,7 +110,8 @@ void ArduinoIoTCloudLPWAN::update() {
106110
execCloudEventCallback(ArduinoIoTCloudEvent::SYNC);
107111
}
108112

109-
void ArduinoIoTCloudLPWAN::printDebugInfo() {
113+
void ArduinoIoTCloudLPWAN::printDebugInfo()
114+
{
110115
Debug.print(DBG_INFO, "***** Arduino IoT Cloud LPWAN - configuration info *****");
111116
Debug.print(DBG_INFO, "Thing ID: %s", getThingId().c_str());
112117
}
@@ -115,15 +120,17 @@ void ArduinoIoTCloudLPWAN::printDebugInfo() {
115120
* PRIVATE MEMBER FUNCTIONS
116121
******************************************************************************/
117122

118-
void ArduinoIoTCloudLPWAN::sendPropertiesToCloud() {
123+
void ArduinoIoTCloudLPWAN::sendPropertiesToCloud()
124+
{
119125
uint8_t data[CBOR_LORA_MSG_MAX_SIZE];
120126
int const length = _thing.encode(data, sizeof(data), true);
121127
if (length > 0) {
122128
writeProperties(data, length);
123129
}
124130
}
125131

126-
int ArduinoIoTCloudLPWAN::writeProperties(const byte data[], int length) {
132+
int ArduinoIoTCloudLPWAN::writeProperties(const byte data[], int length)
133+
{
127134
int retcode = _connection->write(data, length);
128135
int i = 0;
129136
while (_retryEnable && retcode < 0 && i < _maxNumRetry) {

Diff for: ‎src/ArduinoIoTCloudLPWAN.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
* CLASS DECLARATION
2929
******************************************************************************/
3030

31-
class ArduinoIoTCloudLPWAN : public ArduinoIoTCloudClass {
31+
class ArduinoIoTCloudLPWAN : public ArduinoIoTCloudClass
32+
{
3233
public:
3334

3435
ArduinoIoTCloudLPWAN();

Diff for: ‎src/ArduinoIoTCloudTCP.cpp

+31-19
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ const static int CONNECT_FAILURE_SUBSCRIBE = -1;
5050
LOCAL MODULE FUNCTIONS
5151
******************************************************************************/
5252

53-
static unsigned long getTime() {
53+
static unsigned long getTime()
54+
{
5455
return time_service.getTime();
5556
}
5657

@@ -75,9 +76,12 @@ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP():
7576
_shadowTopicIn(""),
7677
_dataTopicOut(""),
7778
_dataTopicIn("")
78-
{}
79+
{
7980

80-
ArduinoIoTCloudTCP::~ArduinoIoTCloudTCP() {
81+
}
82+
83+
ArduinoIoTCloudTCP::~ArduinoIoTCloudTCP()
84+
{
8185
delete _mqttClient; _mqttClient = NULL;
8286
delete _sslClient; _sslClient = NULL;
8387
}
@@ -86,15 +90,17 @@ ArduinoIoTCloudTCP::~ArduinoIoTCloudTCP() {
8690
* PUBLIC MEMBER FUNCTIONS
8791
******************************************************************************/
8892

89-
int ArduinoIoTCloudTCP::begin(ConnectionHandler & connection, String brokerAddress, uint16_t brokerPort) {
93+
int ArduinoIoTCloudTCP::begin(ConnectionHandler & connection, String brokerAddress, uint16_t brokerPort)
94+
{
9095
_connection = &connection;
9196
_brokerAddress = brokerAddress;
9297
_brokerPort = brokerPort;
9398
time_service.begin(&connection);
9499
return begin(_brokerAddress, _brokerPort);
95100
}
96101

97-
int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort) {
102+
int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort)
103+
{
98104

99105
_brokerAddress = brokerAddress;
100106
_brokerPort = brokerPort;
@@ -135,8 +141,8 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort) {
135141
return 1;
136142
}
137143

138-
int ArduinoIoTCloudTCP::connect() {
139-
144+
int ArduinoIoTCloudTCP::connect()
145+
{
140146
if (!_mqttClient->connect(_brokerAddress.c_str(), _brokerPort)) {
141147
return CONNECT_FAILURE;
142148
}
@@ -158,13 +164,14 @@ int ArduinoIoTCloudTCP::connect() {
158164
}
159165

160166

161-
bool ArduinoIoTCloudTCP::disconnect() {
167+
bool ArduinoIoTCloudTCP::disconnect()
168+
{
162169
_mqttClient->stop();
163-
164170
return true;
165171
}
166172

167-
void ArduinoIoTCloudTCP::update() {
173+
void ArduinoIoTCloudTCP::update()
174+
{
168175
// Check if a primitive property wrapper is locally changed
169176
_thing.updateTimestampOnLocallyChangedProperties();
170177

@@ -199,36 +206,39 @@ void ArduinoIoTCloudTCP::update() {
199206
}
200207
}
201208

202-
void ArduinoIoTCloudTCP::printDebugInfo() {
209+
void ArduinoIoTCloudTCP::printDebugInfo()
210+
{
203211
Debug.print(DBG_INFO, "***** Arduino IoT Cloud - configuration info *****");
204212
Debug.print(DBG_INFO, "Device ID: %s", getDeviceId().c_str());
205213
Debug.print(DBG_INFO, "Thing ID: %s", getThingId().c_str());
206214
Debug.print(DBG_INFO, "MQTT Broker: %s:%d", _brokerAddress.c_str(), _brokerPort);
207215
}
208216

209-
int ArduinoIoTCloudTCP::reconnect() {
217+
int ArduinoIoTCloudTCP::reconnect()
218+
{
210219
if (_mqttClient->connected()) {
211220
_mqttClient->stop();
212221
}
213-
214-
// Connect to the broker
215222
return connect();
216223
}
217224

218225

219-
int ArduinoIoTCloudTCP::connected() {
226+
int ArduinoIoTCloudTCP::connected()
227+
{
220228
return _mqttClient->connected();
221229
}
222230

223231
/******************************************************************************
224232
* PRIVATE MEMBER FUNCTIONS
225233
******************************************************************************/
226234

227-
void ArduinoIoTCloudTCP::onMessage(int length) {
235+
void ArduinoIoTCloudTCP::onMessage(int length)
236+
{
228237
ArduinoCloud.handleMessage(length);
229238
}
230239

231-
void ArduinoIoTCloudTCP::handleMessage(int length) {
240+
void ArduinoIoTCloudTCP::handleMessage(int length)
241+
{
232242
String topic = _mqttClient->messageTopic();
233243

234244
byte bytes[length];
@@ -250,7 +260,8 @@ void ArduinoIoTCloudTCP::handleMessage(int length) {
250260
}
251261
}
252262

253-
void ArduinoIoTCloudTCP::sendPropertiesToCloud() {
263+
void ArduinoIoTCloudTCP::sendPropertiesToCloud()
264+
{
254265
uint8_t data[MQTT_TRANSMIT_BUFFER_SIZE];
255266
int const length = _thing.encode(data, sizeof(data));
256267
if (length > 0)
@@ -265,7 +276,8 @@ void ArduinoIoTCloudTCP::sendPropertiesToCloud() {
265276
}
266277
}
267278

268-
void ArduinoIoTCloudTCP::requestLastValue() {
279+
void ArduinoIoTCloudTCP::requestLastValue()
280+
{
269281
// Send the getLastValues CBOR message to the cloud
270282
// [{0: "r:m", 3: "getLastValues"}] = 81 A2 00 63 72 3A 6D 03 6D 67 65 74 4C 61 73 74 56 61 6C 75 65 73
271283
// Use http://cbor.me to easily generate CBOR encoding

Diff for: ‎src/ArduinoIoTCloudTCP.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ static uint16_t const DEFAULT_BROKER_PORT_USER_PASS_AUTH = 8884;
4646
* CLASS DECLARATION
4747
******************************************************************************/
4848

49-
class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass {
49+
class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
50+
{
5051
public:
5152

5253
ArduinoIoTCloudTCP();

Diff for: ‎src/CloudSerial.cpp

+27-18
Original file line numberDiff line numberDiff line change
@@ -29,46 +29,53 @@
2929
CTOR/DTOR
3030
******************************************************************************/
3131

32-
CloudSerialClass::CloudSerialClass() {
32+
CloudSerialClass::CloudSerialClass()
33+
{
34+
3335
}
3436

35-
CloudSerialClass::~CloudSerialClass() {
37+
CloudSerialClass::~CloudSerialClass()
38+
{
39+
3640
}
3741

3842
/******************************************************************************
3943
* PUBLIC MEMBER FUNCTIONS
4044
******************************************************************************/
4145

42-
void CloudSerialClass::begin(int /*baud*/) {
46+
void CloudSerialClass::begin(int /*baud*/)
47+
{
4348
_txBuffer.clear();
4449
_rxBuffer.clear();
4550
}
4651

47-
void CloudSerialClass::end() {
48-
}
52+
void CloudSerialClass::end()
53+
{
4954

50-
int CloudSerialClass::available() {
55+
}
5156

57+
int CloudSerialClass::available()
58+
{
5259
return _rxBuffer.available();
5360
}
5461

55-
int CloudSerialClass::availableForWrite() {
56-
62+
int CloudSerialClass::availableForWrite()
63+
{
5764
return _txBuffer.availableForStore();
5865
}
5966

60-
int CloudSerialClass::peek() {
61-
67+
int CloudSerialClass::peek()
68+
{
6269
return _rxBuffer.peek();
6370
}
6471

65-
int CloudSerialClass::read() {
66-
72+
int CloudSerialClass::read()
73+
{
6774
return _rxBuffer.read_char();
6875
}
6976

70-
void CloudSerialClass::flush() {
71-
77+
void CloudSerialClass::flush()
78+
{
7279
byte out[CLOUD_SERIAL_TX_BUFFER_SIZE];
7380
int length = 0;
7481

@@ -79,7 +86,8 @@ void CloudSerialClass::flush() {
7986
ArduinoCloud.write(ArduinoCloud._stdoutTopic, out, length);
8087
}
8188

82-
size_t CloudSerialClass::write(const uint8_t data) {
89+
size_t CloudSerialClass::write(const uint8_t data)
90+
{
8391
_txBuffer.store_char(data);
8492

8593
if (_txBuffer.isFull() || data == '\n') {
@@ -89,12 +97,13 @@ size_t CloudSerialClass::write(const uint8_t data) {
8997
return 1;
9098
}
9199

92-
CloudSerialClass::operator bool() {
93-
100+
CloudSerialClass::operator bool()
101+
{
94102
return ArduinoCloud.connected();
95103
}
96104

97-
void CloudSerialClass::appendStdin(const uint8_t *buffer, size_t size) {
105+
void CloudSerialClass::appendStdin(const uint8_t *buffer, size_t size)
106+
{
98107
while (!_rxBuffer.isFull() && size--) {
99108
_rxBuffer.store_char(*buffer++);
100109
}

Diff for: ‎src/CloudSerial.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@
4343
class ArduinoIoTCloudTCP;
4444

4545

46-
class CloudSerialClass : public Stream {
46+
class CloudSerialClass : public Stream
47+
{
4748
public:
4849
CloudSerialClass();
4950
~CloudSerialClass();

0 commit comments

Comments
 (0)