Fixed telnet parser (see #18)

CHANGELOG.md

@@ -1,4 +1,7 @@
 # CHANGELOG
+## unreleased
+- parser: fixed telnet parser
+
 ## 0.9.4: - 2019-06-10
 - parser: Added support for OGINREACH (Garmin inReach) beacons
 - parser: Added support for OGFLYM (Flymaster) beacons

ogn/parser/telnet_parser.py

@@ -23,11 +23,18 @@ def parse(telnet_data):
                 'turn_rate': float(telnet_data[101:107]),
                 'magic_number': int(telnet_data[114:116]),
                 'gps_status': telnet_data[117:122],
-                'frequency_offset': float(telnet_data[123:129]),
-                'signal_quality': float(telnet_data[132:137]),
-                'error_count': float(telnet_data[139:142]),
-                'distance': float(telnet_data[143:150]),
-                'bearing': float(telnet_data[152:158]),
-                'phi': float(telnet_data[161:167])}
+                'channel': int(telnet_data[124:126]),
+                'flarm_timeslot': telnet_data[126] == 'f',
+                'ogn_timeslot': telnet_data[127] == 'o',
+                'frequency_offset': float(telnet_data[128:134]),
+                'decode_quality': float(telnet_data[137:142]),
+                'signal_quality': float(telnet_data[143:147]),
+                'demodulator_type': int(telnet_data[150:151]),
+                'error_count': float(telnet_data[151:154]),
+                'distance': float(telnet_data[155:162]),
+                'bearing': float(telnet_data[164:170]),
+                'phi': float(telnet_data[173:179]),
+                'multichannel': telnet_data[183] == '+'}
+
     except Exception:
         raise ParseError

tests/parser/test_parse_telnet.py

@@ -18,29 +18,35 @@ class TestStringMethods(unittest.TestCase):
         # set the utcnow-mock near to the time in the test string
         datetime_mock.utcnow.return_value = datetime(2015, 1, 1, 10, 0, 55)
 
-        message = parse('0.867sec:868.398MHz:   1:2:DD9AB2 100050: [ +47.44356, +11.77856]deg 2749m  +3.2m/s  34.5m/s 082.7deg  -0.7deg/sec 5 03x03m  -1.6kHz  8.5dB  1e   50.6km 151.4deg  +1.9deg')
+        message = parse('0.181sec:868.394MHz:   1:2:DDA411 103010: [ +50.86800, +12.15279]deg  988m  +0.1m/s  25.7m/s 085.4deg  -3.5deg/sec 5 03x04m 01f_-12.61kHz  5.8/15.5dB/2 10e   30.9km 099.5deg  +1.1deg + ?')
 
-        self.assertEqual(message['pps_offset'], 0.867)
-        self.assertEqual(message['frequency'], 868.398)
+        self.assertEqual(message['pps_offset'], 0.181)
+        self.assertEqual(message['frequency'], 868.394)
         self.assertEqual(message['aircraft_type'], 1)
         self.assertEqual(message['address_type'], 2)
-        self.assertEqual(message['address'], 'DD9AB2')
-        self.assertEqual(message['timestamp'], datetime(2015, 1, 1, 10, 0, 50))
-        self.assertEqual(message['latitude'], 47.44356)
-        self.assertEqual(message['longitude'], 11.77856)
-        self.assertEqual(message['altitude'], 2749)
-        self.assertEqual(message['climb_rate'], 3.2)
-        self.assertEqual(message['ground_speed'], 34.5)
-        self.assertEqual(message['track'], 82.7)
-        self.assertEqual(message['turn_rate'], -0.7)
+        self.assertEqual(message['address'], 'DDA411')
+        self.assertEqual(message['timestamp'], datetime(2015, 1, 1, 10, 30, 10))
+        self.assertEqual(message['latitude'], 50.868)
+        self.assertEqual(message['longitude'], 12.15279)
+        self.assertEqual(message['altitude'], 988)
+        self.assertEqual(message['climb_rate'], 0.1)
+        self.assertEqual(message['ground_speed'], 25.7)
+        self.assertEqual(message['track'], 85.4)
+        self.assertEqual(message['turn_rate'], -3.5)
         self.assertEqual(message['magic_number'], 5)  # the '5' is a magic number... 1 if ground_speed is 0.0m/s an 3 or 5 if airborne. Do you have an idea what it is?
-        self.assertEqual(message['gps_status'], '03x03')
-        self.assertEqual(message['frequency_offset'], -1.6)
-        self.assertEqual(message['signal_quality'], 8.5)
-        self.assertEqual(message['error_count'], 1)
-        self.assertEqual(message['distance'], 50.6)
-        self.assertEqual(message['bearing'], 151.4)
-        self.assertEqual(message['phi'], 1.9)
+        self.assertEqual(message['gps_status'], '03x04')
+        self.assertEqual(message['channel'], 1)
+        self.assertEqual(message['flarm_timeslot'], True)
+        self.assertEqual(message['ogn_timeslot'], False)
+        self.assertEqual(message['frequency_offset'], -12.61)
+        self.assertEqual(message['decode_quality'], 5.8)
+        self.assertEqual(message['signal_quality'], 15.5)
+        self.assertEqual(message['demodulator_type'], 2)
+        self.assertEqual(message['error_count'], 10)
+        self.assertEqual(message['distance'], 30.9)
+        self.assertEqual(message['bearing'], 99.5)
+        self.assertEqual(message['phi'], 1.1)
+        self.assertEqual(message['multichannel'], True)
 
 
 if __name__ == '__main__':