sdm660: Gps: Checkout Gps Configs from Mi A2 Android 10 release

jasmine-user-10-QKQ1.190910.002-V11.0.4.0.QDIMIXM-release-keys Change-Id: Id8b7ba36921ac8a656554fef8f10783c63402e8b
2020-01-11 18:15:42 +01:00 · 2020-01-11 18:15:42 +01:00 · b01f670bb7
commit b01f670bb7
parent b6b9f2a12e
6 changed files with 439 additions and 121 deletions
--- a/configs/gps/apdr.conf
+++ b/configs/gps/apdr.conf
@ -16,29 +16,190 @@
 # SENSOR_STATISTIC_PRINT_COUNT
 #  Skip Number of Print
 #
+# QDR_DYNAMIC_LOADING = 1~3
+# Configure QDR library to be loaded
+#   1: QDR3
+#   2: QDR2-GYRO
+#   3: QDR2-DWT
+#
+#
+
+
+######################################
+#                                    #
+#   Default Configuration            #
+#  (GNSS only,QDR Disabled)          #
+#                                    #
+# For QDR enablement, comment        #
+# this section and enabled           #
+# either QDR3 OR                     #
+# QDR2-DWT OR QDR2-Gyro related      #
+# configuration section in below.    #
+#                                    #
+######################################

 SENSOR_SERVICE = accel
 SENSOR_PROVIDER = native
 SENSOR_RATE = 100
 SENSOR_SAMPLES = 1
-SENSOR_STATISTIC_ENABLED = 3
-SENSOR_STATISTIC_PRINT_COUNT = 50
-
-SENSOR_SERVICE = vehicle_accel
-SENSOR_PROVIDER = native
-SENSOR_RATE = 10
-SENSOR_SAMPLES = 1
-SENSOR_STATISTIC_ENABLED = 3
-SENSOR_STATISTIC_PRINT_COUNT = 50

 SENSOR_SERVICE = gyro
 SENSOR_PROVIDER = native
 SENSOR_RATE = 100
 SENSOR_SAMPLES = 1
-SENSOR_STATISTIC_ENABLED = 3
-SENSOR_STATISTIC_PRINT_COUNT = 50

-GNSS_POS_STATISTIC_ENABLED = 3
-GNSS_POS_STATISTIC_PRNTCNT = 10
-GNSS_MSR_STATISTIC_ENABLED = 3
-GNSS_MSR_STATISTIC_PRNTCNT = 10
+SENSOR_SERVICE = vehicle_gear
+SENSOR_PROVIDER = native
+SENSOR_RATE = 100
+SENSOR_SAMPLES = 1
+
+
+######################################
+#                                    #
+#   QDR3 Configuration               #
+#                                    #
+# For QDR3,                          #
+# comment default configuration above#
+# and                                #
+# uncomment below configuration      #
+# settings.                          #
+#                                    #
+######################################
+#
+#SENSOR_SERVICE = accel
+#SENSOR_PROVIDER = native
+#SENSOR_RATE = 10
+#SENSOR_SAMPLES = 10
+#
+#SENSOR_SERVICE = vehicle_speed
+#SENSOR_PROVIDER = native
+#SENSOR_RATE = 100
+#SENSOR_SAMPLES = 1
+#
+#SENSOR_SERVICE = gyro
+#SENSOR_PROVIDER = native
+#SENSOR_RATE = 10
+#SENSOR_SAMPLES = 10
+#
+#SENSOR_SERVICE = vehicle_gear
+#SENSOR_PROVIDER = native
+#SENSOR_RATE = 100
+#SENSOR_SAMPLES = 1
+#
+#
+##Enable/disable sensor data flashback feature
+#QDR_FLASHBACK_ENABLED = 0
+##Configure QDR library to be loaded 1: QDR3 2: QDR2-GYRO 3: QDR2-DWS
+#QDR_DYNAMIC_LOADING = 1
+##Enable/disable sensor data batching feature
+#QDR_BATCHING_ENABLED = 2
+##Reporting offset before PPS boundary
+#QDR_REPORTING_OFFSET = 0
+##Sensor dispatch threshold declaration
+#QDR_SENSDISPATCH_MS = 30
+#
+
+######################################
+#                                    #
+#   QDR2-DWT Configuration           #
+#                                    #
+# For QDR2-DWT,                      #
+# comment default configuration above#
+# and                                #
+# uncomment below configuration      #
+# settings.                          #
+#                                    #
+######################################
+#
+#SENSOR_SERVICE = vehicle_speed
+#SENSOR_PROVIDER = native
+#SENSOR_RATE = 100
+#SENSOR_SAMPLES = 1
+#SENSOR_STATISTIC_ENABLED = 3
+#SENSOR_STATISTIC_PRINT_COUNT = 50
+#
+#SENSOR_SERVICE = vehicle_dws
+#SENSOR_PROVIDER = native
+#SENSOR_RATE = 100
+#SENSOR_SAMPLES = 1
+#SENSOR_STATISTIC_ENABLED = 3
+#SENSOR_STATISTIC_PRINT_COUNT = 50
+#
+#SENSOR_SERVICE = vehicle_gear
+#SENSOR_PROVIDER = native
+#SENSOR_RATE = 100
+#SENSOR_SAMPLES = 1
+#SENSOR_STATISTIC_ENABLED = 3
+#SENSOR_STATISTIC_PRINT_COUNT = 50
+#
+#GNSS_POS_STATISTIC_ENABLED = 3
+#GNSS_POS_STATISTIC_PRNTCNT = 10
+#GNSS_MSR_STATISTIC_ENABLED = 3
+#GNSS_MSR_STATISTIC_PRNTCNT = 10
+#
+##Enable/disable sensor data flashback feature
+#QDR_FLASHBACK_ENABLED = 0
+##Configure QDR library to be loaded 1: QDR3 2: QDR2-GYRO 3: QDR2-DWS
+#QDR_DYNAMIC_LOADING = 3
+##Enable/disable sensor data batching feature
+#QDR_BATCHING_ENABLED = 0
+##Reporting offset before PPS boundary
+#QDR_REPORTING_OFFSET = 0
+##Sensor dispatch threshold declaration
+#QDR_SENSDISPATCH_MS = 30
+##QDR_ENABLE_QG shall be set as 1
+#QDR_ENABLE_QG = 1
+##Select Wheel set (E.g.: Front two wheels, Rear two wheels OR All four wheels)
+##To be used for differential wheel tick OR speed service.
+##This configuration is applicable when QDR_CAN_TYPE configured as
+##ODO_DWS(3) or ODO_DWT(2).
+##Value "0": Use Front two wheels
+##Value "1": Use Rear two wheels
+##Value "2": Use All four wheels
+#QG_DRIVE_WHEEL_FW_RW_AW = 2
+##Max Wheel tick value above which wheel tick rolls over
+##This configuration is applicable when QDR_CAN_TYPE configured as ODO_DWT(2)
+#QG_DWT_MAX_WHEEL_TICK_COUNT = 255.0
+##Configure Wheel constant for DWT based below equation
+##(2 * pi * WHEEL_RADIUS / Pulses Per revolution)
+##This configuration is applicable when QDR_CAN_TYPE configured as ODO_DWT(2)
+#QG_DWT_WHEEL_CONSTANT = 0.044
+
+######################################
+#                                    #
+#   QDR2-GYRO Configuration          #
+#                                    #
+# For QDR2-GYRO,                     #
+# comment default configuration above#
+# and                                #
+# uncomment below configuration      #
+# settings.                          #
+#                                    #
+######################################
+#
+#SENSOR_SERVICE = vehicle_speed
+#SENSOR_PROVIDER = native
+#SENSOR_RATE = 100
+#SENSOR_SAMPLES = 1
+#
+#SENSOR_SERVICE = vehicle_gyro
+#SENSOR_PROVIDER = native
+#SENSOR_RATE = 100
+#SENSOR_SAMPLES = 1
+#
+#SENSOR_SERVICE = vehicle_gear
+#SENSOR_PROVIDER = native
+#SENSOR_RATE = 100
+#SENSOR_SAMPLES = 1
+#
+##Enable/disable sensor data flashback feature
+#QDR_FLASHBACK_ENABLED = 0
+##Configure QDR library to be loaded 1: QDR3 2: QDR2-GYRO 3: QDR2-DWS
+#QDR_DYNAMIC_LOADING = 2
+##Enable/disable sensor data batching feature
+#QDR_BATCHING_ENABLED = 0
+##Reporting offset before PPS boundary
+#QDR_REPORTING_OFFSET = 0
+##Sensor dispatch threshold declaration
+#QDR_SENSDISPATCH_MS = 30
+#
--- a/configs/gps/gps.conf
+++ b/configs/gps/gps.conf
@ -11,15 +11,16 @@
 #XTRA3   = 3
 XTRA_VERSION_CHECK=0

+XTRA_TEST_ENABLED = 1
+XTRA_THROTTLE_ENABLED = 0
+
 # Error Estimate
 # _SET = 1
 # _CLEAR = 0
 ERR_ESTIMATE=0

 #NTP server
-NTP_SERVER=1.android.pool.ntp.org
-NTP_SERVER_2=asia.pool.ntp.org
-NTP_SERVER_3=time.izatcloud.net
+NTP_SERVER=time.izatcloud.net

 #XTRA CA path
 XTRA_CA_PATH=/system/etc/security/cacerts
@ -27,7 +28,7 @@ XTRA_CA_PATH=/system/etc/security/cacerts
 # 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
+DEBUG_LEVEL = 5

 # Intermediate position report, 1=enable, 0=disable
 INTERMEDIATE_POS=0
@ -37,18 +38,18 @@ INTERMEDIATE_POS=0
 # Set bit 0x1 if MO GPS functionalities are to be locked
 # Set bit 0x2 if NI GPS functionalities are to be locked
 # default - non is locked for backward compatibility
-#GPS_LOCK = 0
+GPS_LOCK = 0

 # supl version 1.0
 SUPL_VER=0x20000

 # Emergency SUPL, 1=enable, 0=disable
-#SUPL_ES=0
+SUPL_ES=0

 #Choose PDN for Emergency SUPL
 #1 - Use emergency PDN
 #0 - Use regular SUPL PDN for Emergency SUPL
-#USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=0
+USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=1

 #SUPL_MODE is a bit mask set in config.xml per carrier by default.
 #If it is uncommented here, this value will overwrite the value from
@ -64,7 +65,7 @@ SUPL_MODE=3
 # ON_DEMAND_TIME = 0x10
 # GEOFENCE = 0x20
 # default = ON_DEMAND_TIME | MSA | MSB | SCHEDULING | GEOFENCE
-CAPABILITIES=0x37
+CAPABILITIES=0x13

 # Accuracy threshold for intermediate positions
 # less accurate positions are ignored, 0 for passing all positions
@ -75,7 +76,7 @@ ACCURACY_THRES=70
 ################################

 # FOR SUPL SUPPORT, set the following
-SUPL_HOST=supl.qxwz.com
+SUPL_HOST=supl.google.com
 SUPL_PORT=7275

 # FOR C2K PDE SUPPORT, set the following
@ -97,7 +98,7 @@ SUPL_PORT=7275
 # 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
+LPP_PROFILE = 2

 ################################
 # EXTRA SETTINGS
@ -113,7 +114,7 @@ SGLTE_TARGET=0
 # 0x1: RRC CPlane
 # 0x2: RRLP UPlane
 # 0x4: LLP Uplane
-A_GLONASS_POS_PROTOCOL_SELECT = 0
+A_GLONASS_POS_PROTOCOL_SELECT = 0x2

 ##################################################
 # Select technology for LPPe Control Plane
@ -122,7 +123,7 @@ A_GLONASS_POS_PROTOCOL_SELECT = 0
 # 0x2: WLAN AP Measurements for LPPe CP
 # 0x4: SRN AP measurement for CP
 # 0x8: Sensor Barometer Measurement LPPe CP
-LPPE_CP_TECHNOLOGY = 0
+#LPPE_CP_TECHNOLOGY = 0

 ##################################################
 # Select technology for LPPe User Plane
@ -131,7 +132,7 @@ LPPE_CP_TECHNOLOGY = 0
 # 0x2: WLAN AP Measurements for LPPe UP
 # 0x4: SRN AP measurement for UP
 # 0x8: Sensor Barometer Measurement LPPe UP
-LPPE_UP_TECHNOLOGY = 0
+#LPPE_UP_TECHNOLOGY = 0

 ##################################################
 # AGPS_CONFIG_INJECT
@ -222,8 +223,71 @@ PROPAGATION_TIME_UNCERTAINTY = 1
 # SUPL_APN = abc.xyz
 # SUPL_IP_TYPE = 4

+#####################################
+# Modem type
+#####################################
+# This setting configures modem type
+# (external=0 or internal=1)
+# comment out the next line to vote
+# for the first modem in the list
+MODEM_TYPE = 1

-XTRA_TEST_ENABLED = 1
-XTRA_THROTTLE_ENABLED = 0
+##################################################
+# CONSTRAINED TIME UNCERTAINTY MODE
+##################################################
+# 0 : disabled (default)
+# 1 : enabled
+# This setting enables GPS engine to keep its time
+# uncertainty below the specified constraint
+#CONSTRAINED_TIME_UNCERTAINTY_ENABLED = 0

-XTRA_SYSTEM_TIME_INJECT = 1
+# If constrained time uncertainty mode is enabled,
+# this setting specifies the time uncertainty
+# threshold that gps engine need to maintain.
+# In unit of milli-seconds.
+# Default is 0.0 meaning that modem default value
+# of time uncertainty threshold will be used.
+#CONSTRAINED_TIME_UNCERTAINTY_THRESHOLD = 0.0
+
+# If constrained time uncertainty mode is enabled,
+# this setting specifies the power budget that
+# gps engine is allowed to spend to maintain the time
+# uncertainty.
+# Default is 0 meaning that GPS engine is not constained
+# by power budget and can spend as much power as needed.
+# In unit of 0.1 milli watt second.
+#CONSTRAINED_TIME_UNCERTAINTY_ENERGY_BUDGET = 0
+
+##################################################
+# POSITION ASSISTED CLOCK ESTIMATOR
+##################################################
+# 0 : disabled (default)
+# 1 : enabled
+# This setting enables GPS engine to estimate clock
+# bias and drift when the signal from at least 1
+# SV is available and the UE<55>s position is known by
+# other position engines.
+#POSITION_ASSISTED_CLOCK_ESTIMATOR_ENABLED = 0
+
+#####################################
+# proxyAppPackageName
+#####################################
+# This is a string that is sent to the framework
+# in nfwNotifyCb callback
+PROXY_APP_PACKAGE_NAME = com.google.android.carrierlocation
+
+#####################################
+# CP_MTLR_ES
+#####################################
+# CP MTLR ES, 1=enable, 0=disable
+CP_MTLR_ES=0
+
+##################################################
+# GNSS_DEPLOYMENT
+##################################################
+# 0 : Enable QTI GNSS (default)
+# 1 : Enable QCSR SS5
+# This setting use to select between QTI GNSS
+# and QCSR SS5 hardware receiver.
+# By default QTI GNSS receiver is enabled.
+# GNSS_DEPLOYMENT = 0
--- a/configs/gps/izat.conf
+++ b/configs/gps/izat.conf
@ -16,6 +16,13 @@ WIFI_WAIT_TIMEOUT_SELECT = 0
 ##################################################
 LPPE_SRN_DATA_SCAN_INJECT_TIME=2

+##################################################
+# Identify this target as OTA updated or new
+# 0 - New target
+# 1 - OTA updated
+##################################################
+OTA_UPDATED_TARGET=0
+
 ################################
 # NLP Settings
 ################################
@ -37,7 +44,7 @@ LPPE_SRN_DATA_SCAN_INJECT_TIME=2
 # without EULA consent, but the uncertainty can be high.
 # QNP preferred mode prefers QNP when there is EULA consent,
 # otherwise OSNLP is used.
-NLP_MODE = 1
+NLP_MODE = 4
 NLP_MODE_EMERGENCY = 2
 NLP_TOLERANCE_TIME_FIRST = 5000
 NLP_TOLERANCE_TIME_AFTER = 20000
@ -48,19 +55,12 @@ NLP_COMBO_MODE_USES_QNP_WITH_NO_EULA_CONSENT = 1
 #########################################
 # NLP PACKAGE SETTINGS
 #########################################
-# OSNLP_PACKAGE/OSNLP_ACTION: name/action of default NLP package
-#OSNLP_PACKAGE = com.google.android.gms
-#OSNLP_ACTION = com.android.location.service.v3.NetworkLocationProvider
-# REGION_OSNLP_PACKAGE/REGION_OSNLP_ACTION:
-# These two values will be used as alternative
+# OSNLP_PACKAGE: name of default NLP package
+OSNLP_PACKAGE = com.google.android.gms
+# REGION_OSNLP_PACKAGE:
+# This value will be used as alternative
 # for particular region where default NLP is not functional.
-#REGION_OSNLP_PACKAGE = com.baidu.map.location
-
-# Threshold period for ZPP triggers
-ZPP_TRIGGER_THRESHOLD=60000
-# Accuracy threshold for ZPP positions
-# less accurate positions are ignored
-ZPP_ACCURACY_THRESHOLD=20000
+#REGION_OSNLP_PACKAGE =

 ###################################
 # GEOFENCE SERVICES
@ -96,20 +96,11 @@ GTP_PRIVACY_RETRY_INTERVAL = 86400
 #BASIC
 #PREMIUM

-#GTP_CELL_PROC valid options:
-# AP
-# MODEM
-GTP_CELL_PROC=MODEM
-
-#GTP_CELL valid modes:
+#GTP_MODE valid modes:
 # DISABLED
-# BASIC
-GTP_CELL=DISABLED
-
-#GTP_WIFI valid modes:
-# DISABLED
-# BASIC
-GTP_WIFI=DISABLED
+# LEGACY_WWAN
+# SDK (WWAN not available for Modems before LocTech 10.0)
+GTP_MODE=DISABLED

 #GTP_WAA valid modes:
 # DISABLED
@ -120,13 +111,9 @@ GTP_WAA=DISABLED
 # DISABLED
 # BASIC
 # PREMIUM
+# MODEM_DEFAULT
 SAP=PREMIUM

-#ODCPI valid modes:
-#DISABLED
-#BASIC
-ODCPI=BASIC
-
 #FREE_WIFI_SCAN_INJECT valid modes:
 #DISABLED
 #BASIC
@ -159,9 +146,8 @@ WIFI_SUPPLICANT_INFO=BASIC

 #FEATURE MASKS:
 # GTP-WIFI    0X03
-# GTP-AP-CELL 0X0c
 # GTP-MP-CELL 0xc00
-# GTP-WAA     0X300
+# GTP-WAA     0x100
 # SAP         0Xc0
 # ODCPI      0x1000
 # FREE_WIFI_SCAN_INJECT   0x2000
@ -177,75 +163,49 @@ WIFI_SUPPLICANT_INFO=BASIC
 #1. Any valid values obtained from ro.baseband separated by single space. For example: sglte sglte2
 #2. 'all' or 'all exclude' -> for all basebands
 #3. 'all exclude XXXX' -> All basebands exclude XXXX. For example: all exclude sglte
-PROCESS_NAME=DR_AP_Service
-PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
-PROCESS_GROUPS=gps diag
-PREMIUM_FEATURE=0
-IZAT_FEATURE_MASK=0
-PLATFORMS=all
-BASEBAND=all
-HARDWARE_TYPE=automotive
-
-PROCESS_NAME=garden_app
-PROCESS_ARGUMENT=-l 0 -T 1
-PROCESS_STATE=DISABLED
-PROCESS_GROUPS=gps diag
-PREMIUM_FEATURE=0
-IZAT_FEATURE_MASK=0
-PLATFORMS=all
-BASEBAND=all
-HARDWARE_TYPE=automotive
-
-PROCESS_NAME=gpsone_daemon
-PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
-PROCESS_GROUPS=inet
-PREMIUM_FEATURE=0
-IZAT_FEATURE_MASK=0
-PLATFORMS=msm7630_fusion
-BASEBAND=svlte2a sglte sglte2
-HARDWARE_TYPE=all
-
 PROCESS_NAME=lowi-server
 PROCESS_ARGUMENT=
 PROCESS_STATE=ENABLED
-PROCESS_GROUPS=gps net_admin wifi inet oem_2901
+PROCESS_GROUPS=gps wifi inet oem_2901
 PREMIUM_FEATURE=0
 IZAT_FEATURE_MASK=0xf303
 PLATFORMS=all
 BASEBAND=all
 HARDWARE_TYPE=all
+VENDOR_ENHANCED_PROCESS=0

 PROCESS_NAME=xtwifi-inet-agent
 PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
+PROCESS_STATE=ENABLED
 PROCESS_GROUPS=inet gps
 PREMIUM_FEATURE=1
-IZAT_FEATURE_MASK=0xf0f
+IZAT_FEATURE_MASK=0xc03
 PLATFORMS=all
 BASEBAND=all
 HARDWARE_TYPE=all
+VENDOR_ENHANCED_PROCESS=1

 PROCESS_NAME=xtwifi-client
 PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
+PROCESS_STATE=ENABLED
 PROCESS_GROUPS=wifi inet gps system oem_2904
 PREMIUM_FEATURE=1
-IZAT_FEATURE_MASK=0xf0f
+IZAT_FEATURE_MASK=0xd03
 PLATFORMS=all
 BASEBAND=all
 HARDWARE_TYPE=all
+VENDOR_ENHANCED_PROCESS=1

 PROCESS_NAME=slim_daemon
 PROCESS_ARGUMENT=
-PROCESS_STATE=DISABLED
-PROCESS_GROUPS=gps qcom_diag can
+PROCESS_STATE=ENABLED
+PROCESS_GROUPS=gps oem_2901 can plugdev diag sensors
 PREMIUM_FEATURE=1
 IZAT_FEATURE_MASK=0xf0
 PLATFORMS=all
 BASEBAND=all
 HARDWARE_TYPE=all
+VENDOR_ENHANCED_PROCESS=1

 PROCESS_NAME=xtra-daemon
 PROCESS_ARGUMENT=
@ -256,7 +216,39 @@ IZAT_FEATURE_MASK=0
 PLATFORMS=all
 BASEBAND=all
 HARDWARE_TYPE=all
+VENDOR_ENHANCED_PROCESS=0

-#Accuracy threshold for ZPP positions
-# less accurate positions are ignored
-ZPP_ACCURACY_THRESHOLD=1000
+########################################
+# Engine Service which host DRE module #
+# To enable DRE engine service, change #
+# PROCESS_STATE=ENABLED                #
+########################################
+PROCESS_NAME=engine-service
+PROCESS_ARGUMENT=DRE-INT libloc_epDr.so
+PROCESS_STATE=DISABLED
+PROCESS_GROUPS=gps diag inet qwes oem_2901 system
+PREMIUM_FEATURE=0
+IZAT_FEATURE_MASK=0
+PLATFORMS=all
+BASEBAND=all
+HARDWARE_TYPE=all
+VENDOR_ENHANCED_PROCESS=1
+
+########################################
+# Engine Service which host PPE module #
+# To enable PPE engine service, change #
+# PROCESS_STATE=ENABLED                #
+# and update process arugements        #
+# with PPE library name                #
+#PROCESS_ARGUMENT=PPE libepsimulator.so#
+########################################
+PROCESS_NAME=engine-service
+PROCESS_ARGUMENT=PPE libepsimulator.so
+PROCESS_STATE=DISABLED
+PROCESS_GROUPS=gps diag inet oem_2901
+PREMIUM_FEATURE=0
+IZAT_FEATURE_MASK=0
+PLATFORMS=all
+BASEBAND=all
+HARDWARE_TYPE=all
+VENDOR_ENHANCED_PROCESS=1
--- a/configs/gps/lowi.conf
+++ b/configs/gps/lowi.conf
@ -5,7 +5,11 @@
 # GENERAL DESCRIPTION
 #  This file contains the config params for LOWI
 #
-# Copyright (c) 2012-2013 Qualcomm Atheros, Inc.
+# Copyright (c) 2019 Qualcomm Technologies, Inc.
+#  All Rights Reserved.
+#  Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+# 2012-2013 Qualcomm Atheros, Inc.
 #  All Rights Reserved.
 #  Qualcomm Atheros Confidential and Proprietary.
 #
@ -18,4 +22,5 @@

 # Log level
 # EL_LOG_OFF = 0, EL_ERROR = 1, EL_WARNING = 2, EL_INFO = 3, EL_DEBUG = 4, EL_VERBOSE = 5, EL_LOG_ALL = 100
-LOWI_LOG_LEVEL = 2
+LOWI_LOG_LEVEL = 3
+LOWI_USE_LOWI_LP = 0
--- a/configs/gps/sap.conf
+++ b/configs/gps/sap.conf
@ -25,15 +25,10 @@ SENSOR_ACCEL_SAMPLES_PER_BATCH_HIGH=25
 SENSOR_GYRO_BATCHES_PER_SEC_HIGH=4
 SENSOR_GYRO_SAMPLES_PER_BATCH_HIGH=25

-# Sensor Control Mode (0=AUTO, 1=FORCE_ON)
+# Sensor Control Mode (0=AUTO, 1=FORCE_ON, 2=MODEM_DEFAULT)
 # used in loc_eng_reinit
 SENSOR_CONTROL_MODE=1
-
-# Enable or Disable Sensors for GPS use (0=Enable, 1=Disable)
-# used in loc_eng_reinit
 SENSOR_USAGE=0
-
-# Choose GSIFF sensor provider (1=Snapdragon Sensors Core, 2=Android NDK)
 SENSOR_PROVIDER=1

 # Bit mask used to define which sensor algorithms are used.
@ -49,15 +44,72 @@ SENSOR_ALGORITHM_CONFIG_MASK=0x0
 #VN_ACCEL_CFG=0:5
 #VN_GYRO_CFG=0:5.5
 #VN_ODOMETRY_CFG=0:2,4.5
-VN_ACCEL_CFG=1:128,0,12,0.0048828125,12,12,0.0048828125,24,12,0.0048828125
-VN_GYRO_CFG=1:129,0,16,0.00006103515625,16,16,0.00006103515625,32,16,0.00006103515625
-VN_ODOMETRY_CFG=1:130,0,1,5,6,32
+
+################################################
+#  QDR3 configurations                         #
+################################################
 VN_SPEED_CFG=1:131,5,8,1,2,3,1,1,9,2,14,2
-VN_DWS_CFG=1:132,5,8,1,2,3,1,1,5,2,7,2,9,2,11,2,13,2,15,2,17,2,19,2
 VN_GEAR_CFG=1:422,20,4,0,4,1,9,0,1,2,3,4,5,6,7,8

+################################################
+#  QDR2-Gyro configurations                    #
+################################################
+#VN_GYRO_CFG=1:555,0,1,0,0,0,0,-6.5,6.6066,-6.5,-1.00,2,6.607,6.6068,0,0,16,0.0002,0,16,0.0002,0,16,0.0002
+#VN_SPEED_CFG=1:555,0,0,1,2,1,0.01,0,56,8,48,8
+#VN_GEAR_CFG=1:555,16,4,0,1,1,9,0,1,2,3,4,5,6,7,8
+
+################################################
+#  QDR2-DWT configurations                     #
+################################################
+#VN_SPEED_CFG=1:555,22,1,2,1,1,1,0,8,8,23,1,2,0,1,0,8,8,23,1
+#VN_GEAR_CFG=1:555,12,4,16,14,16,8,1,2,3,4,5,6,7,8
+#VN_DWS_CFG=1:555,0,0,1,3,1,1,0,0,8,0,0,8,8,0,0,16,8,0,0,24,8,0,0
+#VN_GYRO_CFG=1:555,40,16,1.0,40,16,1.0,40,16,1.0
+
+#####################################################################################
+#                    VNW service batching configuration strings                     #
+# VNW provider will initialize default type as Time based batching                  #
+# Each service batch value is configured to be 100                                  #
+# VN_ACCEL_CFG_BATCH_VALUE will be treated as time in Ms if VN_CFG_BATCH_TYPE       #
+# is set to time based batching                                                     #
+# VN_ACCEL_CFG_BATCH_VALUE will be treated as sample count if VN_CFG_BATCH_TYPE     #
+# is set to count based batching                                                    #
+# Uncomment and update batch time /sample count as per selected batching type       #
+#####################################################################################
+# Batching type
+# 1 - Time based  (default)
+# 2 - Count based
+#VN_CFG_BATCH_TYPE=1
+
+#Vehicle Accel batching value, it can either accept time in milli seconds or sample count
+#VN_ACCEL_CFG_BATCH_VALUE=100
+
+#Vehicle Gyro batching value, it can either accept time in milli seconds or sample count
+#VN_GYRO_CFG_BATCH_VALUE=100
+
+#Vehicle Odo batching value, it can either accept time in milli seconds or sample count
+#VN_ODOMETRY_CFG_BATCH_VALUE=100
+
+#Vehicle Speed batching value, it can either accept time in milli seconds or sample count
+#VN_SPEED_CFG_BATCH_VALUE=100
+
+#Vehicle Gear batching value, it can either accept time in milli seconds or sample count
+#VN_GEAR_CFG_BATCH_VALUE=100
+
+#Vehicle DWS batching value, it can either accept time in milli seconds or sample count
+#VN_DWS_CFG_BATCH_VALUE=100
+####################################################################################
+
 #Procesors clock ratio: AP and CAN bus microcontroller
-VN_PROC_CLOCK_RATIO=1.93165618815148
+################################################
+#  QDR3 configurations                         #
+################################################
+VN_PROC_CLOCK_RATIO=1.0
+
+################################################
+#  QDR2-DWT OR QDR2-Gyro configurations        #
+################################################
+#VN_PROC_CLOCK_RATIO = 1.0

 # Time source used by Sensor HAL
 # Setting this value controls accuracy of location sensor services.
@ -68,3 +120,44 @@ VN_PROC_CLOCK_RATIO=1.93165618815148
 #  4 - CLOCK_BOOTTIME using Alarm timer interface
 NDK_PROVIDER_TIME_SOURCE=1

+# Sensor Batching Configuration
+# 0 - Time based
+# 1 - Fixed count based
+# 2 - Variable count based
+COUNT_BASED_BATCHING=1
+SYNC_ONCE=0
+
+#Sensor HAL Provider Configuration HAL Library name including path
+################################################
+#                                              #
+# Configuration for BMI 160 Sensor             #
+#                                              #
+################################################
+SENSOR_TYPE=2
+SENSOR_HAL_LIB_PATH=/usr/lib/libbmi160sensors.so.1
+
+################################################
+#                                              #
+# Configuration for ASM330 Sensor              #
+#                                              #
+################################################
+#SENSOR_TYPE=1
+#SENSOR_HAL_LIB_PATH=/usr/lib/libasm330sensors.so.1
+
+
+################################################
+#                                              #
+# Configuration for IAM20680 Sensor            #
+#                                              #
+################################################
+#SENSOR_TYPE=3
+#SENSOR_HAL_LIB_PATH=/usr/lib/libiam20680sensors.so.1
+
+
+################################################
+#                                              #
+# Configuration for SMI130 Sensor              #
+#                                              #
+################################################
+#SENSOR_TYPE=4
+#SENSOR_HAL_LIB_PATH=/usr/lib/libsmi130sensors.so.1
--- a/configs/gps/xtwifi.conf
+++ b/configs/gps/xtwifi.conf
@ -40,10 +40,13 @@ SIZE_BYTE_TOTAL_CACHE = 5000000
 # can support ASN URI v3 protocol.
 # XT_SERVER_ROOT_URL_V3 = https://gtpma1.izatcloud.net:443/uds/v3

-# 1: default mode, where mobile downloads tiles and partitions
-# 2: mode for memory and bandwidth limited devices, where mobile
-#    downloads AP list and cell list
-# GTP_AP_MODE = 2
+# 3: Wi-Fi APDB injection via Izat SDK. GTP server is not accessed
+#    for any GTP requests, instead notification is sent to Izat SDK.
+#    WiFi crowdsourcing module is disabled.
+# 4: Wi-Fi APDB injection via Izat SDK. GTP server is not accessed
+#    for any GTP requests, instead notification is sent to Izat SDK.
+#    WiFi crowdsourcing module is active, also accessed via Izat SDK.
+# GTP_AP_MODE = 4

 # 1: MP cell features relies on GTP AP for either download or upload
 # 0: MP cell features does not rely on GTP AP