1.0alpha19

Add support for Trimble RT17, Furuno LPY1000, Sirf III/IV and Septentrio
eltorio · Aug 31, 2014 · 767c6db · 767c6db
1 parent 44694ac
commit 767c6db
Show file tree

Hide file tree

Showing 19 changed files with 97 additions and 35 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "jni/simonlynen_android_libs"]
 	path = jni/simonlynen_android_libs
 	url = git://github.com/simonlynen/android_libs.git
+[submodule "jni/RTKLIB"]
+	path = jni/RTKLIB
+	url = https://github.com/eltorio/RTKLIB.git
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="gpsplus.rtkgps"
-    android:versionCode="18"
-    android:versionName="1.0 alpha18" >
+    android:versionCode="19"
+    android:versionName="1.0 alpha19" >
 
     <uses-sdk
         android:minSdkVersion="14"

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ RTKLIB rtknavi port on android.
 
 #### [rtklib][rtklib] features:
 
-* Version pre 2.4.2p8 (all except uBlox improvements wich currently break the parsing)
+* Version pre 2.4.2p9
 * GPS, GLONASS, Galileo, QZSS, BeiDou and SBAS Navigation systems
 * Single, DGPS/DGNSS, Kinematic, Static, Moving-Baseline, Fixed,
   PPP-Kinematic, PPP-Static and PPP-Fixed positioning modes.
@@ -20,7 +20,7 @@ RTKLIB rtknavi port on android.
 * Proprietary protocotols: 
   NovAtel: OEM4/V/6,OEM3,OEMStar,Superstar II, Hemisphere: Eclipse,Crescent,
     u-blox: LEA-4T/5T/6T, SkyTraq: S1315F, JAVAD GRIL/GREIS, Furuno
-    GW-10-II/III and NVS NV08C BINR.
+    GW-10-II/III, NVS NV08C BINR, SiRF III/IV, and Trimble RT17.
 * TCP/IP, NTRIP, local log file
 * Support for multiple geoids (see explanation)
 

diff --git a/assets/commands/ubx_m8n_bds_raw_1hz.cmd b/assets/commands/ubx_m8n_bds_raw_1hz.cmd
@@ -0,0 +1,16 @@
+!UBX CFG-GNSS 0 32 32 1 6 16 16 0 0
+!UBX CFG-GNSS 0 32 32 1 3 16 16 0 1
+!UBX CFG-MSG 3 16 0 0 0 1 0 0
+!UBX CFG-MSG 3 15 0 0 0 1 0 0
+!UBX CFG-MSG 1 32 0 0 0 1 0 0
+
+
+
+
+
+
+
+@
+!UBX CFG-MSG 3 16 0 0 0 0 0 0
+!UBX CFG-MSG 3 15 0 0 0 0 0 0
+!UBX CFG-MSG 1 32 0 0 0 0 0 0

diff --git a/assets/commands/ubx_m8n_glo_raw_1hz.cmd b/assets/commands/ubx_m8n_glo_raw_1hz.cmd
@@ -0,0 +1,16 @@
+!UBX CFG-GNSS 0 32 32 1 3 16 16 0 0
+!UBX CFG-GNSS 0 32 32 1 6 16 16 0 1
+!UBX CFG-MSG 3 16 0 0 0 1 0 0
+!UBX CFG-MSG 3 15 0 0 0 1 0 0
+!UBX CFG-MSG 1 32 0 0 0 1 0 0
+
+
+
+
+
+
+
+@
+!UBX CFG-MSG 3 16 0 0 0 0 0 0
+!UBX CFG-MSG 3 15 0 0 0 0 0 0
+!UBX CFG-MSG 1 32 0 0 0 0 0 0

diff --git a/assets/commands/ubx_raw_10hz.cmd b/assets/commands/ubx_raw_10hz.cmd
@@ -1,6 +1,6 @@
-!UBX CFG-RATE 100 1 1
-
-
-@
-!UBX CFG-RATE 1000 1 1
+!UBX CFG-RATE 100 1 1
+
 
+@
+!UBX CFG-RATE 1000 1 1
+

diff --git a/assets/commands/ubx_raw_1hz.cmd b/assets/commands/ubx_raw_1hz.cmd
@@ -1,6 +1,6 @@
-!UBX CFG-RATE 1000 1 1
-
-
-@
-!UBX CFG-RATE 1000 1 1
+!UBX CFG-RATE 1000 1 1
+
 
+@
+!UBX CFG-RATE 1000 1 1
+

diff --git a/assets/commands/ubx_raw_5hz.cmd b/assets/commands/ubx_raw_5hz.cmd
@@ -1,6 +1,6 @@
-!UBX CFG-RATE 200 1 1
-
-
-@
-!UBX CFG-RATE 1000 1 1
+!UBX CFG-RATE 200 1 1
+
 
+@
+!UBX CFG-RATE 1000 1 1
+

diff --git a/bin/RTKGPS+-release.apk b/bin/RTKGPS+-release.apk
diff --git a/jni/RTKLIB b/jni/RTKLIB
diff --git a/jni/rtklib.mk b/jni/rtklib.mk
@@ -5,7 +5,7 @@ RTKLIB_CFLAGS := -DENAGLO -DENAGAL -DENAQZS -DENACMP -DNFREQ=3 -DTRACE
 
 LOCAL_MODULE    := rtklib
 
-RTKLIB_CFLAGS += -DLAPACK
+RTKLIB_CFLAGS += -DLAPACK -D_HAVE_FGETLN_
 LOCAL_STATIC_LIBRARIES += clapack blas f2c
 
 LOCAL_CFLAGS += -fvisibility=hidden
@@ -58,7 +58,8 @@ LOCAL_SRC_FILES += \
         $(RTKLIB_PATH)/src/rcv/skytraq.c \
         $(RTKLIB_PATH)/src/rcv/sirf.c \
         $(RTKLIB_PATH)/src/rcv/ss2.c \
-        $(RTKLIB_PATH)/src/rcv/ublox.c
+        $(RTKLIB_PATH)/src/rcv/ublox.c \
+	$(RTKLIB_PATH)/src/rcv/rt17.c
 
 LOCAL_SRC_FILES += log.c
 

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
@@ -165,7 +165,9 @@
   <string name="strfmt_javad">JAVAD GRIL/GREIS</string>
   <string name="strfmt_nvs">NVS NVC08C</string>
   <string name="strfmt_binex">BINEX</string>
+  <string name="strfmt_rt17">Trimble RT17</string>
   <string name="strfmt_lexr">Furuno LPY-10000</string>
+  <string name="strfmt_sept">Septentrio</string>
   <string name="strfmt_sirf">SiRF</string>
   <string name="strfmt_rinex">RINEX</string>
   <string name="strfmt_sp3">SP3</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -184,7 +184,9 @@
     <string name="strfmt_javad">JAVAD GRIL/GREIS</string>
     <string name="strfmt_nvs">NVS NVC08C</string>
     <string name="strfmt_binex">BINEX</string>
+    <string name="strfmt_rt17">Trimble RT17</string>
     <string name="strfmt_lexr">Furuno LPY-10000</string>
+    <string name="strfmt_sept">Septentrio</string>
     <string name="strfmt_sirf">SiRF</string>
     <string name="strfmt_rinex">RINEX</string>
     <string name="strfmt_sp3">SP3</string>

diff --git a/src/gpsplus/rtkgps/geoportail/GeoportailWMTSTileSource.java b/src/gpsplus/rtkgps/geoportail/GeoportailWMTSTileSource.java
@@ -8,21 +8,26 @@
 public class GeoportailWMTSTileSource extends OnlineTileSourceBase {
 
     private GeoportailLayer mLayer;
-    private static String baseUrl[] = {"https://wxs.ign.fr/"+License.KEY+"/geoportail/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&STYLE=normal&TILEMATRIXSET=PM"
-                                    };
+   // private static String baseUrl[] = {"https://wxs.ign.fr/"+License.KEY+"/geoportail/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&STYLE=normal&TILEMATRIXSET=PM"  };
 
     public GeoportailWMTSTileSource(final string aResourceId,
                                 GeoportailLayer layer) {
         super(layer.getLayer(), aResourceId, layer.getMinimalZoom(), layer.getMaximalZoom(), 256,
-                layer.getFilenameEnding(), baseUrl);
+                layer.getFilenameEnding(), GeoportailWMTSTileSource.getUrl());
 
         mLayer = layer;
     }
 
+
+    private  static String[] getUrl() {
+        return new String[]{"https://wxs.ign.fr/"+License.getKey()+"/geoportail/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&STYLE=normal&TILEMATRIXSET=PM"
+        };
+    }
+
     @Override
     public String getTileURLString(MapTile aTile) {
         StringBuffer tileURLString = new StringBuffer();
-        tileURLString.append(getBaseUrl());
+        tileURLString.append(GeoportailWMTSTileSource.getUrl()[0]);
         tileURLString.append("&LAYER="+mLayer.getLayer());
         tileURLString.append("&FORMAT="+mLayer.getFormat());
         tileURLString.append("&TILEMATRIX="+aTile.getZoomLevel());

diff --git a/src/gpsplus/rtkgps/geoportail/License.java.sample b/src/gpsplus/rtkgps/geoportail/License.java.sample
@@ -6,6 +6,12 @@ public class License {
     //so you need to obtain a developer key from http://api.ign.fr for free
     //next rename this file License.java and set your key
 
-    public static final String KEY = "00dbijqtbt4oawuw30ne81uk";  // Developer key can be obtained for 90 days from http://api.ign.fr
-    public static final String USER_AGENT = "Android";            // key dependent
+    private static final String KEY = "00dbijqtbt4oawuw30ne81uk";  // Developer key can be obtained for 90 days from http://api.ign.fr
+    private static final String USER_AGENT = "Android";            // key dependent
+    public static String getKey() {
+        return License.KEY;
+    }
+    public static String getUserAgent() {
+        return License.USER_AGENT;
+    }
 }
diff --git a/src/gpsplus/rtkgps/settings/InputCorrectionFragment.java b/src/gpsplus/rtkgps/settings/InputCorrectionFragment.java
@@ -35,7 +35,10 @@ public class InputCorrectionFragment extends InputRoverFragment {
         StreamFormat.OEM3,
         StreamFormat.OEM4,
         StreamFormat.UBX,
+        StreamFormat.RT17,
         StreamFormat.SS2,
+        StreamFormat.LEXR,
+        StreamFormat.SEPT,
         StreamFormat.CRES,
         StreamFormat.STQ,
         StreamFormat.GW10,

diff --git a/src/gpsplus/rtkgps/settings/InputRoverFragment.java b/src/gpsplus/rtkgps/settings/InputRoverFragment.java
@@ -58,8 +58,11 @@ public class InputRoverFragment extends PreferenceFragment {
         StreamFormat.OEM3,
         StreamFormat.OEM4,
         StreamFormat.UBX,
+        StreamFormat.RT17,
         StreamFormat.SIRF,
         StreamFormat.SS2,
+        StreamFormat.LEXR,
+        StreamFormat.SEPT,
         StreamFormat.CRES,
         StreamFormat.STQ,
         StreamFormat.GW10,

diff --git a/src/gpsplus/rtklib/constants/StreamFormat.java b/src/gpsplus/rtklib/constants/StreamFormat.java
@@ -31,20 +31,24 @@ public enum StreamFormat implements IHasRtklibId {
     NVS(10, R.string.strfmt_nvs),
     /** stream format: BINEX */
     BINEX(11, R.string.strfmt_binex),
-    /** stream format: Furuno LPY-10000 */
-    LEXR(12, R.string.strfmt_lexr),
+    /** Trimble RT17 */
+    RT17(12, R.string.strfmt_rt17),
     /** stream format: SiRF    (reserved) */
     SIRF(13, R.string.strfmt_sirf),
+    /** stream format: Furuno LPY-10000 */
+    LEXR(14, R.string.strfmt_lexr),
+    /** stream format Septentrio */
+    SEPT(15, R.string.strfmt_sept),
     /** stream format: RINEX */
-    RINEX(14, R.string.strfmt_rinex),
+    RINEX(16, R.string.strfmt_rinex),
     /** stream format: SP3 */
-    SP3(15, R.string.strfmt_sp3),
+    SP3(17, R.string.strfmt_sp3),
     /** stream format: RINEX CLK */
-    RNXCLK(16, R.string.strfmt_rnxclk),
+    RNXCLK(18, R.string.strfmt_rnxclk),
     /** stream format: SBAS messages */
-    SBAS(17, R.string.strfmt_sbas),
+    SBAS(19, R.string.strfmt_sbas),
     /** stream format: NMEA 0183 */
-    NMEA(18, R.string.strfmt_nmea)
+    NMEA(20, R.string.strfmt_nmea)
 
     ;
 

diff --git a/src/org/osmdroid/tileprovider/modules/WMTSMapTileDownloader.java b/src/org/osmdroid/tileprovider/modules/WMTSMapTileDownloader.java
@@ -211,7 +211,7 @@ public Drawable loadTile(final MapTileRequestState aState) throws CantContinueEx
 
                 final HttpUriRequest head = new HttpGet(tileURLString);
                 //Geoportail has a mandatory user-agent
-                head.setHeader("User-Agent", License.USER_AGENT); // TODO have tileSource dependent User-Agent
+                head.setHeader("User-Agent", License.getUserAgent()); // TODO have tileSource dependent User-Agent
                 final HttpResponse response = httpClient.execute(head);
 
                 // Check to see if we got success