iqgen: GLONASS fix

Author: valeri-atamaniouk

peregrine/iqgen/bits/encoder_1bit.py

@@ -171,7 +171,7 @@ def addSamples(self, sample_array):
     for band in range(4):
       bandIndex = self.bandIndexes[band]
       band_bits = BandBitEncoder.convertBand(sample_array[bandIndex])
-      self.bits[start + band:end:2] = band_bits
+      self.bits[start + band:end:4] = band_bits
 
     self.n_bits = end
 

peregrine/iqgen/bits/signals.py

@@ -173,12 +173,12 @@ def getCodeChipIndex(svTime_s):
       return long(svTime_s * GPS.L2C.CODE_CHIP_RATE_HZ)
 
 # GLONASS L1
-GLONASS_L1_CENTER_FREQUENCY_HZ = 1602000
-GLONASS_L1_FREQUENCY_STEP_HZ = 562500
+GLONASS_L1_CENTER_FREQUENCY_HZ = 1602000000l
+GLONASS_L1_FREQUENCY_STEP_HZ = 562500l
 
 # GLONASS L2
-GLONASS_L2_CENTER_FREQUENCY_HZ = 1246000
-GLONASS_L2_FREQUENCY_STEP_HZ = 437500
+GLONASS_L2_CENTER_FREQUENCY_HZ = 1246000000l
+GLONASS_L2_FREQUENCY_STEP_HZ = 437500l
 
 # GLONASS L1 and L2 common
 GLONASS_SYMBOL_RATE_HZ = 100

peregrine/iqgen/if_iface.py

@@ -136,15 +136,15 @@ class GLONASS(object):
 
     class L1(object):
       INTERMEDIATE_FREQUENCIES_HZ = \
-          [float(12000000 + b * 562500) for b in range(7)] + \
-          [float(12000000 + b * 562500) for b in range(-7, 0)]
-      INDEX = 1
+          [float(12000000l + b * 562500l) for b in range(7)] + \
+          [float(12000000l + b * 562500l) for b in range(-7, 0)]
+      INDEX = 2
 
     class L2(object):
       INTERMEDIATE_FREQUENCIES_HZ = \
-          [float(11000000 + b * 437500) for b in range(7)] + \
-          [float(11000000 + b * 437500) for b in range(-7, 0)]
-      INDEX = 2
+          [float(11000000l + b * 437500l) for b in range(7)] + \
+          [float(11000000l + b * 437500l) for b in range(-7, 0)]
+      INDEX = 3
 
   class Galileo(object):
 

peregrine/iqgen/iqgen_main.py

@@ -225,10 +225,20 @@ def __init__(self, option_strings, dest, nargs=None, **kwargs):
       super(UpdateDopplerType, self).__init__(option_strings, dest, **kwargs)
 
     def doUpdate(self, sv, parser, namespace, values, option_string):
-      if sv.l1caEnabled:
-        frequency_hz = signals.GPS.L1CA.CENTER_FREQUENCY_HZ
-      elif sv.l2cEnabled:
-        frequency_hz = signals.GPS.L2C.CENTER_FREQUENCY_HZ
+      if isinstance(sv, GPSSatellite):
+        if sv.l1caEnabled:
+          frequency_hz = signals.GPS.L1CA.CENTER_FREQUENCY_HZ
+        elif sv.l2cEnabled:
+          frequency_hz = signals.GPS.L2C.CENTER_FREQUENCY_HZ
+        else:
+          raise ValueError("Signal band must be specified before doppler")
+      elif isinstance(sv, GLOSatellite):
+        if sv.isL1Enabled():
+          frequency_hz = signals.GLONASS.L1S[sv.prn].CENTER_FREQUENCY_HZ
+        elif sv.isL2Enabled():
+          frequency_hz = signals.GLONASS.L2S[sv.prn].CENTER_FREQUENCY_HZ
+        else:
+          raise ValueError("Signal band must be specified before doppler")
       else:
         raise ValueError("Signal band must be specified before doppler")
 
@@ -676,8 +686,8 @@ def main():
     enabledGLONASSL2 |= sv.isBandEnabled(outputConfig.GLONASS.L2.INDEX,
                                          outputConfig)
 
-  enabledGPS = enabledGPSL1 or enabledGPSL2
-  enabledGLONASS = enabledGLONASSL1 or enabledGLONASSL2
+  enabledGPS |= enabledGPSL1 or enabledGPSL2
+  enabledGLONASS |= enabledGLONASSL1 or enabledGLONASSL2
 
   # Configure data encoder
   if args.encoder == "1bit":