Merge pull request #489 from meshtastic/precision-try-2

Fixup handling for radio configs with disabled channel
This commit is contained in:
Ben Meadors
2024-02-22 07:14:41 -06:00
committed by GitHub

View File

@@ -52,7 +52,7 @@ class Node:
# don't show disabled channels
if channel_pb2.Channel.Role.Name(c.role) != "DISABLED":
print(
f" {channel_pb2.Channel.Role.Name(c.role)} psk={pskToString(c.settings.psk)} {cStr}"
f" Index {c.index}: {channel_pb2.Channel.Role.Name(c.role)} psk={pskToString(c.settings.psk)} {cStr}"
)
publicURL = self.getURL(includeAll=False)
adminURL = self.getURL(includeAll=True)
@@ -691,13 +691,7 @@ class Node:
# for stress testing, we can always download all channels
fastChannelDownload = True
# Once we see a response that has NO settings, assume
# we are at the end of channels and stop fetching
quitEarly = (
c.role == channel_pb2.Channel.Role.DISABLED
) and fastChannelDownload
if quitEarly or index >= 8 - 1:
if index >= 8 - 1:
logging.debug("Finished downloading channels")
self.channels = self.partialChannels