Skip to content

Commit 57750fa

Browse files
committed
No code changes - Apply VSC whitespace rules
1 parent 83a7eec commit 57750fa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1356
-1323
lines changed

Firmware/RTK_Everywhere/Begin.ino

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -199,11 +199,11 @@ void beginBoard()
199199
{
200200
// Specify the GNSS radio
201201
#ifdef COMPILE_UM980
202-
gnss = (GNSS *) new GNSS_UM980();
203-
#else // COMPILE_UM980
204-
gnss = (GNSS *) new GNSS_None();
202+
gnss = (GNSS *)new GNSS_UM980();
203+
#else // COMPILE_UM980
204+
gnss = (GNSS *)new GNSS_None();
205205
systemPrintln("<<<<<<<<<< !!!!!!!!!! UM980 NOT COMPILED !!!!!!!!!! >>>>>>>>>>");
206-
#endif // COMPILE_UM980
206+
#endif // COMPILE_UM980
207207

208208
present.brand = BRAND_SPARKFUN;
209209
present.psram_2mb = true;
@@ -215,8 +215,8 @@ void beginBoard()
215215
present.button_powerHigh = true; // Button is pressed when high
216216
present.beeper = true;
217217
present.gnss_to_uart = true;
218-
present.antennaPhaseCenter_mm = 115.7; //Default to Torch helical APC
219-
present.needsExternalPpl = true; // Uses the PointPerfect Library
218+
present.antennaPhaseCenter_mm = 115.7; // Default to Torch helical APC
219+
present.needsExternalPpl = true; // Uses the PointPerfect Library
220220
present.galileoHasCapable = true;
221221
present.multipathMitigation = true; // UM980 has MPM, other platforms do not
222222
present.minCno = true;
@@ -610,12 +610,12 @@ void beginBoard()
610610
// mosaic COM3 is available as a generic COM port. The firmware configures the baud. Nothing else.
611611

612612
// Specify the GNSS radio
613-
#ifdef COMPILE_MOSAICX5
614-
gnss = (GNSS *) new GNSS_MOSAIC();
615-
#else // COMPILE_MOSAICX5
616-
gnss = (GNSS *) new GNSS_None();
613+
#ifdef COMPILE_MOSAICX5
614+
gnss = (GNSS *)new GNSS_MOSAIC();
615+
#else // COMPILE_MOSAICX5
616+
gnss = (GNSS *)new GNSS_None();
617617
systemPrintln("<<<<<<<<<< !!!!!!!!!! MOSAICX5 NOT COMPILED !!!!!!!!!! >>>>>>>>>>");
618-
#endif // COMPILE_MOSAICX5
618+
#endif // COMPILE_MOSAICX5
619619

620620
present.brand = BRAND_SPARKPNT;
621621
present.psram_4mb = true;
@@ -690,8 +690,8 @@ void beginBoard()
690690
present.brand = BRAND_SPARKPNT;
691691
present.psram_2mb = true;
692692
present.gnss_lg290p = true;
693-
present.antennaPhaseCenter_mm = 42.0; //Default to SPK6618H APC
694-
present.needsExternalPpl = true; // Uses the PointPerfect Library
693+
present.antennaPhaseCenter_mm = 42.0; // Default to SPK6618H APC
694+
present.needsExternalPpl = true; // Uses the PointPerfect Library
695695
present.gnss_to_uart = true;
696696

697697
// The following are present on the optional shield. Devices will be marked offline if shield is not present.
@@ -718,7 +718,7 @@ void beginBoard()
718718
pin_PICO = 26;
719719
pin_microSD_CS = 27;
720720

721-
pin_gpioExpanderInterrupt = 14; //Pin 'AOI' on Portability Shield
721+
pin_gpioExpanderInterrupt = 14; // Pin 'AOI' on Portability Shield
722722

723723
pin_bluetoothStatusLED = 0; // Green status LED
724724
// pin_gnssStatusLED = 13;
@@ -1243,7 +1243,8 @@ void beginFuelGauge()
12431243
// Check to see if we are dangerously low
12441244
if (batteryLevelPercent < 5 && batteryChargingPercentPerHour < 0.5) // 5% and not charging
12451245
{
1246-
systemPrintf("Battery too low: %d%%. Charging rate: %0.1f%%/hr. Please charge. Shutting down...\r\n", batteryLevelPercent, batteryChargingPercentPerHour);
1246+
systemPrintf("Battery too low: %d%%. Charging rate: %0.1f%%/hr. Please charge. Shutting down...\r\n",
1247+
batteryLevelPercent, batteryChargingPercentPerHour);
12471248

12481249
if (online.display == true)
12491250
displayMessage("Charge Battery", 0);

Firmware/RTK_Everywhere/Bluetooth.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ void bluetoothUpdate()
8181
bool bluetoothIsConnected()
8282
{
8383
#ifdef COMPILE_BT
84-
if(bluetoothGetState() == BT_OFF)
85-
return(false);
84+
if (bluetoothGetState() == BT_OFF)
85+
return (false);
8686

8787
if (settings.bluetoothRadioType == BLUETOOTH_RADIO_SPP_AND_BLE)
8888
{

Firmware/RTK_Everywhere/Cellular.ino

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
//----------------------------------------
22

3-
#ifdef COMPILE_CELLULAR
3+
#ifdef COMPILE_CELLULAR
44

55
// The following define is used to avoid confusion between the cellular
66
// code and the GNSS code where PPP has a completely different meaning.
77
// The remaining references to PPP in this code are present due to values
88
// from the PPP (Point-to-Point Protocol) driver and ARDUINO_EVENT_PPP_*
99
// events.
10-
#define CELLULAR PPP
10+
#define CELLULAR PPP
1111

1212
//----------------------------------------
1313
// Cellular interface definitions
1414

15-
#define CELLULAR_MODEM_MODEL PPP_MODEM_GENERIC
15+
#define CELLULAR_MODEM_MODEL PPP_MODEM_GENERIC
1616

17-
#define CELLULAR_MODEM_APN "internet"
18-
#define CELLULAR_MODEM_PIN NULL // Personal Identification Number: String in double quotes
17+
#define CELLULAR_MODEM_APN "internet"
18+
#define CELLULAR_MODEM_PIN NULL // Personal Identification Number: String in double quotes
1919

20-
#define CELLULAR_BOOT_DELAY DELAY_SEC(15) // Delay after boot before starting cellular
20+
#define CELLULAR_BOOT_DELAY DELAY_SEC(15) // Delay after boot before starting cellular
2121

22-
#define CELLULAR_ATTACH_POLL_INTERVAL 100 // Milliseconds
22+
#define CELLULAR_ATTACH_POLL_INTERVAL 100 // Milliseconds
2323

2424
//----------------------------------------
2525

@@ -44,7 +44,7 @@ void cellularAttached(NetIndex_t index, uintptr_t parameter, bool debug)
4444
cellularIsAttached = CELLULAR.attached();
4545
if (cellularIsAttached)
4646
{
47-
// Attached to a mobile network, continue
47+
// Attached to a mobile network, continue
4848
// Display the network information
4949
systemPrintf("Cellular attached to %s\r\n", CELLULAR.operatorName().c_str());
5050

@@ -69,7 +69,7 @@ void cellularAttached(NetIndex_t index, uintptr_t parameter, bool debug)
6969
// Switch into a state where data may be sent and received
7070
if (debug)
7171
systemPrintln("Switching to data mode...");
72-
CELLULAR.mode(ESP_MODEM_MODE_CMUX); // Data and Command mixed mode
72+
CELLULAR.mode(ESP_MODEM_MODE_CMUX); // Data and Command mixed mode
7373

7474
// Get the next sequence entry
7575
networkSequenceNextEntry(index, debug);
@@ -86,10 +86,8 @@ void cellularEvent(arduino_event_id_t event)
8686
String module;
8787

8888
// Take the network offline if necessary
89-
if (networkIsInterfaceOnline(NETWORK_CELLULAR)
90-
&& (event != ARDUINO_EVENT_ETH_GOT_IP)
91-
&& (event != ARDUINO_EVENT_ETH_GOT_IP6)
92-
&& (event != ARDUINO_EVENT_PPP_CONNECTED))
89+
if (networkIsInterfaceOnline(NETWORK_CELLULAR) && (event != ARDUINO_EVENT_ETH_GOT_IP) &&
90+
(event != ARDUINO_EVENT_ETH_GOT_IP6) && (event != ARDUINO_EVENT_PPP_CONNECTED))
9391
{
9492
networkMarkOffline(NETWORK_CELLULAR);
9593
}
@@ -200,7 +198,8 @@ void cellularStart(NetIndex_t index, uintptr_t parameter, bool debug)
200198
// Configure the cellular modem
201199
CELLULAR.setApn(CELLULAR_MODEM_APN);
202200
CELLULAR.setPin(CELLULAR_MODEM_PIN);
203-
CELLULAR.setResetPin(pin_Cellular_Reset, cellularModemResetLow); // v3.0.2 allows you to set the reset delay, but we don't need it
201+
CELLULAR.setResetPin(pin_Cellular_Reset,
202+
cellularModemResetLow); // v3.0.2 allows you to set the reset delay, but we don't need it
204203
CELLULAR.setPins(pin_Cellular_TX, pin_Cellular_RX, pin_Cellular_RTS, pin_Cellular_CTS, CELLULAR_MODEM_FC);
205204

206205
// Now let the PPP turn the modem back on again if needed - with a 200ms reset
@@ -234,4 +233,4 @@ void cellularStop(NetIndex_t index, uintptr_t parameter, bool debug)
234233
networkSequenceNextEntry(index, debug);
235234
}
236235

237-
#endif // COMPILE_CELLULAR
236+
#endif // COMPILE_CELLULAR

0 commit comments

Comments
 (0)