Skip to content

Commit 010a50a

Browse files
nseidlenseidle
committed
Whitespace format
1 parent ba62573 commit 010a50a

File tree

1 file changed

+46
-29
lines changed

1 file changed

+46
-29
lines changed

‎Firmware/RTK_Surveyor/menuPP.ino‎

Lines changed: 46 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,17 @@ void menuPointPerfectKeys()
130130

131131
if (settings.debugLBand == true)
132132
{
133-
systemPrintf(" settings.pointPerfectCurrentKeyStart: %lld - %s\r\n", settings.pointPerfectCurrentKeyStart, printDateFromUnixEpoch(settings.pointPerfectCurrentKeyStart / 1000));
134-
systemPrintf(" settings.pointPerfectCurrentKeyDuration: %lld - %s\r\n", settings.pointPerfectCurrentKeyDuration, printDaysFromDuration(settings.pointPerfectCurrentKeyDuration));
135-
systemPrintf(" settings.pointPerfectNextKeyStart: %lld - %s\r\n", settings.pointPerfectNextKeyStart, printDateFromUnixEpoch(settings.pointPerfectNextKeyStart / 1000));
136-
systemPrintf(" settings.pointPerfectNextKeyDuration: %lld - %s\r\n", settings.pointPerfectNextKeyDuration, printDaysFromDuration(settings.pointPerfectNextKeyDuration));
133+
systemPrintf(" settings.pointPerfectCurrentKeyStart: %lld - %s\r\n",
134+
settings.pointPerfectCurrentKeyStart,
135+
printDateFromUnixEpoch(settings.pointPerfectCurrentKeyStart / 1000));
136+
systemPrintf(" settings.pointPerfectCurrentKeyDuration: %lld - %s\r\n",
137+
settings.pointPerfectCurrentKeyDuration,
138+
printDaysFromDuration(settings.pointPerfectCurrentKeyDuration));
139+
systemPrintf(" settings.pointPerfectNextKeyStart: %lld - %s\r\n", settings.pointPerfectNextKeyStart,
140+
printDateFromUnixEpoch(settings.pointPerfectNextKeyStart / 1000));
141+
systemPrintf(" settings.pointPerfectNextKeyDuration: %lld - %s\r\n",
142+
settings.pointPerfectNextKeyDuration,
143+
printDaysFromDuration(settings.pointPerfectNextKeyDuration));
137144
}
138145
}
139146
else if (incoming == 4)
@@ -189,25 +196,25 @@ char *printDateFromGPSEpoch(long long gpsEpoch)
189196
// https://www.epochconverter.com/programming/c
190197
char *printDateFromUnixEpoch(long long unixEpoch)
191198
{
192-
char *buf = (char *)malloc(strlen("01/01/2023") + 1); //Make room for terminator
193-
time_t rawtime = unixEpoch;
199+
char *buf = (char *)malloc(strlen("01/01/2023") + 1); // Make room for terminator
200+
time_t rawtime = unixEpoch;
194201

195-
struct tm ts;
196-
ts = *localtime(&rawtime);
202+
struct tm ts;
203+
ts = *localtime(&rawtime);
197204

198-
// Format time, "dd/mm/yyyy"
199-
strftime(buf, strlen("01/01/2023") + 1, "%d/%m/%Y", &ts);
200-
return (buf);
205+
// Format time, "dd/mm/yyyy"
206+
strftime(buf, strlen("01/01/2023") + 1, "%d/%m/%Y", &ts);
207+
return (buf);
201208
}
202209

203210
// Given a duration in ms, print days
204211
char *printDaysFromDuration(long long duration)
205212
{
206-
float days = duration / (1000.0 * 60 * 60 * 24); //Convert ms to days
213+
float days = duration / (1000.0 * 60 * 60 * 24); // Convert ms to days
207214

208-
char *response = (char *)malloc(strlen("34.9") + 1); //Make room for terminator
209-
sprintf(response, "%0.2f", days);
210-
return (response);
215+
char *response = (char *)malloc(strlen("34.9") + 1); // Make room for terminator
216+
sprintf(response, "%0.2f", days);
217+
return (response);
211218
}
212219

213220
// Connect to 'home' WiFi and then ThingStream API. This will attach this unique device to the ThingStream network.
@@ -363,22 +370,31 @@ bool pointperfectProvisionDevice()
363370
strcpy(settings.pointPerfectBrokerHost, (const char *)((*jsonZtp)["brokerHost"]));
364371
strcpy(settings.pointPerfectLBandTopic, (const char *)((*jsonZtp)["subscriptions"][0]["path"]));
365372

366-
strcpy(settings.pointPerfectCurrentKey, (const char *)((*jsonZtp)["dynamickeys"]["current"]["value"]));
373+
strcpy(settings.pointPerfectCurrentKey,
374+
(const char *)((*jsonZtp)["dynamickeys"]["current"]["value"]));
367375
settings.pointPerfectCurrentKeyDuration = (*jsonZtp)["dynamickeys"]["current"]["duration"];
368376
settings.pointPerfectCurrentKeyStart = (*jsonZtp)["dynamickeys"]["current"]["start"];
369377

370378
strcpy(settings.pointPerfectNextKey, (const char *)((*jsonZtp)["dynamickeys"]["next"]["value"]));
371379
settings.pointPerfectNextKeyDuration = (*jsonZtp)["dynamickeys"]["next"]["duration"];
372380
settings.pointPerfectNextKeyStart = (*jsonZtp)["dynamickeys"]["next"]["start"];
373-
381+
374382
if (settings.debugLBand == true)
375383
{
376384
systemPrintf(" pointPerfectCurrentKey: %s\r\n", settings.pointPerfectCurrentKey);
377-
systemPrintf(" pointPerfectCurrentKeyStart: %lld - %s\r\n", settings.pointPerfectCurrentKeyStart, printDateFromUnixEpoch(settings.pointPerfectCurrentKeyStart / 1000)); //printDateFromUnixEpoch expects seconds
378-
systemPrintf(" pointPerfectCurrentKeyDuration: %lld - %s\r\n", settings.pointPerfectCurrentKeyDuration, printDaysFromDuration(settings.pointPerfectCurrentKeyDuration));
385+
systemPrintf(" pointPerfectCurrentKeyStart: %lld - %s\r\n",
386+
settings.pointPerfectCurrentKeyStart,
387+
printDateFromUnixEpoch(settings.pointPerfectCurrentKeyStart /
388+
1000)); // printDateFromUnixEpoch expects seconds
389+
systemPrintf(" pointPerfectCurrentKeyDuration: %lld - %s\r\n",
390+
settings.pointPerfectCurrentKeyDuration,
391+
printDaysFromDuration(settings.pointPerfectCurrentKeyDuration));
379392
systemPrintf(" pointPerfectNextKey: %s\r\n", settings.pointPerfectNextKey);
380-
systemPrintf(" pointPerfectNextKeyStart: %lld - %s\r\n", settings.pointPerfectNextKeyStart, printDateFromUnixEpoch(settings.pointPerfectNextKeyStart / 1000));
381-
systemPrintf(" pointPerfectNextKeyDuration: %lld - %s\r\n", settings.pointPerfectNextKeyDuration, printDaysFromDuration(settings.pointPerfectNextKeyDuration));
393+
systemPrintf(" pointPerfectNextKeyStart: %lld - %s\r\n", settings.pointPerfectNextKeyStart,
394+
printDateFromUnixEpoch(settings.pointPerfectNextKeyStart / 1000));
395+
systemPrintf(" pointPerfectNextKeyDuration: %lld - %s\r\n",
396+
settings.pointPerfectNextKeyDuration,
397+
printDaysFromDuration(settings.pointPerfectNextKeyDuration));
382398
}
383399
}
384400
}
@@ -494,10 +510,7 @@ bool checkPrivateKeyValidity(char *privateKey, int privateKeySize)
494510
mbedtls_pk_context pk;
495511
mbedtls_pk_init(&pk);
496512

497-
int result_code =
498-
mbedtls_pk_parse_key(&pk,
499-
(unsigned char *)privateKey, privateKeySize + 1,
500-
nullptr, 0);
513+
int result_code = mbedtls_pk_parse_key(&pk, (unsigned char *)privateKey, privateKeySize + 1, nullptr, 0);
501514
mbedtls_pk_free(&pk);
502515
if (result_code < 0)
503516
{
@@ -724,11 +737,15 @@ void mqttCallback(char *topic, byte *message, unsigned int length)
724737
{
725738
systemPrintln();
726739
systemPrintf(" pointPerfectCurrentKey: %s\r\n", settings.pointPerfectCurrentKey);
727-
systemPrintf(" pointPerfectCurrentKeyStart: %lld - %s\r\n", settings.pointPerfectCurrentKeyStart, printDateFromUnixEpoch(settings.pointPerfectCurrentKeyStart));
728-
systemPrintf(" pointPerfectCurrentKeyDuration: %lld - %s\r\n", settings.pointPerfectCurrentKeyDuration, printDaysFromDuration(settings.pointPerfectCurrentKeyDuration));
740+
systemPrintf(" pointPerfectCurrentKeyStart: %lld - %s\r\n", settings.pointPerfectCurrentKeyStart,
741+
printDateFromUnixEpoch(settings.pointPerfectCurrentKeyStart));
742+
systemPrintf(" pointPerfectCurrentKeyDuration: %lld - %s\r\n", settings.pointPerfectCurrentKeyDuration,
743+
printDaysFromDuration(settings.pointPerfectCurrentKeyDuration));
729744
systemPrintf(" pointPerfectNextKey: %s\r\n", settings.pointPerfectNextKey);
730-
systemPrintf(" pointPerfectNextKeyStart: %lld - %s\r\n", settings.pointPerfectNextKeyStart, printDateFromUnixEpoch(settings.pointPerfectNextKeyStart));
731-
systemPrintf(" pointPerfectNextKeyDuration: %lld - %s\r\n", settings.pointPerfectNextKeyDuration, printDaysFromDuration(settings.pointPerfectNextKeyDuration));
745+
systemPrintf(" pointPerfectNextKeyStart: %lld - %s\r\n", settings.pointPerfectNextKeyStart,
746+
printDateFromUnixEpoch(settings.pointPerfectNextKeyStart));
747+
systemPrintf(" pointPerfectNextKeyDuration: %lld - %s\r\n", settings.pointPerfectNextKeyDuration,
748+
printDaysFromDuration(settings.pointPerfectNextKeyDuration));
732749
}
733750
}
734751

0 commit comments

Comments
 (0)