joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

send decodes to map

Browse Source
This commit is contained in:
Jakob Ketterl 2019-08-11 17:39:41 +02:00
parent cbb65e8d79
commit 55c8ce7cf0
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
owrx/kiss.py
View File

@ -1,5 +1,6 @@
import socket import socket
import time import time
from owrx.map import Map, LatLngLocation
import logging import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -78,6 +79,7 @@ class KissClient(object):
yield l[i:i + n] yield l[i:i + n]
information = ax25frame[control_pid+2:] information = ax25frame[control_pid+2:]
# TODO how can we tell if this is an APRS frame at all?
aprsData = self.parseAprsData(information) aprsData = self.parseAprsData(information)
data = { data = {
@ -86,12 +88,19 @@ class KissClient(object):
"path": [self.extractCallsign(c) for c in chunks(ax25frame[14:control_pid], 7)] "path": [self.extractCallsign(c) for c in chunks(ax25frame[14:control_pid], 7)]
} }
data.update(aprsData) data.update(aprsData)
logger.debug(data) logger.debug(data)
if "lat" in data and "lon" in data:
Map.getSharedInstance().updateLocation(data["source"], LatLngLocation(data["lat"], data["lon"]), "APRS")
return data return data
def parseAprsData(self, data): def parseAprsData(self, data):
hexdump(data) #hexdump(data)
# TODO detect MIC-E frame and decode accordingly
data = data.decode() data = data.decode()
logger.debug(data)
def parseCoordinates(raw): def parseCoordinates(raw):
return { return {