Minor fixes

src/algorithms/libs/rtklib/rtklib_conversions.cc

@@ -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.
+ */
+
 #include "rtklib_conversions.h"
 
 

src/algorithms/libs/rtklib/rtklib_pntpos.h

@@ -59,18 +59,15 @@
 #include "rtklib_ionex.h"
 
 /* constants -----------------------------------------------------------------*/
+const int NX = 4 + 3;          //!< # of estimated parameters
 
-//#define SQR(x)      ((x)*(x))
+const int MAXITR = 10;         //!< max number of iteration for point pos
-
+const double ERR_ION = 5.0;    //!< ionospheric delay std (m)
-#define NX          (4+3)       /* # of estimated parameters */
+const double ERR_TROP = 3.0;   //!< tropspheric delay std (m)
-
+const double ERR_SAAS = 0.3;   //!< saastamoinen model error std (m)
-#define MAXITR      10          /* max number of iteration for point pos */
+const double ERR_BRDCI = 0.5;  //!< broadcast iono model error factor
-#define ERR_ION     5.0         /* ionospheric delay std (m) */
+const double ERR_CBIAS = 0.3;  //!< code bias error std (m)
-#define ERR_TROP    3.0         /* tropspheric delay std (m) */
+const double REL_HUMI = 0.7;   //!< relative humidity for saastamoinen model
-#define ERR_SAAS    0.3         /* saastamoinen model error std (m) */
-#define ERR_BRDCI   0.5         /* broadcast iono model error factor */
-#define ERR_CBIAS   0.3         /* code bias error std (m) */
-#define REL_HUMI    0.7         /* relative humidity for saastamoinen model */
 
 /* pseudorange measurement error variance ------------------------------------*/
 double varerr(const prcopt_t *opt, double el, int sys);

src/algorithms/libs/rtklib/rtklib_rtkcmn.cc

@@ -114,7 +114,7 @@ const solopt_t solopt_default = { /* defaults solution output options */
         0, 1, 0, 0, 0, 0,                 /* degf, outhead, outopt, datum, height, geoid */
         0, 0, 0,                       /* solstatic, sstat, trace */
         {0.0, 0.0},                  /* nmeaintv */
-        " ",""                      /* separator/program name */
+        " ", "", 0                      /* separator/program name */
 };
 
 
@@ -2046,10 +2046,10 @@ void eci2ecef(gtime_t tutc, const double *erpv, double *U, double *gmst)
     if (gmst) *gmst = gmst_;
 
     trace(5, "gmst=%.12f gast=%.12f\n", gmst_, gast);
-    trace(5, "P=\n"); tracemat(5, P, 3, 3, 15, 12);
+    trace(5, "P=\n"); //tracemat(5, P, 3, 3, 15, 12);
-    trace(5, "N=\n"); tracemat(5, N, 3, 3, 15, 12);
+    trace(5, "N=\n"); //tracemat(5, N, 3, 3, 15, 12);
-    trace(5, "W=\n"); tracemat(5, W, 3, 3, 15, 12);
+    trace(5, "W=\n"); //tracemat(5, W, 3, 3, 15, 12);
-    trace(5, "U=\n"); tracemat(5, U, 3, 3, 15, 12);
+    trace(5, "U=\n"); //tracemat(5, U, 3, 3, 15, 12);
 }
 
 
@@ -3120,10 +3120,10 @@ void freenav(nav_t *nav, int opt)
 //}
 //#else
 
-void traceopen(const char *file) {}
+//void traceopen(const char *file) {}
-void traceclose(void) {}
+//void traceclose(void) {}
-void tracelevel(int level) {}
+//void tracelevel(int level) {}
-void trace   (int level, const char *format, ...)
+void trace (int level  __attribute__((unused)), const char *format  __attribute__((unused)), ...)
 {
     /* va_list ap;*/
     /* print error message to stderr */
@@ -3131,15 +3131,15 @@ void trace   (int level, const char *format, ...)
     va_start(ap,format);
     vfprintf(stdout,format,ap); va_end(ap);*/
 }
-void tracet  (int level, const char *format, ...) {}
+//void tracet  (int level, const char *format, ...) {}
-void tracemat(int level, const double *A, int n, int m, int p, int q) {}
+//void tracemat(int level, const double *A, int n, int m, int p, int q) {}
-void traceobs(int level, const obsd_t *obs, int n) {}
+//void traceobs(int level, const obsd_t *obs, int n) {}
-void tracenav(int level, const nav_t *nav) {}
+//void tracenav(int level, const nav_t *nav) {}
-void tracegnav(int level, const nav_t *nav) {}
+//void tracegnav(int level, const nav_t *nav) {}
-void tracehnav(int level, const nav_t *nav) {}
+//void tracehnav(int level, const nav_t *nav) {}
-void tracepeph(int level, const nav_t *nav) {}
+//void tracepeph(int level, const nav_t *nav) {}
-void tracepclk(int level, const nav_t *nav) {}
+//void tracepclk(int level, const nav_t *nav) {}
-void traceb  (int level, const unsigned char *p, int n) {}
+//void traceb  (int level, const unsigned char *p, int n) {}
 
 //#endif /* TRACE */
 
@@ -3165,8 +3165,7 @@ int execcmd(const char *cmd)
 void createdir(const char *path)
 {
     char buff[1024], *p;
-
+    //tracet(3, "createdir: path=%s\n", path);
-    tracet(3, "createdir: path=%s\n", path);
 
     strcpy(buff, path);
     if (!(p = strrchr(buff, FILEPATHSEP))) return;

src/algorithms/libs/rtklib/rtklib_rtkcmn.h

@@ -219,19 +219,19 @@ int savenav(const char *file, const nav_t *nav);
 void freeobs(obs_t *obs);
 void freenav(nav_t *nav, int opt);
 
-void traceopen(const char *file);
+//void traceopen(const char *file);
-void traceclose(void);
+//void traceclose(void);
-void tracelevel(int level);
+//void tracelevel(int level);
 void trace   (int level, const char *format, ...);
-void tracet  (int level, const char *format, ...);
+//void tracet  (int level, const char *format, ...);
-void tracemat(int level, const double *A, int n, int m, int p, int q);
+//void tracemat(int level, const double *A, int n, int m, int p, int q);
-void traceobs(int level, const obsd_t *obs, int n);
+//void traceobs(int level, const obsd_t *obs, int n);
-void tracenav(int level, const nav_t *nav);
+//void tracenav(int level, const nav_t *nav);
-void tracegnav(int level, const nav_t *nav);
+//void tracegnav(int level, const nav_t *nav);
-void tracehnav(int level, const nav_t *nav);
+//void tracehnav(int level, const nav_t *nav);
-void tracepeph(int level, const nav_t *nav);
+//void tracepeph(int level, const nav_t *nav);
-void tracepclk(int level, const nav_t *nav);
+//void tracepclk(int level, const nav_t *nav);
-void traceb  (int level, const unsigned char *p, int n);
+//void traceb  (int level, const unsigned char *p, int n);
 
 int execcmd(const char *cmd);
 void createdir(const char *path);