diff --git a/app/consapp/convbin/bcc/_convbin.cbproj b/app/consapp/convbin/bcc/_convbin.cbproj index 23be7b23f..b6391586d 100644 --- a/app/consapp/convbin/bcc/_convbin.cbproj +++ b/app/consapp/convbin/bcc/_convbin.cbproj @@ -478,7 +478,6 @@ - diff --git a/app/consapp/convbin/gcc/makefile b/app/consapp/convbin/gcc/makefile index 809ed5201..b6399ceac 100644 --- a/app/consapp/convbin/gcc/makefile +++ b/app/consapp/convbin/gcc/makefile @@ -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 @@ -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 diff --git a/app/consapp/str2str/gcc/makefile b/app/consapp/str2str/gcc/makefile index 3d3ab7ea6..0c6bd9c24 100644 --- a/app/consapp/str2str/gcc/makefile +++ b/app/consapp/str2str/gcc/makefile @@ -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 @@ -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 diff --git a/app/qtapp/rtkconv_qt/convmain.cpp b/app/qtapp/rtkconv_qt/convmain.cpp index 68c666ebd..183cc6d93 100644 --- a/app/qtapp/rtkconv_qt/convmain.cpp +++ b/app/qtapp/rtkconv_qt/convmain.cpp @@ -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()) { diff --git a/app/qtapp/rtkconv_qt/rtklib_de.ts b/app/qtapp/rtkconv_qt/rtklib_de.ts index 5a1ad38b2..14f4a80c3 100644 --- a/app/qtapp/rtkconv_qt/rtklib_de.ts +++ b/app/qtapp/rtkconv_qt/rtklib_de.ts @@ -2364,7 +2364,7 @@ Copyright (C) 2016-2024 Jens Reimann - All (*.*);;RTCM 2 (*.rtcm2);;RTCM 3 (*.rtcm3);;NovtAtel (*.gps);;ublox (*.ubx);;SuperStart II (*.log);;Hemisphere (*.bin);;Javad (*.jps);;RINEX OBS (*.obs *.*O);Septentrio (*.sbf) + All (*.*);;RTCM 2 (*.rtcm2);;RTCM 3 (*.rtcm3);;NovtAtel (*.gps);;ublox (*.ubx);;Hemisphere (*.bin);;Javad (*.jps);;RINEX OBS (*.obs *.*O);Septentrio (*.sbf) diff --git a/app/qtapp/rtkconv_qt/rtklib_zh_CN.ts b/app/qtapp/rtkconv_qt/rtklib_zh_CN.ts index 575f960c1..1388fc508 100644 --- a/app/qtapp/rtkconv_qt/rtklib_zh_CN.ts +++ b/app/qtapp/rtkconv_qt/rtklib_zh_CN.ts @@ -2262,8 +2262,8 @@ Copyright (C) 2016-2025 Jens Reimann - All (*.*);;RTCM 2 (*.rtcm2);;RTCM 3 (*.rtcm3);;NovtAtel (*.gps);;ublox (*.ubx);;SuperStart II (*.log);;Hemisphere (*.bin);;Javad (*.jps);;RINEX OBS (*.obs *.*O);;Septentrio (*.sbf) - 所有文件 (*.*);;RTCM 2 (*.rtcm2);;RTCM 3 (*.rtcm3);;NovtAtel (*.gps);;ublox (*.ubx);;SuperStart II (*.log);;Hemisphere (*.bin);;Javad (*.jps);;RINEX OBS (*.obs *.*O);;Septentrio (*.sbf) + All (*.*);;RTCM 2 (*.rtcm2);;RTCM 3 (*.rtcm3);;NovtAtel (*.gps);;ublox (*.ubx);;Hemisphere (*.bin);;Javad (*.jps);;RINEX OBS (*.obs *.*O);;Septentrio (*.sbf) + 所有文件 (*.*);;RTCM 2 (*.rtcm2);;RTCM 3 (*.rtcm3);;NovtAtel (*.gps);;ublox (*.ubx);;Hemisphere (*.bin);;Javad (*.jps);;RINEX OBS (*.obs *.*O);;Septentrio (*.sbf) diff --git a/app/winapp/rtkconv/convmain.dfm b/app/winapp/rtkconv/convmain.dfm index 11a53e04b..2fd620a70 100644 --- a/app/winapp/rtkconv/convmain.dfm +++ b/app/winapp/rtkconv/convmain.dfm @@ -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 diff --git a/app/winapp/rtkconv/rtkconv.cbproj b/app/winapp/rtkconv/rtkconv.cbproj index 848faff65..dfd5d201c 100644 --- a/app/winapp/rtkconv/rtkconv.cbproj +++ b/app/winapp/rtkconv/rtkconv.cbproj @@ -593,7 +593,6 @@ - @@ -633,7 +632,6 @@ - diff --git a/app/winapp/rtknavi/rtknavi.cbproj b/app/winapp/rtknavi/rtknavi.cbproj index c2e876b67..62857f6a5 100644 --- a/app/winapp/rtknavi/rtknavi.cbproj +++ b/app/winapp/rtknavi/rtknavi.cbproj @@ -759,8 +759,6 @@ - - diff --git a/app/winapp/rtkplot/rtkplot.cbproj b/app/winapp/rtkplot/rtkplot.cbproj index b5b35bb69..d00b039b8 100644 --- a/app/winapp/rtkplot/rtkplot.cbproj +++ b/app/winapp/rtkplot/rtkplot.cbproj @@ -728,7 +728,6 @@ - diff --git a/app/winapp/srctblbrows/srctblbrows.cbproj b/app/winapp/srctblbrows/srctblbrows.cbproj index 03e56850a..9e57cee70 100644 --- a/app/winapp/srctblbrows/srctblbrows.cbproj +++ b/app/winapp/srctblbrows/srctblbrows.cbproj @@ -503,7 +503,6 @@ - diff --git a/app/winapp/strsvr/strsvr.cbproj b/app/winapp/strsvr/strsvr.cbproj index a871587f8..26f509edc 100644 --- a/app/winapp/strsvr/strsvr.cbproj +++ b/app/winapp/strsvr/strsvr.cbproj @@ -616,7 +616,6 @@ - diff --git a/src/rcvraw.c b/src/rcvraw.c index 17c1b2263..512040e3f 100644 --- a/src/rcvraw.c +++ b/src/rcvraw.c @@ -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;ifreqn[i]=0; - raw->icpc=0.0; raw->nbyte=raw->len=0; raw->iod=raw->flag=raw->tbase=raw->outtype=0; raw->tod=-1; diff --git a/src/rtklib.h b/src/rtklib.h index 9b5f7c760..f2f157862 100644 --- a/src/rtklib.h +++ b/src/rtklib.h @@ -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 */ diff --git a/test/data/rcvraw/ss2_20080517.log b/test/data/rcvraw/ss2_20080517.log deleted file mode 100644 index 1a6ba89f5..000000000 Binary files a/test/data/rcvraw/ss2_20080517.log and /dev/null differ