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/bcc/_convbin.cbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,9 @@
<CppCompile Include="..\..\..\..\src\rcv\unicore.c">
<BuildOrder>26</BuildOrder>
</CppCompile>
<CppCompile Include="..\..\..\..\src\rcv\adnav.c">
<BuildOrder>28</BuildOrder>
</CppCompile>
<CppCompile Include="..\..\..\..\src\rinex.c">
<BuildOrder>8</BuildOrder>
<BuildOrder>13</BuildOrder>
Expand Down
9 changes: 9 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 @@ -86,6 +86,7 @@ static const char *help[]={
" 0x01-01,0x01-02,0x01-03,0x01-04,0x01-06,0x7f-05",
" Trimble : RT17",
" Septentrio : SBF",
" Advanded Navigation : ANPP",
" RINEX : OBS, NAV, GNAV, HNAV, LNAV, QNAV",
"",
" Options [default]",
Expand All @@ -111,6 +112,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 @@ -170,6 +172,7 @@ static const char *help[]={
" *.rt17 Trimble RT17",
" *.sbf Septentrio SBF",
" *.unc Unicore binary data output",
" *.anpp Advanced Navigation Packet Protocol",
" *.obs,*.*o RINEX OBS",
" *.rnx RINEX OBS",
" *.nav,*.*n RINEX NAV",
Expand Down Expand Up @@ -403,7 +406,11 @@ static int get_filetime(const char *file, gtime_t *time)
struct stat st;
if (!stat(path, &st)) {
struct tm tm;
#ifdef _MSC_VER
if (gmtime_s(&tm, &st.st_mtime) != 0) {
#else
if (gmtime_r(&st.st_mtime, &tm)) {
#endif
double ep[6];
ep[0] = tm.tm_year + 1900;
ep[1] = tm.tm_mon + 1;
Expand Down Expand Up @@ -633,6 +640,7 @@ static int cmdopts(int argc, char **argv, rnxopt_t *opt, char **ifile,
#ifdef RTK_DISABLED
else if (!strcmp(fmt,"tersus")) format=STRFMT_TERSUS;
#endif
else if (!strcmp(fmt,"anpp" )) format=STRFMT_ANPP;
else if (!strcmp(fmt,"rinex")) format=STRFMT_RINEX;
}
else {
Expand All @@ -657,6 +665,7 @@ static int cmdopts(int argc, char **argv, rnxopt_t *opt, char **ifile,
#ifdef RTK_DISABLED
else if (!strcmp(p,".trs" )) format=STRFMT_TERSUS;
#endif
else if (!strcmp(p,".anpp" )) format=STRFMT_ANPP;
else if (!strcmp(p,".obs" )) format=STRFMT_RINEX;
else if (!strcmp(p+3,"o" )) format=STRFMT_RINEX;
else if (!strcmp(p+3,"O" )) format=STRFMT_RINEX;
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 @@ -72,6 +72,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 @@ -101,6 +103,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
1 change: 1 addition & 0 deletions app/consapp/convbin/msc/msc.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@
<ClCompile Include="..\..\..\..\src\rcv\septentrio.c" />
<ClCompile Include="..\..\..\..\src\rcv\swiftnav.c" />
<ClCompile Include="..\..\..\..\src\rcv\unicore.c" />
<ClCompile Include="..\..\..\..\src\rcv\adnav.c" />
<ClCompile Include="..\convbin.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
5 changes: 4 additions & 1 deletion app/consapp/rtkrcv/gcc/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ rtkrcv : rtkrcv.o vt.o rtkcmn.o trace.o rtksvr.o rtkpos.o geoid.o solution.o
rtkrcv : sbas.o stream.o rcvraw.o rtcm.o preceph.o options.o pntpos.o ppp.o ppp_ar.o
rtkrcv : novatel.o ublox.o crescent.o skytraq.o javad.o nvs.o binex.o
rtkrcv : rt17.o ephemeris.o rinex.o ionex.o rtcm2.o rtcm3.o rtcm3e.o
rtkrcv : tides.o septentrio.o swiftnav.o unicore.o
rtkrcv : tides.o septentrio.o swiftnav.o unicore.o adnav.o
rtkrcv : sofa.o


Expand Down Expand Up @@ -91,6 +91,8 @@ septentrio.o: $(SRC)/rcv/septentrio.c
$(CC) -c $(CFLAGS) $(SRC)/rcv/septentrio.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 @@ -126,6 +128,7 @@ binex.o : $(SRC)/rtklib.h
rt17.o : $(SRC)/rtklib.h
septentrio.o: $(SRC)/rtklib.h
unciore.o : $(SRC)/rtklib.h
adnav.o : $(SRC)/rtklib.h
ephemeris.o: $(SRC)/rtklib.h
rinex.o : $(SRC)/rtklib.h
ionex.o : $(SRC)/rtklib.h
Expand Down
4 changes: 2 additions & 2 deletions app/consapp/rtkrcv/rtkrcv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ static const char *pathopts[]={ /* path options help */
#define FLGOPT "0:off,1:std+2:age/ratio/ns"
#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,9:ntripcas,11:udpcli"
#define FMTOPT "0:rtcm2,1:rtcm3,2:oem4,4:ubx,5:swift,6:hemis,7:skytraq,8:javad,9:nvs,10:binex,11:rt17,12:sbf,14:unicore,15:rinex,16:sp3,17:clk"
#define FMTOPT "0:rtcm2,1:rtcm3,2:oem4,4:ubx,5:swift,6:hemis,7:skytraq,8:javad,9:nvs,10:binex,11:rt17,12:sbf,14:unicore,15:anpp,16:rinex,17:sp3,18:clk"
#define NMEOPT "0:off,1:latlon,2:single"
#define SOLOPT "0:llh,1:xyz,2:enu,3:nmea,4:stat"
#define MSGOPT "0:all,1:rover,2:base,3:corr"
Expand Down Expand Up @@ -1029,7 +1029,7 @@ static void prstream(vt_t *vt)
"http","ntripcas","udpsvr","udpcli","membuf"
};
const char *fmt[]={"rtcm2","rtcm3","oem4","","ubx","swift","hemis","skytreq",
"javad","nvs","binex","rt17","sbf","","unicore","sp3",""};
"javad","nvs","binex","rt17","sbf","","unicore","anpp","sp3",""};
const char *sol[]={"llh","xyz","enu","nmea","stat","-"};
stream_t stream[9];
int i,format[9]={0};
Expand Down
5 changes: 4 additions & 1 deletion app/consapp/str2str/gcc/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ all : str2str
str2str : str2str.o stream.o rtkcmn.o trace.o solution.o sbas.o geoid.o
str2str : rcvraw.o novatel.o ublox.o crescent.o skytraq.o javad.o
str2str : nvs.o binex.o rt17.o rtcm.o rtcm2.o rtcm3.o rtcm3e.o preceph.o streamsvr.o
str2str : septentrio.o swiftnav.o unicore.o
str2str : septentrio.o swiftnav.o unicore.o adnav.o
str2str : sofa.o

str2str.o : ../str2str.c
Expand Down Expand Up @@ -68,6 +68,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 @@ -96,6 +98,7 @@ preceph.o : $(SRC)/rtklib.h
septentrio.o: $(SRC)/rtklib.h
swiftnav.o : $(SRC)/rtklib.h
unicore.o : $(SRC)/rtklib.h
adnav.o : $(SRC)/rtklib.h

install:
cp str2str $(BINDIR)
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
4 changes: 3 additions & 1 deletion app/qtapp/rtkconv_qt/convmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ void MainWindow::selectInputFile()
{
QString filename = QFileDialog::getOpenFileName(this, tr("Input RTCM, RCV RAW or RINEX File"), ui->cBInputFile->currentText(),
tr("All (*.*);;RTCM 2 (*.rtcm2);;RTCM 3 (*.rtcm3);;NovtAtel (*.gps);;ublox (*.ubx);;"
"Hemisphere (*.bin);;Javad (*.jps);;RINEX OBS (*.obs *.*O);;Septentrio (*.sbf)"));
"Hemisphere (*.bin);;Javad (*.jps);;RINEX OBS (*.obs *.*O);;Septentrio (*.sbf);;ANPP (*.anpp)"));

if (!filename.isEmpty()) {
ui->cBInputFile->setCurrentText(QDir::toNativeSeparators(filename));
Expand Down Expand Up @@ -798,6 +798,8 @@ void MainWindow::convertFile()
conversionThread->format = STRFMT_SEPT;
} else if (fi.completeSuffix() == "unc") {
conversionThread->format = STRFMT_UNICORE;
} else if (fi.completeSuffix() == "anpp") {
conversionThread->format = STRFMT_ANPP;
} else if (fi.completeSuffix().toLower() == "obs") {
conversionThread->format = STRFMT_RINEX;
} else if (fi.completeSuffix().toLower().contains("nav")) {
Expand Down
2 changes: 1 addition & 1 deletion app/qtapp/rtknavi_qt/navimain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ static int strfmt[] = { /* stream formats */
#define FLGOPT "0:off,1:std+2:age/ratio/ns"
#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,9:ntripcas"
#define FMTOPT "0:rtcm2,1:rtcm3,2:oem4,4:ubx,5:swift,6:hemis,7:skytraq,8:javad,9:nvs,10:binex,11:rt17,12:sbf,14:unicore,15:rinex,16:sp3,17:clk"
#define FMTOPT "0:rtcm2,1:rtcm3,2:oem4,4:ubx,5:swift,6:hemis,7:skytraq,8:javad,9:nvs,10:binex,11:rt17,12:sbf,14:unicore,15:anpp,16:rinex,17:sp3,18:clk"
#define NMEOPT "0:off,1:latlon,2:single"
#define SOLOPT "0:llh,1:xyz,2:enu,3:nmea,4:stat"

Expand Down
1 change: 1 addition & 0 deletions app/winapp/rtkconv/convmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,6 +896,7 @@ void __fastcall TMainWindow::ConvertFile(void)
else if (!strcmp(p,".trs" )) format=STRFMT_TERSUS;
else if (!strcmp(p,".cnb" )) format=STRFMT_CNAV;
#endif
else if (!strcmp(p,".anpp" )) format=STRFMT_ANPP;
else if (!strcmp(p,".obs" )) format=STRFMT_RINEX;
else if (!strcmp(p,".OBS" )) format=STRFMT_RINEX;
else if (!strcmp(p,".nav" )) format=STRFMT_RINEX;
Expand Down
2 changes: 1 addition & 1 deletion app/winapp/rtkconv/convmain.dfm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1151,7 +1151,7 @@ object MainWindow: TMainWindow
'All (*.*)|*.*|RTCM 2 (*.rtcm2)|*.rtcm2|RTCM 3 (*.rtcm3)|*.rtcm3|' +
'NovtAtel (*.gps)|*.gps|ublox (*.ubx)|*.ubx' +
'|Hemisphere (*.bin)|*.bin|Javad (*.jps)|*.jps|' +
'Septentrio (*.sbf)|*.sbf|' +
'Septentrio (*.sbf)|*.sbf|ANPP (*.anpp)|*.anpp|' +
'RINEX OBS (*.obs,*.*O)|*.obs;*.*O'
Options = [ofHideReadOnly, ofNoChangeDir, ofEnableSizing]
Left = 260
Expand Down
3 changes: 3 additions & 0 deletions app/winapp/rtkconv/rtkconv.cbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,9 @@
<CppCompile Include="..\..\..\src\rcv\unicore.c">
<BuildOrder>39</BuildOrder>
</CppCompile>
<CppCompile Include="..\..\..\src\rcv\adnav.c">
<BuildOrder>42</BuildOrder>
</CppCompile>
<CppCompile Include="..\..\..\src\rinex.c">
<BuildOrder>31</BuildOrder>
</CppCompile>
Expand Down
2 changes: 1 addition & 1 deletion app/winapp/rtknavi/naviopt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ static char proxyaddr[MAXSTR]=""; /* proxy address */
#define FLGOPT "0:off,1:std+2:age/ratio/ns"
#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,9:ntripcas"
#define FMTOPT "0:rtcm2,1:rtcm3,2:oem4,4:ubx,5:swift,6:hemis,7:skytraq,8:javad,9:nvs,10:binex,11:rt17,12:sbf,14:unicore,15:rinex,16:sp3,17:clk"
#define FMTOPT "0:rtcm2,1:rtcm3,2:oem4,4:ubx,5:swift,6:hemis,7:skytraq,8:javad,9:nvs,10:binex,11:rt17,12:sbf,14:unicore,15:anpp,16:rinex,17:sp3,18:clk"
#define NMEOPT "0:off,1:latlon,2:single"
#define SOLOPT "0:llh,1:xyz,2:enu,3:nmea,4:stat"
#define MSGOPT "0:all,1:rover,2:base,3:corr"
Expand Down
3 changes: 3 additions & 0 deletions app/winapp/rtknavi/rtknavi.cbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,9 @@
<CppCompile Include="..\..\..\src\rcv\unicore.c">
<BuildOrder>60</BuildOrder>
</CppCompile>
<CppCompile Include="..\..\..\src\rcv\adnav.c">
<BuildOrder>64</BuildOrder>
</CppCompile>
<CppCompile Include="..\..\..\src\rinex.c">
<BuildOrder>47</BuildOrder>
<BuildOrder>16</BuildOrder>
Expand Down
3 changes: 3 additions & 0 deletions app/winapp/rtkplot/rtkplot.cbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,9 @@
<CppCompile Include="..\..\..\src\rcv\unicore.c">
<BuildOrder>60</BuildOrder>
</CppCompile>
<CppCompile Include="..\..\..\src\rcv\adnav.c">
<BuildOrder>64</BuildOrder>
</CppCompile>
<CppCompile Include="..\..\..\src\rinex.c">
<BuildOrder>52</BuildOrder>
</CppCompile>
Expand Down
3 changes: 3 additions & 0 deletions app/winapp/srctblbrows/srctblbrows.cbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,9 @@
<CppCompile Include="..\..\..\src\rcv\unicore.c">
<BuildOrder>23</BuildOrder>
</CppCompile>
<CppCompile Include="..\..\..\src\rcv\adnav.c">
<BuildOrder>27</BuildOrder>
</CppCompile>
<CppCompile Include="..\..\..\src\rtkcmn.c">
<BuildOrder>23</BuildOrder>
</CppCompile>
Expand Down
3 changes: 3 additions & 0 deletions app/winapp/strsvr/strsvr.cbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,9 @@
<CppCompile Include="..\..\..\src\rcv\unicore.c">
<BuildOrder>41</BuildOrder>
</CppCompile>
<CppCompile Include="..\..\..\src\rcv\adnav.c">
<BuildOrder>43</BuildOrder>
</CppCompile>
<CppCompile Include="..\..\..\src\rtcm.c">
<BuildOrder>31</BuildOrder>
</CppCompile>
Expand Down
1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ endif()
aux_source_directory(. DIR_SRCS_RTKLIB)
set(DIR_SRCS_RTKLIB_RCV
${DIR_SRCS_RTKLIB_RCV}
rcv/adnav.c
rcv/binex.c
rcv/crescent.c
rcv/javad.c
Expand Down
12 changes: 3 additions & 9 deletions src/convrnx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,15 +340,9 @@ 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);
str->fp = NULL;
}
}
/* set format and files in RINEX options comments ----------------------------*/
Expand Down
Loading