Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gps: update gnss RF path loss and remove log for user build am: c20437c5ba am: 220034220d am: e2ccd78611

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/14689774

Change-Id: I96bfd1507ce955e0428f6a64671587c48b4e0ade
This commit is contained in:
Edwin Tung 2021-05-25 12:55:12 +00:00 • committed by Automerger Merge Worker
commit cd546a40be
10 changed files with 251 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

25
device.mk
View file

@ -758,29 +758,8 @@ PRODUCT_PACKAGES += \
libopenvx-opencl
endif
GPS_CHIPSET := 47765
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml \
device/google/gs101/gnss/${GPS_CHIPSET}/config/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \
device/google/gs101/gnss/${GPS_CHIPSET}/config/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
device/google/gs101/gnss/${GPS_CHIPSET}/config/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \
device/google/gs101/gnss/${GPS_CHIPSET}/config/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer \
device/google/gs101/gnss/${GPS_CHIPSET}/firmware/SensorHub.patch:$(TARGET_COPY_OUT_VENDOR)/firmware/SensorHub.patch
PRODUCT_SOONG_NAMESPACES += \
device/google/gs101/gnss/$(GPS_CHIPSET)
PRODUCT_PACKAGES += \
android.hardware.gnss@2.1-impl-google \
gps.default \
flp.default \
gpsd \
lhd \
scd \
android.hardware.gnss@2.1-service-brcm
PRODUCT_PACKAGES_DEBUG += \
init.gps_log.rc
# GPS HAL
include device/google/gs101/gnss/device-gnss.mk
# Trusty (KM, GK, Storage)
$(call inherit-product, system/core/trusty/trusty-storage.mk)

9
gnss/47765/config/gps.xml
View file

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
<hal
<hal
PortName="/dev/ttyBCM"
BaudRate="921600"
GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
GpioDelayMs="130"
LogEnabled="true"
CustGpioDelayMs="250"
LogEnabled="false"
Log="JAVA"
SecondaryConfigPath="/data/vendor/gps/gps2.xml"
SecondaryConfigPath="/vendor/etc/gnss/gps2.xml"
LogDirectory="/sdcard/gps/broadcom/storage/"
CtrlPipe="/data/vendor/gps/glgpsctrl"
NmeaOutName="/data/vendor/gps/nmea_out"
@ -56,6 +56,7 @@
AttributionAppPkgName="com.google.android.carrierlocation"
CpResetInvalidateSec="15"
AssertEnabled="false"
/>
<gll

92
gnss/47765/config/gps.xml.oriole Normal file
View file

@ -0,0 +1,92 @@
<?xml version="1.0" encoding="utf-8"?>
<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
<hal
PortName="/dev/ttyBCM"
BaudRate="921600"
GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
CustGpioDelayMs="250"
LogEnabled="false"
Log="JAVA"
SecondaryConfigPath="/vendor/etc/gnss/gps2.xml"
LogDirectory="/sdcard/gps/broadcom/storage/"
CtrlPipe="/data/vendor/gps/glgpsctrl"
NmeaOutName="/data/vendor/gps/nmea_out"
acSuplServer="supl.google.com"
SuplPort="7275"
SuplLogEnable="true"
SuplLogFullName="/data/vendor/gps/suplflow.txt"
tlsEnable="true"
SuplSslMethod="SSLv23_NO_TLSv1_2"
SuplEnable="true"
SuplUseApn="true"
SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
SuplUT1Seconds="20"
SuplUT2Seconds="20"
SuplUT3Seconds="20"
TcpConnectionTimeout="20"
SuplLppCapable="true"
SuplEcidCapable="true"
SuplVersion="2"
SuplMinorVersion="0"
SuplOtdoaCapable="true"
SuplGlonassCapable = "true"
SuplGalileoCapable = "true"
SuplBdsCapable = "true"
SuplMgpsCapable = "true"
RtoEnable="true"
RtoConfig="gllto.glpals.com/rto/v1/latest/rto.dat"
RtiEnable="true"
RtiConfig="gllto.glpals.com:80/rtistatus4.dat"
HttpSyncLto="true"
LtoConfig="gllto2.glpals.com/4day/v5/latest/lto2.dat"
LtoFileName="lto2.dat"
LtoDir="/data/vendor/gps/"
LtoSyncThresholdDays="1"
GnssYearOfHardware="2020"
CpGuardTimeSec="1"
CpLppGuardTimeSec="1"
IgnoreInjectedSystemTime="true"
AttributionAppPkgName="com.google.android.carrierlocation"
CpResetInvalidateSec="15"
AssertEnabled="false"
/>
<gll
LogPriMask="LOG_INFO"
LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
GpsCarrierType="3,1,3,1,2,3,2,3,3,3,1,2,1,1,2,1,2,1,1,1,1,1,1,3,3,3,3,1,2,3,2,3"
RfType="GL_RF_4776_BRCM"
ExtL5Bias="17.6"
EnableFilteringForLTEB13="true"
WarmStandbyTimeout1Seconds="10"
WarmStandbyTimeout2Seconds="20"
EnableGnssPropagateInStandby="true"
RfPathLossDb_Ap="3.8"
RfPathLossDb_Cp="3.8"
RfPathLossDb_Ap_L5="4.1"
RfPathLossDb_Cp_L5="4.1"
/>
<gll_features
EnableLowPowerPmm="true"
EnableNicAutoSwitch="true"
EnableNavic="true"
/>
</glgps>

92
gnss/47765/config/gps.xml.raven Normal file
View file

@ -0,0 +1,92 @@
<?xml version="1.0" encoding="utf-8"?>
<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
<hal
PortName="/dev/ttyBCM"
BaudRate="921600"
GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
CustGpioDelayMs="250"
LogEnabled="false"
Log="JAVA"
SecondaryConfigPath="/vendor/etc/gnss/gps2.xml"
LogDirectory="/sdcard/gps/broadcom/storage/"
CtrlPipe="/data/vendor/gps/glgpsctrl"
NmeaOutName="/data/vendor/gps/nmea_out"
acSuplServer="supl.google.com"
SuplPort="7275"
SuplLogEnable="true"
SuplLogFullName="/data/vendor/gps/suplflow.txt"
tlsEnable="true"
SuplSslMethod="SSLv23_NO_TLSv1_2"
SuplEnable="true"
SuplUseApn="true"
SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
SuplUT1Seconds="20"
SuplUT2Seconds="20"
SuplUT3Seconds="20"
TcpConnectionTimeout="20"
SuplLppCapable="true"
SuplEcidCapable="true"
SuplVersion="2"
SuplMinorVersion="0"
SuplOtdoaCapable="true"
SuplGlonassCapable = "true"
SuplGalileoCapable = "true"
SuplBdsCapable = "true"
SuplMgpsCapable = "true"
RtoEnable="true"
RtoConfig="gllto.glpals.com/rto/v1/latest/rto.dat"
RtiEnable="true"
RtiConfig="gllto.glpals.com:80/rtistatus4.dat"
HttpSyncLto="true"
LtoConfig="gllto2.glpals.com/4day/v5/latest/lto2.dat"
LtoFileName="lto2.dat"
LtoDir="/data/vendor/gps/"
LtoSyncThresholdDays="1"
GnssYearOfHardware="2020"
CpGuardTimeSec="1"
CpLppGuardTimeSec="1"
IgnoreInjectedSystemTime="true"
AttributionAppPkgName="com.google.android.carrierlocation"
CpResetInvalidateSec="15"
AssertEnabled="false"
/>
<gll
LogPriMask="LOG_INFO"
LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
GpsCarrierType="3,1,3,1,2,3,2,3,3,3,1,2,1,1,2,1,2,1,1,1,1,1,1,3,3,3,3,1,2,3,2,3"
RfType="GL_RF_4776_BRCM"
ExtL5Bias="17.6"
EnableFilteringForLTEB13="true"
WarmStandbyTimeout1Seconds="10"
WarmStandbyTimeout2Seconds="20"
EnableGnssPropagateInStandby="true"
RfPathLossDb_Ap="4"
RfPathLossDb_Cp="4"
RfPathLossDb_Ap_L5="4"
RfPathLossDb_Cp_L5="4"
/>
<gll_features
EnableLowPowerPmm="true"
EnableNicAutoSwitch="true"
EnableNavic="true"
/>
</glgps>

9
gnss/47765/config/gps2.xml Normal file
View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
<hal
LogEnabled="true"
Log="JAVA"
AssertEnabled="true"
/>
</glgps>

8
gnss/47765/config/lhd.conf
View file

@ -5,9 +5,9 @@ GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandb
LhePatch=/vendor/firmware/SensorHub.patch
Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG
LheConsole=/data/vendor/gps/LheConsole
# LheConsole=/data/vendor/gps/LheConsole
LogEnabled=true
LogEnabled=false
Log=JAVA
LogDirectory=/sdcard/gps/broadcom/storage
@ -17,7 +17,7 @@ LheBbdControl=/dev/bbd_control
# LheBbdSensor=/dev/bbd_sensor
LheFailSafe=/data/vendor/gps/esw-crash-dump.txt
# LheFailSafe=/data/vendor/gps/esw-crash-dump.txt
NvStorageDir=/data/vendor/gps/
@ -26,3 +26,5 @@ NvStorageDir=/data/vendor/gps/
LheAutoBaudDelayMS=10
TrafficLogEnabled=false
SecondaryConfigPath=/vendor/etc/gnss/lhd2.conf

5
gnss/47765/config/lhd2.conf Normal file
View file

@ -0,0 +1,5 @@
LheConsole=/data/vendor/gps/LheConsole
LogEnabled=true
Log=JAVA
LheFailSafe=/data/vendor/gps/esw-crash-dump.txt

3
gnss/47765/config/scd.conf
View file

@ -1,5 +1,6 @@
LogEnabled=true
LogEnabled=false
Log=JAVA
LogDirectory=/sdcard/gps/broadcom/storage
NvStorageDir=/data/vendor/gps/
TcpConnectionTimeout=20
SecondaryConfigPath=/vendor/etc/gnss/scd2.conf

2
gnss/47765/config/scd2.conf Normal file
View file

@ -0,0 +1,2 @@
LogEnabled=true
Log=JAVA

37
gnss/device-gnss.mk Normal file
View file

@ -0,0 +1,37 @@
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml \
device/google/gs101/gnss/47765/config/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \
device/google/gs101/gnss/47765/config/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf \
device/google/gs101/gnss/47765/config/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer \
device/google/gs101/gnss/47765/firmware/SensorHub.patch:$(TARGET_COPY_OUT_VENDOR)/firmware/SensorHub.patch
ifneq (,$(filter raven, $(TARGET_PRODUCT)))
PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
else ifneq (,$(filter oriole, $(TARGET_PRODUCT)))
PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
else
PRODUCT_COPY_FILES += device/google/gs101/gnss/47765/config/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
endif
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
# userdebug specific
PRODUCT_COPY_FILES += \
device/google/gs101/gnss/47765/config/lhd2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd2.conf \
device/google/gs101/gnss/47765/config/scd2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd2.conf \
device/google/gs101/gnss/47765/config/gps2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps2.xml
endif
PRODUCT_SOONG_NAMESPACES += \
device/google/gs101/gnss/47765
PRODUCT_PACKAGES += \
android.hardware.gnss@2.1-impl-google \
gps.default \
flp.default \
gpsd \
lhd \
scd \
android.hardware.gnss@2.1-service-brcm
PRODUCT_PACKAGES_DEBUG += \
init.gps_log.rc