From 3550b4249df85bd78439d6b03257913f40ddf4aa Mon Sep 17 00:00:00 2001
From: joanvallve <jvallve@iri.upc.edu>
Date: Tue, 7 Jul 2020 16:57:37 +0200
Subject: [PATCH] export uniq ephemerides and updatenav functions
---
src/rtkcmn.c | 13 +++++++++++--
src/rtklib.h | 3 +++
src/rtksvr.c | 8 --------
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/rtkcmn.c b/src/rtkcmn.c
index 9d1ab96..f8565bd 100644
--- a/src/rtkcmn.c
+++ b/src/rtkcmn.c
@@ -2531,7 +2531,7 @@ static int cmpeph(const void *p1, const void *p2)
q1->sat-q2->sat);
}
/* sort and unique ephemeris -------------------------------------------------*/
-static void uniqeph(nav_t *nav)
+extern void uniqeph(nav_t *nav)
{
eph_t *nav_eph;
int i,j;
@@ -2569,7 +2569,7 @@ static int cmpgeph(const void *p1, const void *p2)
q1->sat-q2->sat);
}
/* sort and unique glonass ephemeris -----------------------------------------*/
-static void uniqgeph(nav_t *nav)
+extern void uniqgeph(nav_t *nav)
{
geph_t *nav_geph;
int i,j;
@@ -2599,6 +2599,15 @@ static void uniqgeph(nav_t *nav)
trace(4,"uniqgeph: ng=%d\n",nav->ng);
}
+/* update navigation data ----------------------------------------------------*/
+extern void updatenav(nav_t *nav)
+{
+ int i,j;
+ for (i=0;i<MAXSAT;i++) for (j=0;j<NFREQ;j++) {
+ nav->lam[i][j]=satwavelen(i+1,j,nav);
+ }
+}
+
/* compare sbas ephemeris ----------------------------------------------------*/
static int cmpseph(const void *p1, const void *p2)
{
diff --git a/src/rtklib.h b/src/rtklib.h
index c4927f8..d7bf3a1 100644
--- a/src/rtklib.h
+++ b/src/rtklib.h
@@ -1544,6 +1544,9 @@ EXPORT double dms2deg(const double *dms);
/* input and output functions ------------------------------------------------*/
EXPORT void readpos(const char *file, const char *rcv, double *pos);
EXPORT int sortobs(obs_t *obs);
+EXPORT void updatenav(nav_t *nav);
+EXPORT void uniqeph(nav_t *nav);
+EXPORT void uniqgeph(nav_t *nav);
EXPORT void uniqnav(nav_t *nav);
EXPORT int screent(gtime_t time, gtime_t ts, gtime_t te, double tint);
EXPORT int readnav(const char *file, nav_t *nav);
diff --git a/src/rtksvr.c b/src/rtksvr.c
index a82da2c..34a3360 100644
--- a/src/rtksvr.c
+++ b/src/rtksvr.c
@@ -108,14 +108,6 @@ static void writesol(rtksvr_t *svr, int index)
rtksvrunlock(svr);
}
}
-/* update navigation data ----------------------------------------------------*/
-static void updatenav(nav_t *nav)
-{
- int i,j;
- for (i=0;i<MAXSAT;i++) for (j=0;j<NFREQ;j++) {
- nav->lam[i][j]=satwavelen(i+1,j,nav);
- }
-}
/* update glonass frequency channel number in raw data struct ----------------*/
static void updatefcn(rtksvr_t *svr)
{
--
GitLab