From 981d0579d6beeffc7e36984f5ff9299c13d6742c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 23 Apr 2017 21:10:32 +0200 Subject: [PATCH] Arrange headers --- src/algorithms/libs/rtklib/rtklib.h | 3 ++- .../libs/rtklib/rtklib_conversions.cc | 13 +++++++------ .../libs/rtklib/rtklib_conversions.h | 4 +++- src/algorithms/libs/rtklib/rtklib_ephemeris.cc | 2 +- src/algorithms/libs/rtklib/rtklib_ephemeris.h | 2 +- src/algorithms/libs/rtklib/rtklib_ionex.cc | 18 +++++++++--------- src/algorithms/libs/rtklib/rtklib_ionex.h | 2 +- src/algorithms/libs/rtklib/rtklib_pntpos.cc | 2 +- src/algorithms/libs/rtklib/rtklib_pntpos.h | 3 +-- src/algorithms/libs/rtklib/rtklib_preceph.cc | 3 ++- src/algorithms/libs/rtklib/rtklib_preceph.h | 2 +- src/algorithms/libs/rtklib/rtklib_rtkcmn.h | 13 ++----------- src/algorithms/libs/rtklib/rtklib_sbas.cc | 5 ++--- src/algorithms/libs/rtklib/rtklib_sbas.h | 4 +--- 14 files changed, 34 insertions(+), 42 deletions(-) diff --git a/src/algorithms/libs/rtklib/rtklib.h b/src/algorithms/libs/rtklib/rtklib.h index b40ec2325..7a68e50b5 100644 --- a/src/algorithms/libs/rtklib/rtklib.h +++ b/src/algorithms/libs/rtklib/rtklib.h @@ -47,7 +47,8 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ + * + *----------------------------------------------------------------------------*/ #ifndef GNSS_SDR_RTKLIB_H_ #define GNSS_SDR_RTKLIB_H_ diff --git a/src/algorithms/libs/rtklib/rtklib_conversions.cc b/src/algorithms/libs/rtklib/rtklib_conversions.cc index 0fce2e31b..1937a9998 100644 --- a/src/algorithms/libs/rtklib/rtklib_conversions.cc +++ b/src/algorithms/libs/rtklib/rtklib_conversions.cc @@ -47,19 +47,20 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ + * + *----------------------------------------------------------------------------*/ #include "rtklib_conversions.h" obsd_t insert_obs_to_rtklib(obsd_t rtklib_obs, Gnss_Synchro gnss_synchro, int week, int band) { - rtklib_obs.D[band]=gnss_synchro.Carrier_Doppler_hz; - rtklib_obs.P[band]=gnss_synchro.Pseudorange_m; - rtklib_obs.L[band]=gnss_synchro.Carrier_phase_rads;//todo: check units + rtklib_obs.D[band] = gnss_synchro.Carrier_Doppler_hz; + rtklib_obs.P[band] = gnss_synchro.Pseudorange_m; + rtklib_obs.L[band] = gnss_synchro.Carrier_phase_rads;//todo: check units //rtklib_obs.SNR=gnss_synchro.CN0_dB_hz; - rtklib_obs.sat=gnss_synchro.PRN; - rtklib_obs.time=gpst2time(adjgpsweek(week),gnss_synchro.RX_time); + rtklib_obs.sat = gnss_synchro.PRN; + rtklib_obs.time = gpst2time(adjgpsweek(week), gnss_synchro.RX_time); //printf("OBS RX TIME [%i]: %s,%f\n\r",rtklib_obs.sat,time_str(rtklib_obs.time,3),rtklib_obs.time.sec); return rtklib_obs; } diff --git a/src/algorithms/libs/rtklib/rtklib_conversions.h b/src/algorithms/libs/rtklib/rtklib_conversions.h index 67d8cd2d8..cfbb67958 100644 --- a/src/algorithms/libs/rtklib/rtklib_conversions.h +++ b/src/algorithms/libs/rtklib/rtklib_conversions.h @@ -46,7 +46,9 @@ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + *----------------------------------------------------------------------------*/ #ifndef GNSS_SDR_RTKLIB_CONVERSIONS_H_ diff --git a/src/algorithms/libs/rtklib/rtklib_ephemeris.cc b/src/algorithms/libs/rtklib/rtklib_ephemeris.cc index fba5040da..26da3195e 100644 --- a/src/algorithms/libs/rtklib/rtklib_ephemeris.cc +++ b/src/algorithms/libs/rtklib/rtklib_ephemeris.cc @@ -48,7 +48,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - */ + *----------------------------------------------------------------------------*/ #include "rtklib_ephemeris.h" diff --git a/src/algorithms/libs/rtklib/rtklib_ephemeris.h b/src/algorithms/libs/rtklib/rtklib_ephemeris.h index e701634ea..8275d4b94 100644 --- a/src/algorithms/libs/rtklib/rtklib_ephemeris.h +++ b/src/algorithms/libs/rtklib/rtklib_ephemeris.h @@ -48,7 +48,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - *-----------------------------------------------------------------------------*/ + *----------------------------------------------------------------------------*/ #ifndef GNSS_SDR_RTKLIB_EPHEMERIS_H_ diff --git a/src/algorithms/libs/rtklib/rtklib_ionex.cc b/src/algorithms/libs/rtklib/rtklib_ionex.cc index 62f46f8fe..2364f0531 100644 --- a/src/algorithms/libs/rtklib/rtklib_ionex.cc +++ b/src/algorithms/libs/rtklib/rtklib_ionex.cc @@ -47,15 +47,15 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* references: -* [1] S.Schear, W.Gurtner and J.Feltens, IONEX: The IONosphere Map EXchange -* Format Version 1, February 25, 1998 -* [2] S.Schaer, R.Markus, B.Gerhard and A.S.Timon, Daily Global Ionosphere -* Maps based on GPS Carrier Phase Data Routinely producted by CODE -* Analysis Center, Proceeding of the IGS Analysis Center Workshop, 1996 -* -*-----------------------------------------------------------------------------*/ + * + * References: + * [1] S.Schear, W.Gurtner and J.Feltens, IONEX: The IONosphere Map EXchange + * Format Version 1, February 25, 1998 + * [2] S.Schaer, R.Markus, B.Gerhard and A.S.Timon, Daily Global Ionosphere + * Maps based on GPS Carrier Phase Data Routinely producted by CODE + * Analysis Center, Proceeding of the IGS Analysis Center Workshop, 1996 + * + *----------------------------------------------------------------------------*/ #include "rtklib_ionex.h" diff --git a/src/algorithms/libs/rtklib/rtklib_ionex.h b/src/algorithms/libs/rtklib/rtklib_ionex.h index a30ba5b10..a3cb71c84 100644 --- a/src/algorithms/libs/rtklib/rtklib_ionex.h +++ b/src/algorithms/libs/rtklib/rtklib_ionex.h @@ -55,7 +55,7 @@ * Maps based on GPS Carrier Phase Data Routinely producted by CODE * Analysis Center, Proceeding of the IGS Analysis Center Workshop, 1996 * - *-----------------------------------------------------------------------------*/ + *----------------------------------------------------------------------------*/ #ifndef GNSS_SDR_RTKLIB_IONEX_H_ #define GNSS_SDR_RTKLIB_IONEX_H_ diff --git a/src/algorithms/libs/rtklib/rtklib_pntpos.cc b/src/algorithms/libs/rtklib/rtklib_pntpos.cc index 92086497c..a60fbdbec 100644 --- a/src/algorithms/libs/rtklib/rtklib_pntpos.cc +++ b/src/algorithms/libs/rtklib/rtklib_pntpos.cc @@ -48,7 +48,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - *-----------------------------------------------------------------------------*/ + *----------------------------------------------------------------------------*/ #include "rtklib_pntpos.h" diff --git a/src/algorithms/libs/rtklib/rtklib_pntpos.h b/src/algorithms/libs/rtklib/rtklib_pntpos.h index 43d76241a..f44ac9809 100644 --- a/src/algorithms/libs/rtklib/rtklib_pntpos.h +++ b/src/algorithms/libs/rtklib/rtklib_pntpos.h @@ -48,7 +48,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - *-----------------------------------------------------------------------------*/ + *----------------------------------------------------------------------------*/ #ifndef GNSS_SDR_RTKLIB_PNTPOS_H_ #define GNSS_SDR_RTKLIB_PNTPOS_H_ @@ -60,7 +60,6 @@ /* constants -----------------------------------------------------------------*/ const int NX = 4 + 3; //!< # of estimated parameters - const int MAXITR = 10; //!< max number of iteration for point pos const double ERR_ION = 5.0; //!< ionospheric delay std (m) const double ERR_TROP = 3.0; //!< tropspheric delay std (m) diff --git a/src/algorithms/libs/rtklib/rtklib_preceph.cc b/src/algorithms/libs/rtklib/rtklib_preceph.cc index 66e2a5cad..9fea57f2c 100644 --- a/src/algorithms/libs/rtklib/rtklib_preceph.cc +++ b/src/algorithms/libs/rtklib/rtklib_preceph.cc @@ -58,7 +58,8 @@ * [4] D.A.Vallado, Fundamentals of Astrodynamics and Applications 2nd ed, * Space Technology Library, 2004 * - *-----------------------------------------------------------------------------*/ + *----------------------------------------------------------------------------*/ + #include "rtklib_preceph.h" diff --git a/src/algorithms/libs/rtklib/rtklib_preceph.h b/src/algorithms/libs/rtklib/rtklib_preceph.h index b39ffb603..673a96bf8 100644 --- a/src/algorithms/libs/rtklib/rtklib_preceph.h +++ b/src/algorithms/libs/rtklib/rtklib_preceph.h @@ -58,7 +58,7 @@ * [4] D.A.Vallado, Fundamentals of Astrodynamics and Applications 2nd ed, * Space Technology Library, 2004 * - *-----------------------------------------------------------------------------*/ + *----------------------------------------------------------------------------*/ #ifndef GNSS_SDR_RTKLIB_PRECEPH_H_ #define GNSS_SDR_RTKLIB_PRECEPH_H_ diff --git a/src/algorithms/libs/rtklib/rtklib_rtkcmn.h b/src/algorithms/libs/rtklib/rtklib_rtkcmn.h index fabc86fee..6a8383fe1 100644 --- a/src/algorithms/libs/rtklib/rtklib_rtkcmn.h +++ b/src/algorithms/libs/rtklib/rtklib_rtkcmn.h @@ -49,16 +49,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * - * options : -DLAPACK use LAPACK/BLAS - * -DMKL use Intel MKL - * -DTRACE enable debug trace - * -DWIN32 use WIN32 API - * -DNOCALLOC no use calloc for zero matrix - * -DIERS_MODEL use GMF instead of NMF - * -DDLL built for shared library - * -DCPUTIME_IN_GPST cputime operated in gpst - * - * references : + * References : * [1] IS-GPS-200D, Navstar GPS Space Segment/Navigation User Interfaces, * 7 March, 2006 * [2] RTCA/DO-229C, Minimum operational performanc standards for global @@ -82,7 +73,7 @@ * [10] GLONASS/GPS/Galileo/Compass/SBAS NV08C receiver series BINR interface * protocol specification ver.1.3, August, 2012 * - *-----------------------------------------------------------------------------*/ + *----------------------------------------------------------------------------*/ #ifndef GNSS_SDR_RTKLIB_RTKCMN_H_ #define GNSS_SDR_RTKLIB_RTKCMN_H_ diff --git a/src/algorithms/libs/rtklib/rtklib_sbas.cc b/src/algorithms/libs/rtklib/rtklib_sbas.cc index efebc30f8..05f41f743 100644 --- a/src/algorithms/libs/rtklib/rtklib_sbas.cc +++ b/src/algorithms/libs/rtklib/rtklib_sbas.cc @@ -49,8 +49,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * - * option : -DRRCENA enable rrc correction - * * References : * [1] RTCA/DO-229C, Minimum operational performanc standards for global * positioning system/wide area augmentation system airborne equipment, @@ -59,7 +57,8 @@ * Interface Specification for QZSS, Japan Aerospace Exploration Agency, * July 31, 2009 * - *-----------------------------------------------------------------------------*/ + *----------------------------------------------------------------------------*/ + #include "rtklib_sbas.h" diff --git a/src/algorithms/libs/rtklib/rtklib_sbas.h b/src/algorithms/libs/rtklib/rtklib_sbas.h index 9f55bfc04..13933236b 100644 --- a/src/algorithms/libs/rtklib/rtklib_sbas.h +++ b/src/algorithms/libs/rtklib/rtklib_sbas.h @@ -49,8 +49,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * - * option : -DRRCENA enable rrc correction - * * References : * [1] RTCA/DO-229C, Minimum operational performanc standards for global * positioning system/wide area augmentation system airborne equipment, @@ -59,7 +57,7 @@ * Interface Specification for QZSS, Japan Aerospace Exploration Agency, * July 31, 2009 * - *-----------------------------------------------------------------------------*/ + *----------------------------------------------------------------------------*/ #ifndef GNSS_SDR_RTKLIB_SBAS_H_ #define GNSS_SDR_RTKLIB_SBAS_H_