Skip to content

Commit 7893760

Browse files
ourairqualityourairquality
committed
clean up remnants of rcv/ss2.c
which was removed some time ago.
1 parent 1a4f998 commit 7893760

11 files changed

Lines changed: 1 addition & 17 deletions

File tree

‎app/consapp/convbin/bcc/_convbin.cbproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,6 @@
478478
<DeployFile LocalName="..\..\..\..\src\rcv\rt17.c" Configuration="Release" Class="ProjectFile"/>
479479
<DeployFile LocalName="..\..\..\..\src\rcv\septentrio.c" Configuration="Release" Class="ProjectFile"/>
480480
<DeployFile LocalName="..\..\..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"/>
481-
<DeployFile LocalName="..\..\..\..\src\rcv\ss2.c" Configuration="Release" Class="ProjectFile"/>
482481
<DeployFile LocalName="..\..\..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"/>
483482
<DeployFile LocalName="..\..\..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"/>
484483
<DeployFile LocalName="..\..\..\..\src\rcv\ublox.c" Configuration="Release" Class="ProjectFile"/>

‎app/consapp/convbin/gcc/makefile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ ephemeris.o: $(SRC)/ephemeris.c
5252
$(CC) -c $(CFLAGS) $(SRC)/ephemeris.c
5353
novatel.o : $(SRC)/rcv/novatel.c
5454
$(CC) -c $(CFLAGS) $(SRC)/rcv/novatel.c
55-
ss2.o : $(SRC)/rcv/ss2.c
56-
$(CC) -c $(CFLAGS) $(SRC)/rcv/ss2.c
5755
ublox.o : $(SRC)/rcv/ublox.c
5856
$(CC) -c $(CFLAGS) $(SRC)/rcv/ublox.c
5957
crescent.o : $(SRC)/rcv/crescent.c
@@ -93,7 +91,6 @@ pntpos.o : $(SRC)/rtklib.h
9391
ephemeris.o: $(SRC)/rtklib.h
9492
ionex.o : $(SRC)/rtklib.h
9593
novatel.o : $(SRC)/rtklib.h
96-
ss2.o : $(SRC)/rtklib.h
9794
ublox.o : $(SRC)/rtklib.h
9895
crescent.o : $(SRC)/rtklib.h
9996
skytraq.o : $(SRC)/rtklib.h

‎app/consapp/str2str/gcc/makefile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ novatel.o : $(SRC)/rcv/novatel.c
4040
$(CC) -c $(CFLAGS) $(SRC)/rcv/novatel.c
4141
ublox.o : $(SRC)/rcv/ublox.c
4242
$(CC) -c $(CFLAGS) $(SRC)/rcv/ublox.c
43-
ss2.o : $(SRC)/rcv/ss2.c
44-
$(CC) -c $(CFLAGS) $(SRC)/rcv/ss2.c
4543
crescent.o : $(SRC)/rcv/crescent.c
4644
$(CC) -c $(CFLAGS) $(SRC)/rcv/crescent.c
4745
skytraq.o : $(SRC)/rcv/skytraq.c
@@ -84,7 +82,6 @@ geoid.o : $(SRC)/rtklib.h
8482
rcvraw.o : $(SRC)/rtklib.h
8583
novatel.o : $(SRC)/rtklib.h
8684
ublox.o : $(SRC)/rtklib.h
87-
ss2.o : $(SRC)/rtklib.h
8885
crescent.o : $(SRC)/rtklib.h
8986
skytraq.o : $(SRC)/rtklib.h
9087
javad.o : $(SRC)/rtklib.h

‎app/winapp/rtkconv/rtkconv.cbproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,6 @@
593593
<DeployFile LocalName="..\..\..\src\rcv\septentrio.c" Configuration="Release" Class="ProjectFile"/>
594594
<DeployFile LocalName="..\..\..\src\rcv\skytraq.c" Configuration="Debug" Class="ProjectFile"/>
595595
<DeployFile LocalName="..\..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"/>
596-
<DeployFile LocalName="..\..\..\src\rcv\ss2.c" Configuration="Release" Class="ProjectFile"/>
597596
<DeployFile LocalName="..\..\..\src\rcv\swiftnav.c" Configuration="Debug" Class="ProjectFile"/>
598597
<DeployFile LocalName="..\..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"/>
599598
<DeployFile LocalName="..\..\..\src\rcv\ublox.c" Configuration="Debug" Class="ProjectFile"/>
@@ -633,7 +632,6 @@
633632
<DeployFile LocalName="..\..\src\rcv\rt17.c" Configuration="Debug" Class="ProjectFile"/>
634633
<DeployFile LocalName="..\..\src\rcv\septentrio.c" Configuration="Debug" Class="ProjectFile"/>
635634
<DeployFile LocalName="..\..\src\rcv\skytraq.c" Configuration="Debug" Class="ProjectFile"/>
636-
<DeployFile LocalName="..\..\src\rcv\ss2.c" Configuration="Debug" Class="ProjectFile"/>
637635
<DeployFile LocalName="..\..\src\rcv\tersus.c" Configuration="Debug" Class="ProjectFile"/>
638636
<DeployFile LocalName="..\..\src\rcv\ublox.c" Configuration="Debug" Class="ProjectFile"/>
639637
<DeployFile LocalName="..\..\src\rcvraw.c" Configuration="Debug" Class="ProjectFile"/>

‎app/winapp/rtknavi/rtknavi.cbproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -759,8 +759,6 @@
759759
<DeployFile LocalName="..\..\..\src\rcv\septentrio.c" Configuration="Release" Class="ProjectFile"/>
760760
<DeployFile LocalName="..\..\..\src\rcv\skytraq.c" Configuration="Debug" Class="ProjectFile"/>
761761
<DeployFile LocalName="..\..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"/>
762-
<DeployFile LocalName="..\..\..\src\rcv\ss2.c" Configuration="Debug" Class="ProjectFile"/>
763-
<DeployFile LocalName="..\..\..\src\rcv\ss2.c" Configuration="Release" Class="ProjectFile"/>
764762
<DeployFile LocalName="..\..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"/>
765763
<DeployFile LocalName="..\..\..\src\rcv\tersus.c" Configuration="Debug" Class="ProjectFile"/>
766764
<DeployFile LocalName="..\..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"/>

‎app/winapp/rtkplot/rtkplot.cbproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,6 @@
728728
<DeployFile LocalName="..\..\..\src\rcv\septentrio.c" Configuration="Release" Class="ProjectFile"/>
729729
<DeployFile LocalName="..\..\..\src\rcv\skytraq.c" Configuration="Debug" Class="ProjectFile"/>
730730
<DeployFile LocalName="..\..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"/>
731-
<DeployFile LocalName="..\..\..\src\rcv\ss2.c" Configuration="Release" Class="ProjectFile"/>
732731
<DeployFile LocalName="..\..\..\src\rcv\swiftnav.c" Configuration="Debug" Class="ProjectFile"/>
733732
<DeployFile LocalName="..\..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"/>
734733
<DeployFile LocalName="..\..\..\src\rcv\ublox.c" Configuration="Debug" Class="ProjectFile"/>

‎app/winapp/srctblbrows/srctblbrows.cbproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,6 @@
503503
<DeployFile LocalName="..\..\..\src\rcv\rt17.c" Configuration="Release" Class="ProjectFile"/>
504504
<DeployFile LocalName="..\..\..\src\rcv\septentrio.c" Configuration="Release" Class="ProjectFile"/>
505505
<DeployFile LocalName="..\..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"/>
506-
<DeployFile LocalName="..\..\..\src\rcv\ss2.c" Configuration="Release" Class="ProjectFile"/>
507506
<DeployFile LocalName="..\..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"/>
508507
<DeployFile LocalName="..\..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"/>
509508
<DeployFile LocalName="..\..\..\src\rcv\ublox.c" Configuration="Release" Class="ProjectFile"/>

‎app/winapp/strsvr/strsvr.cbproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,6 @@
616616
<DeployFile LocalName="..\..\..\src\rcv\rt17.c" Configuration="Release" Class="ProjectFile"/>
617617
<DeployFile LocalName="..\..\..\src\rcv\septentrio.c" Configuration="Release" Class="ProjectFile"/>
618618
<DeployFile LocalName="..\..\..\src\rcv\skytraq.c" Configuration="Release" Class="ProjectFile"/>
619-
<DeployFile LocalName="..\..\..\src\rcv\ss2.c" Configuration="Release" Class="ProjectFile"/>
620619
<DeployFile LocalName="..\..\..\src\rcv\swiftnav.c" Configuration="Release" Class="ProjectFile"/>
621620
<DeployFile LocalName="..\..\..\src\rcv\tersus.c" Configuration="Release" Class="ProjectFile"/>
622621
<DeployFile LocalName="..\..\..\src\rcv\ublox.c" Configuration="Release" Class="ProjectFile"/>

‎src/rcvraw.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,10 +1321,9 @@ extern int init_raw(raw_t *raw, int format)
13211321
raw->halfc[i][j]=0;
13221322
raw->lockflag[i][j]=0;
13231323
}
1324-
raw->icpp[i]=raw->off[i]=raw->prCA[i]=raw->dpCA[i]=0.0;
1324+
raw->prCA[i]=raw->dpCA[i]=0.0;
13251325
}
13261326
for (i=0;i<MAXOBS;i++) raw->freqn[i]=0;
1327-
raw->icpc=0.0;
13281327
raw->nbyte=raw->len=0;
13291328
raw->iod=raw->flag=raw->tbase=raw->outtype=0;
13301329
raw->tod=-1;

‎src/rtklib.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1253,7 +1253,6 @@ typedef struct { /* receiver raw data control type */
12531253
uint8_t subfrm[MAXSAT][380]; /* subframe buffer */
12541254
double lockt[MAXSAT][NFREQ+NEXOBS]; /* lock time (s) */
12551255
unsigned char lockflag[MAXSAT][NFREQ+NEXOBS]; /* used for carrying forward cycle slip */
1256-
double icpp[MAXSAT],off[MAXSAT],icpc; /* carrier params for ss2 */
12571256
double prCA[MAXSAT],dpCA[MAXSAT]; /* L1/CA pseudorange/doppler for javad */
12581257
uint8_t halfc[MAXSAT][NFREQ+NEXOBS]; /* half-cycle resolved */
12591258
char freqn[MAXOBS]; /* frequency number for javad */

0 commit comments

Comments
 (0)