Skip to content

Commit 778461e

Browse files
TMRh20TMRh20
committed
Clang format per @2bndy5 #39 
1 parent a1c353a commit 778461e

8 files changed

+228
-237
lines changed

‎Dns.cpp

+90-95
Large diffs are not rendered by default.

‎Dns.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
class DNSClient
1313
{
1414
public:
15-
1615
void begin(const IPAddress& aDNSServer);
1716

1817
/**
@@ -22,7 +21,7 @@ class DNSClient
2221
* @result 1 if aIPAddrString was successfully converted to an IP address,
2322
* else error code
2423
*/
25-
int inet_aton(const char *aIPAddrString, IPAddress& aResult);
24+
int inet_aton(const char* aIPAddrString, IPAddress& aResult);
2625

2726
/**
2827
* Resolve the given hostname to an IP address.

‎RF24Client.cpp

+37-37
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ int RF24Client::connect(IPAddress ip, uint16_t port)
4141
{
4242
#if UIP_ACTIVE_OPEN > 0
4343

44-
//do{
44+
// do{
4545

4646
stop();
4747
uip_ipaddr_t ipaddr;
@@ -75,10 +75,10 @@ int RF24Client::connect(IPAddress ip, uint16_t port)
7575
#endif
7676
}
7777
}
78-
//delay(25);
79-
//}while(millis()-timer < 175);
78+
// delay(25);
79+
// }while(millis()-timer < 175);
8080

81-
#endif //Active open enabled
81+
#endif // Active open enabled
8282

8383
return 0;
8484
}
@@ -105,7 +105,7 @@ int RF24Client::connect(const char* host, uint16_t port)
105105
return connect(remote_addr, port);
106106
}
107107
#else // ! UIP_UDP
108-
//Do something with the input parameters to prevent compile time warnings
108+
// Do something with the input parameters to prevent compile time warnings
109109
if (host) {
110110
};
111111
if (port) {
@@ -214,7 +214,7 @@ size_t RF24Client::_write(uip_userdata_t* u, const uint8_t* buf, size_t size)
214214
size_t remain = size - total_written;
215215
payloadSize = rf24_min(remain, UIP_TCP_MSS);
216216

217-
//RF24EthernetClass::tick();
217+
// RF24EthernetClass::tick();
218218
goto test2;
219219
}
220220
return u->out_pos;
@@ -227,9 +227,9 @@ size_t RF24Client::_write(uip_userdata_t* u, const uint8_t* buf, size_t size)
227227

228228
void uip_log(char* msg)
229229
{
230-
//Serial.println();
231-
//Serial.println("** UIP LOG **");
232-
//Serial.println(msg);
230+
// Serial.println();
231+
// Serial.println("** UIP LOG **");
232+
// Serial.println(msg);
233233
if (msg)
234234
{
235235
};
@@ -243,11 +243,11 @@ void serialip_appcall(void)
243243

244244
#if UIP_CONNECTION_TIMEOUT > 0
245245
if (u && u->connectTimeout > 0) {
246-
if(!u->initialData){
246+
if (!u->initialData) {
247247
u->connectTimer = millis();
248248
u->initialData = true;
249-
}else
250-
if (millis() - u->connectTimer > u->connectTimeout){
249+
}
250+
else if (millis() - u->connectTimer > u->connectTimeout) {
251251
u->state |= UIP_CLIENT_CLOSE;
252252
u->connectTimer = millis();
253253
IF_RF24ETHERNET_DEBUG_CLIENT(Serial.println(); Serial.print(millis()); Serial.println("UIP Client close(timeout)"););
@@ -264,9 +264,9 @@ void serialip_appcall(void)
264264

265265
if (u)
266266
{
267-
#if UIP_CONNECTION_TIMEOUT > 0
268-
u->connectTimer = millis();
269-
#endif
267+
#if UIP_CONNECTION_TIMEOUT > 0
268+
u->connectTimer = millis();
269+
#endif
270270
uip_conn->appstate = u;
271271
IF_RF24ETHERNET_DEBUG_CLIENT(Serial.print(F("UIPClient allocated state: ")); Serial.println(u->state, BIN););
272272
}
@@ -282,9 +282,9 @@ void serialip_appcall(void)
282282
if (uip_newdata())
283283
{
284284
IF_RF24ETHERNET_DEBUG_CLIENT(Serial.println(); Serial.print(millis()); Serial.print(F(" UIPClient uip_newdata, uip_len:")); Serial.println(uip_len););
285-
#if UIP_CONNECTION_TIMEOUT > 0
286-
u->connectTimer = millis();
287-
#endif
285+
#if UIP_CONNECTION_TIMEOUT > 0
286+
u->connectTimer = millis();
287+
#endif
288288

289289
if (u->sent)
290290
{
@@ -336,15 +336,15 @@ void serialip_appcall(void)
336336
u->state &= ~UIP_CLIENT_RESTART;
337337
u->hold = (u->out_pos = (u->windowOpened = (u->packets_out = false)));
338338
u->restartTime = millis();
339-
#if UIP_CONNECTION_TIMEOUT > 0
339+
#if UIP_CONNECTION_TIMEOUT > 0
340340
u->connectTimer = millis();
341-
#endif
341+
#endif
342342
}
343343

344344
/*******Polling**********/
345345
if (uip_poll() || uip_rexmit())
346346
{
347-
//IF_RF24ETHERNET_DEBUG_CLIENT( Serial.println(); Serial.println(F("UIPClient uip_poll")); );
347+
// IF_RF24ETHERNET_DEBUG_CLIENT( Serial.println(); Serial.println(F("UIPClient uip_poll")); );
348348

349349
if (u->packets_out != 0)
350350
{
@@ -359,24 +359,24 @@ void serialip_appcall(void)
359359
// Only call this if the TCP window has already been re-opened, the connection is being polled, but no data
360360
// has been acked
361361
if (!(u->state & (UIP_CLIENT_CLOSE | UIP_CLIENT_REMOTECLOSED)))
362-
{
363-
364-
if (u->windowOpened == true && u->state & UIP_CLIENT_RESTART && millis() - u->restartTime > u->restartInterval)
365362
{
366-
u->restartTime = millis();
363+
364+
if (u->windowOpened == true && u->state & UIP_CLIENT_RESTART && millis() - u->restartTime > u->restartInterval)
365+
{
366+
u->restartTime = millis();
367367
#if defined RF24ETHERNET_DEBUG_CLIENT || defined ETH_DEBUG_L1
368368
Serial.println();
369369
Serial.print(millis());
370-
#if UIP_CONNECTION_TIMEOUT > 0
371-
Serial.print(F(" UIPClient Re-Open TCP Window, time remaining before abort: "));
372-
Serial.println( UIP_CONNECTION_TIMEOUT - (millis() - u->connectTimer));
373-
#endif
370+
#if UIP_CONNECTION_TIMEOUT > 0
371+
Serial.print(F(" UIPClient Re-Open TCP Window, time remaining before abort: "));
372+
Serial.println(UIP_CONNECTION_TIMEOUT - (millis() - u->connectTimer));
373+
#endif
374374
#endif
375-
u->restartInterval += 500;
376-
u->restartInterval = rf24_min(u->restartInterval, 7000);
377-
uip_restart();
375+
u->restartInterval += 500;
376+
u->restartInterval = rf24_min(u->restartInterval, 7000);
377+
uip_restart();
378+
}
378379
}
379-
}
380380
}
381381

382382
/*******Close**********/
@@ -434,10 +434,10 @@ uip_userdata_t* RF24Client::_allocateData()
434434
data->out_pos = 0;
435435
data->hold = 0;
436436
data->initialData = false;
437-
#if (UIP_CONNECTION_TIMEOUT > 0)
438-
data->connectTimer = millis();
439-
data->connectTimeout = UIP_CONNECTION_TIMEOUT;
440-
#endif
437+
#if (UIP_CONNECTION_TIMEOUT > 0)
438+
data->connectTimer = millis();
439+
data->connectTimeout = UIP_CONNECTION_TIMEOUT;
440+
#endif
441441
return data;
442442
}
443443
}

‎RF24Ethernet.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ void RF24EthernetClass::tick()
220220
yield();
221221
#endif
222222
#if defined(ARDUINO_ARCH_ESP32)
223-
const TickType_t xDelay = 1 / portTICK_PERIOD_MS;
224-
vTaskDelay( xDelay );
223+
const TickType_t xDelay = 1 / portTICK_PERIOD_MS;
224+
vTaskDelay(xDelay);
225225
#endif
226226

227227
if (RF24Ethernet.network.update() == EXTERNAL_DATA_TYPE) {

0 commit comments

Comments
 (0)