Skip to content

Support for Advanced Navigation ANPP format #861

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
joe-saronic wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Support for Advanced Navigation ANPP format #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions app/consapp/convbin/convbin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ static const char *help[]={
" rt17 = Trimble RT17",
" sbf = Septentrio SBF",
" unicore = Unicore binary data output",
" anpp = Advanced Navigation Packet Protocol",
" rinex= RINEX",
" -ro opt receiver options",
" -f freq number of frequencies [all]",
Expand Down Expand Up @@ -630,6 +631,7 @@ static int cmdopts(int argc, char **argv, rnxopt_t *opt, char **ifile,
else if (!strcmp(fmt,"rt17" )) format=STRFMT_RT17;
else if (!strcmp(fmt,"sbf" )) format=STRFMT_SEPT;
else if (!strcmp(fmt,"unicore")) format=STRFMT_UNICORE;
else if (!strcmp(fmt,"anpp" )) format=STRFMT_ANPP;
#ifdef RTK_DISABLED
else if (!strcmp(fmt,"tersus")) format=STRFMT_TERSUS;
#endif
Expand All @@ -654,6 +656,7 @@ static int cmdopts(int argc, char **argv, rnxopt_t *opt, char **ifile,
else if (!strcmp(p,".rt17" )) format=STRFMT_RT17;
else if (!strcmp(p,".sbf" )) format=STRFMT_SEPT;
else if (!strcmp(p,".unc" )) format=STRFMT_UNICORE;
else if (!strcmp(p,".anpp" )) format=STRFMT_ANPP;
#ifdef RTK_DISABLED
else if (!strcmp(p,".trs" )) format=STRFMT_TERSUS;
#endif
Expand Down
5 changes: 4 additions & 1 deletion app/consapp/convbin/gcc/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ all : convbin
convbin : convbin.o rtkcmn.o trace.o rinex.o sbas.o preceph.o rcvraw.o convrnx.o
convbin : rtcm.o rtcm2.o rtcm3.o rtcm3e.o pntpos.o ephemeris.o ionex.o
convbin : novatel.o ublox.o crescent.o skytraq.o javad.o nvs.o
convbin : binex.o rt17.o septentrio.o swiftnav.o unicore.o
convbin : binex.o rt17.o septentrio.o swiftnav.o unicore.o adnav.o
convbin : sofa.o

convbin.o : ../convbin.c
Expand Down Expand Up @@ -74,6 +74,8 @@ swiftnav.o: $(SRC)/rcv/swiftnav.c
$(CC) -c $(CFLAGS) $(SRC)/rcv/swiftnav.c
unicore.o: $(SRC)/rcv/unicore.c
$(CC) -c $(CFLAGS) $(SRC)/rcv/unicore.c
adnav.o : $(SRC)/rcv/adnav.c
$(CC) -c $(CFLAGS) $(SRC)/rcv/adnav.c
sofa.o : $(SRC)/sofa.c
$(CC) -c $(CFLAGS) $(SRC)/sofa.c

Expand Down Expand Up @@ -104,6 +106,7 @@ rt17.o : $(SRC)/rtklib.h
septentrio.o: $(SRC)/rtklib.h
swiftnav.o : $(SRC)/rtklib.h
unciore.o : $(SRC)/rtklib.h
adnav.o : $(SRC)/rtklib.h

DATDIR = ../../../test/data/rcvraw

Expand Down
2 changes: 2 additions & 0 deletions app/consapp/str2str/str2str.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ static const char *help[]={
" rt17 : Trimble RT17 (only in)",
" sbf : Septentrio SBF (only in)",
" unicore : Unicore (only in)",
" anpp : Advanced Navigation Packet Protocol (only in)",
"",
" -msg \"type[(tint)][,type[(tint)]...]\"",
" rtcm message types and output intervals (s)",
Expand Down Expand Up @@ -168,6 +169,7 @@ static void decodefmt(char *path, int *fmt)
else if (!strcmp(p,"#rt17" )) *fmt=STRFMT_RT17;
else if (!strcmp(p,"#sbf" )) *fmt=STRFMT_SEPT;
else if (!strcmp(p,"#unicore" )) *fmt=STRFMT_UNICORE;
else if (!strcmp(p,"#anpp" )) *fmt=STRFMT_ANPP;
else return;
*p='\0';
}
Expand Down
11 changes: 1 addition & 10 deletions src/convrnx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,16 +340,7 @@ static int open_strfile(strfile_t *str, const char *file)
static void close_strfile(strfile_t *str)
{
trace(3,"close_strfile:\n");

if (str->format==STRFMT_RTCM2||str->format==STRFMT_RTCM3) {
if (str->fp) fclose(str->fp);
}
else if (str->format<=MAXRCVFMT) {
if (str->fp) fclose(str->fp);
}
else if (str->format==STRFMT_RINEX) {
if (str->fp) fclose(str->fp);
}
if (str->fp) fclose(str->fp);
}
/* set format and files in RINEX options comments ----------------------------*/
static void setopt_file(int format, char **paths, int n, const int *mask,
Expand Down
Loading