[hamradio-commits] [gnss-sdr] 220/236: Fix controthread test to use new configuration scheme

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.

commit b8aa2023484029becb2e1f02a83fbe5f669b7931
Author: Javier Arribas <javiarribas at gmail.com>
Date:   Mon Apr 25 16:03:57 2016 +0200

    Fix controthread test to use new configuration scheme
---
 src/tests/control_thread/control_thread_test.cc | 44 +++++++++++--------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/tests/control_thread/control_thread_test.cc b/src/tests/control_thread/control_thread_test.cc
index b31e180..c5cd157 100644
--- a/src/tests/control_thread/control_thread_test.cc
+++ b/src/tests/control_thread/control_thread_test.cc
@@ -62,19 +62,17 @@ TEST(Control_Thread_Test, InstantiateRunControlMessages)
     config->set_property("SignalSource.repeat", "true");
     config->set_property("SignalConditioner.implementation", "Pass_Through");
     config->set_property("SignalConditioner.item_type", "gr_complex");
-    config->set_property("Channels_GPS.count", "2");
-    config->set_property("Channels_Galileo.count", "0");
+    config->set_property("Channels_1C.count", "2");
+    config->set_property("Channels_1E.count", "0");
     config->set_property("Channels.in_acquisition", "1");
-    config->set_property("Channel.system", "GPS");
-    config->set_property("Channel.signal", "1C");
-    config->set_property("Acquisition_GPS.implementation", "GPS_L1_CA_PCPS_Acquisition");
-    config->set_property("Acquisition_GPS.threshold", "1");
-    config->set_property("Acquisition_GPS.doppler_max", "5000");
-    config->set_property("Acquisition_GPS.doppler_min", "-5000");
-    config->set_property("Tracking_GPS.implementation", "GPS_L1_CA_DLL_PLL_Tracking");
-    config->set_property("Tracking_GPS.item_type", "gr_complex");
-    config->set_property("TelemetryDecoder_GPS.implementation", "GPS_L1_CA_Telemetry_Decoder");
-    config->set_property("TelemetryDecoder_GPS.item_type", "gr_complex");
+    config->set_property("Acquisition_1C.implementation", "GPS_L1_CA_PCPS_Acquisition");
+    config->set_property("Acquisition_1C.threshold", "1");
+    config->set_property("Acquisition_1C.doppler_max", "5000");
+    config->set_property("Acquisition_1C.doppler_min", "-5000");
+    config->set_property("Tracking_1C.implementation", "GPS_L1_CA_DLL_PLL_Tracking");
+    config->set_property("Tracking_1C.item_type", "gr_complex");
+    config->set_property("TelemetryDecoder_1C.implementation", "GPS_L1_CA_Telemetry_Decoder");
+    config->set_property("TelemetryDecoder_1C.item_type", "gr_complex");
     config->set_property("Observables.implementation", "GPS_L1_CA_Observables");
     config->set_property("Observables.item_type", "gr_complex");
     config->set_property("PVT.implementation", "GPS_L1_CA_PVT");
@@ -127,19 +125,17 @@ TEST(Control_Thread_Test, InstantiateRunControlMessages2)
     config->set_property("SignalSource.repeat", "true");
     config->set_property("SignalConditioner.implementation", "Pass_Through");
     config->set_property("SignalConditioner.item_type", "gr_complex");
-    config->set_property("Channels_GPS.count", "4");
-    config->set_property("Channels_Galileo.count", "0");
+    config->set_property("Channels_1C.count", "4");
+    config->set_property("Channels_1E.count", "0");
     config->set_property("Channels.in_acquisition", "1");
-    config->set_property("Channel.system", "GPS");
-    config->set_property("Channel.signal", "1C");
-    config->set_property("Acquisition_GPS.implementation", "GPS_L1_CA_PCPS_Acquisition");
-    config->set_property("Acquisition_GPS.threshold", "1");
-    config->set_property("Acquisition_GPS.doppler_max", "5000");
-    config->set_property("Acquisition_GPS.doppler_min", "-5000");
-    config->set_property("Tracking_GPS.implementation", "GPS_L1_CA_DLL_PLL_C_Aid_Tracking");
-    config->set_property("Tracking_GPS.item_type", "gr_complex");
-    config->set_property("TelemetryDecoder_GPS.implementation", "GPS_L1_CA_Telemetry_Decoder");
-    config->set_property("TelemetryDecoder_GPS.item_type", "gr_complex");
+    config->set_property("Acquisition_1C.implementation", "GPS_L1_CA_PCPS_Acquisition");
+    config->set_property("Acquisition_1C.threshold", "1");
+    config->set_property("Acquisition_1C.doppler_max", "5000");
+    config->set_property("Acquisition_1C.doppler_min", "-5000");
+    config->set_property("Tracking_1C.implementation", "GPS_L1_CA_DLL_PLL_C_Aid_Tracking");
+    config->set_property("Tracking_1C.item_type", "gr_complex");
+    config->set_property("TelemetryDecoder_1C.implementation", "GPS_L1_CA_Telemetry_Decoder");
+    config->set_property("TelemetryDecoder_1C.item_type", "gr_complex");
     config->set_property("Observables.implementation", "GPS_L1_CA_Observables");
     config->set_property("Observables.item_type", "gr_complex");
     config->set_property("PVT.implementation", "GPS_L1_CA_PVT");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git