mirror of
https://github.com/meshtastic/python.git
synced 2025-12-30 19:37:52 -05:00
reverted file belonging to another PR
This commit is contained in:
committed by
Thomas Göttgens
parent
edb537947a
commit
72510088c9
@@ -3,7 +3,6 @@
|
||||
import sys
|
||||
import random
|
||||
import time
|
||||
import json
|
||||
import logging
|
||||
import collections
|
||||
from typing import AnyStr
|
||||
@@ -83,8 +82,8 @@ class MeshInterface:
|
||||
myinfo = ''
|
||||
if self.myInfo:
|
||||
myinfo = f"\nMy info: {stripnl(MessageToJson(self.myInfo))}"
|
||||
mesh = "\n\nNodes in mesh: "
|
||||
nodes = {}
|
||||
mesh = "\nNodes in mesh:"
|
||||
nodes = ""
|
||||
if self.nodes:
|
||||
for n in self.nodes.values():
|
||||
# when the TBeam is first booted, it sometimes shows the raw data
|
||||
@@ -99,11 +98,8 @@ class MeshInterface:
|
||||
addr = convert_mac_addr(val)
|
||||
n2['user']['macaddr'] = addr
|
||||
|
||||
# use id as dictionary key for correct json format in list of nodes
|
||||
nodeid = n2['user']['id']
|
||||
n2['user'].pop('id')
|
||||
nodes[nodeid] = n2
|
||||
infos = owner + myinfo + mesh + json.dumps(nodes)
|
||||
nodes = nodes + f" {stripnl(n2)}"
|
||||
infos = owner + myinfo + mesh + nodes
|
||||
print(infos)
|
||||
return infos
|
||||
|
||||
|
||||
Reference in New Issue
Block a user