From d2873a0bafad8099d16c69711b626b79c89354bb Mon Sep 17 00:00:00 2001 From: Tushar Janefalkar Date: Thu, 24 Jan 2013 17:41:46 -0800 Subject: Split gps configuration file (change 1/2) gps.conf now split into izat.conf: proprietary items sap.conf : sensor assisted positioning items gps.conf : items used in open source (gps.conf moved to open source) CRs-fixed: 461129 Change-Id: I819230ee3bb13aad0b91f7d33bfb9e57b6d1abe1 --- etc/gps.conf | 66 +++++++++++++++++++----------------------------------------- 1 file changed, 21 insertions(+), 45 deletions(-) (limited to 'etc') diff --git a/etc/gps.conf b/etc/gps.conf index 322fe16..b38526a 100644 --- a/etc/gps.conf +++ b/etc/gps.conf @@ -1,3 +1,12 @@ +XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin +XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin +XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin + +# Error Estimate +# _SET = 1 +# _CLEAR = 0 +ERR_ESTIMATE=0 + #Test NTP_SERVER=time.gpsonextra.net #Asia @@ -7,13 +16,9 @@ NTP_SERVER=time.gpsonextra.net #North America # NTP_SERVER=north-america.pool.ntp.org -XTRA_SERVER_1=http://xtra1.gpsonextra.net/xtra.bin -XTRA_SERVER_2=http://xtra2.gpsonextra.net/xtra.bin -XTRA_SERVER_3=http://xtra3.gpsonextra.net/xtra.bin - # DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info # 4 - Debug, 5 - Verbose -DEBUG_LEVEL = 2 +DEBUG_LEVEL = 3 # Intermediate position report, 1=enable, 0=disable INTERMEDIATE_POS=0 @@ -21,15 +26,11 @@ INTERMEDIATE_POS=0 # supl version 1.0 SUPL_VER=0x10000 -# Error Estimate -# _SET = 1 -# _CLEAR = 0 -ERR_ESTIMATE=0 - # GPS Capabilities bit mask # SCHEDULING = 1 # MSB = 2 # MSA = 4 +# ON_DEMAND_TIME = 0x10 # ULP = 0x20 # default = MSA | MSB | SCHEDULING | ULP CAPABILITIES=0x27 @@ -50,42 +51,17 @@ CAPABILITIES=0x27 # C2K_HOST=c2k.pde.com or IP # C2K_PORT=1234 -################################ -# Sensor Settings -################################ - -# Needs to be set explicitly based on sensor -# There is no default value. -#GYRO_BIAS_RANDOM_WALK= - -SENSOR_ACCEL_BATCHES_PER_SEC=2 -SENSOR_ACCEL_SAMPLES_PER_BATCH=5 -SENSOR_GYRO_BATCHES_PER_SEC=2 -SENSOR_GYRO_SAMPLES_PER_BATCH=5 - -# Sensor Control Mode (0=AUTO, 1=FORCE_ON) -SENSOR_CONTROL_MODE=0 - -# Enable or Disable Sensors for GPS use (0=Enable, 1=Disable) -SENSOR_USAGE=0 - -# Choose GSIFF sensor provider (1=DSPS, 2=Android NDK) -SENSOR_PROVIDER=1 - -################################ -# Indoor Positioning Settings -################################ -# 0: QUIPC disabled, 1: QUIPC enabled, 2: forced QUIPC only -QUIPC_ENABLED = 0 - -################################ -# EXTRA SETTINGS -################################ -# Enable or Disable Wiper (1=Enable, 0=Disable) -ENABLE_WIPER=1 - #################################### # LTE Positioning Profile Settings #################################### -# 0: Enable RRLP on LTE(Default) 1: Enable LPP_User_Plane on LTE +# 0: Enable RRLP on LTE(Default) +# 1: Enable LPP_User_Plane on LTE +# 2: Enable LPP_Control_Plane +# 3: Enable both LPP_User_Plane and LPP_Control_Plane LPP_PROFILE = 0 + +################################ +# EXTRA SETTINGS +################################ +# NMEA provider (1=Modem Processor, 0=Application Processor) +NMEA_PROVIDER=0 -- cgit v1.2.3 From a739e07644999a9a198c624fd6e3b1f51c651e40 Mon Sep 17 00:00:00 2001 From: Tushar Janefalkar Date: Mon, 25 Mar 2013 12:49:54 -0700 Subject: Include gps.conf Android make file in build The Android.mk for gps.conf was ineffective since it was commented out. This change corrects that. Change-Id: If07df6a2a1694b442a741382206261b5087a0105 --- etc/Android.mk | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'etc') diff --git a/etc/Android.mk b/etc/Android.mk index 26a39db..96dc5d7 100755 --- a/etc/Android.mk +++ b/etc/Android.mk @@ -1,11 +1,11 @@ -#LOCAL_PATH := $(call my-dir) -#include $(CLEAR_VARS) +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) -#LOCAL_MODULE := gps.conf -#LOCAL_MODULE_TAGS := optional -#LOCAL_MODULE_CLASS := ETC -#LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/ -#LOCAL_SRC_FILES := gps.conf -#include $(BUILD_PREBUILT) +LOCAL_MODULE := gps.conf +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_CLASS := ETC +LOCAL_MODULE_PATH := $(TARGET_OUT_ETC)/ +LOCAL_SRC_FILES := gps.conf +include $(BUILD_PREBUILT) -- cgit v1.2.3 From b2490777c1c8fe89e2353a69d754d0b74ce81a55 Mon Sep 17 00:00:00 2001 From: Kevin Tang Date: Fri, 5 Apr 2013 11:10:55 -0700 Subject: removed exe bit of the file access mod find . -type f -executable -exec chmod -x {} \; Change-Id: Ib6e09bc4bf1d8e4cde63c1df0b15877bf42525b8 --- etc/Android.mk | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 etc/Android.mk (limited to 'etc') diff --git a/etc/Android.mk b/etc/Android.mk old mode 100755 new mode 100644 -- cgit v1.2.3 From 8dd8689be20398a79804f8b5c6713bdf50e2128b Mon Sep 17 00:00:00 2001 From: Satheesh Jayakumar Date: Tue, 9 Apr 2013 14:33:42 -0700 Subject: gps.conf: Removed the option to configure ulp on/off Since the switch for ulp in gps.conf did not truly turn QCA implementation for Fused Location Provider on/off this change removes this redundant parameter from gps.conf Change-Id: I677c42a00e6b0d156c2e4c3b65da13a55eb97279 CRs-Fixed: 461273 --- etc/gps.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'etc') diff --git a/etc/gps.conf b/etc/gps.conf index b38526a..f3396d2 100644 --- a/etc/gps.conf +++ b/etc/gps.conf @@ -31,9 +31,8 @@ SUPL_VER=0x10000 # MSB = 2 # MSA = 4 # ON_DEMAND_TIME = 0x10 -# ULP = 0x20 -# default = MSA | MSB | SCHEDULING | ULP -CAPABILITIES=0x27 +# default = MSA | MSB | SCHEDULING +CAPABILITIES=0x7 # Accuracy threshold for intermediate positions # less accurate positions are ignored, 0 for passing all positions -- cgit v1.2.3 From 388477e2e7ebd55295c075a720056c4bbcd8e1c7 Mon Sep 17 00:00:00 2001 From: Kevin Tang Date: Fri, 12 Apr 2013 17:22:54 -0700 Subject: gps: Add A-GLONASS Position protocol in gps.conf OEMs rely on gps.conf to config gps features. We want to have default config in the conf file however to both serve as recommendeded setting and as setting template. This added A-GLONASS protocol is already supported by the current implementation. Now we are adding the default config to the conf file." Change-Id: Ib9f66d01963c87ac5b3d70a68e1d4dd085771d47 CRs-fixed: 454855 --- etc/gps.conf | 8 ++++++++ 1 file changed, 8 insertions(+) mode change 100644 => 100755 etc/gps.conf (limited to 'etc') diff --git a/etc/gps.conf b/etc/gps.conf old mode 100644 new mode 100755 index f3396d2..3b298b2 --- a/etc/gps.conf +++ b/etc/gps.conf @@ -64,3 +64,11 @@ LPP_PROFILE = 0 ################################ # NMEA provider (1=Modem Processor, 0=Application Processor) NMEA_PROVIDER=0 + +################################################## +# Select Positioning Protocol on A-GLONASS system +################################################## +# 0x1: RRC CPlane +# 0x2: RRLP UPlane +# 0x4: LLP Uplane +A_GLONASS_POS_PROTOCOL_SELECT = 0 -- cgit v1.2.3 From c0a3657a4ee2899dd12a43d5a31e611937f62ae6 Mon Sep 17 00:00:00 2001 From: Tushar Janefalkar Date: Mon, 15 Apr 2013 10:52:06 -0700 Subject: Set On Demand Time as default in gps.conf The capabilities mask in gps.conf was updated to set On Demand Time injection by default Change-Id: I1532072040aa258d441e23649c6e038bc8e56923 --- etc/gps.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'etc') diff --git a/etc/gps.conf b/etc/gps.conf index 3b298b2..8428315 100755 --- a/etc/gps.conf +++ b/etc/gps.conf @@ -27,12 +27,12 @@ INTERMEDIATE_POS=0 SUPL_VER=0x10000 # GPS Capabilities bit mask -# SCHEDULING = 1 -# MSB = 2 -# MSA = 4 +# SCHEDULING = 0x01 +# MSB = 0x02 +# MSA = 0x04 # ON_DEMAND_TIME = 0x10 -# default = MSA | MSB | SCHEDULING -CAPABILITIES=0x7 +# default = ON_DEMAND_TIME | MSA | MSB | SCHEDULING +CAPABILITIES=0x17 # Accuracy threshold for intermediate positions # less accurate positions are ignored, 0 for passing all positions -- cgit v1.2.3 From 6fa0e8a9833271cc720c6ac751930b69395db096 Mon Sep 17 00:00:00 2001 From: Tushar Janefalkar Date: Thu, 20 Jun 2013 17:24:37 -0700 Subject: DEBUG_LEVEL 0 to produce no logs In accordance to gps.conf, debug level of 0 now produces no logs at all. In addition, if the parameter DEBUG_LEVEL is commented in gps.conf, logs will be printed according to Android's logging levels CRs-fixed: 503157 Change-Id: I26ca2be67fbc7ce2bf633f66d9b88ca6450e9d27 --- etc/gps.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'etc') diff --git a/etc/gps.conf b/etc/gps.conf index 8428315..f73401f 100755 --- a/etc/gps.conf +++ b/etc/gps.conf @@ -18,6 +18,7 @@ NTP_SERVER=time.gpsonextra.net # DEBUG LEVELS: 0 - none, 1 - Error, 2 - Warning, 3 - Info # 4 - Debug, 5 - Verbose +# If DEBUG_LEVEL is commented, Android's logging levels will be used DEBUG_LEVEL = 3 # Intermediate position report, 1=enable, 0=disable -- cgit v1.2.3