Skip to content

Commit 73098ed

Browse files
authored
Merge pull request #653 from LeeLeahy2/wip-bugs
Network: Fix minor bugs
2 parents 779affd + 3cbef28 commit 73098ed

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

Firmware/RTK_Everywhere/Network.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,7 +1366,7 @@ bool networkIsHighestPriority(NetIndex_t index)
13661366
// Determine if the specified interface has higher priority
13671367
higherPriority = (priority == NETWORK_OFFLINE);
13681368
if (!higherPriority)
1369-
higherPriority = (priority > networkPriorityTable[index]);
1369+
higherPriority = (priority >= networkPriorityTable[index]);
13701370
return higherPriority;
13711371
}
13721372

@@ -1528,7 +1528,7 @@ void networkPrintStatus(uint8_t priority)
15281528
{
15291529
NetMask_t bitMask;
15301530
NETCONSUMER_MASK_t consumerMask;
1531-
NETCONSUMER_t consumers;
1531+
NETCONSUMER_MASK_t consumers;
15321532
bool highestPriority;
15331533
int index;
15341534
const char *name;

Firmware/RTK_Everywhere/menuMain.ino

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@ void terminalUpdate()
88
static bool passRtcmToGnss;
99
static uint32_t rtcmTimer;
1010

11-
// Determine which items are periodically displayed
12-
if ((millis() - lastPeriodicDisplay) >= settings.periodicDisplayInterval)
13-
{
14-
lastPeriodicDisplay = millis();
15-
periodicDisplay = settings.periodicDisplay;
16-
}
17-
1811
// Check for USB serial input
1912
if (systemAvailable())
2013
{

0 commit comments

Comments
 (0)