Skip to content

clean up remnants of rcv/ss2.c #883

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
ourairquality wants to merge 2 commits into
base: main
Choose a base branch
from
Open

clean up remnants of rcv/ss2.c #883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec4b74f
clean up remnants of rcv/ss2.c
ourairquality Jun 5, 2026
5d0b461
rtkconv add sbf file type
ourairquality Jun 6, 2026
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
1 change: 0 additions & 1 deletion app/consapp/convbin/bcc/_convbin.cbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,6 @@
<DeployFile LocalName="..\..\..\..\src\rcv\rt17.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\..\src\rcv\septentrio.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\..\src\rcv\ss2.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\..\src\rcv\ublox.c" Configuration="Release" Class="ProjectFile"/>
Expand Down
3 changes: 0 additions & 3 deletions app/consapp/convbin/gcc/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ ephemeris.o: $(SRC)/ephemeris.c
$(CC) -c $(CFLAGS) $(SRC)/ephemeris.c
novatel.o : $(SRC)/rcv/novatel.c
$(CC) -c $(CFLAGS) $(SRC)/rcv/novatel.c
ss2.o : $(SRC)/rcv/ss2.c
$(CC) -c $(CFLAGS) $(SRC)/rcv/ss2.c
ublox.o : $(SRC)/rcv/ublox.c
$(CC) -c $(CFLAGS) $(SRC)/rcv/ublox.c
crescent.o : $(SRC)/rcv/crescent.c
Expand Down Expand Up @@ -93,7 +91,6 @@ pntpos.o : $(SRC)/rtklib.h
ephemeris.o: $(SRC)/rtklib.h
ionex.o : $(SRC)/rtklib.h
novatel.o : $(SRC)/rtklib.h
ss2.o : $(SRC)/rtklib.h
ublox.o : $(SRC)/rtklib.h
crescent.o : $(SRC)/rtklib.h
skytraq.o : $(SRC)/rtklib.h
Expand Down
3 changes: 0 additions & 3 deletions app/consapp/str2str/gcc/makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ novatel.o : $(SRC)/rcv/novatel.c
$(CC) -c $(CFLAGS) $(SRC)/rcv/novatel.c
ublox.o : $(SRC)/rcv/ublox.c
$(CC) -c $(CFLAGS) $(SRC)/rcv/ublox.c
ss2.o : $(SRC)/rcv/ss2.c
$(CC) -c $(CFLAGS) $(SRC)/rcv/ss2.c
crescent.o : $(SRC)/rcv/crescent.c
$(CC) -c $(CFLAGS) $(SRC)/rcv/crescent.c
skytraq.o : $(SRC)/rcv/skytraq.c
Expand Down Expand Up @@ -84,7 +82,6 @@ geoid.o : $(SRC)/rtklib.h
rcvraw.o : $(SRC)/rtklib.h
novatel.o : $(SRC)/rtklib.h
ublox.o : $(SRC)/rtklib.h
ss2.o : $(SRC)/rtklib.h
crescent.o : $(SRC)/rtklib.h
skytraq.o : $(SRC)/rtklib.h
javad.o : $(SRC)/rtklib.h
Expand Down
2 changes: 1 addition & 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 @@ -448,7 +448,7 @@ void MainWindow::showStopTimeDialog()
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);;SuperStart II (*.log);;"
tr("All (*.*);;RTCM 2 (*.rtcm2);;RTCM 3 (*.rtcm3);;NovtAtel (*.gps);;ublox (*.ubx);;"
"Hemisphere (*.bin);;Javad (*.jps);;RINEX OBS (*.obs *.*O);;Septentrio (*.sbf)"));

if (!filename.isEmpty()) {
Expand Down
2 changes: 1 addition & 1 deletion app/qtapp/rtkconv_qt/rtklib_de.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2364,7 +2364,7 @@ Copyright (C) 2016-2024 Jens Reimann</source>
</message>
<message>
<location filename="convmain.cpp" line="453"/>
<source>All (*.*);;RTCM 2 (*.rtcm2);;RTCM 3 (*.rtcm3);;NovtAtel (*.gps);;ublox (*.ubx);;SuperStart II (*.log);;Hemisphere (*.bin);;Javad (*.jps);;RINEX OBS (*.obs *.*O);Septentrio (*.sbf)</source>
<source>All (*.*);;RTCM 2 (*.rtcm2);;RTCM 3 (*.rtcm3);;NovtAtel (*.gps);;ublox (*.ubx);;Hemisphere (*.bin);;Javad (*.jps);;RINEX OBS (*.obs *.*O);Septentrio (*.sbf)</source>
<translation type="unfinished"></translation>
</message>
<message>
Expand Down
4 changes: 2 additions & 2 deletions app/qtapp/rtkconv_qt/rtklib_zh_CN.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2262,8 +2262,8 @@ Copyright (C) 2016-2025 Jens Reimann</source>
</message>
<message>
<location filename="convmain.cpp" line="453"/>
<source>All (*.*);;RTCM 2 (*.rtcm2);;RTCM 3 (*.rtcm3);;NovtAtel (*.gps);;ublox (*.ubx);;SuperStart II (*.log);;Hemisphere (*.bin);;Javad (*.jps);;RINEX OBS (*.obs *.*O);;Septentrio (*.sbf)</source>
<translation>所有文件 (*.*);;RTCM 2 (*.rtcm2);;RTCM 3 (*.rtcm3);;NovtAtel (*.gps);;ublox (*.ubx);;SuperStart II (*.log);;Hemisphere (*.bin);;Javad (*.jps);;RINEX OBS (*.obs *.*O);;Septentrio (*.sbf)</translation>
<source>All (*.*);;RTCM 2 (*.rtcm2);;RTCM 3 (*.rtcm3);;NovtAtel (*.gps);;ublox (*.ubx);;Hemisphere (*.bin);;Javad (*.jps);;RINEX OBS (*.obs *.*O);;Septentrio (*.sbf)</source>
<translation>所有文件 (*.*);;RTCM 2 (*.rtcm2);;RTCM 3 (*.rtcm3);;NovtAtel (*.gps);;ublox (*.ubx);;Hemisphere (*.bin);;Javad (*.jps);;RINEX OBS (*.obs *.*O);;Septentrio (*.sbf)</translation>
</message>
<message>
<location filename="convmain.cpp" line="483"/>
Expand Down
7 changes: 4 additions & 3 deletions app/winapp/rtkconv/convmain.dfm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1149,9 +1149,10 @@ object MainWindow: TMainWindow
object OpenDialog: TOpenDialog
Filter =
'All (*.*)|*.*|RTCM 2 (*.rtcm2)|*.rtcm2|RTCM 3 (*.rtcm3)|*.rtcm3|' +
'NovtAtel (*.gps)|*.gps|ublox (*.ubx)|*.ubx|SuperStart II (*.log)' +
'|*.log|Hemisphere (*.bin)|*.bin|Javad (*.jps)|*.jps|RINEX OBS (*' +
'.obs,*.*O)|*.obs;*.*O'
'NovtAtel (*.gps)|*.gps|ublox (*.ubx)|*.ubx' +
'|Hemisphere (*.bin)|*.bin|Javad (*.jps)|*.jps|' +
'Septentrio (*.sbf)|*.sbf|' +
'RINEX OBS (*.obs,*.*O)|*.obs;*.*O'
Options = [ofHideReadOnly, ofNoChangeDir, ofEnableSizing]
Left = 260
Top = 221
Expand Down
2 changes: 0 additions & 2 deletions app/winapp/rtkconv/rtkconv.cbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,6 @@
<DeployFile LocalName="..\..\..\src\rcv\septentrio.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\skytraq.c" Configuration="Debug" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\ss2.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\swiftnav.c" Configuration="Debug" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\ublox.c" Configuration="Debug" Class="ProjectFile"/>
Expand Down Expand Up @@ -633,7 +632,6 @@
<DeployFile LocalName="..\..\src\rcv\rt17.c" Configuration="Debug" Class="ProjectFile"/>
<DeployFile LocalName="..\..\src\rcv\septentrio.c" Configuration="Debug" Class="ProjectFile"/>
<DeployFile LocalName="..\..\src\rcv\skytraq.c" Configuration="Debug" Class="ProjectFile"/>
<DeployFile LocalName="..\..\src\rcv\ss2.c" Configuration="Debug" Class="ProjectFile"/>
<DeployFile LocalName="..\..\src\rcv\tersus.c" Configuration="Debug" Class="ProjectFile"/>
<DeployFile LocalName="..\..\src\rcv\ublox.c" Configuration="Debug" Class="ProjectFile"/>
<DeployFile LocalName="..\..\src\rcvraw.c" Configuration="Debug" Class="ProjectFile"/>
Expand Down
2 changes: 0 additions & 2 deletions app/winapp/rtknavi/rtknavi.cbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,8 +759,6 @@
<DeployFile LocalName="..\..\..\src\rcv\septentrio.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\skytraq.c" Configuration="Debug" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\ss2.c" Configuration="Debug" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\ss2.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\tersus.c" Configuration="Debug" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"/>
Expand Down
1 change: 0 additions & 1 deletion app/winapp/rtkplot/rtkplot.cbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,6 @@
<DeployFile LocalName="..\..\..\src\rcv\septentrio.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\skytraq.c" Configuration="Debug" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\ss2.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\swiftnav.c" Configuration="Debug" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\ublox.c" Configuration="Debug" Class="ProjectFile"/>
Expand Down
1 change: 0 additions & 1 deletion app/winapp/srctblbrows/srctblbrows.cbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,6 @@
<DeployFile LocalName="..\..\..\src\rcv\rt17.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\septentrio.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\ss2.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\ublox.c" Configuration="Release" Class="ProjectFile"/>
Expand Down
1 change: 0 additions & 1 deletion app/winapp/strsvr/strsvr.cbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,6 @@
<DeployFile LocalName="..\..\..\src\rcv\rt17.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\septentrio.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\ss2.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"/>
<DeployFile LocalName="..\..\..\src\rcv\ublox.c" Configuration="Release" Class="ProjectFile"/>
Expand Down
3 changes: 1 addition & 2 deletions src/rcvraw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1321,10 +1321,9 @@ extern int init_raw(raw_t *raw, int format)
raw->halfc[i][j]=0;
raw->lockflag[i][j]=0;
}
raw->icpp[i]=raw->off[i]=raw->prCA[i]=raw->dpCA[i]=0.0;
raw->prCA[i]=raw->dpCA[i]=0.0;
}
for (i=0;i<MAXOBS;i++) raw->freqn[i]=0;
raw->icpc=0.0;
raw->nbyte=raw->len=0;
raw->iod=raw->flag=raw->tbase=raw->outtype=0;
raw->tod=-1;
Expand Down
1 change: 0 additions & 1 deletion src/rtklib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1253,7 +1253,6 @@ typedef struct { /* receiver raw data control type */
uint8_t subfrm[MAXSAT][380]; /* subframe buffer */
double lockt[MAXSAT][NFREQ+NEXOBS]; /* lock time (s) */
unsigned char lockflag[MAXSAT][NFREQ+NEXOBS]; /* used for carrying forward cycle slip */
double icpp[MAXSAT],off[MAXSAT],icpc; /* carrier params for ss2 */
double prCA[MAXSAT],dpCA[MAXSAT]; /* L1/CA pseudorange/doppler for javad */
uint8_t halfc[MAXSAT][NFREQ+NEXOBS]; /* half-cycle resolved */
char freqn[MAXOBS]; /* frequency number for javad */
Expand Down
Binary file removed test/data/rcvraw/ss2_20080517.log
View file
Open in desktop
Binary file not shown.