glonass: added file formats with GLO signals for acquisition

Added GLONASS-specific file formats for processing.

Author: valeri-atamaniouk

peregrine/analysis/tracking_loop.py

@@ -18,6 +18,7 @@
 from peregrine.log import default_logging_config
 from peregrine.tracking import Tracker
 from peregrine.gps_constants import L1CA, L2C
+from peregrine.glo_constants import GLO_L1, GLO_L2
 from peregrine.run import populate_peregrine_cmd_line_arguments
 
 
@@ -129,6 +130,8 @@ def main():
 
   samples = {L1CA: {'IF': freq_profile['GPS_L1_IF']},
              L2C: {'IF': freq_profile['GPS_L2_IF']},
+             GLO_L1: {'IF': freq_profile['GLO_L1_IF']},
+             GLO_L2: {'IF': freq_profile['GLO_L2_IF']},
              'samples_total': -1,
              'sample_index': skip_samples}
 

peregrine/defaults.py

@@ -34,11 +34,29 @@
 sample_channel_GLO_L1 = 2
 sample_channel_GLO_L2 = 3
 
+file_encoding_1bit_x1_gpsl1 = [
+    sample_channel_GPS_L1]  # GPS L1
+
+file_encoding_1bit_x1_gpsl2 = [
+    sample_channel_GPS_L2]  # GPS L2
+
+file_encoding_1bit_x1_glol1 = [
+    sample_channel_GLO_L1]  # GLO L1
+
+file_encoding_1bit_x1_glol2 = [
+    sample_channel_GLO_L2]  # GLO L2
+
 file_encoding_1bit_x2 = [
     sample_channel_GPS_L1,  # GPS L1
     sample_channel_GPS_L2]  # GPS L2
 
+file_encoding_1bit_x2_glol1l2 = [
+    sample_channel_GLO_L1,  # GLO L1
+    sample_channel_GLO_L2]  # GLO L2
+
+file_encoding_2bits = file_encoding_1bit_x1_gpsl1
 file_encoding_2bits_x2 = file_encoding_1bit_x2
+file_encoding_2bits_x2_glol1l2 = file_encoding_1bit_x2_glol1l2
 
 # encoding is taken from here:
 # https://swiftnav.hackpad.com/MicroZed-Sample-Grabber-IFgt5DbAunD
@@ -70,35 +88,58 @@
     sample_channel_GPS_L1]  # RF1
 
 file_encoding_profile = {
+    'piksi': file_encoding_1bit_x1_gpsl1,
+    'piksinew': file_encoding_1bit_x1_gpsl1,
+    'int8': file_encoding_1bit_x1_gpsl1,
+    'c8c8': file_encoding_1bit_x2,
+    '1bit': file_encoding_1bit_x1_gpsl1,
+    '1bitrev': file_encoding_1bit_x1_gpsl1,
+    '1bit_x1': file_encoding_1bit_x1_gpsl1,
+    '1bit_x1.gpsl1': file_encoding_1bit_x1_gpsl1,
+    '1bit_x1.gpsl2': file_encoding_1bit_x1_gpsl2,
+    '1bit_x1.glol1': file_encoding_1bit_x1_glol1,
+    '1bit_x1.glol2': file_encoding_1bit_x1_glol2,
     '1bit_x2': file_encoding_1bit_x2,
+    '1bit_x2.gps': file_encoding_1bit_x2,
+    '1bit_x2.glo': file_encoding_1bit_x2_glol1l2,
+    '2bits': file_encoding_2bits,
+    '2bits.glol1': file_encoding_1bit_x1_glol1,
+    '2bits.glol2': file_encoding_1bit_x1_glol2,
     '2bits_x2': file_encoding_2bits_x2,
+    '2bits_x2.gps': file_encoding_2bits_x2,
+    '2bits_x2.glo': file_encoding_2bits_x2_glol1l2,
     '2bits_x4': file_encoding_2bits_x4}
 
 # 'peregrine' frequencies profile
 freq_profile_peregrine = {
     'GPS_L1_IF': 4.092e6,
     'GPS_L2_IF': 4.092e6,
+    'GLO_L1_IF': 6e6,
+    'GLO_L2_IF': 6e6,
     'sampling_freq': 16.368e6}
 
 # 'low_rate' frequencies profile
 freq_profile_low_rate = {
     'GPS_L1_IF': 1026375.0,
     'GPS_L2_IF': 7.4e5,
     'GLO_L1_IF': 12e5,
+    'GLO_L2_IF': 12e5,
     'sampling_freq': 24.84375e5}
 
 # 'normal_rate' frequencies profile
 freq_profile_normal_rate = {
     'GPS_L1_IF': 10263750.0,
     'GPS_L2_IF': 7.4e6,
     'GLO_L1_IF': 12e6,
+    'GLO_L2_IF': 12e6,
     'sampling_freq': 24.84375e6}
 
 # 'high_rate' frequencies profile
 freq_profile_high_rate = {
     'GPS_L1_IF': freq_profile_normal_rate['GPS_L1_IF'],
     'GPS_L2_IF': freq_profile_normal_rate['GPS_L2_IF'],
     'GLO_L1_IF': freq_profile_normal_rate['GLO_L1_IF'],
+    'GLO_L2_IF': freq_profile_normal_rate['GLO_L2_IF'],
     'sampling_freq': 99.375e6}
 
 freq_profile_lookup = {

peregrine/glo_constants.py

@@ -11,3 +11,4 @@
 glo_code_wavelength = glo_code_period * c
 
 GLO_L1 = 'glo_l1'
+GLO_L2 = 'glo_l2'

peregrine/run.py

@@ -19,7 +19,7 @@
 
 from peregrine.samples import load_samples
 from peregrine.acquisition import Acquisition, load_acq_results,\
-                                  save_acq_results
+    save_acq_results
 from peregrine.navigation import navigation
 import peregrine.tracking as tracking
 from peregrine.log import default_logging_config
@@ -56,7 +56,6 @@ def __call__(self, parser, namespace, file_hnd, option_string=None):
     file_hnd.close()
 
 
-
 def populate_peregrine_cmd_line_arguments(parser):
   if sys.stdout.isatty():
     progress_bar_default = 'stdout'
@@ -115,12 +114,10 @@ def populate_peregrine_cmd_line_arguments(parser):
                         help="How many milliseconds to skip")
 
   inputCtrl.add_argument("-f", "--file-format",
-                         choices=['piksi', 'int8', '1bit', '1bitrev',
-                                  '1bit_x2', '2bits', '2bits_x2', '2bits_x4'],
+                         choices=defaults.file_encoding_profile.keys(),
                          metavar='FORMAT',
                          help="The format of the sample data file "
-                         "('piksi', 'int8', '1bit', '1bitrev', "
-                         "'1bit_x2', '2bits', '2bits_x2', '2bits_x4')")
+                         "(%s)" % defaults.file_encoding_profile.keys())
 
   inputCtrl.add_argument("--ms-to-process",
                          metavar='MS',
@@ -236,6 +233,7 @@ def main():
   samples = {gps.L1CA: {'IF': freq_profile['GPS_L1_IF']},
              gps.L2C: {'IF': freq_profile['GPS_L2_IF']},
              glo.GLO_L1: {'IF': freq_profile['GLO_L1_IF']},
+             glo.GLO_L2: {'IF': freq_profile['GLO_L2_IF']},
              'samples_total': -1,
              'sample_index': skip_samples}
 
@@ -250,22 +248,29 @@ def main():
                        acq_results_file)
       sys.exit(1)
   else:
+    encoding_profile = defaults.file_encoding_profile[args.file_format]
+
     acq_results = []
-    for signal in [gps.L1CA, glo.GLO_L1]:
-      if signal == gps.L1CA:
+    for channel in encoding_profile:
+      if channel == defaults.sample_channel_GPS_L1:
+        signal = gps.L1CA
         code_period = gps.l1ca_code_period
         code_len = gps.l1ca_code_length
         i_f = freq_profile['GPS_L1_IF']
         samplesPerCode = int(round(freq_profile['sampling_freq'] /
-                         (gps.l1ca_chip_rate / gps.l1ca_code_length)))
-      else:
+                                   (gps.l1ca_chip_rate / gps.l1ca_code_length)))
+      elif channel == defaults.sample_channel_GLO_L1:
         if args.skip_glonass:
           continue
+        signal = glo.GLO_L1
         code_period = glo.glo_code_period
         code_len = glo.glo_code_len
         i_f = freq_profile['GLO_L1_IF']
         samplesPerCode = int(round(freq_profile['sampling_freq'] /
-                         (glo.glo_chip_rate / glo.glo_code_len)))
+                                   (glo.glo_chip_rate / glo.glo_code_len)))
+      else:
+        # No acquisition for other signals
+        continue
 
       # Get 11ms of acquisition samples for fine frequency estimation
       load_samples(samples=samples,