diff --git a/src/algorithms/libs/opencl/clFFT.h b/src/algorithms/libs/opencl/clFFT.h index 348505312..0498dab87 100644 --- a/src/algorithms/libs/opencl/clFFT.h +++ b/src/algorithms/libs/opencl/clFFT.h @@ -68,7 +68,6 @@ extern "C" { clFFT_Forward = -1, clFFT_Inverse = 1 - } clFFT_Direction; // XForm dimension @@ -77,7 +76,6 @@ extern "C" clFFT_1D = 0, clFFT_2D = 1, clFFT_3D = 3 - } clFFT_Dimension; // XForm Data type diff --git a/src/algorithms/libs/rtklib/rtklib_pntpos.cc b/src/algorithms/libs/rtklib/rtklib_pntpos.cc index 170763eb4..d2e0cda0d 100644 --- a/src/algorithms/libs/rtklib/rtklib_pntpos.cc +++ b/src/algorithms/libs/rtklib/rtklib_pntpos.cc @@ -236,8 +236,8 @@ double prange(const obsd_t *obs, const nav_t *nav, const double *azel, //CHECK IF IT IS STILL NEEDED if (opt->ionoopt == IONOOPT_IFLC) - { /* dual-frequency */ - + { + /* dual-frequency */ if (P1 == 0.0 || P2 == 0.0) { return 0.0; diff --git a/src/algorithms/libs/rtklib/rtklib_ppp.cc b/src/algorithms/libs/rtklib/rtklib_ppp.cc index 0c0dcb708..043a9da5f 100644 --- a/src/algorithms/libs/rtklib/rtklib_ppp.cc +++ b/src/algorithms/libs/rtklib/rtklib_ppp.cc @@ -1689,7 +1689,6 @@ int res_ppp(int iter __attribute__((unused)), const obsd_t *obs, int n, const do for (j = 0; j < 2; j++) { /* for phase and code */ - if (meas[j] == 0.0) { continue; diff --git a/src/algorithms/libs/rtklib/rtklib_rtkpos.cc b/src/algorithms/libs/rtklib/rtklib_rtkpos.cc index 38c9ce9a6..95a3dd72c 100644 --- a/src/algorithms/libs/rtklib/rtklib_rtkpos.cc +++ b/src/algorithms/libs/rtklib/rtklib_rtkpos.cc @@ -1657,7 +1657,6 @@ int ddres(rtk_t *rtk, const nav_t *nav, double dt, const double *x, } for (m = 0; m < 4; m++) { /* m=0:gps/qzs/sbs, 1:glo, 2:gal, 3:bds */ - for (f = opt->mode > PMODE_DGPS ? 0 : nf; f < nf * 2; f++) { /* search reference satellite with highest elevation */ @@ -2863,7 +2862,6 @@ int rtkpos(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav) } if (opt->mode == PMODE_MOVEB) { /* moving baseline */ - /* estimate position/velocity of base station */ if (!pntpos(obs + nu, nr, nav, &rtk->opt, &solb, nullptr, nullptr, msg)) { diff --git a/src/algorithms/libs/rtklib/rtklib_rtksvr.cc b/src/algorithms/libs/rtklib/rtklib_rtksvr.cc index 5524742f2..d39d91f6e 100644 --- a/src/algorithms/libs/rtklib/rtklib_rtksvr.cc +++ b/src/algorithms/libs/rtklib/rtklib_rtksvr.cc @@ -494,7 +494,6 @@ void decodefile(rtksvr_t *svr, int index) if (svr->format[index] == STRFMT_SP3) { /* precise ephemeris */ - /* read sp3 precise ephemeris */ readsp3(file, &nav, 0); if (nav.ne <= 0) @@ -517,8 +516,8 @@ void decodefile(rtksvr_t *svr, int index) rtksvrunlock(svr); } else if (svr->format[index] == STRFMT_RNXCLK) - { /* precise clock */ - + { + /* precise clock */ /* read rinex clock */ // Disabled!! if (true /*readrnxc(file, &nav)<=0 */) { diff --git a/src/algorithms/libs/rtklib/rtklib_stream.cc b/src/algorithms/libs/rtklib/rtklib_stream.cc index 5b0ef85cd..a3a190477 100644 --- a/src/algorithms/libs/rtklib/rtklib_stream.cc +++ b/src/algorithms/libs/rtklib/rtklib_stream.cc @@ -955,7 +955,6 @@ int gentcp(tcp_t *tcp, int type, char *msg) if (type == 0) { /* server socket */ - #ifdef SVR_REUSEADDR /* multiple-use of server socket */ setsockopt(tcp->sock, SOL_SOCKET, SO_REUSEADDR, (const char *)&opt, diff --git a/src/algorithms/libs/rtklib/rtklib_tides.cc b/src/algorithms/libs/rtklib/rtklib_tides.cc index f675e38a6..957e9842a 100644 --- a/src/algorithms/libs/rtklib/rtklib_tides.cc +++ b/src/algorithms/libs/rtklib/rtklib_tides.cc @@ -355,7 +355,6 @@ void tidedisp(gtime_t tutc, const double *rr, int opt, const erp_t *erp, if (opt & 1) { /* solid earth tides */ - /* sun and moon position in ecef */ sunmoonpos(tutc, erpv, rs, rm, &gmst); diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_sine_table.h b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_sine_table.h index ed051f121..c98d113aa 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_sine_table.h +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/include/volk_gnsssdr/volk_gnsssdr_sine_table.h @@ -28,7 +28,6 @@ /* From gnuradio/gnuradio-runtime/lib/math/sine_table.h * max_error = 2.353084136763606e-06 */ static const float sine_table_10bits[1 << 10][2] = { - {2.925817799165007e-09, 7.219194364267018e-09}, {2.925707643778599e-09, 2.526699001579799e-07}, {2.925487337153070e-09, 1.191140162167675e-06}, diff --git a/src/core/libs/supl/asn-rrlp/GANSSAlmanacElement.h b/src/core/libs/supl/asn-rrlp/GANSSAlmanacElement.h index 3391b4885..f1ba08493 100644 --- a/src/core/libs/supl/asn-rrlp/GANSSAlmanacElement.h +++ b/src/core/libs/supl/asn-rrlp/GANSSAlmanacElement.h @@ -25,7 +25,6 @@ extern "C" GANSSAlmanacElement_PR_NOTHING, /* No components present */ GANSSAlmanacElement_PR_keplerianAlmanacSet, /* Extensions may appear below */ - } GANSSAlmanacElement_PR; /* GANSSAlmanacElement */ diff --git a/src/core/libs/supl/asn-rrlp/GANSSClockModel.h b/src/core/libs/supl/asn-rrlp/GANSSClockModel.h index 05d019a1e..63f8dafe8 100644 --- a/src/core/libs/supl/asn-rrlp/GANSSClockModel.h +++ b/src/core/libs/supl/asn-rrlp/GANSSClockModel.h @@ -25,7 +25,6 @@ extern "C" GANSSClockModel_PR_NOTHING, /* No components present */ GANSSClockModel_PR_standardClockModelList, /* Extensions may appear below */ - } GANSSClockModel_PR; /* GANSSClockModel */ diff --git a/src/core/libs/supl/asn-rrlp/GANSSOrbitModel.h b/src/core/libs/supl/asn-rrlp/GANSSOrbitModel.h index 23a907d01..01ce5dea5 100644 --- a/src/core/libs/supl/asn-rrlp/GANSSOrbitModel.h +++ b/src/core/libs/supl/asn-rrlp/GANSSOrbitModel.h @@ -25,7 +25,6 @@ extern "C" GANSSOrbitModel_PR_NOTHING, /* No components present */ GANSSOrbitModel_PR_keplerianSet, /* Extensions may appear below */ - } GANSSOrbitModel_PR; /* GANSSOrbitModel */ diff --git a/src/core/libs/supl/asn-rrlp/RRLP-Component.h b/src/core/libs/supl/asn-rrlp/RRLP-Component.h index 02208b69d..bdeaa99aa 100644 --- a/src/core/libs/supl/asn-rrlp/RRLP-Component.h +++ b/src/core/libs/supl/asn-rrlp/RRLP-Component.h @@ -33,7 +33,6 @@ extern "C" RRLP_Component_PR_assistanceDataAck, RRLP_Component_PR_protocolError, /* Extensions may appear below */ - } RRLP_Component_PR; /* RRLP-Component */ diff --git a/src/core/libs/supl/asn-rrlp/SatStatus.h b/src/core/libs/supl/asn-rrlp/SatStatus.h index 0673b5cd6..ffde0c7b4 100644 --- a/src/core/libs/supl/asn-rrlp/SatStatus.h +++ b/src/core/libs/supl/asn-rrlp/SatStatus.h @@ -28,7 +28,6 @@ extern "C" SatStatus_PR_oldSatelliteAndModel, SatStatus_PR_newNaviModelUC, /* Extensions may appear below */ - } SatStatus_PR; /* SatStatus */ diff --git a/src/core/libs/supl/asn-supl/CellInfo.h b/src/core/libs/supl/asn-supl/CellInfo.h index 945d867c6..e1e40dc21 100644 --- a/src/core/libs/supl/asn-supl/CellInfo.h +++ b/src/core/libs/supl/asn-supl/CellInfo.h @@ -29,7 +29,6 @@ extern "C" CellInfo_PR_wcdmaCell, CellInfo_PR_cdmaCell, /* Extensions may appear below */ - } CellInfo_PR; /* CellInfo */ diff --git a/src/core/libs/supl/asn-supl/FrequencyInfo.h b/src/core/libs/supl/asn-supl/FrequencyInfo.h index 48ed6c07e..94fc40402 100644 --- a/src/core/libs/supl/asn-supl/FrequencyInfo.h +++ b/src/core/libs/supl/asn-supl/FrequencyInfo.h @@ -28,7 +28,6 @@ extern "C" fmodeSpecificInfo_PR_fdd, fmodeSpecificInfo_PR_tdd, /* Extensions may appear below */ - } fmodeSpecificInfo_PR; /* FrequencyInfo */ diff --git a/src/core/libs/supl/asn-supl/PosPayLoad.h b/src/core/libs/supl/asn-supl/PosPayLoad.h index 66c03457d..7ec42edf7 100644 --- a/src/core/libs/supl/asn-supl/PosPayLoad.h +++ b/src/core/libs/supl/asn-supl/PosPayLoad.h @@ -27,7 +27,6 @@ extern "C" PosPayLoad_PR_rrcPayload, PosPayLoad_PR_rrlpPayload, /* Extensions may appear below */ - } PosPayLoad_PR; /* PosPayLoad */ diff --git a/src/core/libs/supl/asn-supl/SETAuthKey.h b/src/core/libs/supl/asn-supl/SETAuthKey.h index 7a9fbe6fe..8fa64c9b2 100644 --- a/src/core/libs/supl/asn-supl/SETAuthKey.h +++ b/src/core/libs/supl/asn-supl/SETAuthKey.h @@ -26,7 +26,6 @@ extern "C" SETAuthKey_PR_shortKey, SETAuthKey_PR_longKey, /* Extensions may appear below */ - } SETAuthKey_PR; /* SETAuthKey */ diff --git a/src/core/libs/supl/asn-supl/SETId.h b/src/core/libs/supl/asn-supl/SETId.h index ece63df60..c511537ba 100644 --- a/src/core/libs/supl/asn-supl/SETId.h +++ b/src/core/libs/supl/asn-supl/SETId.h @@ -33,7 +33,6 @@ extern "C" SETId_PR_nai, SETId_PR_iPAddress, /* Extensions may appear below */ - } SETId_PR; /* SETId */ diff --git a/src/core/libs/supl/asn-supl/SLPAddress.h b/src/core/libs/supl/asn-supl/SLPAddress.h index 4b13147ef..651cdc6f4 100644 --- a/src/core/libs/supl/asn-supl/SLPAddress.h +++ b/src/core/libs/supl/asn-supl/SLPAddress.h @@ -27,7 +27,6 @@ extern "C" SLPAddress_PR_iPAddress, SLPAddress_PR_fQDN, /* Extensions may appear below */ - } SLPAddress_PR; /* SLPAddress */ diff --git a/src/core/libs/supl/asn-supl/UlpMessage.h b/src/core/libs/supl/asn-supl/UlpMessage.h index 15f42aa9c..42890f9c2 100644 --- a/src/core/libs/supl/asn-supl/UlpMessage.h +++ b/src/core/libs/supl/asn-supl/UlpMessage.h @@ -38,7 +38,6 @@ extern "C" UlpMessage_PR_msDUMMY2, UlpMessage_PR_msDUMMY3, /* Extensions may appear below */ - } UlpMessage_PR; /* UlpMessage */ diff --git a/src/core/libs/supl/asn-supl/Velocity.h b/src/core/libs/supl/asn-supl/Velocity.h index 1db003a82..41c28c456 100644 --- a/src/core/libs/supl/asn-supl/Velocity.h +++ b/src/core/libs/supl/asn-supl/Velocity.h @@ -31,7 +31,6 @@ extern "C" Velocity_PR_horveluncert, Velocity_PR_horandveruncert, /* Extensions may appear below */ - } Velocity_PR; /* Velocity */ diff --git a/src/core/libs/supl/supl.h b/src/core/libs/supl/supl.h index 2f997d6f3..a4601fb72 100644 --- a/src/core/libs/supl/supl.h +++ b/src/core/libs/supl/supl.h @@ -191,7 +191,6 @@ typedef struct supl_rrlp_ctx_s int cnt_acq; int acq_time; struct supl_acquis_s acq[MAX_EPHEMERIS]; - } supl_assist_t; typedef struct supl_param_s @@ -232,7 +231,6 @@ typedef struct supl_ctx_s void *buf; size_t size; } slp_session_id; - } supl_ctx_t; int supl_ctx_new(supl_ctx_t *ctx); diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc index 1ed03dbc8..f604682a4 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test.cc @@ -1069,14 +1069,12 @@ TEST_F(TrackingPullInTest, ValidationOfResults) } } } //end plot - - } //end acquisition Delay errors loop - } //end acquisition Doppler errors loop + } //end acquisition Delay errors loop + } //end acquisition Doppler errors loop pull_in_results_v_v.push_back(pull_in_results_v); - - } //end CN0 LOOP - //build the mesh grid + + //build the mesh grid std::vector doppler_error_mesh; std::vector code_delay_error_mesh; for (unsigned int current_acq_doppler_error_idx = 0; current_acq_doppler_error_idx < acq_doppler_error_hz_values.size(); current_acq_doppler_error_idx++) diff --git a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc index d82fcd3cd..bde3572cb 100644 --- a/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc +++ b/src/tests/unit-tests/signal-processing-blocks/tracking/tracking_pull-in_test_fpga.cc @@ -1244,19 +1244,14 @@ TEST_F(TrackingPullInTestFpga, ValidationOfResults) std::cout << ge.what() << std::endl; } } - } //end plot - - } //end acquisition Delay errors loop - + } //end plot + } //end acquisition Delay errors loop usleep(100000); // give time to the HW to consume all the remaining samples - - } //end acquisition Doppler errors loop - + } //end acquisition Doppler errors loop pull_in_results_v_v.push_back(pull_in_results_v); - } //end CN0 LOOP - //build the mesh grid + //build the mesh grid std::vector doppler_error_mesh; std::vector code_delay_error_mesh; for (unsigned int current_acq_doppler_error_idx = 0; current_acq_doppler_error_idx < acq_doppler_error_hz_values.size(); current_acq_doppler_error_idx++)