dominic/meshtastic-sdr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added raw mode so something else can handle data if neeeded

Browse Source
This commit is contained in:
Josh Conway 2024-09-12 01:15:24 +00:00
parent cd12ab44d7
commit 9b734ac653
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
python scripts/meshtastic_gnuradio_RX.py
View File

@ -48,6 +48,7 @@ parser.add_argument('-i', '--input', action='store', dest='input', help='SDR cap
parser.add_argument('-k', '--key', action='store',dest='key', help='AES key override in Base64') parser.add_argument('-k', '--key', action='store',dest='key', help='AES key override in Base64')
parser.add_argument('-n', '--net', action='store',dest='net', help='Network TCP in ip or DNS. ZeroMQ protocol.') parser.add_argument('-n', '--net', action='store',dest='net', help='Network TCP in ip or DNS. ZeroMQ protocol.')
parser.add_argument('-p', '--port', action='store',dest='port', help='Network port') parser.add_argument('-p', '--port', action='store',dest='port', help='Network port')
parser.add_argument('-r', '--raw', action='store_true',dest='raw', help='Deactivates all handling and passes Gnuradio data raw')
parser.add_argument('-d', '--debug', action='store_true',dest='debug', help='Print more debug messages') parser.add_argument('-d', '--debug', action='store_true',dest='debug', help='Print more debug messages')
args = parser.parse_args() args = parser.parse_args()
@ -265,18 +266,21 @@ def networkParse(ipAddr, port, aesKey):
while True: while True:
if socket.poll(10) != 0: if socket.poll(10) != 0:
msg = socket.recv() msg = socket.recv()
timeNow = datetime.now() if args.raw:
print("Datetime: " + timeNow.strftime("%Y-%m-%d %H:%M:%S")) print(msg)
extractedData = dataExtractor(msg.hex())
PacketID = extractedData['packetID'].hex()
if debug:
print("Packet: " + msg.hex())
decryptedData = dataDecryptor(extractedData, aesKey)
protobufMessage = decodeProtobuf(decryptedData, msb2lsb(extractedData['sender'].hex()), msb2lsb(extractedData['dest'].hex()) )
if (protobufMessage == "INVALID PROTOBUF: "):
print(decryptedData)
else: else:
print(protobufMessage + "\n") timeNow = datetime.now()
print("Datetime: " + timeNow.strftime("%Y-%m-%d %H:%M:%S"))
extractedData = dataExtractor(msg.hex())
PacketID = extractedData['packetID'].hex()
if debug:
print("Packet: " + msg.hex())
decryptedData = dataDecryptor(extractedData, aesKey)
protobufMessage = decodeProtobuf(decryptedData, msb2lsb(extractedData['sender'].hex()), msb2lsb(extractedData['dest'].hex()) )
if (protobufMessage == "INVALID PROTOBUF: "):
print(decryptedData)
else:
print(protobufMessage + "\n")
else: else:
time.sleep(0.1) # wait 100ms and try again time.sleep(0.1) # wait 100ms and try again