From 71ec2dc4afc2eee9b4b240e6e930770c7e872af5 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Wed, 31 Aug 2022 20:10:57 +0800 Subject: [PATCH] Move lhd.conf, scd.conf to device folder Move lhd.conf, scd.conf to device folder and maintain them separately by project requirement Bug: 244258007 Test: confirm the configurations are correct Change-Id: I42acbfda84e4c6eab6d95b99b100edfa99f7a704 --- device-cheetah.mk | 8 ++++++-- device-cloudripper.mk | 9 +++++++-- device-panther.mk | 8 ++++++-- device-ravenclaw.mk | 8 ++++++-- location/lhd.conf | 33 +++++++++++++++++++++++++++++++++ location/lhd.conf.c10 | 33 +++++++++++++++++++++++++++++++++ location/lhd.conf.p10 | 33 +++++++++++++++++++++++++++++++++ location/lhd_user.conf | 31 +++++++++++++++++++++++++++++++ location/lhd_user.conf.c10 | 31 +++++++++++++++++++++++++++++++ location/lhd_user.conf.p10 | 31 +++++++++++++++++++++++++++++++ location/scd.conf | 6 ++++++ location/scd.conf.c10 | 6 ++++++ location/scd.conf.p10 | 6 ++++++ location/scd_user.conf | 5 +++++ location/scd_user.conf.c10 | 5 +++++ location/scd_user.conf.p10 | 5 +++++ 16 files changed, 250 insertions(+), 8 deletions(-) create mode 100644 location/lhd.conf create mode 100644 location/lhd.conf.c10 create mode 100644 location/lhd.conf.p10 create mode 100644 location/lhd_user.conf create mode 100644 location/lhd_user.conf.c10 create mode 100644 location/lhd_user.conf.p10 create mode 100644 location/scd.conf create mode 100644 location/scd.conf.c10 create mode 100644 location/scd.conf.p10 create mode 100644 location/scd_user.conf create mode 100644 location/scd_user.conf.c10 create mode 100644 location/scd_user.conf.p10 diff --git a/device-cheetah.mk b/device-cheetah.mk index fb37119..0e62814 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -240,10 +240,14 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ - device/google/pantah/location/gps.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + device/google/pantah/location/gps.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ + device/google/pantah/location/lhd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/pantah/location/scd.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf else PRODUCT_COPY_FILES += \ - device/google/pantah/location/gps_user.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + device/google/pantah/location/gps_user.xml.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ + device/google/pantah/location/lhd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/pantah/location/scd_user.conf.c10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf endif # Set support one-handed mode diff --git a/device-cloudripper.mk b/device-cloudripper.mk index d90c4af..c579fba 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -164,10 +164,15 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ - device/google/pantah/location/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + device/google/pantah/location/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ + device/google/pantah/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/pantah/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf else PRODUCT_COPY_FILES += \ - device/google/pantah/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + device/google/pantah/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ + device/google/pantah/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/pantah/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf + endif # Set zram size diff --git a/device-panther.mk b/device-panther.mk index 926fab4..ea3735d 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -227,10 +227,14 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ - device/google/pantah/location/gps.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + device/google/pantah/location/gps.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ + device/google/pantah/location/lhd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/pantah/location/scd.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf else PRODUCT_COPY_FILES += \ - device/google/pantah/location/gps_user.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + device/google/pantah/location/gps_user.xml.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ + device/google/pantah/location/lhd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/pantah/location/scd_user.conf.p10:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf endif # Set support one-handed mode diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index 27a1cdd..c18b4eb 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -166,10 +166,14 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/pantah/prebuilts # Location ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ - device/google/pantah/location/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + device/google/pantah/location/gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ + device/google/pantah/location/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/pantah/location/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf else PRODUCT_COPY_FILES += \ - device/google/pantah/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml + device/google/pantah/location/gps_user.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml \ + device/google/pantah/location/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ + device/google/pantah/location/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf endif # Set zram size diff --git a/location/lhd.conf b/location/lhd.conf new file mode 100644 index 0000000..efde25b --- /dev/null +++ b/location/lhd.conf @@ -0,0 +1,33 @@ +LheName=bbd + +LheRsmResetTimeoutMS=10000 +GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby + +LhePatch=/vendor/firmware/SensorHub.patch +Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG +LheConsole=/data/vendor/gps/LheConsole + +LogEnabled=true +Log=JAVA +LogDirectory=/sdcard/gps/broadcom/storage + +LheBbdPacket=/dev/ttyBCM + +LheBbdControl=/dev/bbd_control + +# LheBbdSensor=/dev/bbd_sensor + +LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt +LogLevel=*:I + +NvStorageDir=/data/vendor/gps/ + +# Enable BBD debugging at these stages: +# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD + +LheAutoBaudDelayMS=10 +TrafficLogEnabled=false +SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf + +SkipSensorWakeLock=true +LoggerWakeLockEnable=false diff --git a/location/lhd.conf.c10 b/location/lhd.conf.c10 new file mode 100644 index 0000000..efde25b --- /dev/null +++ b/location/lhd.conf.c10 @@ -0,0 +1,33 @@ +LheName=bbd + +LheRsmResetTimeoutMS=10000 +GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby + +LhePatch=/vendor/firmware/SensorHub.patch +Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG +LheConsole=/data/vendor/gps/LheConsole + +LogEnabled=true +Log=JAVA +LogDirectory=/sdcard/gps/broadcom/storage + +LheBbdPacket=/dev/ttyBCM + +LheBbdControl=/dev/bbd_control + +# LheBbdSensor=/dev/bbd_sensor + +LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt +LogLevel=*:I + +NvStorageDir=/data/vendor/gps/ + +# Enable BBD debugging at these stages: +# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD + +LheAutoBaudDelayMS=10 +TrafficLogEnabled=false +SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf + +SkipSensorWakeLock=true +LoggerWakeLockEnable=false diff --git a/location/lhd.conf.p10 b/location/lhd.conf.p10 new file mode 100644 index 0000000..efde25b --- /dev/null +++ b/location/lhd.conf.p10 @@ -0,0 +1,33 @@ +LheName=bbd + +LheRsmResetTimeoutMS=10000 +GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby + +LhePatch=/vendor/firmware/SensorHub.patch +Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG +LheConsole=/data/vendor/gps/LheConsole + +LogEnabled=true +Log=JAVA +LogDirectory=/sdcard/gps/broadcom/storage + +LheBbdPacket=/dev/ttyBCM + +LheBbdControl=/dev/bbd_control + +# LheBbdSensor=/dev/bbd_sensor + +LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt +LogLevel=*:I + +NvStorageDir=/data/vendor/gps/ + +# Enable BBD debugging at these stages: +# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD + +LheAutoBaudDelayMS=10 +TrafficLogEnabled=false +SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf + +SkipSensorWakeLock=true +LoggerWakeLockEnable=false diff --git a/location/lhd_user.conf b/location/lhd_user.conf new file mode 100644 index 0000000..0216ace --- /dev/null +++ b/location/lhd_user.conf @@ -0,0 +1,31 @@ +LheName=bbd + +LheRsmResetTimeoutMS=10000 +GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby + +LhePatch=/vendor/firmware/SensorHub.patch +Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG +# LheConsole=/data/vendor/gps/LheConsole + +LogEnabled=false +Log=JAVA +LogDirectory=/sdcard/gps/broadcom/storage + +LheBbdPacket=/dev/ttyBCM + +LheBbdControl=/dev/bbd_control + +# LheBbdSensor=/dev/bbd_sensor + +# LheFailSafe=/data/vendor/gps/esw-crash-dump.txt + +NvStorageDir=/data/vendor/gps/ + +# Enable BBD debugging at these stages: +# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD + +LheAutoBaudDelayMS=10 +TrafficLogEnabled=false + +SkipSensorWakeLock=true +LoggerWakeLockEnable=false diff --git a/location/lhd_user.conf.c10 b/location/lhd_user.conf.c10 new file mode 100644 index 0000000..0216ace --- /dev/null +++ b/location/lhd_user.conf.c10 @@ -0,0 +1,31 @@ +LheName=bbd + +LheRsmResetTimeoutMS=10000 +GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby + +LhePatch=/vendor/firmware/SensorHub.patch +Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG +# LheConsole=/data/vendor/gps/LheConsole + +LogEnabled=false +Log=JAVA +LogDirectory=/sdcard/gps/broadcom/storage + +LheBbdPacket=/dev/ttyBCM + +LheBbdControl=/dev/bbd_control + +# LheBbdSensor=/dev/bbd_sensor + +# LheFailSafe=/data/vendor/gps/esw-crash-dump.txt + +NvStorageDir=/data/vendor/gps/ + +# Enable BBD debugging at these stages: +# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD + +LheAutoBaudDelayMS=10 +TrafficLogEnabled=false + +SkipSensorWakeLock=true +LoggerWakeLockEnable=false diff --git a/location/lhd_user.conf.p10 b/location/lhd_user.conf.p10 new file mode 100644 index 0000000..0216ace --- /dev/null +++ b/location/lhd_user.conf.p10 @@ -0,0 +1,31 @@ +LheName=bbd + +LheRsmResetTimeoutMS=10000 +GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby + +LhePatch=/vendor/firmware/SensorHub.patch +Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG +# LheConsole=/data/vendor/gps/LheConsole + +LogEnabled=false +Log=JAVA +LogDirectory=/sdcard/gps/broadcom/storage + +LheBbdPacket=/dev/ttyBCM + +LheBbdControl=/dev/bbd_control + +# LheBbdSensor=/dev/bbd_sensor + +# LheFailSafe=/data/vendor/gps/esw-crash-dump.txt + +NvStorageDir=/data/vendor/gps/ + +# Enable BBD debugging at these stages: +# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD + +LheAutoBaudDelayMS=10 +TrafficLogEnabled=false + +SkipSensorWakeLock=true +LoggerWakeLockEnable=false diff --git a/location/scd.conf b/location/scd.conf new file mode 100644 index 0000000..43f9cd2 --- /dev/null +++ b/location/scd.conf @@ -0,0 +1,6 @@ +LogEnabled=true +Log=JAVA +LogDirectory=/sdcard/gps/broadcom/storage +NvStorageDir=/data/vendor/gps/ +TcpConnectionTimeout=20 +SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf diff --git a/location/scd.conf.c10 b/location/scd.conf.c10 new file mode 100644 index 0000000..43f9cd2 --- /dev/null +++ b/location/scd.conf.c10 @@ -0,0 +1,6 @@ +LogEnabled=true +Log=JAVA +LogDirectory=/sdcard/gps/broadcom/storage +NvStorageDir=/data/vendor/gps/ +TcpConnectionTimeout=20 +SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf diff --git a/location/scd.conf.p10 b/location/scd.conf.p10 new file mode 100644 index 0000000..43f9cd2 --- /dev/null +++ b/location/scd.conf.p10 @@ -0,0 +1,6 @@ +LogEnabled=true +Log=JAVA +LogDirectory=/sdcard/gps/broadcom/storage +NvStorageDir=/data/vendor/gps/ +TcpConnectionTimeout=20 +SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf diff --git a/location/scd_user.conf b/location/scd_user.conf new file mode 100644 index 0000000..e75f209 --- /dev/null +++ b/location/scd_user.conf @@ -0,0 +1,5 @@ +LogEnabled=false +Log=JAVA +LogDirectory=/sdcard/gps/broadcom/storage +NvStorageDir=/data/vendor/gps/ +TcpConnectionTimeout=20 diff --git a/location/scd_user.conf.c10 b/location/scd_user.conf.c10 new file mode 100644 index 0000000..e75f209 --- /dev/null +++ b/location/scd_user.conf.c10 @@ -0,0 +1,5 @@ +LogEnabled=false +Log=JAVA +LogDirectory=/sdcard/gps/broadcom/storage +NvStorageDir=/data/vendor/gps/ +TcpConnectionTimeout=20 diff --git a/location/scd_user.conf.p10 b/location/scd_user.conf.p10 new file mode 100644 index 0000000..e75f209 --- /dev/null +++ b/location/scd_user.conf.p10 @@ -0,0 +1,5 @@ +LogEnabled=false +Log=JAVA +LogDirectory=/sdcard/gps/broadcom/storage +NvStorageDir=/data/vendor/gps/ +TcpConnectionTimeout=20