Skip to content

Commit c71fbda

Browse files
committed
Initialize loggingType. Improve paintLogging
1 parent 43a5665 commit c71fbda

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

Firmware/RTK_Everywhere/Display.ino

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1853,6 +1853,7 @@ void paintLogging(std::vector<iconPropertyBlinking> *iconList, bool pulse, bool
18531853
loggingIconDisplayed %= LOGGING_ICON_STATES; // Wrap
18541854

18551855
iconPropertyBlinking prop;
1856+
prop.icon.bitmap = nullptr;
18561857
prop.duty = 0b11111111;
18571858

18581859
if (((online.logging == true) && (logIncreasing || ntpLogIncreasing)) || (present.gnss_mosaicX5 && logIncreasing))
@@ -1861,6 +1862,10 @@ void paintLogging(std::vector<iconPropertyBlinking> *iconList, bool pulse, bool
18611862
{
18621863
prop.icon = LoggingNTPIconProperties.iconDisplay[loggingIconDisplayed][present.display_type];
18631864
}
1865+
else if (loggingType == LOGGING_STANDARD)
1866+
{
1867+
prop.icon = LoggingIconProperties.iconDisplay[loggingIconDisplayed][present.display_type];
1868+
}
18641869
else if (loggingType == LOGGING_PPP)
18651870
{
18661871
prop.icon = LoggingPPPIconProperties.iconDisplay[loggingIconDisplayed][present.display_type];
@@ -1869,18 +1874,15 @@ void paintLogging(std::vector<iconPropertyBlinking> *iconList, bool pulse, bool
18691874
{
18701875
prop.icon = LoggingCustomIconProperties.iconDisplay[loggingIconDisplayed][present.display_type];
18711876
}
1872-
else // if (loggingType == LOGGING_STANDARD)
1873-
{
1874-
prop.icon = LoggingIconProperties.iconDisplay[loggingIconDisplayed][present.display_type];
1875-
}
1876-
1877-
iconList->push_back(prop);
1877+
// Could be LOGGING_UNKNOWN
18781878
}
18791879
else if (pulse)
18801880
{
18811881
prop.icon = PulseIconProperties.iconDisplay[loggingIconDisplayed][present.display_type];
1882-
iconList->push_back(prop);
18831882
}
1883+
1884+
if (prop.icon.bitmap)
1885+
iconList->push_back(prop);
18841886
}
18851887

18861888
// Survey in is running. Show 3D Mean and elapsed time.

Firmware/RTK_Everywhere/RTK_Everywhere.ino

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ typedef enum LoggingType
280280
LOGGING_PPP,
281281
LOGGING_CUSTOM
282282
} LoggingType;
283-
LoggingType loggingType;
283+
LoggingType loggingType = LOGGING_UNKNOWN;
284284

285285
SdFile *managerTempFile = nullptr; // File used for uploading or downloading in the file manager section of AP config
286286
bool managerFileOpen = false;
@@ -936,7 +936,7 @@ volatile bool deadManWalking;
936936
\
937937
/* Turn on nearly all the debug prints */ \
938938
settings.debugCorrections = true; \
939-
settings.debugGnss = false; \
939+
settings.debugGnss = true; \
940940
settings.debugHttpClientData = true; \
941941
settings.debugHttpClientState = true; \
942942
settings.debugLora = true; \
@@ -981,7 +981,7 @@ volatile bool deadManWalking;
981981
\
982982
/* Turn on nearly all the debug prints */ \
983983
settings.debugCorrections = true; \
984-
settings.debugGnss = false; \
984+
settings.debugGnss = true; \
985985
settings.debugHttpClientData = false; \
986986
settings.debugHttpClientState = true; \
987987
settings.debugLora = false; \

0 commit comments

Comments
 (0)