Skip to content

Commit 63da200

Browse files
committed
Paint up/down load icons for all network interfaces
1 parent c0549b5 commit 63da200

File tree

1 file changed

+12
-27
lines changed

1 file changed

+12
-27
lines changed

Firmware/RTK_Everywhere/Display.ino

Lines changed: 12 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -823,38 +823,24 @@ void setRadioIcons(std::vector<iconPropertyBlinking> *iconList)
823823
usbSerialIncomingRtcm = false;
824824
}
825825

826+
bool networkOnline = false;
827+
828+
#ifdef COMPILE_ETHERNET
829+
if (networkIsInterfaceOnline(NETWORK_ETHERNET))
830+
networkOnline = true;
831+
#endif // COMPILE_ETHERNET
832+
826833
#ifdef COMPILE_WIFI
827834
if (networkIsInterfaceOnline(NETWORK_WIFI))
828-
{
829-
if (netIncomingRTCM == true) // Download : Columns 74 - 81
830-
{
831-
iconPropertyBlinking prop;
832-
prop.icon = DownloadArrow128x64;
833-
prop.duty = 0b11111111;
834-
iconList->push_back(prop);
835-
netIncomingRTCM = false;
836-
}
837-
if (mqttClientDataReceived == true) // Download : Columns 74 - 81
838-
{
839-
iconPropertyBlinking prop;
840-
prop.icon = DownloadArrow128x64;
841-
prop.duty = 0b11111111;
842-
iconList->push_back(prop);
843-
mqttClientDataReceived = false;
844-
}
845-
if (netOutgoingRTCM == true) // Upload : Columns 83 - 90
846-
{
847-
iconPropertyBlinking prop;
848-
prop.icon = UploadArrow128x64;
849-
prop.duty = 0b11111111;
850-
iconList->push_back(prop);
851-
netOutgoingRTCM = false;
852-
}
853-
}
835+
networkOnline = true;
854836
#endif // COMPILE_WIFI
855837

856838
#ifdef COMPILE_CELLULAR
857839
if (networkIsInterfaceOnline(NETWORK_CELLULAR))
840+
networkOnline = true;
841+
#endif // COMPILE_CELLULAR
842+
843+
if (networkOnline)
858844
{
859845
if (netIncomingRTCM == true) // Download : Columns 74 - 81
860846
{
@@ -881,7 +867,6 @@ void setRadioIcons(std::vector<iconPropertyBlinking> *iconList)
881867
netOutgoingRTCM = false;
882868
}
883869
}
884-
#endif // COMPILE_CELLULAR
885870

886871
switch (systemState) // Dynamic Model / Base : Columns 92 - 106
887872
{

0 commit comments

Comments
 (0)