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

convert speed to metric

Browse Source
This commit is contained in:
Jakob Ketterl 2019-08-15 22:10:58 +02:00
parent cc6561bdda
commit 46ac0ecc77
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
owrx/aprs.py
View File

@ -10,6 +10,9 @@ def decodeBase91(input):
base = decodeBase91(input[:-1]) * 91 if len(input) > 1 else 0 base = decodeBase91(input[:-1]) * 91 if len(input) > 1 else 0
return base + (ord(input[-1]) - 33) return base + (ord(input[-1]) - 33)
# speed is in knots... convert to metric (km/h)
speedConversionFactor = 1.852
class Ax25Parser(object): class Ax25Parser(object):
def parse(self, ax25frame): def parse(self, ax25frame):
@ -122,7 +125,8 @@ class AprsParser(object):
aprsData["range"] = 2 * 1.08 ** (information[11] - 33) aprsData["range"] = 2 * 1.08 ** (information[11] - 33)
else: else:
aprsData["course"] = (information[10] - 33) * 4 aprsData["course"] = (information[10] - 33) * 4
aprsData["speed"] = 1.08 ** (information[11] - 33) - 1 # speed is in knots... convert to metric (km/h)
aprsData["speed"] = (1.08 ** (information[11] - 33) - 1) * speedConversionFactor
# compression type # compression type
t = information[12] t = information[12]
aprsData["fix"] = (t & 0b00100000) > 0 aprsData["fix"] = (t & 0b00100000) > 0
@ -252,6 +256,8 @@ class MicEParser(object):
speed -= 800 speed -= 800
if course >= 400: if course >= 400:
course -= 400 course -= 400
# speed is in knots... convert to metric (km/h)
speed *= speedConversionFactor
comment = information[9:].decode("us-ascii").strip() comment = information[9:].decode("us-ascii").strip()
(comment, altitude) = self.extractAltitude(comment) (comment, altitude) = self.extractAltitude(comment)