Merge branch 'main' into ls-github

This commit is contained in:
DJ2LS 2023-10-25 13:21:45 +02:00 committed by GitHub
commit c98999190e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions

View file

@ -174,7 +174,7 @@ class MeshRouter():
except Exception as e: except Exception as e:
self.log.warning("[MESH] error adding data to routing table", e=e, router=new_router) self.log.warning("[MESH] error adding data to routing table", e=e, router=new_router)
def broadcast_routing_table(self, interval=10): def broadcast_routing_table(self, interval=600):
while True: while True:
# always enable receiving for datac4 if broadcasting # always enable receiving for datac4 if broadcasting

View file

@ -1407,8 +1407,12 @@ def send_modem_state():
} }
) )
#print(output) try:
return json.dumps(output) json_out = json.dumps(output)
except Exception as e:
log.warning("[SCK] error while json conversion for modem state", e=e)
return json_out
def command_response(command, status): def command_response(command, status):