From 4461a9198ac65f0d631bf5337e1ad94b4ed46d65 Mon Sep 17 00:00:00 2001 From: Edwin Tung Date: Thu, 17 Aug 2023 16:56:32 +0800 Subject: [PATCH] gps: disable gps log on user build Bug: 296059179 Test: gps works on user build Change-Id: Ifed416135eaf15022607e4cbec4b95603c72b088 --- location/gnssd/gnss_release.mk | 9 +- location/gnssd/release/gps.cfg | 2 +- location/gnssd/release/gps_user.cfg | 206 ++++++++++++++++++++++++++++ 3 files changed, 214 insertions(+), 3 deletions(-) create mode 100644 location/gnssd/release/gps_user.cfg diff --git a/location/gnssd/gnss_release.mk b/location/gnssd/gnss_release.mk index 1822de0..76afbd1 100644 --- a/location/gnssd/gnss_release.mk +++ b/location/gnssd/gnss_release.mk @@ -12,5 +12,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_SOONG_NAMESPACES += \ $(GPS_ROOT) -PRODUCT_COPY_FILES += \ - $(GPS_ROOT)/release/gps.cfg:vendor/etc/gnss/gps.cfg +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) + PRODUCT_COPY_FILES += \ + $(GPS_ROOT)/release/gps.cfg:vendor/etc/gnss/gps.cfg +else + PRODUCT_COPY_FILES += \ + $(GPS_ROOT)/release/gps_user.cfg:vendor/etc/gnss/gps.cfg +endif diff --git a/location/gnssd/release/gps.cfg b/location/gnssd/release/gps.cfg index 99b9fa0..014e492 100644 --- a/location/gnssd/release/gps.cfg +++ b/location/gnssd/release/gps.cfg @@ -120,7 +120,7 @@ rtc_min_num_of_fixes=10 additional_rtc_uncertainty_ms=10 # set to 1 for FW SGEE download - Requires Android FW to be properly configured -Sif_UseFwXtraInterface=0 +Sif_UseFwXtraInterface=1 # Low power configurations # ACT C/No loss limit: 0dB to 15dB (0 = ACT is disabled by default) 3dB = 50% Duty Cycle, 6dB = 25% Duty Cycle, 9dB = 12.5% Duty Cycle diff --git a/location/gnssd/release/gps_user.cfg b/location/gnssd/release/gps_user.cfg new file mode 100644 index 0000000..ca289c6 --- /dev/null +++ b/location/gnssd/release/gps_user.cfg @@ -0,0 +1,206 @@ +############################################ +GlueLayer_ToolConfigSelection=3 +user_ports_tcp_name=Autotest +user_ports_tcp_port=7555 +debug_console=0 +debug_dir=/data/vendor/gps/logs +############################################ +GlueLayer_IsGedKeyExist=1 +GlueLayer_isForceIPV6=0 +GlueLayer_EnableGnssCfgInterface=1 +debug_enable=0 + +uni_log_max_file_count=5 +uni_log_max_size_mb=20 +uni_log_total_max_size_mb=100 + +gnss_device_type=K041 + +# send debug req on MCW oddity +#Chip_Configuration_Io_Options=0x85 + +# borrow this field to force CP crash on GAL bad ISM +#Chip_Configuration_WT1=1 + +# Chip_Configuration_TrackerDebugMode = 0x10 + +# enables CHPP for SPI port +# uncomment the *chpp* lines below (and comment gnss_device-data_port_kepslim_present above) to use SPI+CHPP +# when using CHPP, make sure to enable the CHPP defines in build_settings.mak +chpp_betp_client=1 +chpp_log_level=2 +gnss_device_data_port_chpp_spi_device=/dev/gnss_ipc +gnss_device_data_port_chpp_present=1 + +### Update for VTS ### +GlueLayer_YearOfHW=2023 +scheduling_enabled=1 + +### temporarily disable precise time aiding ### +Chip_Configuration_AidingConfiguration=0x00020046 + +# set shared reference clock for freq aiding (0x20) +# enable dcxo (0x04) +Chip_Configuration_RefClkControl=0x24 + +### Override for DCXO Cnom/TuneValue +#Chip_Configuration_DCXOtuneValue=3200 + +### DCXO Optional Parameters. ##### +# Can specify Crystal type, and/or over-ride T0-inflection point #### +# +# Optionally specify DXCO Crystal type, and operation mode +# 8 bits. Lower 4 bits Crystal ID# (0-15) +# Upper 4 bits Poly Configuration: (0/1) +# Poly Configuration: 0: Use CP's poly, 1: Force use of default manufactures polynomial +### Crystal Types: +## 0 - Unknown/Default +## 1 - Kyocera CT1612RB +## 2 - NDK NX1612SD CS12311 +## 3 - NDK NX1612SD CS13950 +## 4 - NDK NX1612SD CS15298 +## 5 - KDS 7CG07680A10 +## 6- TXC 0W76870003 +## E.g. Use Kyocera, and ignore CP's polynomial: DCXO_CrystalType=0x11 +## E.g. Use KDS, and Use CP's polynomial: DCXO_CrystalType=0x05 +Chip_Configuration_DCXO_CrystalType=0x11 + +## Optionally specify DXCO Inflection point temperature, #### +# This will override any default value or value in Crystal type #### +# Value is degrees C x 100 E.g. 2855 = 28.55 deg C +# Range should be 2000 to 3100 +#Chip_Configuration_DCXO_InflectionPoint=2855 + +# disable spam dog to avoid loss of position request +spam_dog_ms=0 +# disable HW watchdog +Chip_Configuration_WatchdogPeriod = 0 + +# GPS= 0x0001 GLO= 0x0002 GALILEO=0x0004 BEIDOU=0x0008 SBAS=0x0010 QZSS=0x0020 +# MEMS Static Detect=0x4000 MEMS Heading=0x2000 +### 2C48 L1 only MCW ### +Chip_Configuration_GNSSConstConstraintDef=0x603F +Chip_Configuration_RfMiscCtrl=0x80008001 + +# DVS: 0 = Disabled (default), 1 = Enabled +# DFS: 0 = Disabled (default), 1 = Enabled +# JJM: disabling due to suspicion that DVFS is contributing to GAL BAD ISM +Chip_Configuration_FeatureCfg_DVS = 1 +Chip_Configuration_FeatureCfg_DFS = 1 + +# This is a bitfield that will disable incoming interrupts for mailboxes +# AP = 0x1 +# APM = 0x2 +# CP = 0x4 +# CHUB = 0x8 +# The CHUB on the neus continually triggers a bit so this is to prevent +# it from continually waking the gnss. +mailboxDisabled=0x8 + +### Specify RFIC ID for K40 ### +# 55200001 = S5520 EVT1 +gnss_rfic_chip_id=55200001 + +# Uncomment to Disable SUPL +#Aiding_AidingType=0 +# Uncomment to Disable SUPL (Ignore Android Framework Requests to Enable SUPL) +#GlueLayer_EnableFwConfiguration=0 + +#Uncomment to disable SGEE +#Sif_OperationMode=0 + +# Enables RTC time aiding from Host +# 1 - enable, 0 - disable (default) +UseRtcForAiding=1 + +# Min number of prior fixes needed for RTC time aiding +rtc_min_num_of_fixes=10 + +# increase rtc uncertainty from Host to hedge against bad fixes +additional_rtc_uncertainty_ms=10 + +# set to 1 for FW SGEE download - Requires Android FW to be properly configured +Sif_UseFwXtraInterface=1 + +# Low power configurations +# ACT C/No loss limit: 0dB to 15dB (0 = ACT is disabled by default) 3dB = 50% Duty Cycle, 6dB = 25% Duty Cycle, 9dB = 12.5% Duty Cycle +Chip_Configuration_FeatureCfg_ACT = 5 + +ChipCfg_DspMemdumpEnable=1 + +GNSS_CARRIER_CONFIG_BEGIN +# DEFAULT +GNSS_CARRIER_ID=0 +ENABLE_2G_CP_CAPS_MSA=1 +ENABLE_2G_CP_CAPS_MSB=1 +ENABLE_3G_CP_CAPS_MSA=1 +ENABLE_3G_CP_CAPS_MSB=1 +ENABLE_4G_CP_CAPS_MSA=1 +ENABLE_4G_CP_CAPS_MSB=1 +ENABLE_5G_CP_CAPS_MSA=1 +ENABLE_5G_CP_CAPS_MSB=1 +ENABLE_2G_UP_CAPS_MSA=1 +ENABLE_2G_UP_CAPS_MSB=1 +ENABLE_3G_UP_CAPS_MSA=1 +ENABLE_3G_UP_CAPS_MSB=1 +ENABLE_4G_UP_CAPS_MSA=1 +ENABLE_4G_UP_CAPS_MSB=1 +ENABLE_5G_UP_CAPS_MSA=0 +ENABLE_5G_UP_CAPS_MSB=0 +SUPL_UT2_SEC=20 +SUPL_UT3_SEC=20 +ENABLE_LPP_CP=1 +ENABLE_LPP_UP=0 +ENABLE_LPPE_CP=3 +ENABLE_LPPE_UP=0 +# ATT +GNSS_CARRIER_ID=1 +# TMO +GNSS_CARRIER_ID=2 +ENABLE_3G_CP_CAPS_MSA=0 +ENABLE_4G_CP_CAPS_MSA=0 +# VZW +GNSS_CARRIER_ID=3 +ENABLE_LPP_UP=1 +ENABLE_LPPE_UP=3 +# VISIBLE +GNSS_CARRIER_ID=4 +ENABLE_LPP_UP=1 +ENABLE_LPPE_UP=3 +# AIRTEL +GNSS_CARRIER_ID=5 +# RAKUTEN +GNSS_CARRIER_ID=6 +ENABLE_LPP_UP=1 +ENABLE_LPPE_UP=3 +# KDDI +GNSS_CARRIER_ID=7 +ENABLE_LPP_CP=0 +ENABLE_LPP_UP=1 +ENABLE_LPPE_CP=0 +ENABLE_LPPE_UP=3 +# SBM +GNSS_CARRIER_ID=8 +ENABLE_LPP_CP=0 +ENABLE_LPP_UP=0 +ENABLE_LPPE_CP=0 +ENABLE_LPPE_UP=0 +ENABLE_5G_CP_CAPS_MSA=0 +ENABLE_5G_CP_CAPS_MSB=0 +GNSS_CARRIER_CONFIG_END + +bdsUsedInUSPolicy=2 +sbasUsedInUSPolicy=2 +qzssUsedInUSPolicy=2 +navicUsedInUSPolicy=2 + +Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 +GlueLayer_MeasCorrCap=7 + +RfPathLossDb_Ap=3.5 +RfPathLossDb_Cp=3.5 + +Agnss_SuplUseCpNi=1 +PosReq_Supl2Params_SuplNiUdpPort=7275 + +NmeaBitmask=0x010003fff