Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/qtapp/rtknavi_qt/naviopt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ void OptDialog::BtnStaPosFileClick()
{
QString fileName;

fileName=QDir::toNativeSeparators(QFileDialog::getOpenFileName(this,tr("Station Postion File"),QString(),tr("Position File (*.pos);;All (*.*)")));
fileName=QDir::toNativeSeparators(QFileDialog::getOpenFileName(this,tr("Station Position File"),QString(),tr("Position File (*.pos);;All (*.*)")));

StaPosFile->setText(fileName);
}
Expand Down
2 changes: 1 addition & 1 deletion app/qtapp/rtkpost_qt/postopt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ void OptDialog::BtnStaPosViewClick()
//---------------------------------------------------------------------------
void OptDialog::BtnStaPosFileClick()
{
StaPosFile->setText(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this,tr("Station Postion File"),QString(),tr("Position File (*.pos);;All (*.*)"))));
StaPosFile->setText(QDir::toNativeSeparators(QFileDialog::getOpenFileName(this,tr("Station Position File"),QString(),tr("Position File (*.pos);;All (*.*)"))));
}
//---------------------------------------------------------------------------
void OptDialog::RovPosTypeChange()
Expand Down
2 changes: 1 addition & 1 deletion app/qtapp/rtkpost_qt/postopt.ui
Original file line number Diff line number Diff line change
Expand Up @@ -2311,7 +2311,7 @@
</item>
<item>
<property name="text">
<string>RINEX Header Postion</string>
<string>RINEX Header Position</string>
</property>
</item>
</widget>
Expand Down
2 changes: 1 addition & 1 deletion app/qtapp/strsvr_qt/convdlg.ui
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
<string/>
</property>
<property name="text">
<string>Message Types (Inteval: s) separeted by ,</string>
<string>Message Types (Interval: s) separated by ,</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion app/winapp/rtknavi/naviopt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ void __fastcall TOptDialog::BtnStaPosViewClick(TObject *Sender)
//---------------------------------------------------------------------------
void __fastcall TOptDialog::BtnStaPosFileClick(TObject *Sender)
{
OpenDialog->Title="Station Postion File";
OpenDialog->Title="Station Position File";
OpenDialog->FilterIndex=3;
if (!OpenDialog->Execute()) return;
StaPosFile->Text=OpenDialog->FileName;
Expand Down
2 changes: 1 addition & 1 deletion app/winapp/rtkpost/postopt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ void __fastcall TOptDialog::BtnStaPosViewClick(TObject *Sender)
//---------------------------------------------------------------------------
void __fastcall TOptDialog::BtnStaPosFileClick(TObject *Sender)
{
OpenDialog->Title="Station Postion File";
OpenDialog->Title="Station Position File";
OpenDialog->FilterIndex=3;
if (!OpenDialog->Execute()) return;
StaPosFile->Text=OpenDialog->FileName;
Expand Down
2 changes: 1 addition & 1 deletion app/winapp/rtkpost/postopt.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -1364,7 +1364,7 @@ object OptDialog: TOptDialog
'X/Y/Z-ECEF (m)'
'Average of Single Position'
'Get from Position File'
'RINEX Header Postion')
'RINEX Header Position')
end
object DatumRef: TComboBox
Left = 186
Expand Down
2 changes: 1 addition & 1 deletion app/winapp/strsvr/convdlg.dfm
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ object ConvDialog: TConvDialog
Top = 34
Width = 208
Height = 13
Caption = 'Message Types (Inteval: s) separeted by ,'
Caption = 'Message Types (Interval: s) separated by ,'
end
object BtnOk: TButton
Left = 177
Expand Down
2 changes: 1 addition & 1 deletion doc/doc/relnotes_2.2.1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ Changes: ver.2.2.0 -> ver.2.2.1
(b) Keyword replacement in input and output file paths is supported for
batch processing.
(c) "Excluded Satellites" is activated in "Options - Setting1" dialog.
(d) "RINEX Header Position" is added as "Base/NRTK Station postion" in
(d) "RINEX Header Position" is added as "Base/NRTK Station position" in
"Options - Position" dialog.
(e) "Rover List" and "Base Station List" are added in "Options - Misc"
dialog.
Expand Down
4 changes: 2 additions & 2 deletions doc/doc/relnotes_2.3.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Changes: ver.2.2.2 -> ver.2.3.0
(r) "Output Solution Status" option is added in "Options"-"Output" dialog
(s) "Meas Errors of Doppler Frequency" option is added in "Options"-"Statistics" dialog
(t) "Process Noise of Receiver Accel Horiz/Vertical" option is added in "Options"-"Statistics" dialog
(u) "Rover Position" can be set in "Options"-"Postions" dialog if "Fixed" is selected as "Positioning Mode"
(u) "Rover Position" can be set in "Options"-"Positions" dialog if "Fixed" is selected as "Positioning Mode"
(v) "Geoid Data File" option is added in "Options"-"Files"
(w) SkyTraq S1315F receiver is supported.
(x) Hemisphere Eclipse receiver is supported.
Expand Down Expand Up @@ -116,7 +116,7 @@ Changes: ver.2.2.2 -> ver.2.3.0
(n) "Output Solution Status" option is added in "Options"-"Output" dialog
(o) "Meas Errors of Doppler Frequency" option is added in "Options"-"Statistics" dialog
(p) "Process Noise of Receiver Accel Horiz/Vertical" option is added in "Options"-"Statistics" dialog
(q) "Rover Position" can be set in "Options"-"Postions" dialog if "Fixed" is selected as "Positioning Mode"
(q) "Rover Position" can be set in "Options"-"Positions" dialog if "Fixed" is selected as "Positioning Mode"
(r) "Geoid Data File" option is added in "Options"-"Files"
(s) '#' can be used for comment in "Rover List" or "Base Station List" in Options-"Misc" dialog
(t) Wild-cards in file path of precise ephemeris (SP3) are supported.
Expand Down
4 changes: 2 additions & 2 deletions src/ephemeris.c
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ static 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) */
Expand Down Expand Up @@ -655,7 +655,7 @@ static 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 */
Expand Down
2 changes: 1 addition & 1 deletion src/postpos.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ static pcvs_t pcvsr={0}; /* satellite antenna parameters */
static obs_t obss={0}; /* observation data */
static nav_t navs={0}; /* navigation data */
static sbs_t sbss={0}; /* sbas messages */
static sta_t stas[MAXRCV]; /* station infomation */
static sta_t stas[MAXRCV]; /* station information */
static int nepoch=0; /* number of observation epochs */
static int iobsu =0; /* current rover observation data index */
static int iobsr =0; /* current reference observation data index */
Expand Down
2 changes: 1 addition & 1 deletion src/preceph.c
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ extern 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)
Expand Down
2 changes: 1 addition & 1 deletion src/rcv/crescent.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ static int chksum(const uint8_t *buff, int len)
return (sum>>8)==buff[len-3]&&(sum&0xFF)==buff[len-4]&&
buff[len-2]==0x0D&&buff[len-1]==0x0A;
}
/* decode bin 1 postion/velocity ---------------------------------------------*/
/* decode bin 1 position/velocity ---------------------------------------------*/
static int decode_crespos(raw_t *raw)
{
int ns,week,mode;
Expand Down
2 changes: 1 addition & 1 deletion src/rcv/novatel.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
* improve unchange-test of beidou ephemeris
* 2017/06/15 1.15 add output half-cycle-ambiguity status to LLI
* improve slip-detection by lock-time rollback
* 2018/10/10 1.16 fix problem on data souce for galileo ephemeris
* 2018/10/10 1.16 fix problem on data source for galileo ephemeris
* output L2W instead of L2D for L2Pcodeless
* test toc difference to output beidou ephemeris
* 2019/05/10 1.17 save galileo E5b data to obs index 2
Expand Down
2 changes: 1 addition & 1 deletion src/rcv/rt17.c
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
| 5. Positions AKA Stream Positions
| (NOT RECOMMENDED)
|
| Streamed postions are of no use to RTKLIB. They will be ignored. RTKLIB
| Streamed positions are of no use to RTKLIB. They will be ignored. RTKLIB
| computes positions from the raw satellite data. It has no use for the
| receiver's position solutions. Streamed positions also consume
| considerable bandwidth in the stream and/or space in a file.
Expand Down
4 changes: 2 additions & 2 deletions src/rtkcmn.c
Original file line number Diff line number Diff line change
Expand Up @@ -1919,7 +1919,7 @@ extern double dms2deg(const double *dms)
double sign=dms[0]<0.0?-1.0:1.0;
return sign*(fabs(dms[0])+dms[1]/60.0+dms[2]/3600.0);
}
/* 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)
Expand Down Expand Up @@ -3941,7 +3941,7 @@ extern 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_;
Expand Down
2 changes: 1 addition & 1 deletion src/rtkpos.c
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ static void udpos(rtk_t *rtk, double tt)
for (i=0;i<3;i++) initx(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];
var/=3.0;

Expand Down
2 changes: 1 addition & 1 deletion src/rtksvr.c
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ static void update_svr(rtksvr_t *svr, int ret, obs_t *obs, nav_t *nav,
else if (ret==9) { /* ion/utc parameters */
update_ionutc(svr,nav,index);
}
else if (ret==5) { /* antenna postion */
else if (ret==5) { /* antenna position */
update_antpos(svr,index);
}
else if (ret==7) { /* dgps correction */
Expand Down
14 changes: 7 additions & 7 deletions src/solution.c
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ static 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,
Expand Down Expand Up @@ -294,7 +294,7 @@ static int decode_nmeagga(char **val, int n, sol_t *sol)
sol->ns=nrcv;
sol->age=(float)age;

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,
Expand Down Expand Up @@ -452,7 +452,7 @@ static int decode_solxyz(char *buff, const solopt_t *opt, sol_t *sol)
}
covtosol_vel(P,sol);
}
sol->type=0; /* postion type = xyz */
sol->type=0; /* position type = xyz */

if (MAXSOLQ<sol->stat) sol->stat=SOLQ_NONE;
return 1;
Expand Down Expand Up @@ -518,7 +518,7 @@ static int decode_solllh(char *buff, const solopt_t *opt, sol_t *sol)
covecef(pos,Q,P);
covtosol_vel(P,sol);
}
sol->type=0; /* postion type = xyz */
sol->type=0; /* position type = xyz */

if (MAXSOLQ<sol->stat) sol->stat=SOLQ_NONE;
return 1;
Expand Down Expand Up @@ -553,7 +553,7 @@ static 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;
Expand Down Expand Up @@ -1625,7 +1625,7 @@ extern int outsols(uint8_t *buff, const sol_t *sol, const double *rb,
return p-buff;
}
/* output solution extended ----------------------------------------------------
* output solution exteneded infomation
* output solution exteneded information
* args : uint8_t *buff IO output buffer
* sol_t *sol I solution
* ssat_t *ssat I satellite status
Expand Down Expand Up @@ -1710,7 +1710,7 @@ extern 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
Expand Down
2 changes: 1 addition & 1 deletion src/stream.c
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
#define NTRIP_RSP_HTTP "HTTP/" /* ntrip response: http */
#define NTRIP_RSP_ERROR "ERROR" /* ntrip response: error */
#define NTRIP_RSP_UNAUTH "HTTP/1.0 401 Unauthorized\r\n"
#define NTRIP_RSP_ERR_PWD "ERROR - Bad Pasword\r\n"
#define NTRIP_RSP_ERR_PWD "ERROR - Bad Password\r\n"
#define NTRIP_RSP_ERR_MNTP "ERROR - Bad Mountpoint\r\n"

#define FTP_CMD "wget" /* ftp/http command */
Expand Down