rtklib 2.4.2 p11

JensReimann · Mar 22, 2015 · 2ca7f95 · 2ca7f95
1 parent 946ad59
commit 2ca7f95
Show file tree

Hide file tree

Showing 32 changed files with 1,289 additions and 1,110 deletions.
diff --git a/app/icon/Thumbs.db b/app/icon/Thumbs.db
diff --git a/app/rtkconv/rtkconv.cbproj.local b/app/rtkconv/rtkconv.cbproj.local
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>2012/10/18 07:18:17.000.621,D:\proj\rtklib\app\rtkconv\Unit1.dfm=D:\proj\rtklib\app\rtkconv\codeopt.dfm</Transaction>
-    <Transaction>2012/10/18 07:18:17.000.621,D:\proj\rtklib\app\rtkconv\Unit1.h=D:\proj\rtklib\app\rtkconv\codeopt.h</Transaction>
+    <Transaction>2012/10/18 07:18:17.000.621,D:\proj\rtklib\app\rtkconv\codeopt.dfm=D:\proj\rtklib\app\rtkconv\Unit1.dfm</Transaction>
+    <Transaction>2012/10/18 07:18:17.000.621,D:\proj\rtklib\app\rtkconv\codeopt.h=D:\proj\rtklib\app\rtkconv\Unit1.h</Transaction>
     <Transaction>2013/11/02 15:50:12.000.955,=D:\proj\RTKLIB\src\rcv\septentrio.c</Transaction>
     <Transaction>2014/07/26 19:58:36.000.097,=D:\proj\RTKLIB\src\rcv\rcvlex.c</Transaction>
     <Transaction>2014/08/26 08:52:10.000.736,=D:\proj\RTKLIB\src\rcv\rt17.c</Transaction>

diff --git a/app/rtkget/rtkget.cbproj.local b/app/rtkget/rtkget.cbproj.local
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>2012/12/25 21:32:22.000.915,D:\proj\rtklib\app\downloader\Unit1.h=D:\proj\rtklib\app\downloader\dloptdlg.h</Transaction>
-    <Transaction>2012/12/25 21:32:22.000.915,D:\proj\rtklib\app\downloader\Unit1.dfm=D:\proj\rtklib\app\downloader\dloptdlg.dfm</Transaction>
-    <Transaction>2012/12/30 01:36:05.000.072,D:\proj\rtklib\app\rtkget\downloader.cbproj=D:\proj\rtklib\app\rtkget\rtkget.cbproj</Transaction>
-    <Transaction>2012/12/30 01:36:25.000.708,D:\proj\rtklib\app\rtkget\dlmain.h=D:\proj\rtklib\app\rtkget\getmain.h</Transaction>
-    <Transaction>2012/12/30 01:36:25.000.708,D:\proj\rtklib\app\rtkget\dlmain.dfm=D:\proj\rtklib\app\rtkget\getmain.dfm</Transaction>
-    <Transaction>2012/12/30 01:36:50.000.174,D:\proj\rtklib\app\rtkget\dloptdlg.h=D:\proj\rtklib\app\rtkget\getoptdlg.h</Transaction>
-    <Transaction>2012/12/30 01:36:50.000.174,D:\proj\rtklib\app\rtkget\dloptdlg.dfm=D:\proj\rtklib\app\rtkget\getoptdlg.dfm</Transaction>
-    <Transaction>2013/01/15 05:46:47.000.312,D:\proj\rtklib\app\rtkget\Unit1.h=D:\proj\rtklib\app\rtkget\staoptdlg.h</Transaction>
-    <Transaction>2013/01/15 05:46:47.000.312,D:\proj\rtklib\app\rtkget\Unit1.dfm=D:\proj\rtklib\app\rtkget\staoptdlg.dfm</Transaction>
+    <Transaction>2012/12/25 21:32:22.000.915,D:\proj\rtklib\app\downloader\dloptdlg.dfm=D:\proj\rtklib\app\downloader\Unit1.dfm</Transaction>
+    <Transaction>2012/12/25 21:32:22.000.915,D:\proj\rtklib\app\downloader\dloptdlg.h=D:\proj\rtklib\app\downloader\Unit1.h</Transaction>
+    <Transaction>2012/12/30 01:36:05.000.072,D:\proj\rtklib\app\rtkget\rtkget.cbproj=D:\proj\rtklib\app\rtkget\downloader.cbproj</Transaction>
+    <Transaction>2012/12/30 01:36:25.000.708,D:\proj\rtklib\app\rtkget\getmain.dfm=D:\proj\rtklib\app\rtkget\dlmain.dfm</Transaction>
+    <Transaction>2012/12/30 01:36:25.000.708,D:\proj\rtklib\app\rtkget\getmain.h=D:\proj\rtklib\app\rtkget\dlmain.h</Transaction>
+    <Transaction>2012/12/30 01:36:50.000.174,D:\proj\rtklib\app\rtkget\getoptdlg.dfm=D:\proj\rtklib\app\rtkget\dloptdlg.dfm</Transaction>
+    <Transaction>2012/12/30 01:36:50.000.174,D:\proj\rtklib\app\rtkget\getoptdlg.h=D:\proj\rtklib\app\rtkget\dloptdlg.h</Transaction>
+    <Transaction>2013/01/15 05:46:47.000.312,D:\proj\rtklib\app\rtkget\staoptdlg.h=D:\proj\rtklib\app\rtkget\Unit1.h</Transaction>
+    <Transaction>2013/01/15 05:46:47.000.312,D:\proj\rtklib\app\rtkget\staoptdlg.dfm=D:\proj\rtklib\app\rtkget\Unit1.dfm</Transaction>
   </Transactions>
 </BorlandProject>
diff --git a/app/rtklaunch/rtklaunch.cbproj.local b/app/rtklaunch/rtklaunch.cbproj.local
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>2012/12/27 19:26:29.000.829,D:\proj\rtklib\app\launcher\rtklaunch.h=C:\Users\ttaka\Documents\RAD Studio\Projects\Unit1.h</Transaction>
-    <Transaction>2012/12/27 19:26:29.000.829,D:\proj\rtklib\app\launcher\rtklaunch.dfm=C:\Users\ttaka\Documents\RAD Studio\Projects\Unit1.dfm</Transaction>
-    <Transaction>2012/12/27 19:26:45.000.244,D:\proj\rtklib\app\launcher\launcher.cbproj=C:\Users\ttaka\Documents\RAD Studio\Projects\Project1.cbproj</Transaction>
-    <Transaction>2012/12/29 11:22:01.000.566,D:\proj\rtklib\app\launcher\launchmain.dfm=D:\proj\rtklib\app\launcher\rtklaunch.dfm</Transaction>
-    <Transaction>2012/12/29 11:22:01.000.566,D:\proj\rtklib\app\launcher\launchmain.h=D:\proj\rtklib\app\launcher\rtklaunch.h</Transaction>
-    <Transaction>2012/12/29 11:33:04.000.473,D:\proj\rtklib\app\launcher\launchmain.dfm=D:\proj\rtklib\app\launcher\Unit1.dfm</Transaction>
-    <Transaction>2012/12/29 11:33:04.000.473,D:\proj\rtklib\app\launcher\launchmain.h=D:\proj\rtklib\app\launcher\Unit1.h</Transaction>
-    <Transaction>2013/01/01 11:51:56.000.716,D:\proj\rtklib\app\launcher\rtklaunch.cbproj=D:\proj\rtklib\app\launcher\launcher.cbproj</Transaction>
+    <Transaction>2012/12/27 19:26:29.000.829,C:\Users\ttaka\Documents\RAD Studio\Projects\Unit1.dfm=D:\proj\rtklib\app\launcher\rtklaunch.dfm</Transaction>
+    <Transaction>2012/12/27 19:26:29.000.829,C:\Users\ttaka\Documents\RAD Studio\Projects\Unit1.h=D:\proj\rtklib\app\launcher\rtklaunch.h</Transaction>
+    <Transaction>2012/12/27 19:26:45.000.244,C:\Users\ttaka\Documents\RAD Studio\Projects\Project1.cbproj=D:\proj\rtklib\app\launcher\launcher.cbproj</Transaction>
+    <Transaction>2012/12/29 11:22:01.000.566,D:\proj\rtklib\app\launcher\rtklaunch.dfm=D:\proj\rtklib\app\launcher\launchmain.dfm</Transaction>
+    <Transaction>2012/12/29 11:22:01.000.566,D:\proj\rtklib\app\launcher\rtklaunch.h=D:\proj\rtklib\app\launcher\launchmain.h</Transaction>
+    <Transaction>2012/12/29 11:33:04.000.473,D:\proj\rtklib\app\launcher\Unit1.h=D:\proj\rtklib\app\launcher\launchmain.h</Transaction>
+    <Transaction>2012/12/29 11:33:04.000.473,D:\proj\rtklib\app\launcher\Unit1.dfm=D:\proj\rtklib\app\launcher\launchmain.dfm</Transaction>
+    <Transaction>2013/01/01 11:51:56.000.716,D:\proj\rtklib\app\launcher\launcher.cbproj=D:\proj\rtklib\app\launcher\rtklaunch.cbproj</Transaction>
   </Transactions>
 </BorlandProject>
diff --git a/app/rtklib_consapp.groupproj.local b/app/rtklib_consapp.groupproj.local
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>2009/01/29 00:54:25.123.bdsgroup,C:\Users\ttaka\Documents\Borland Studio Projects\ProjectGroup1.bdsgroup=G:\rtklib_2.2.0b\app\rtklib_consapp.bdsgroup</Transaction>
+    <Transaction>2009/01/29 00:54:25.123.bdsgroup,G:\rtklib_2.2.0b\app\rtklib_consapp.bdsgroup=C:\Users\ttaka\Documents\Borland Studio Projects\ProjectGroup1.bdsgroup</Transaction>
   </Transactions>
 	<Default.Personality>
-		<Projects ActiveProject="D:\proj\RTKLIB\app\convbin\bcc\_convbin.cbproj"/>
+		<Projects ActiveProject="D:\proj\RTKLIB\app\rnx2rtkp\bcc\_rnx2rtkp.cbproj"/>
 	</Default.Personality>
 </BorlandProject>
diff --git a/app/rtklib_winapp.groupproj.local b/app/rtklib_winapp.groupproj.local
@@ -2,6 +2,6 @@
 <BorlandProject>
 	<Transactions/>
 	<Default.Personality>
-		<Projects ActiveProject="D:\proj\rtklib_2.4.2_master\RTKLIB\app\rtkconv\rtkconv.cbproj"/>
+		<Projects ActiveProject="D:\proj\RTKLIB\app\rtkconv\rtkconv.cbproj"/>
 	</Default.Personality>
 </BorlandProject>
diff --git a/app/rtknavi/navimain.dfm b/app/rtknavi/navimain.dfm
@@ -1223,7 +1223,7 @@ object MainForm: TMainForm
     Left = 274
     Top = 91
     Bitmap = {
-      494C010102000400840010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010102000400880010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000001000000001002000000000000010
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000

diff --git a/app/rtknavi_mkl/rtknavi_mkl.cbproj.local b/app/rtknavi_mkl/rtknavi_mkl.cbproj.local
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>2012/05/13 18:34:08.000.532,D:\proj\rtklib\app\rtknavi\rtknavi.cbproj=D:\proj\rtklib\app\rtknavi_mkl\rtknavi_mkl.cbproj</Transaction>
+    <Transaction>2012/05/13 18:34:08.000.532,D:\proj\rtklib\app\rtknavi_mkl\rtknavi_mkl.cbproj=D:\proj\rtklib\app\rtknavi\rtknavi.cbproj</Transaction>
     <Transaction>2014/08/26 09:32:22.000.166,=D:\proj\RTKLIB\src\rcv\rt17.c</Transaction>
   </Transactions>
 </BorlandProject>
diff --git a/app/rtkplot/rtkplot.cbproj.local b/app/rtkplot/rtkplot.cbproj.local
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>2012/05/20 06:22:06.000.259,D:\proj\rtklib\app\rtkplot\Unit1.dfm=D:\proj\rtklib\app\rtkplot\geview.dfm</Transaction>
-    <Transaction>2012/05/20 06:22:06.000.259,D:\proj\rtklib\app\rtkplot\Unit1.h=D:\proj\rtklib\app\rtkplot\geview.h</Transaction>
+    <Transaction>2012/05/20 06:22:06.000.259,D:\proj\rtklib\app\rtkplot\geview.h=D:\proj\rtklib\app\rtkplot\Unit1.h</Transaction>
+    <Transaction>2012/05/20 06:22:06.000.259,D:\proj\rtklib\app\rtkplot\geview.dfm=D:\proj\rtklib\app\rtkplot\Unit1.dfm</Transaction>
     <Transaction>2014/08/26 09:33:12.000.785,=D:\proj\RTKLIB\src\rcv\rt17.c</Transaction>
-    <Transaction>2014/08/31 12:20:44.000.286,D:\proj\RTKLIB\app\rtkplot\mapdlg.dfm=D:\proj\RTKLIB\app\rtkplot\skydlg.dfm</Transaction>
-    <Transaction>2014/08/31 12:20:44.000.286,D:\proj\RTKLIB\app\rtkplot\mapdlg.cpp=D:\proj\RTKLIB\app\rtkplot\skydlg.cpp</Transaction>
-    <Transaction>2014/08/31 12:20:44.000.286,D:\proj\RTKLIB\app\rtkplot\mapdlg.h=D:\proj\RTKLIB\app\rtkplot\skydlg.h</Transaction>
-    <Transaction>2014/08/31 12:21:42.000.544,D:\proj\RTKLIB\app\rtkplot\skydlg.h=D:\proj\RTKLIB\app\rtkplot\mapdlg.h</Transaction>
-    <Transaction>2014/08/31 12:21:42.000.564,D:\proj\RTKLIB\app\rtkplot\mapdlg.dfm=D:\proj\RTKLIB\app\rtkplot\skydlg.dfm</Transaction>
-    <Transaction>2014/08/31 12:21:42.000.564,D:\proj\RTKLIB\app\rtkplot\mapdlg.h=D:\proj\RTKLIB\app\rtkplot\skydlg.h</Transaction>
-    <Transaction>2014/08/31 12:21:42.000.564,D:\proj\RTKLIB\app\rtkplot\mapdlg.cpp=D:\proj\RTKLIB\app\rtkplot\skydlg.cpp</Transaction>
-    <Transaction>2014/08/31 12:21:42.000.544,D:\proj\RTKLIB\app\rtkplot\skydlg.cpp=D:\proj\RTKLIB\app\rtkplot\mapdlg.cpp</Transaction>
-    <Transaction>2014/08/31 12:21:42.000.544,D:\proj\RTKLIB\app\rtkplot\skydlg.dfm=D:\proj\RTKLIB\app\rtkplot\mapdlg.dfm</Transaction>
+    <Transaction>2014/08/31 12:20:44.000.286,D:\proj\RTKLIB\app\rtkplot\skydlg.cpp=D:\proj\RTKLIB\app\rtkplot\mapdlg.cpp</Transaction>
+    <Transaction>2014/08/31 12:20:44.000.286,D:\proj\RTKLIB\app\rtkplot\skydlg.h=D:\proj\RTKLIB\app\rtkplot\mapdlg.h</Transaction>
+    <Transaction>2014/08/31 12:20:44.000.286,D:\proj\RTKLIB\app\rtkplot\skydlg.dfm=D:\proj\RTKLIB\app\rtkplot\mapdlg.dfm</Transaction>
+    <Transaction>2014/08/31 12:21:42.000.544,D:\proj\RTKLIB\app\rtkplot\mapdlg.dfm=D:\proj\RTKLIB\app\rtkplot\skydlg.dfm</Transaction>
+    <Transaction>2014/08/31 12:21:42.000.564,D:\proj\RTKLIB\app\rtkplot\skydlg.h=D:\proj\RTKLIB\app\rtkplot\mapdlg.h</Transaction>
+    <Transaction>2014/08/31 12:21:42.000.544,D:\proj\RTKLIB\app\rtkplot\mapdlg.h=D:\proj\RTKLIB\app\rtkplot\skydlg.h</Transaction>
+    <Transaction>2014/08/31 12:21:42.000.544,D:\proj\RTKLIB\app\rtkplot\mapdlg.cpp=D:\proj\RTKLIB\app\rtkplot\skydlg.cpp</Transaction>
+    <Transaction>2014/08/31 12:21:42.000.564,D:\proj\RTKLIB\app\rtkplot\skydlg.cpp=D:\proj\RTKLIB\app\rtkplot\mapdlg.cpp</Transaction>
+    <Transaction>2014/08/31 12:21:42.000.564,D:\proj\RTKLIB\app\rtkplot\skydlg.dfm=D:\proj\RTKLIB\app\rtkplot\mapdlg.dfm</Transaction>
     <Transaction>2014/08/31 12:22:33.000.525,D:\proj\RTKLIB\app\rtkplot\skydlg.cpp=</Transaction>
     <Transaction>2014/08/31 12:24:52.000.986,=D:\proj\RTKLIB\app\rtkplot\mapdlg.cpp</Transaction>
     <Transaction>2014/08/31 12:24:59.000.431,=D:\proj\RTKLIB\app\rtkplot\skydlg.cpp</Transaction>

diff --git a/app/rtkpost_mkl/rtkpost_mkl.cbproj.local b/app/rtkpost_mkl/rtkpost_mkl.cbproj.local
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <BorlandProject>
 	<Transactions>
-    <Transaction>2012/10/28 01:18:46.000.372,D:\proj\rtklib\app\rtkpost\extopt.dfm=D:\proj\rtklib\app\rtkpost_mkl\Unit1.dfm</Transaction>
-    <Transaction>2012/10/28 01:18:46.000.372,D:\proj\rtklib\app\rtkpost\extopt.h=D:\proj\rtklib\app\rtkpost_mkl\Unit1.h</Transaction>
+    <Transaction>2012/10/28 01:18:46.000.372,D:\proj\rtklib\app\rtkpost_mkl\Unit1.h=D:\proj\rtklib\app\rtkpost\extopt.h</Transaction>
+    <Transaction>2012/10/28 01:18:46.000.372,D:\proj\rtklib\app\rtkpost_mkl\Unit1.dfm=D:\proj\rtklib\app\rtkpost\extopt.dfm</Transaction>
   </Transactions>
 </BorlandProject>
diff --git a/app/rtkrcv/gcc/makefile b/app/rtkrcv/gcc/makefile
@@ -5,19 +5,21 @@ SRC    = ../../../src
 
 # for beagleboard
 #CTARGET= -mfpu=neon -mfloat-abi=softfp -ffast-math
-CTARGET= -DENAGLO -DENAGAL -DENAQZS -DNFREQ=3
+CTARGET= -DENAGLO -DENAQZS -DENACMP -DNFREQ=3
 
-CFLAGS = -Wall -O3 -ansi -pedantic -Wno-unused-but-set-variable -I$(SRC) -DTRACE $(CTARGET) -g
+CFLAGS = -Wall -O3 -ansi -pedantic -Wno-unused-but-set-variable -I$(SRC) -I.. -DTRACE $(CTARGET) -g
 LDLIBS  = -lm -lrt -lpthread
 
 all        : rtkrcv
-rtkrcv     : rtkrcv.o rtkcmn.o rtksvr.o rtkpos.o geoid.o solution.o lambda.o
+rtkrcv     : rtkrcv.o vt.o rtkcmn.o rtksvr.o rtkpos.o geoid.o solution.o lambda.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 ss2.o crescent.o skytraq.o gw10.o javad.o nvs.o binex.o
 rtkrcv     : rt17.o ephemeris.o rinex.o ionex.o rtcm2.o rtcm3.o rtcm3e.o qzslex.o
 
 rtkrcv.o   : ../rtkrcv.c
 	$(CC) -c $(CFLAGS) ../rtkrcv.c
+vt.o       : ../vt.c
+	$(CC) -c $(CFLAGS) ../vt.c
 rtkcmn.o   : $(SRC)/rtkcmn.c
 	$(CC) -c $(CFLAGS) $(SRC)/rtkcmn.c
 rtksvr.o   : $(SRC)/rtksvr.c
@@ -83,7 +85,7 @@ ionex.o    : $(SRC)/ionex.c
 qzslex.o   : $(SRC)/qzslex.c
 	$(CC) -c $(CFLAGS) $(SRC)/qzslex.c
 
-rtkrcv.o   : $(SRC)/rtklib.h
+rtkrcv.o   : $(SRC)/rtklib.h ../vt.h
 rtkcmn.o   : $(SRC)/rtklib.h
 rtksvr.o   : $(SRC)/rtklib.h
 rtkpos.o   : $(SRC)/rtklib.h