Skip to content

Deletion of old API, STR_NTRIPC_S, also needs modifications of rtkrcv.c and naviopt.cpp #638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yoronneko wants to merge 4 commits into
base: rtklib_2.4.3
Choose a base branch
from
Open

Deletion of old API, STR_NTRIPC_S, also needs modifications of rtkrcv.c and naviopt.cpp #638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8cf84ae
Update rtkrcv.c reflecting API change in stream.c
yoronneko Jan 7, 2022
e77705a
Update naviopt.cpp reflecting stream.c API change
yoronneko Jan 7, 2022
b21d95f
Update readme.txt
yoronneko Dec 29, 2022
cf08cbc
Update septentrio.c
yoronneko Jun 22, 2023
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
8 changes: 4 additions & 4 deletions app/consapp/rtkrcv/rtkrcv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ static const char *pathopts[]={ /* path options help */
#define TIMOPT "0:gpst,1:utc,2:jst,3:tow"
#define CONOPT "0:dms,1:deg,2:xyz,3:enu,4:pyl"
#define FLGOPT "0:off,1:std+2:age/ratio/ns"
#define ISTOPT "0:off,1:serial,2:file,3:tcpsvr,4:tcpcli,7:ntripcli,8:ftp,9:http"
#define OSTOPT "0:off,1:serial,2:file,3:tcpsvr,4:tcpcli,6:ntripsvr,11:ntripc_c"
#define ISTOPT "0:off,1:serial,2:file,3:tcpsvr,4:tcpcli,6:ntripcli,7:ftp,8:http"
#define OSTOPT "0:off,1:serial,2:file,3:tcpsvr,4:tcpcli,5:ntripsvr"
#define FMTOPT "0:rtcm2,1:rtcm3,2:oem4,3:oem3,4:ubx,5:ss2,6:hemis,7:skytraq,8:gw10,9:javad,10:nvs,11:binex,12:rt17,13:sbf,14:cmr,15:tersus,18:sp3"
#define NMEOPT "0:off,1:latlon,2:single"
#define SOLOPT "0:llh,1:xyz,2:enu,3:nmea,4:stat"
Expand Down Expand Up @@ -921,8 +921,8 @@ static void prstream(vt_t *vt)
"log rover","log base","log corr","monitor"
};
const char *type[]={
"-","serial","file","tcpsvr","tcpcli","udp","ntrips","ntripc","ftp",
"http","ntripc_s","ntripc_c"
"-","serial","file","tcpsvr","tcpcli","ntrips","ntripc","ftp",
"http","ntripcas","udpsvr","udpcli","membuf"
};
const char *fmt[]={"rtcm2","rtcm3","oem4","oem3","ubx","ss2","hemis","skytreq",
"gw10","javad","nvs","binex","rt17","sbf","cmr","","","sp3",""};
Expand Down
4 changes: 2 additions & 2 deletions app/winapp/rtknavi/naviopt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ static char proxyaddr[MAXSTR]=""; /* proxy address */
#define TIMOPT "0:gpst,1:utc,2:jst,3:tow"
#define CONOPT "0:dms,1:deg,2:xyz,3:enu,4:pyl"
#define FLGOPT "0:off,1:std+2:age/ratio/ns"
#define ISTOPT "0:off,1:serial,2:file,3:tcpsvr,4:tcpcli,7:ntripcli,8:ftp,9:http"
#define OSTOPT "0:off,1:serial,2:file,3:tcpsvr,4:tcpcli,6:ntripsvr"
#define ISTOPT "0:off,1:serial,2:file,3:tcpsvr,4:tcpcli,6:ntripcli,7:ftp,8:http"
#define OSTOPT "0:off,1:serial,2:file,3:tcpsvr,4:tcpcli,5:ntripsvr"
#define FMTOPT "0:rtcm2,1:rtcm3,2:oem4,3:oem3,4:ubx,5:ss2,6:hemis,7:skytraq,8:gw10,9:javad,10:nvs,11:binex,12:rt17,13:sbf,14:cmr,17:sp3"
#define NMEOPT "0:off,1:latlon,2:single"
#define SOLOPT "0:llh,1:xyz,2:enu,3:nmea"
Expand Down
5 changes: 5 additions & 0 deletions readme.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
** Modification by yoronneko **

- Update rtkrcv.c and naviopt for reflecting API change in stream.c


#
# RTKLIB 2.4.3 Betas
#
Expand Down
4 changes: 2 additions & 2 deletions src/rcv/septentrio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ static int decode_measepoch(raw_t *raw)
info=U1(p+18);
n2 =U1(p+19);
fcn =0;
if (sig==31) sig+=(info>>3)*32;
if (sig==31) sig=32+(info>>3);
else if (sig>=8&&sig<=11) fcn=(info>>3)-8;

if (ant!=ant_sel) {
Expand Down Expand Up @@ -255,7 +255,7 @@ static int decode_measepoch(raw_t *raw)
sig =U1(p)&0x1f;
ant =U1(p)>>5;
info=U1(p+5);
if (sig==31) sig+=(info>>3)*32;
if (sig==31) sig=32+(info>>3);

if (ant!=ant_sel) {
trace(3,"sbf measepoch ant error: sat=%d ant=%d\n",sat,ant);
Expand Down