From 772578a15a48bcb6af6419bdad4ee8f4ed78fc41 Mon Sep 17 00:00:00 2001 From: "Kevin F. Haggerty" Date: Wed, 17 Jan 2018 20:26:37 -0700 Subject: [PATCH] msm8974-common: gps: Import configs from klte-common Change-Id: I92fbf38ecac658fa69191b89890b79e82e05acec --- gps/etc/flp.conf | 60 ++++++++++++++ gps/etc/gps.conf | 39 ++++----- gps/etc/izat.conf | 196 ++++++++++++++++++++++++++++++++++++++++++++++ gps/etc/sap.conf | 53 +++++++++++++ 4 files changed, 329 insertions(+), 19 deletions(-) create mode 100644 gps/etc/flp.conf create mode 100644 gps/etc/izat.conf create mode 100644 gps/etc/sap.conf diff --git a/gps/etc/flp.conf b/gps/etc/flp.conf new file mode 100644 index 0000000..a34f3d2 --- /dev/null +++ b/gps/etc/flp.conf @@ -0,0 +1,60 @@ +################################### +##### FLP settings ##### +################################### + +################################### +# FLP BATCHING SIZE +################################### +# The number of batched locations +# requested to modem. The desired number +# defined below may not be satisfied, as +# the modem can only return the number +# of batched locations that can be allocated, +# which is limited by memory. The default +# batch size defined as 20 as below. +BATCH_SIZE=20 + +################################### +# FLP BATCHING SESSION TIMEOUT +################################### +# Duration with which batch session timeout +# happens in milliseconds. If not specified +# or set to zero, batching session timeout +# defaults to 20 seconds by the modem. +# BATCH_SESSION_TIMEOUT=20000 + +################################### +# FLP CAPABILITIES BIT MASK +################################### +# GEOFENCE = 0x01 +# BATCHING = 0x02 +# default = GEOFENCE | BATCHING +CAPABILITIES=0x00 + +################################### +# FLP BATCHING ACCURACY +################################### +# Set to one of the defined values below +# to define the accuracy of batching. +# If not specified, accuracy defaults +# to LOW. +# FLP BATCHING ACCURACY values: +# Low accuracy = 0 +# Medium accuracy = 1 +# High accuracy = 2 +ACCURACY=0 + +################################### +# FLP GEOFENCE RESPONSIVENESS +################################### +# If set to one of the defined values below, +# it will override the responsiveness for +# FLP geofence, which implements the fused +# location API. If not set to a value defined +# below, which is default, it will not +# override the responsivness. +# FLP_GEOFENCE_RESPONSIVENESS_OVERRIDE Values: +# 1: LOW responsiveness +# 2: MEDIUM responsiveness +# 3: HIGH responsiveness +FLP_GEOFENCE_RESPONSIVENESS_OVERRIDE = 0 diff --git a/gps/etc/gps.conf b/gps/etc/gps.conf index 4e6b436..162a299 100644 --- a/gps/etc/gps.conf +++ b/gps/etc/gps.conf @@ -1,15 +1,13 @@ -#Uncommenting these urls would only enable -#the power up auto injection and force injection(test case). -#XTRA_SERVER_1=http://xtrapath1.izatcloud.net/xtra2.bin -#XTRA_SERVER_2=http://xtrapath2.izatcloud.net/xtra2.bin -#XTRA_SERVER_3=http://xtrapath3.izatcloud.net/xtra2.bin +XTRA_SERVER_1=https://xtrapath1.izatcloud.net/xtra3grc.bin +XTRA_SERVER_2=https://xtrapath2.izatcloud.net/xtra3grc.bin +XTRA_SERVER_3=https://xtrapath3.izatcloud.net/xtra3grc.bin #Version check for XTRA #DISABLE = 0 #AUTO = 1 #XTRA2 = 2 #XTRA3 = 3 -XTRA_VERSION_CHECK=0 +XTRA_VERSION_CHECK=1 # Error Estimate # _SET = 1 @@ -17,18 +15,18 @@ XTRA_VERSION_CHECK=0 ERR_ESTIMATE=0 #Test -NTP_SERVER=time.gpsonextra.net +# NTP_SERVER=time.izatcloud.net #Asia # NTP_SERVER=asia.pool.ntp.org #Europe # NTP_SERVER=europe.pool.ntp.org #North America -# NTP_SERVER=north-america.pool.ntp.org +#NTP_SERVER=north-america.pool.ntp.org # 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 = 2 # Intermediate position report, 1=enable, 0=disable INTERMEDIATE_POS=0 @@ -40,11 +38,12 @@ INTERMEDIATE_POS=0 # default - non is locked for backward compatibility #GPS_LOCK = 0 -# supl version 1.0 -SUPL_VER=0x10000 +# supl version 2.0 +SUPL_VER=0x20000 # Emergency SUPL, 1=enable, 0=disable -SUPL_ES=0 +#SUPL_ES=0 +# Sensor R&D : Non-SUPL ES should be default #Choose PDN for Emergency SUPL #1 - Use emergency PDN @@ -52,11 +51,12 @@ SUPL_ES=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 +#If it is uncommented here, this value will over write the value from #config.xml. #MSA=0X2 #MSB=0X1 -#SUPL_MODE= +#Sensor R&D : Change default bit mask +#SUPL_MODE=1 # GPS Capabilities bit mask # SCHEDULING = 0x01 @@ -65,7 +65,7 @@ USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL=1 # ON_DEMAND_TIME = 0x10 # GEOFENCE = 0x20 # default = ON_DEMAND_TIME | MSA | MSB | SCHEDULING | GEOFENCE -CAPABILITIES=0x37 +CAPABILITIES=0x31 # Accuracy threshold for intermediate positions # less accurate positions are ignored, 0 for passing all positions @@ -76,8 +76,8 @@ CAPABILITIES=0x37 ################################ # FOR SUPL SUPPORT, set the following -# SUPL_HOST=supl.host.com or IP -# SUPL_PORT=1234 +#SUPL_HOST=supl.google.com +#SUPL_PORT=7275 # FOR C2K PDE SUPPORT, set the following # C2K_HOST=c2k.pde.com or IP @@ -98,13 +98,13 @@ CAPABILITIES=0x37 # 1: Enable LPP_User_Plane on LTE # 2: Enable LPP_Control_Plane # 3: Enable both LPP_User_Plane and LPP_Control_Plane -LPP_PROFILE = 2 +#LPP_PROFILE = 0 # Sensor R&D : This will not be injected to MODEM ################################ # EXTRA SETTINGS ################################ # NMEA provider (1=Modem Processor, 0=Application Processor) -NMEA_PROVIDER=0 +NMEA_PROVIDER=1 # Mark if it is a SGLTE target (1=SGLTE, 0=nonSGLTE) SGLTE_TARGET=0 @@ -114,4 +114,5 @@ SGLTE_TARGET=0 # 0x1: RRC CPlane # 0x2: RRLP UPlane # 0x4: LLP Uplane +# Sensor R&D : This will not be injected to MODEM A_GLONASS_POS_PROTOCOL_SELECT = 0 diff --git a/gps/etc/izat.conf b/gps/etc/izat.conf new file mode 100644 index 0000000..6f5d5b8 --- /dev/null +++ b/gps/etc/izat.conf @@ -0,0 +1,196 @@ +######################################### +# Log verbosity control for izat modules +######################################### +# OFF = 0, ERROR = 1, WARNING = 2, INFO = 3, DEBUG = 4, VERBOSE = 5 +IZAT_DEBUG_LEVEL = 2 + +################################################## +# Select WIFI Wait Timeout value in seconds for SUPL +################################################## +WIFI_WAIT_TIMEOUT_SELECT = 0 + +################################ +# NLP Settings +################################ +# NLP_MODE 1: GNP Only, 2: QNP Only, 3: Combo +# NLP_TOLERANCE_TIME_FIRST: Time in ms used in Combo mode +# to determine how much Tolerance for first position +# NLP_TOLERANCE_TIME_AFTER: Time in ms used in Combo mode +# to determine how much Tolerance for positions after first +# NLP_THRESHOLD: Sets how many failures needed before +# switching preferred NLP in Combo mode +# NLP_ACCURACY_MULTIPLE: Determines how far off the accuracy +# must be, in multiples, between two NLP location reports to +# be considered much worse accuracy. Used in switching logic +# NLP COMBO MODE USES QNP WITH NO EULA CONSENT: Determines +# whether or not to still send network location requests to +# QNP when the EULA is not consented to by the user. QNP can +# still return ZPP locations or injected locations even +# without EULA consent, but the uncertainty can be high. +NLP_MODE = 1 +NLP_TOLERANCE_TIME_FIRST = 5000 +NLP_TOLERANCE_TIME_AFTER = 20000 +NLP_THRESHOLD = 3 +NLP_ACCURACY_MULTIPLE = 2 +NLP_COMBO_MODE_USES_QNP_WITH_NO_EULA_CONSENT = 0 + +# Threshold period for ZPP triggers +ZPP_TRIGGER_THRESHOLD=60000 + +################################### +# GEOFENCE SERVICES +################################### +# If set to one of the defined values below, it will override +# the responsiveness for geofence services, which implements +# the Proximity Alert API. If not set to a value defined below, +# which is default, it will not override the responsivness. +# The geofence HAL API is unaffected by this value. +# GEOFENCE_SERVICES_RESPONSIVENESS_OVERRIDE Values: +# 1: LOW responsiveness +# 2: MEDIUM responsiveness +# 3: HIGH responsiveness +GEOFENCE_SERVICES_RESPONSIVENESS_OVERRIDE = 0 + +##################################### +# IZAT PREMIUM FEATURE SETTINGS +##################################### +#Possible states of a feature: +#DISABLED +#BASIC +#PREMIUM + +#GTP_CELL_PROC valid options: +# AP +# MODEM +GTP_CELL_PROC=MODEM + +#GTP_CELL valid modes: +# DISABLED +# BASIC +GTP_CELL=BASIC + +#GTP_WIFI valid modes: +# DISABLED +# BASIC +GTP_WIFI=BASIC + +#GTP_WAA valid modes: +# DISABLED +# BASIC +GTP_WAA=DISABLED + +#SAP valid modes: +# DISABLED +# BASIC +# PREMIUM +SAP=BASIC + +#ODCPI valid modes: +#DISABLED +#BASIC +ODCPI=DISABLED + +#FREE_WIFI_SCAN_INJECT valid modes: +#DISABLED +#BASIC +FREE_WIFI_SCAN_INJECT=BASIC + +#SUPL_WIFI valid modes: +#DISABLED +#BASIC +SUPL_WIFI=DISABLED + +#WIFI_SUPPLICANT_INFO valid modes: +#DISABLED +#BASIC +WIFI_SUPPLICANT_INFO=BASIC + +##################################### +# Location process launcher settings +##################################### + +#Values for PROCESS_STATE: +# ENABLED +# DISABLED + +#FEATURE MASKS: +# GTP-WIFI 0X03 +# GTP-AP-CELL 0X0c +# GTP-MP-CELL 0xc00 +# GTP-WAA 0X300 +# SAP 0Xc0 +# ODCPI 0x1000 +# FREE_WIFI_SCAN_INJECT 0x2000 +# SUPL_WIFI 0x4000 +# WIFI_SUPPLICANT_INFO 0x8000 + +#Values for PLATFORMS can be: +#1. Any valid values obtained from ro.board.platform separated by single space. For example: msm8960 msm8226 +#2. all -> for All platforms + +#Values for BASEBAND can be: +#1. Any valid values obtained from ro.baseband separated by single space. For example: sglte sglte2 +#2. all -> for all basebands + +#Valyes for LEAN_TARGETS can be: +#ENABLED -> if this process is supposed to run on lean and mean targets +#DISABLED -> if this process is to be disabled on lean and mean targets +PROCESS_NAME=/system/bin/garden_app +PROCESS_ARGUMENT=-u 0 -q 0 -j 0 -g 0 -l 0 -Z 0 -T 1 +PROCESS_STATE=ENABLED +PROCESS_GROUPS=gps net_raw +PREMIUM_FEATURE=0 +IZAT_FEATURE_MASK=0 +PLATFORMS=all +BASEBAND=auto +LEAN_TARGETS=DISABLED + +PROCESS_NAME=/system/bin/gpsone_daemon +PROCESS_ARGUMENT= +PROCESS_STATE=DISABLED +PROCESS_GROUPS=inet net_raw +PREMIUM_FEATURE=0 +IZAT_FEATURE_MASK=0 +PLATFORMS=msm7630_fusion +BASEBAND=svlte2a sglte sglte2 +LEAN_TARGETS=DISABLED + +PROCESS_NAME=/system/bin/lowi-server +PROCESS_ARGUMENT= +PROCESS_STATE=ENABLED +PROCESS_GROUPS=gps net_admin wifi inet oem_2950 net_raw +PREMIUM_FEATURE=0 +IZAT_FEATURE_MASK=0xf303 +PLATFORMS=all +BASEBAND=all +LEAN_TARGETS=DISABLED + +PROCESS_NAME=/system/bin/xtwifi-inet-agent +PROCESS_ARGUMENT= +PROCESS_STATE=ENABLED +PROCESS_GROUPS=inet gps +PREMIUM_FEATURE=1 +IZAT_FEATURE_MASK=0xc0f +PLATFORMS=all +BASEBAND=all +LEAN_TARGETS=DISABLED + +PROCESS_NAME=/system/bin/xtwifi-client +PROCESS_ARGUMENT= +PROCESS_STATE=ENABLED +PROCESS_GROUPS=net_admin wifi inet gps net_raw oem_2952 +PREMIUM_FEATURE=1 +IZAT_FEATURE_MASK=0xf0f +PLATFORMS=all +BASEBAND=all +LEAN_TARGETS=DISABLED + +PROCESS_NAME=/system/vendor/bin/slim_daemon +PROCESS_ARGUMENT= +PROCESS_STATE=ENABLED +PROCESS_GROUPS=gps net_raw oem_2950 +PREMIUM_FEATURE=1 +IZAT_FEATURE_MASK=0xf0 +PLATFORMS=all +BASEBAND=all +LEAN_TARGETS=DISABLED diff --git a/gps/etc/sap.conf b/gps/etc/sap.conf new file mode 100644 index 0000000..9ed2451 --- /dev/null +++ b/gps/etc/sap.conf @@ -0,0 +1,53 @@ +################################ +# Sensor Settings +################################ +#The following parameters are optional. +#Internal defaults support MEMS sensors +#native to most handset devices. +#Device specific sensor characterization +#for improved performance is possible as +#described in SAP application notes. +#GYRO_BIAS_RANDOM_WALK= +#ACCEL_RANDOM_WALK_SPECTRAL_DENSITY= +#ANGLE_RANDOM_WALK_SPECTRAL_DENSITY= +#RATE_RANDOM_WALK_SPECTRAL_DENSITY= +#VELOCITY_RANDOM_WALK_SPECTRAL_DENSITY= + +# Sensor Sampling Rate Parameters for Low-Data Rate Filter (should be greater than 0) +# used in loc_eng_reinit +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 Sampling Rate Parameters for High-Data Rate Filter (should be greater than 0) +SENSOR_ACCEL_BATCHES_PER_SEC_HIGH=4 +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) +# used in loc_eng_reinit +SENSOR_CONTROL_MODE=0 + +# 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=2 + +# Bit mask used to define which sensor algorithms are used. +# Setting each bit has the following definition: +# 0x1 - DISABLE_INS_POSITIONING_FILTER +# 0x0 - ENABLE_INS_POSITIONING_FILTER +SENSOR_ALGORITHM_CONFIG_MASK=0x0 + +# Time source used by Sensor HAL +# Setting this value controls accuracy of location sensor services. +# 0 - Unknown +# 1 - CLOCK_BOOTTIME +# 2 - CLOCK_MONOTONIC +# 3 - CLOCK_REALTIME +# 4 - CLOCK_BOOTTIME using Alarm timer interface +NDK_PROVIDER_TIME_SOURCE=1 +