Skip to content

Commit f1b7396

Browse files
committed
Revert all irrelevant formatting changes
1 parent cd0c056 commit f1b7396

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

src/displays.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,12 @@ class DisplayDevice {
6161
private:
6262
void handleHighlight();
6363
void displaySimple(uint16_t value);
64-
6564
U8G2* m_display = new U8G2_SSD1306_128X64_NONAME_F_HW_I2C(U8G2_R0, U8X8_PIN_NONE); // original OBSClassic display
66-
6765
String gridText[ 4 ][ 6 ];
6866
uint8_t mLastProgress = 255;
6967
uint8_t mCurrentLine = 0;
7068
bool mInverted = false;
71-
7269
bool mFlipped = true;
73-
7470
uint32_t mHighlightTill = 0;
7571
bool mHighlighted = false;
7672

src/gps.cpp

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@ void Gps::begin() {
8282
if (!is_neo6()) log_i("Coldstart because we found that newer neos profit from that.");
8383

8484
coldStartGps();
85-
}
85+
}
8686
pollStatistics();
8787
#endif
8888

8989
if (is_neo6()) {
9090
enableAlpIfDataIsAvailable();
9191
}
92-
92+
9393
if (mLastTimeTimeSet == 0) {
9494
#ifdef UBX_M10
9595
setMessageInterval(UBX_CFG_KEY_ID::CFG_MSGOUT_UBX_NAV_TIMEGPS_UART1, 1);
@@ -109,7 +109,6 @@ void Gps::begin() {
109109
//Serial.updateBaudRate(9600);
110110
//mSerial.begin(9600, SERIAL_8N1);
111111
// Debug - forward gps serial to normal serial
112-
113112
/*
114113
log_e("--------_STARTING LOOP");
115114
while(1)
@@ -120,8 +119,7 @@ void Gps::begin() {
120119
val = Serial.read();
121120
if(val >= 0)
122121
mSerial.write(val);
123-
}
124-
*/
122+
}*/
125123
}
126124

127125
void Gps::sendUbx(UBX_MSG ubxMsgId, const uint8_t payload[], uint16_t length) {
@@ -275,7 +273,7 @@ void Gps::configureGpsModule() {
275273
bool success = sendAndWaitForAck(UBX_MSG::CFG_GNSS, UBX_CFG_GNSS, sizeof(UBX_CFG_GNSS));
276274
if (success) {
277275
addStatisticsMessage("Successfully set GNSS");
278-
}
276+
}
279277
else {
280278
addStatisticsMessage("GNSS not configured, likely older GPS");
281279
}
@@ -359,7 +357,7 @@ void Gps::softResetGps() {
359357
void Gps::coldStartGps() {
360358
log_i("Cold-Start GPS!");
361359
handle();
362-
const uint8_t UBX_CFG_RST[] = {0xFF, 0xFF, 0x00, 0x00};
360+
const uint8_t UBX_CFG_RST[] = {0xFF, 0xFF, 0x00, 0x00};
363361
// we had the case where the reset took several seconds
364362
// see https://github.com/openbikesensor/OpenBikeSensorFirmware/issues/309
365363
// Newer firmware (like M10 and likely also M8) will not ack this
@@ -580,8 +578,7 @@ bool Gps::sendAndWaitForAck(UBX_MSG ubxMsgId, const uint8_t *buffer, size_t size
580578
log_w("Retry to send 0x%04x after %dms.", ubxMsgId, millis() - loopStart);
581579
}
582580
if (result) {
583-
//log_d("Success in sending. 0x%04x took %dms", ubxMsgId, millis() - start);
584-
log_e("Success in sending. 0x%04x took %dms", ubxMsgId, millis() - start);
581+
log_d("Success in sending. 0x%04x took %dms", ubxMsgId, millis() - start);
585582
} else {
586583
log_e("Failed to send. 0x%04x NAK: %d after %dms", ubxMsgId, mNakReceived, millis() - start);
587584
}

0 commit comments

Comments
 (0)