From b8aa2023484029becb2e1f02a83fbe5f669b7931 Mon Sep 17 00:00:00 2001 From: Javier Arribas Date: Mon, 25 Apr 2016 16:03:57 +0200 Subject: [PATCH] Fix controthread test to use new configuration scheme --- .../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 b31e18005..c5cd15784 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");