Merge branch 'next' into observables_and_display_color

src/algorithms/libs/rtklib/rtklib_ephemeris.cc

@@ -663,7 +663,7 @@ int satpos_sbas(gtime_t time, gtime_t teph, int sat, const nav_t *nav,
             *svh = -1;
             return 0;
         }
-    /* satellite postion and clock by broadcast ephemeris */
+    /* satellite position and clock by broadcast ephemeris */
     if (!ephpos(time, teph, sat, nav, sbs->lcorr.iode, rs, dts, var, svh)) return 0;
 
     /* sbas satellite correction (long term and fast) */
@@ -734,7 +734,7 @@ int satpos_ssr(gtime_t time, gtime_t teph, int sat, const nav_t *nav,
             *svh = -1;
             return 0;
         }
-    /* satellite postion and clock by broadcast ephemeris */
+    /* satellite position and clock by broadcast ephemeris */
     if (!ephpos(time, teph, sat, nav, ssr->iode, rs, dts, var, svh)) return 0;
 
     /* satellite clock for gps, galileo and qzss */

src/algorithms/libs/rtklib/rtklib_pntpos.cc

@@ -859,7 +859,7 @@ int pntpos(const obsd_t *obs, int n, const nav_t *nav,
             opt_.ionoopt = IONOOPT_BRDC;
             opt_.tropopt = TROPOPT_SAAS;
         }
-    /* satellite positons, velocities and clocks */
+    /* satellite positions, velocities and clocks */
     satposs(sol->time, obs, n, nav, opt_.sateph, rs, dts, var, svh);
 
     /* estimate receiver position with pseudorange */

src/algorithms/libs/rtklib/rtklib_ppp.cc

@@ -425,7 +425,7 @@ int fix_amb_ROUND(rtk_t *rtk, int *sat1, int *sat2, const int *NW, int n)
             sat2[m] = sat2[i];
             NC[m++] = BC;
         }
-    /* select fixed ambiguities by dependancy check */
+    /* select fixed ambiguities by dependency check */
     m = sel_amb(sat1, sat2, NC, var, m);
 
     /* fixed solution */

src/algorithms/libs/rtklib/rtklib_ppp.h

@@ -79,7 +79,7 @@
 
 const double MIN_ARC_GAP = 300.0;          /* min arc gap (s) */
 const double CONST_AMB = 0.001;            /* constraint to fixed ambiguity */
-const double THRES_RES = 0.3;              /* threashold of residuals test (m) */
+const double THRES_RES = 0.3;              /* threshold of residuals test (m) */
 const double LOG_PI = 1.14472988584940017; /* log(pi) */
 const double SQRT2 = 1.41421356237309510;  /* sqrt(2) */
 

src/algorithms/libs/rtklib/rtklib_preceph.cc

@@ -843,7 +843,7 @@ void satantoff(gtime_t time, const double *rs, int sat, const nav_t *nav,
  * args   : gtime_t time       I   time (gpst)
  *          int    sat         I   satellite number
  *          nav_t  *nav        I   navigation data
- *          int    opt         I   sat postion option
+ *          int    opt         I   sat position option
  *                                 (0: center of mass, 1: antenna phase center)
  *          double *rs         O   sat position and velocity (ecef)
  *                                 {x,y,z,vx,vy,vz} (m|m/s)

src/algorithms/libs/rtklib/rtklib_rtcm.cc

@@ -315,7 +315,7 @@ int input_rtcm3(rtcm_t *rtcm, unsigned char data)
 
 
 /* input rtcm 2 message from file ----------------------------------------------
- * fetch next rtcm 2 message and input a messsage from file
+ * fetch next rtcm 2 message and input a message from file
  * args   : rtcm_t *rtcm IO   rtcm control struct
  *          FILE  *fp    I    file pointer
  * return : status (-2: end of file, -1...10: same as above)
@@ -337,7 +337,7 @@ int input_rtcm2f(rtcm_t *rtcm, FILE *fp)
 
 
 /* input rtcm 3 message from file ----------------------------------------------
- * fetch next rtcm 3 message and input a messsage from file
+ * fetch next rtcm 3 message and input a message from file
  * args   : rtcm_t *rtcm IO   rtcm control struct
  *          FILE  *fp    I    file pointer
  * return : status (-2: end of file, -1...10: same as above)

src/algorithms/libs/rtklib/rtklib_rtcm3.cc

@@ -1056,7 +1056,7 @@ int decode_type1021(rtcm_t *rtcm __attribute__((unused)))
 }
 
 
-/* decode type 1022: moledenski-badekas transfromation -----------------------*/
+/* decode type 1022: moledenski-badekas transformation -----------------------*/
 int decode_type1022(rtcm_t *rtcm __attribute__((unused)))
 {
     trace(2, "rtcm3 1022: not supported message\n");
@@ -2699,7 +2699,7 @@ void save_msm_obs(rtcm_t *rtcm, int sys, msm_h_t *h, const double *r,
             /* signal to rinex obs type */
             code[i] = obs2code(sig[i], freq + i);
 
-            /* freqency index for beidou */
+            /* frequency index for beidou */
             if (sys == SYS_BDS)
                 {
                     if (freq[i] == 5)

src/algorithms/libs/rtklib/rtklib_rtkcmn.cc

@@ -1818,7 +1818,7 @@ unsigned int tickget(void)
 
 /* sleep ms --------------------------------------------------------------------
  * sleep ms
- * args   : int   ms         I   miliseconds to sleep (<0:no sleep)
+ * args   : int   ms         I   milliseconds to sleep (<0:no sleep)
  * return : none
  *-----------------------------------------------------------------------------*/
 void sleepms(int ms)
@@ -1883,7 +1883,7 @@ double dms2deg(const double *dms)
 }
 
 
-/* transform ecef to geodetic postion ------------------------------------------
+/* transform ecef to geodetic position ------------------------------------------
  * transform ecef position to geodetic position
  * args   : double *r        I   ecef position {x,y,z} (m)
  *          double *pos      O   geodetic position {lat,lon,h} (rad,m)
@@ -1925,8 +1925,8 @@ void pos2ecef(const double *pos, double *r)
 }
 
 
-/* ecef to local coordinate transfromation matrix ------------------------------
- * compute ecef to local coordinate transfromation matrix
+/* ecef to local coordinate transformation matrix ------------------------------
+ * compute ecef to local coordinate transformation matrix
  * args   : double *pos      I   geodetic position {lat,lon} (rad)
  *          double *E        O   ecef to local coord transformation matrix (3x3)
  * return : none
@@ -2222,7 +2222,7 @@ void eci2ecef(gtime_t tutc, const double *erpv, double *U, double *gmst)
     matmul("NN", 3, 3, 3, 1.0, R1, R2, 0.0, R);
     matmul("NN", 3, 3, 3, 1.0, R, R3, 0.0, N); /* N=Rx(-eps)*Rz(-dspi)*Rx(eps) */
 
-    /* greenwich aparent sidereal time (rad) */
+    /* greenwich apparent sidereal time (rad) */
     gmst_ = utc2gmst(tutc_, erpv[2]);
     gast = gmst_ + dpsi * cos(eps);
     gast += (0.00264 * sin(f[4]) + 0.000063 * sin(2.0 * f[4])) * AS2R;
@@ -4165,7 +4165,7 @@ void sunmoonpos(gtime_t tutc, const double *erpv, double *rsun,
     /* eci to ecef transformation matrix */
     eci2ecef(tutc, erpv, U, &gmst_);
 
-    /* sun and moon postion in ecef */
+    /* sun and moon position in ecef */
     if (rsun) matmul("NN", 3, 1, 3, 1.0, U, rs, 0.0, rsun);
     if (rmoon) matmul("NN", 3, 1, 3, 1.0, U, rm, 0.0, rmoon);
     if (gmst) *gmst = gmst_;

src/algorithms/libs/rtklib/rtklib_rtkpos.cc

@@ -599,7 +599,7 @@ void udpos(rtk_t *rtk, double tt)
             for (i = 0; i < 3; i++) initx_rtk(rtk, rtk->sol.rr[i], VAR_POS, i);
             return;
         }
-    /* check variance of estimated postion */
+    /* check variance of estimated position */
     for (i = 0; i < 3; i++)
         {
             var += rtk->P[i + i * rtk->nx];
@@ -2223,7 +2223,7 @@ void rtkfree(rtk_t *rtk)
  *                .vs   [r]  O   data valid single     (r=0:rover,1:base)
  *                .resp [f]  O   freq(f+1) pseudorange residual (m)
  *                .resc [f]  O   freq(f+1) carrier-phase residual (m)
- *                .vsat [f]  O   freq(f+1) data vaild (0:invalid,1:valid)
+ *                .vsat [f]  O   freq(f+1) data valid (0:invalid,1:valid)
  *                .fix  [f]  O   freq(f+1) ambiguity flag
  *                               (0:nodata,1:float,2:fix,3:hold)
  *                .slip [f]  O   freq(f+1) slip flag
@@ -2262,7 +2262,7 @@ int rtkpos(rtk_t *rtk, const obsd_t *obs, int n, const nav_t *nav)
     traceobs(4, obs, n);
     /*trace(5,"nav=\n"); tracenav(5,nav);*/
 
-    /* set base staion position */
+    /* set base station position */
     if (opt->refpos <= POSOPT_RINEX && opt->mode != PMODE_SINGLE &&
         opt->mode != PMODE_MOVEB)
         {

src/algorithms/libs/rtklib/rtklib_rtksvr.cc

@@ -210,7 +210,7 @@ void updatesvr(rtksvr_t *svr, int ret, obs_t *obs, nav_t *nav, int sat,
             svr->nmsg[index][2]++;
         }
     else if (ret == 5)
-        { /* antenna postion parameters */
+        { /* antenna position parameters */
             if (svr->rtk.opt.refpos == 4 && index == 1)
                 {
                     for (i = 0; i < 3; i++)

src/algorithms/libs/rtklib/rtklib_sbas.cc

@@ -616,10 +616,10 @@ int cmpmsgs(const void *p1, const void *p2)
  *         (gtime_t  te      I   end time  )
  *          sbs_t    *sbs    IO  sbas messages
  * return : number of sbas messages
- * notes  : sbas message are appended and sorted. before calling the funciton,
+ * notes  : sbas message are appended and sorted. before calling the function,
  *          sbs->n, sbs->nmax and sbs->msgs must be set properly. (initially
  *          sbs->n=sbs->nmax=0, sbs->msgs=NULL)
- *          only the following file extentions after wild card expanded are valid
+ *          only the following file extensions after wild card expanded are valid
  *          to read. others are skipped
  *          .sbs, .SBS, .ems, .EMS
  *-----------------------------------------------------------------------------*/

src/algorithms/libs/rtklib/rtklib_solution.cc

@@ -150,7 +150,7 @@ void covtosol(const double *P, sol_t *sol)
 }
 
 
-/* decode nmea gprmc: recommended minumum data for gps -----------------------*/
+/* decode nmea gprmc: recommended minimum data for gps -----------------------*/
 int decode_nmearmc(char **val, int n, sol_t *sol)
 {
     double tod = 0.0, lat = 0.0, lon = 0.0, vel = 0.0, dir = 0.0, date = 0.0, ang = 0.0, ep[6];
@@ -219,7 +219,7 @@ int decode_nmearmc(char **val, int n, sol_t *sol)
     sol->stat = mode == 'D' ? SOLQ_DGPS : SOLQ_SINGLE;
     sol->ns = 0;
 
-    sol->type = 0; /* postion type = xyz */
+    sol->type = 0; /* position type = xyz */
 
     trace(5, "decode_nmearmc: %s rr=%.3f %.3f %.3f stat=%d ns=%d vel=%.2f dir=%.0f ang=%.0f mew=%c mode=%c\n",
         time_str(sol->time, 0), sol->rr[0], sol->rr[1], sol->rr[2], sol->stat, sol->ns,
@@ -310,7 +310,7 @@ int decode_nmeagga(char **val, int n, sol_t *sol)
     sol->stat = 0 <= solq && solq <= 8 ? solq_nmea[solq] : SOLQ_NONE;
     sol->ns = nrcv;
 
-    sol->type = 0; /* postion type = xyz */
+    sol->type = 0; /* position type = xyz */
 
     trace(5, "decode_nmeagga: %s rr=%.3f %.3f %.3f stat=%d ns=%d hdop=%.1f ua=%c um=%c\n",
         time_str(sol->time, 0), sol->rr[0], sol->rr[1], sol->rr[2], sol->stat, sol->ns,
@@ -453,7 +453,7 @@ int decode_solxyz(char *buff, const solopt_t *opt, sol_t *sol)
     if (i < n) sol->age = (float)val[i++];
     if (i < n) sol->ratio = (float)val[i];
 
-    sol->type = 0; /* postion type = xyz */
+    sol->type = 0; /* position type = xyz */
 
     if (MAXSOLQ < sol->stat) sol->stat = SOLQ_NONE;
     return 1;
@@ -512,7 +512,7 @@ int decode_solllh(char *buff, const solopt_t *opt, sol_t *sol)
     if (i < n) sol->age = (float)val[i++];
     if (i < n) sol->ratio = (float)val[i];
 
-    sol->type = 0; /* postion type = xyz */
+    sol->type = 0; /* position type = xyz */
 
     if (MAXSOLQ < sol->stat) sol->stat = SOLQ_NONE;
     return 1;
@@ -558,7 +558,7 @@ int decode_solenu(char *buff, const solopt_t *opt, sol_t *sol)
     if (i < n) sol->age = (float)val[i++];
     if (i < n) sol->ratio = (float)val[i];
 
-    sol->type = 1; /* postion type = enu */
+    sol->type = 1; /* position type = enu */
 
     if (MAXSOLQ < sol->stat) sol->stat = SOLQ_NONE;
     return 1;
@@ -1798,7 +1798,7 @@ int outsols(unsigned char *buff, const sol_t *sol, const double *rb,
 
 
 /* output solution extended ----------------------------------------------------
- * output solution exteneded infomation
+ * output solution exteneded information
  * args   : unsigned char *buff IO output buffer
  *          sol_t  *sol      I   solution
  *          ssat_t *ssat     I   satellite status
@@ -1892,7 +1892,7 @@ void outsol(FILE *fp, const sol_t *sol, const double *rb,
 
 
 /* output solution extended ----------------------------------------------------
- * output solution exteneded infomation to file
+ * output solution exteneded information to file
  * args   : FILE   *fp       I   output file pointer
  *          sol_t  *sol      I   solution
  *          ssat_t *ssat     I   satellite status

src/algorithms/libs/rtklib/rtklib_stream.cc

@@ -1916,7 +1916,7 @@ void strunlock(stream_t *stream) { rtk_unlock(&stream->lock); }
 /* read stream -----------------------------------------------------------------
  * read data from stream (unblocked)
  * args   : stream_t *stream I  stream
- *          unsinged char *buff O data buffer
+ *          unsigned char *buff O data buffer
  *          int    n         I  maximum data length
  * return : read data length
  * notes  : if no data, return immediately with no data
@@ -1978,7 +1978,7 @@ int strread(stream_t *stream, unsigned char *buff, int n)
 /* write stream ----------------------------------------------------------------
  * write data to stream (unblocked)
  * args   : stream_t *stream I   stream
- *          unsinged char *buff I data buffer
+ *          unsigned char *buff I data buffer
  *          int    n         I   data length
  * return : status (0:error, 1:ok)
  * notes  : write data to buffer and return immediately