mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-11-06 10:13:04 +00:00
merging: Starts merge procedure for glonass branch from upstream
Starts merging process of the acquisition and tracking code for GLONASS processing developed by Gabriel Araujo. Fixes compile warnings and errors introduced during rebase operation
This commit is contained in:
committed by
Damian Miralles
parent
bf9345ebd2
commit
19f4da0aa6
@@ -1,6 +1,6 @@
|
||||
#include "glonass_l1_ca_dll_pll_c_aid_tracking.h"
|
||||
#include <glog/logging.h>
|
||||
#include "Glonass_L1_CA.h"
|
||||
#include "GLONASS_L1_CA.h"
|
||||
#include "configuration_interface.h"
|
||||
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
|
||||
#include "glonass_l1_ca_dll_pll_tracking.h"
|
||||
#include <glog/logging.h>
|
||||
#include "Glonass_L1_CA.h"
|
||||
#include "GLONASS_L1_CA.h"
|
||||
#include "configuration_interface.h"
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user