mirror/python
1
0
Fork 0
mirror of https://github.com/meshtastic/python.git synced 2026-02-25 11:10:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

test MeshInterface

Browse Source
This commit is contained in:
Mike Kinney
2021-12-06 21:01:21 -08:00
parent 34553d2a25
commit cc9b6cd7b1
3 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
meshtastic/node.py
View File

@@ -97,11 +97,11 @@ class Node:
def showChannels(self):
"""Show human readable description of our channels"""
print("Channels:")
for c in self.channels:
if c.role != channel_pb2.Channel.Role.DISABLED:
cStr = stripnl(MessageToJson(c.settings))
print(
f" {channel_pb2.Channel.Role.Name(c.role)} psk={pskToString(c.settings.psk)} {cStr}")
if self.channels:
for c in self.channels:
if c.role != channel_pb2.Channel.Role.DISABLED:
cStr = stripnl(MessageToJson(c.settings))
print(f" {channel_pb2.Channel.Role.Name(c.role)} psk={pskToString(c.settings.psk)} {cStr}")
publicURL = self.getURL(includeAll=False)
adminURL = self.getURL(includeAll=True)
print(f"\nPrimary channel URL: {publicURL}")
@@ -110,8 +110,10 @@ class Node:
def showInfo(self):
"""Show human readable description of our node"""
print(
f"Preferences: {stripnl(MessageToJson(self.radioConfig.preferences))}\n")
prefs = ""
if self.radioConfig and self.radioConfig.preferences:
prefs = stripnl(MessageToJson(self.radioConfig.preferences))
print(f"Preferences: {prefs}\n")
self.showChannels()
def requestConfig(self):
@@ -151,18 +153,23 @@ class Node:
def deleteChannel(self, channelIndex):
"""Delete the specifed channelIndex and shift other channels up"""
ch = self.channels[channelIndex]
print('ch:', ch, ' channelIndex:', channelIndex)
if ch.role != channel_pb2.Channel.Role.SECONDARY:
raise Exception("Only SECONDARY channels can be deleted")
# we are careful here because if we move the "admin" channel the channelIndex we need to use
# for sending admin channels will also change
adminIndex = self.iface.localNode._getAdminChannelIndex()
print('adminIndex:', adminIndex)
self.channels.pop(channelIndex)
print('channelIndex:', channelIndex)
self._fixupChannels() # expand back to 8 channels
index = channelIndex
print('max_channels:', self.iface.myInfo.max_channels)
while index < self.iface.myInfo.max_channels:
print('index:', index)
self.writeChannel(index, adminIndex=adminIndex)
index += 1
@@ -231,9 +238,10 @@ class Node:
"""
# Only keep the primary/secondary channels, assume primary is first
channelSet = apponly_pb2.ChannelSet()
for c in self.channels:
if c.role == channel_pb2.Channel.Role.PRIMARY or (includeAll and c.role == channel_pb2.Channel.Role.SECONDARY):
channelSet.settings.append(c.settings)
if self.channels:
for c in self.channels:
if c.role == channel_pb2.Channel.Role.PRIMARY or (includeAll and c.role == channel_pb2.Channel.Role.SECONDARY):
channelSet.settings.append(c.settings)
bytes = channelSet.SerializeToString()
s = base64.urlsafe_b64encode(bytes).decode('ascii')
return f"https://www.meshtastic.org/d/#{s}".replace("=", "")