diff --git a/Android.mk b/Android.mk deleted file mode 100644 index f443f0c5..00000000 --- a/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright (C) 2011 The Android Open-Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -# WARNING: Everything listed here will be built on ALL platforms, -# including x86, the universal, and the SDK. Modules must be uniquely -# named (liblights.panda), and must build everywhere, or limit themselves -# to only building on ARM if they include assembly. Individual makefiles -# are responsible for having their own logic, for fine-grained control. - -LOCAL_PATH := $(call my-dir) - -# if some modules are built directly from this directory (not subdirectories), -# their rules should be written here. - -ifneq (,$(filter $(TARGET_DEVICE),ripcurrentpro ripcurrent24 caiman komodo tokay)) - include $(call all-makefiles-under,$(LOCAL_PATH)) -endif diff --git a/audio/caiman/tuning/fortemedia/BLUETOOTH.dat b/audio/caiman/tuning/fortemedia/BLUETOOTH.dat index fb015419..1dedfa59 100644 Binary files a/audio/caiman/tuning/fortemedia/BLUETOOTH.dat and b/audio/caiman/tuning/fortemedia/BLUETOOTH.dat differ diff --git a/audio/caiman/tuning/fortemedia/BLUETOOTH.mods b/audio/caiman/tuning/fortemedia/BLUETOOTH.mods index ff86e942..df0a6b40 100644 --- a/audio/caiman/tuning/fortemedia/BLUETOOTH.mods +++ b/audio/caiman/tuning/fortemedia/BLUETOOTH.mods @@ -3,7 +3,7 @@ #EXPORT_FLAG BLUETOOTH #PARAM_MODE FULL #SAVE_MODE 3 -#SAVE_TIME 2024-07-23 15:16:17 +#SAVE_TIME 2024-10-11 14:08:41 #CASE_NAME BLUETOOTH-BT_HAC-VOICE_GENERIC-NB #PARAM_TYPE TX+2RX @@ -6253,8 +6253,8 @@ 851 0x0000 //TX_FFP_RESRV_5 852 0x0000 //TX_FFP_RESRV_6 853 0x0002 //TX_FILTINDX -854 0x0001 //TX_TDDRC_THRD_0 -855 0x0002 //TX_TDDRC_THRD_1 +854 0x0000 //TX_TDDRC_THRD_0 +855 0x0090 //TX_TDDRC_THRD_1 856 0x1000 //TX_TDDRC_THRD_2 857 0x1200 //TX_TDDRC_THRD_3 858 0x6000 //TX_TDDRC_SLANT_0 @@ -11643,8 +11643,8 @@ 851 0x0000 //TX_FFP_RESRV_5 852 0x0000 //TX_FFP_RESRV_6 853 0x0002 //TX_FILTINDX -854 0x0001 //TX_TDDRC_THRD_0 -855 0x0002 //TX_TDDRC_THRD_1 +854 0x0000 //TX_TDDRC_THRD_0 +855 0x0090 //TX_TDDRC_THRD_1 856 0x1000 //TX_TDDRC_THRD_2 857 0x1200 //TX_TDDRC_THRD_3 858 0x6000 //TX_TDDRC_SLANT_0 diff --git a/audio/caiman/tuning/fortemedia/HANDSET.mods b/audio/caiman/tuning/fortemedia/HANDSET.mods index 638d3379..d8fabe15 100644 --- a/audio/caiman/tuning/fortemedia/HANDSET.mods +++ b/audio/caiman/tuning/fortemedia/HANDSET.mods @@ -3,7 +3,7 @@ #EXPORT_FLAG HANDSET #PARAM_MODE FULL #SAVE_MODE 3 -#SAVE_TIME 2024-07-23 15:15:40 +#SAVE_TIME 2024-10-11 14:07:45 #CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-NB #PARAM_TYPE TX+2RX diff --git a/audio/caiman/tuning/fortemedia/HANDSFREE.dat b/audio/caiman/tuning/fortemedia/HANDSFREE.dat index 32e7bc6d..3c75fcb7 100644 Binary files a/audio/caiman/tuning/fortemedia/HANDSFREE.dat and b/audio/caiman/tuning/fortemedia/HANDSFREE.dat differ diff --git a/audio/caiman/tuning/fortemedia/HANDSFREE.mods b/audio/caiman/tuning/fortemedia/HANDSFREE.mods index b3849813..7c9d0449 100644 --- a/audio/caiman/tuning/fortemedia/HANDSFREE.mods +++ b/audio/caiman/tuning/fortemedia/HANDSFREE.mods @@ -3,7 +3,7 @@ #EXPORT_FLAG HANDSFREE #PARAM_MODE FULL #SAVE_MODE 3 -#SAVE_TIME 2024-07-23 15:15:11 +#SAVE_TIME 2024-10-14 15:54:48 #CASE_NAME HANDSFREE-HANDSFREE-VOICE_GENERIC-NB #PARAM_TYPE TX+2RX @@ -3558,8 +3558,8 @@ 851 0x0000 //TX_FFP_RESRV_5 852 0x0000 //TX_FFP_RESRV_6 853 0x0002 //TX_FILTINDX -854 0x0008 //TX_TDDRC_THRD_0 -855 0x0030 //TX_TDDRC_THRD_1 +854 0x0003 //TX_TDDRC_THRD_0 +855 0x0090 //TX_TDDRC_THRD_1 856 0x1000 //TX_TDDRC_THRD_2 857 0x1200 //TX_TDDRC_THRD_3 858 0x6000 //TX_TDDRC_SLANT_0 @@ -6253,8 +6253,8 @@ 851 0x0000 //TX_FFP_RESRV_5 852 0x0000 //TX_FFP_RESRV_6 853 0x0002 //TX_FILTINDX -854 0x0001 //TX_TDDRC_THRD_0 -855 0x0002 //TX_TDDRC_THRD_1 +854 0x0003 //TX_TDDRC_THRD_0 +855 0x0090 //TX_TDDRC_THRD_1 856 0x1000 //TX_TDDRC_THRD_2 857 0x1200 //TX_TDDRC_THRD_3 858 0x6000 //TX_TDDRC_SLANT_0 @@ -27813,8 +27813,8 @@ 851 0x0000 //TX_FFP_RESRV_5 852 0x0000 //TX_FFP_RESRV_6 853 0x0002 //TX_FILTINDX -854 0x0001 //TX_TDDRC_THRD_0 -855 0x0002 //TX_TDDRC_THRD_1 +854 0x0003 //TX_TDDRC_THRD_0 +855 0x0090 //TX_TDDRC_THRD_1 856 0x1000 //TX_TDDRC_THRD_2 857 0x1200 //TX_TDDRC_THRD_3 858 0x6000 //TX_TDDRC_SLANT_0 diff --git a/audio/caiman/tuning/fortemedia/HEADSET.dat b/audio/caiman/tuning/fortemedia/HEADSET.dat index 362cabb2..9373e666 100644 Binary files a/audio/caiman/tuning/fortemedia/HEADSET.dat and b/audio/caiman/tuning/fortemedia/HEADSET.dat differ diff --git a/audio/caiman/tuning/fortemedia/HEADSET.mods b/audio/caiman/tuning/fortemedia/HEADSET.mods index 62b2d69b..760f6fda 100644 --- a/audio/caiman/tuning/fortemedia/HEADSET.mods +++ b/audio/caiman/tuning/fortemedia/HEADSET.mods @@ -3,7 +3,7 @@ #EXPORT_FLAG HEADSET #PARAM_MODE FULL #SAVE_MODE 3 -#SAVE_TIME 2024-07-23 15:14:44 +#SAVE_TIME 2024-10-11 14:08:01 #CASE_NAME HEADSET-USB_BLACKBIRD-VOICE_GENERIC-NB #PARAM_TYPE TX+2RX @@ -33203,8 +33203,8 @@ 851 0x0000 //TX_FFP_RESRV_5 852 0x0000 //TX_FFP_RESRV_6 853 0x0002 //TX_FILTINDX -854 0x0001 //TX_TDDRC_THRD_0 -855 0x0002 //TX_TDDRC_THRD_1 +854 0x0000 //TX_TDDRC_THRD_0 +855 0x0090 //TX_TDDRC_THRD_1 856 0x1000 //TX_TDDRC_THRD_2 857 0x1200 //TX_TDDRC_THRD_3 858 0x6000 //TX_TDDRC_SLANT_0 @@ -38593,8 +38593,8 @@ 851 0x0000 //TX_FFP_RESRV_5 852 0x0000 //TX_FFP_RESRV_6 853 0x0002 //TX_FILTINDX -854 0x0001 //TX_TDDRC_THRD_0 -855 0x0002 //TX_TDDRC_THRD_1 +854 0x0000 //TX_TDDRC_THRD_0 +855 0x0090 //TX_TDDRC_THRD_1 856 0x1000 //TX_TDDRC_THRD_2 857 0x1200 //TX_TDDRC_THRD_3 858 0x6000 //TX_TDDRC_SLANT_0 @@ -73628,8 +73628,8 @@ 851 0x0000 //TX_FFP_RESRV_5 852 0x0000 //TX_FFP_RESRV_6 853 0x0002 //TX_FILTINDX -854 0x0001 //TX_TDDRC_THRD_0 -855 0x0002 //TX_TDDRC_THRD_1 +854 0x0000 //TX_TDDRC_THRD_0 +855 0x0090 //TX_TDDRC_THRD_1 856 0x1000 //TX_TDDRC_THRD_2 857 0x1200 //TX_TDDRC_THRD_3 858 0x6000 //TX_TDDRC_SLANT_0 @@ -79018,8 +79018,8 @@ 851 0x0000 //TX_FFP_RESRV_5 852 0x0000 //TX_FFP_RESRV_6 853 0x0002 //TX_FILTINDX -854 0x0001 //TX_TDDRC_THRD_0 -855 0x0002 //TX_TDDRC_THRD_1 +854 0x0000 //TX_TDDRC_THRD_0 +855 0x0090 //TX_TDDRC_THRD_1 856 0x1000 //TX_TDDRC_THRD_2 857 0x1200 //TX_TDDRC_THRD_3 858 0x6000 //TX_TDDRC_SLANT_0 diff --git a/bluetooth/bt_vendor_overlay_caiman.conf b/bluetooth/bt_vendor_overlay_caiman.conf index 6f6100f0..31f75dd9 100644 --- a/bluetooth/bt_vendor_overlay_caiman.conf +++ b/bluetooth/bt_vendor_overlay_caiman.conf @@ -45,4 +45,4 @@ ThreadDispatcherEnabled = true # A2DP_LDAC_QUALITY_MID 1 // Equal to 660/606(kbps) # A2DP_LDAC_QUALITY_LOW 2 // Equal to 330/303(kbps) # A2DP_LDAC_QUALITY_ABR 3 // ABR mode, range: 990,660,492,396,330(kbps) -LdacDefaultQualityMode = 1 +LdacDefaultQualityMode = 3 diff --git a/bluetooth/bt_vendor_overlay_komodo.conf b/bluetooth/bt_vendor_overlay_komodo.conf index 6f6100f0..31f75dd9 100644 --- a/bluetooth/bt_vendor_overlay_komodo.conf +++ b/bluetooth/bt_vendor_overlay_komodo.conf @@ -45,4 +45,4 @@ ThreadDispatcherEnabled = true # A2DP_LDAC_QUALITY_MID 1 // Equal to 660/606(kbps) # A2DP_LDAC_QUALITY_LOW 2 // Equal to 330/303(kbps) # A2DP_LDAC_QUALITY_ABR 3 // ABR mode, range: 990,660,492,396,330(kbps) -LdacDefaultQualityMode = 1 +LdacDefaultQualityMode = 3 diff --git a/bluetooth/bt_vendor_overlay_tokay.conf b/bluetooth/bt_vendor_overlay_tokay.conf index 6f6100f0..31f75dd9 100644 --- a/bluetooth/bt_vendor_overlay_tokay.conf +++ b/bluetooth/bt_vendor_overlay_tokay.conf @@ -45,4 +45,4 @@ ThreadDispatcherEnabled = true # A2DP_LDAC_QUALITY_MID 1 // Equal to 660/606(kbps) # A2DP_LDAC_QUALITY_LOW 2 // Equal to 330/303(kbps) # A2DP_LDAC_QUALITY_ABR 3 // ABR mode, range: 990,660,492,396,330(kbps) -LdacDefaultQualityMode = 1 +LdacDefaultQualityMode = 3 diff --git a/device-caiman.mk b/device-caiman.mk index 8d4372ab..ae89fba3 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -26,12 +26,18 @@ RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR ?= 24D1# Keep this for pdk TODO: b/32711900 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR) $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR)) +ifdef RELEASE_KERNEL_CAIMAN_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_CAIMAN_VERSION) +else +TARGET_LINUX_KERNEL_VERSION ?= 6.1 +endif + ifdef RELEASE_KERNEL_CAIMAN_DIR TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CAIMAN_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CAIMAN_DIR)/kernel-headers ifneq ($(TARGET_BOOTS_16K),true) -PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION) +PRODUCT_16K_DEVELOPER_OPTION ?= $(RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION) endif include device/google/caimito/device-caimito-16k-common.mk @@ -408,11 +414,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true -ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true) +# Bluetooth LE Audio Broadcast PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.bap.broadcast.assist.enabled=true \ bluetooth.profile.bap.broadcast.source.enabled=true -endif # LE Audio switcher in developer options PRODUCT_PRODUCT_PROPERTIES += \ @@ -456,6 +461,8 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Support RIL Domain-selection SUPPORT_RIL_DOMAIN_SELECTION := true +SUPPORT_VENDOR_SATELLITE_SERVICE := true + # ETM ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) $(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) diff --git a/device-caimito-16k-common.mk b/device-caimito-16k-common.mk index b1493a40..30a6f817 100644 --- a/device-caimito-16k-common.mk +++ b/device-caimito-16k-common.mk @@ -14,8 +14,6 @@ # limitations under the License. # -ifneq ($(wildcard $(TARGET_KERNEL_DIR)/16kb/),) - ifeq ($(TARGET_BOOTS_16K),true) # Configures the 16kb kernel directory. TARGET_KERNEL_DIR := $(TARGET_KERNEL_DIR)/16kb @@ -40,5 +38,3 @@ BOARD_16K_OTA_USE_INCREMENTAL := true BOARD_16K_OTA_MOVE_VENDOR := true endif -endif - diff --git a/device-komodo.mk b/device-komodo.mk index 8173c405..185f160c 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -26,12 +26,18 @@ RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR ?= 24D1# Keep this for pdk TODO: b/32711900 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR) $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR)) +ifdef RELEASE_KERNEL_KOMODO_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_KOMODO_VERSION) +else +TARGET_LINUX_KERNEL_VERSION ?= 6.1 +endif + ifdef RELEASE_KERNEL_KOMODO_DIR TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_KOMODO_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_KOMODO_DIR)/kernel-headers ifneq ($(TARGET_BOOTS_16K),true) -PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION) +PRODUCT_16K_DEVELOPER_OPTION ?= $(RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION) endif include device/google/caimito/device-caimito-16k-common.mk @@ -405,11 +411,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.ccp.server.enabled=true \ bluetooth.profile.vcp.controller.enabled=true -ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true) +# Bluetooth LE Audio Broadcast PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.bap.broadcast.assist.enabled=true \ bluetooth.profile.bap.broadcast.source.enabled=true -endif # LE Audio switcher in developer options PRODUCT_PRODUCT_PROPERTIES += \ @@ -448,6 +453,8 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Support RIL Domain-selection SUPPORT_RIL_DOMAIN_SELECTION := true +SUPPORT_VENDOR_SATELLITE_SERVICE := true + # Set support one-handed mode PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true diff --git a/device-tokay.mk b/device-tokay.mk index 6799ec60..a11c9ac7 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -26,12 +26,18 @@ RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR) $(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR)) +ifdef RELEASE_KERNEL_TOKAY_VERSION +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_TOKAY_VERSION) +else +TARGET_LINUX_KERNEL_VERSION ?= 6.1 +endif + ifdef RELEASE_KERNEL_TOKAY_DIR TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_TOKAY_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TOKAY_DIR)/kernel-headers ifneq ($(TARGET_BOOTS_16K),true) -PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION) +PRODUCT_16K_DEVELOPER_OPTION ?= $(RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION) endif include device/google/caimito/device-caimito-16k-common.mk @@ -374,11 +380,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true -ifeq ($(RELEASE_PIXEL_BROADCAST_ENABLED), true) +# Bluetooth LE Audio Broadcast PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.profile.bap.broadcast.assist.enabled=true \ bluetooth.profile.bap.broadcast.source.enabled=true -endif # LE Audio switcher in developer options PRODUCT_PRODUCT_PROPERTIES += \ @@ -417,6 +422,8 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Support RIL Domain-selection SUPPORT_RIL_DOMAIN_SELECTION := true +SUPPORT_VENDOR_SATELLITE_SERVICE := true + # Keyboard height ratio and bottom padding in dp for portrait mode PRODUCT_PRODUCT_PROPERTIES += \ ro.com.google.ime.kb_pad_port_b=8 \ diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg index c0c7f740..d329a77b 100644 --- a/location/caiman/user/gps.cfg +++ b/location/caiman/user/gps.cfg @@ -29,6 +29,7 @@ Chip_Configuration_DCXO_CrystalType=0x11 Chip_Configuration_GNSSConstConstraintDef = 0x60FF LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 +Chip_Configuration_ntn_option=2 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 qzssUsedInUSPolicy=2 diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg index c373b124..61c7f3ed 100644 --- a/location/caiman/userdebug/gps.cfg +++ b/location/caiman/userdebug/gps.cfg @@ -115,6 +115,11 @@ Chip_Configuration_RfMiscCtrl = 0x80008001 #Chip_Configuration_RfMiscCtrl=0x8001 #Chip_Configuration_IspTestConfig=0x22242822 +#Chip_Configuration_ntn_option=0 means no NTN blackout IPC handling +#Chip_Configuration_ntn_option=1 means L1 blanking during NTN blackout period. +#Chip_Configuration_ntn_option=2 means turning GNSS off during NTN blackout period. +Chip_Configuration_ntn_option=2 + # Disable BDS in the U.S. # 0-enabled (default), 1-disabled, 2-auto(disabled in US) #gloUsedInUSPolicy=2 diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg index 8efa8092..f9e6e7c6 100644 --- a/location/komodo/user/gps.cfg +++ b/location/komodo/user/gps.cfg @@ -29,6 +29,7 @@ Chip_Configuration_DCXO_CrystalType=0x11 Chip_Configuration_GNSSConstConstraintDef = 0x60FF LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 +Chip_Configuration_ntn_option=2 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 qzssUsedInUSPolicy=2 diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg index e0ce7ba6..3aae35e8 100644 --- a/location/komodo/userdebug/gps.cfg +++ b/location/komodo/userdebug/gps.cfg @@ -115,6 +115,11 @@ Chip_Configuration_RfMiscCtrl = 0x80008001 #Chip_Configuration_RfMiscCtrl=0x8001 #Chip_Configuration_IspTestConfig=0x22242822 +#Chip_Configuration_ntn_option=0 means no NTN blackout IPC handling +#Chip_Configuration_ntn_option=1 means L1 blanking during NTN blackout period. +#Chip_Configuration_ntn_option=2 means turning GNSS off during NTN blackout period. +Chip_Configuration_ntn_option=2 + # Disable BDS in the U.S. # 0-enabled (default), 1-disabled, 2-auto(disabled in US) #gloUsedInUSPolicy=2 diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg index 554454cd..bd26a81f 100644 --- a/location/ripcurrent24/user/gps.cfg +++ b/location/ripcurrent24/user/gps.cfg @@ -29,6 +29,7 @@ Chip_Configuration_DCXO_CrystalType=0x11 Chip_Configuration_GNSSConstConstraintDef = 0x60FF LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 +Chip_Configuration_ntn_option=2 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 qzssUsedInUSPolicy=2 diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg index d99fc8e0..f6ff481f 100644 --- a/location/ripcurrent24/userdebug/gps.cfg +++ b/location/ripcurrent24/userdebug/gps.cfg @@ -115,6 +115,11 @@ Chip_Configuration_RfMiscCtrl = 0x80008001 #Chip_Configuration_RfMiscCtrl=0x8001 #Chip_Configuration_IspTestConfig=0x22242822 +#Chip_Configuration_ntn_option=0 means no NTN blackout IPC handling +#Chip_Configuration_ntn_option=1 means L1 blanking during NTN blackout period. +#Chip_Configuration_ntn_option=2 means turning GNSS off during NTN blackout period. +Chip_Configuration_ntn_option=2 + # Disable BDS in the U.S. # 0-enabled (default), 1-disabled, 2-auto(disabled in US) #gloUsedInUSPolicy=2 diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg index 554454cd..bd26a81f 100644 --- a/location/ripcurrentpro/user/gps.cfg +++ b/location/ripcurrentpro/user/gps.cfg @@ -29,6 +29,7 @@ Chip_Configuration_DCXO_CrystalType=0x11 Chip_Configuration_GNSSConstConstraintDef = 0x60FF LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 +Chip_Configuration_ntn_option=2 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 qzssUsedInUSPolicy=2 diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg index d99fc8e0..f6ff481f 100644 --- a/location/ripcurrentpro/userdebug/gps.cfg +++ b/location/ripcurrentpro/userdebug/gps.cfg @@ -115,6 +115,11 @@ Chip_Configuration_RfMiscCtrl = 0x80008001 #Chip_Configuration_RfMiscCtrl=0x8001 #Chip_Configuration_IspTestConfig=0x22242822 +#Chip_Configuration_ntn_option=0 means no NTN blackout IPC handling +#Chip_Configuration_ntn_option=1 means L1 blanking during NTN blackout period. +#Chip_Configuration_ntn_option=2 means turning GNSS off during NTN blackout period. +Chip_Configuration_ntn_option=2 + # Disable BDS in the U.S. # 0-enabled (default), 1-disabled, 2-auto(disabled in US) #gloUsedInUSPolicy=2 diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg index 9f4f8775..cf7ed87e 100644 --- a/location/tokay/user/gps.cfg +++ b/location/tokay/user/gps.cfg @@ -29,6 +29,7 @@ Chip_Configuration_DCXO_CrystalType=0x11 Chip_Configuration_GNSSConstConstraintDef = 0x60FF LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 +Chip_Configuration_ntn_option=2 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 qzssUsedInUSPolicy=2 diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg index 6661b9b5..1389d995 100644 --- a/location/tokay/userdebug/gps.cfg +++ b/location/tokay/userdebug/gps.cfg @@ -115,6 +115,11 @@ Chip_Configuration_RfMiscCtrl = 0x80008001 #Chip_Configuration_RfMiscCtrl=0x8001 #Chip_Configuration_IspTestConfig=0x22242822 +#Chip_Configuration_ntn_option=0 means no NTN blackout IPC handling +#Chip_Configuration_ntn_option=1 means L1 blanking during NTN blackout period. +#Chip_Configuration_ntn_option=2 means turning GNSS off during NTN blackout period. +Chip_Configuration_ntn_option=2 + # Disable BDS in the U.S. # 0-enabled (default), 1-disabled, 2-auto(disabled in US) #gloUsedInUSPolicy=2 diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index e1790113..30f94955 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -333,7 +333,6 @@ "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", - "600", "1" ], "ResetOnInit": true @@ -347,11 +346,21 @@ ], "ResetOnInit": true }, + { + "Name": "TAUclampMinOnNiceHighValue", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_value", + "Values": [ + "765", + "0" + ], + "ResetOnInit": true + }, { "Name": "TAUclampMinOnNiceMidValue", "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value", "Values": [ "600", + "590", "0" ], "ResetOnInit": true @@ -360,6 +369,7 @@ "Name": "TAUclampMinOnNiceHighPrio", "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio", "Values": [ + "110", "119", "120" ], @@ -370,6 +380,7 @@ "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio", "Values": [ "128", + "139", "130" ], "ResetOnInit": true @@ -484,6 +495,15 @@ ], "ResetOnInit": true }, + { + "Name": "TAAutoPreferFit", + "Path": "/proc/vendor_sched/groups/ta/auto_prefer_fit", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, { "Name": "TAPreferredIdleMaskHigh", "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high", @@ -938,6 +958,7 @@ "102400", "0" ], + "WriteOnly": true, "ResetOnInit": false }, { @@ -1044,12 +1065,6 @@ "Duration": 5000, "Value": "512" }, - { - "PowerHint": "LAUNCH", - "Node": "TAUClampBoost", - "Duration": 5000, - "Value": "765" - }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", @@ -1120,6 +1135,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "TAAutoPreferFit", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH", "Node": "TAPreferredIdleMaskHigh", @@ -1128,9 +1149,33 @@ }, { "PowerHint": "LAUNCH", - "Node": "TAPreferredIdleMaskMid", + "Node": "TAUclampMinOnNiceEnable", "Duration": 5000, - "Value": "0xff" + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighValue", + "Duration": 5000, + "Value": "765" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighPrio", + "Duration": 5000, + "Value": "110" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidValue", + "Duration": 5000, + "Value": "590" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidPrio", + "Duration": 5000, + "Value": "139" }, { "PowerHint": "LAUNCH", @@ -1754,6 +1799,24 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "AutoPreferIdle", + "Duration": 100, + "Value": "0" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "TAPreferHighCap", @@ -2072,6 +2135,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "AutoPreferIdle", @@ -2258,6 +2327,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferIdle", @@ -2450,6 +2525,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "MemFreq", @@ -2504,6 +2585,18 @@ "Duration": 0, "Value": "4" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2666,6 +2759,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "AutoPreferIdle", @@ -3265,7 +3364,7 @@ "PowerHint": "GAME", "Node": "AutoPreferIdle", "Duration": 0, - "Value": "0" + "Value": "1" }, { "PowerHint": "GAME", @@ -3513,6 +3612,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_PROJECT11", "Node": "MemFreq", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index cb90e907..86dae6e0 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -333,7 +333,6 @@ "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", - "600", "1" ], "ResetOnInit": true @@ -347,11 +346,21 @@ ], "ResetOnInit": true }, + { + "Name": "TAUclampMinOnNiceHighValue", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_value", + "Values": [ + "765", + "0" + ], + "ResetOnInit": true + }, { "Name": "TAUclampMinOnNiceMidValue", "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value", "Values": [ "600", + "590", "0" ], "ResetOnInit": true @@ -360,6 +369,7 @@ "Name": "TAUclampMinOnNiceHighPrio", "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio", "Values": [ + "110", "119", "120" ], @@ -370,6 +380,7 @@ "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio", "Values": [ "128", + "139", "130" ], "ResetOnInit": true @@ -484,6 +495,15 @@ ], "ResetOnInit": true }, + { + "Name": "TAAutoPreferFit", + "Path": "/proc/vendor_sched/groups/ta/auto_prefer_fit", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, { "Name": "TAPreferredIdleMaskHigh", "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high", @@ -938,6 +958,7 @@ "102400", "0" ], + "WriteOnly": true, "ResetOnInit": false }, { @@ -1044,12 +1065,6 @@ "Duration": 5000, "Value": "512" }, - { - "PowerHint": "LAUNCH", - "Node": "TAUClampBoost", - "Duration": 5000, - "Value": "765" - }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", @@ -1120,6 +1135,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "TAAutoPreferFit", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH", "Node": "TAPreferredIdleMaskHigh", @@ -1128,9 +1149,33 @@ }, { "PowerHint": "LAUNCH", - "Node": "TAPreferredIdleMaskMid", + "Node": "TAUclampMinOnNiceEnable", "Duration": 5000, - "Value": "0xff" + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighValue", + "Duration": 5000, + "Value": "765" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighPrio", + "Duration": 5000, + "Value": "110" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidValue", + "Duration": 5000, + "Value": "590" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidPrio", + "Duration": 5000, + "Value": "139" }, { "PowerHint": "LAUNCH", @@ -1623,10 +1668,10 @@ "Value": "0" }, { - "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", - "Node": "ReducePreferIdle", - "Duration": 3000, - "Value": "0" + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "ReducePreferIdle", + "Duration": 3000, + "Value": "0" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", @@ -1754,6 +1799,24 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "AutoPreferIdle", + "Duration": 100, + "Value": "0" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "TAPreferHighCap", @@ -2072,6 +2135,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "AutoPreferIdle", @@ -2258,6 +2327,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferIdle", @@ -2450,6 +2525,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "MemFreq", @@ -2504,6 +2585,18 @@ "Duration": 0, "Value": "4" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2666,6 +2759,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "AutoPreferIdle", @@ -3265,7 +3364,7 @@ "PowerHint": "GAME", "Node": "AutoPreferIdle", "Duration": 0, - "Value": "0" + "Value": "1" }, { "PowerHint": "GAME", @@ -3513,6 +3612,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_PROJECT11", "Node": "MemFreq", diff --git a/perf/powerhint-ripcurrent24.json b/perf/powerhint-ripcurrent24.json index ccab4c15..d1a2e484 100644 --- a/perf/powerhint-ripcurrent24.json +++ b/perf/powerhint-ripcurrent24.json @@ -612,6 +612,7 @@ "102400", "0" ], + "WriteOnly": true, "ResetOnInit": false } ], diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index b74fd196..5b7f18ff 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -321,7 +321,6 @@ "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", - "600", "1" ], "ResetOnInit": true @@ -335,11 +334,21 @@ ], "ResetOnInit": true }, + { + "Name": "TAUclampMinOnNiceHighValue", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_value", + "Values": [ + "765", + "0" + ], + "ResetOnInit": true + }, { "Name": "TAUclampMinOnNiceMidValue", "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value", "Values": [ "600", + "590", "0" ], "ResetOnInit": true @@ -348,6 +357,7 @@ "Name": "TAUclampMinOnNiceHighPrio", "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio", "Values": [ + "110", "119", "120" ], @@ -358,6 +368,7 @@ "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio", "Values": [ "128", + "139", "130" ], "ResetOnInit": true @@ -472,6 +483,15 @@ ], "ResetOnInit": true }, + { + "Name": "TAAutoPreferFit", + "Path": "/proc/vendor_sched/groups/ta/auto_prefer_fit", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, { "Name": "TAPreferredIdleMaskHigh", "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high", @@ -862,6 +882,7 @@ "102400", "0" ], + "WriteOnly": true, "ResetOnInit": false }, { @@ -968,12 +989,6 @@ "Duration": 5000, "Value": "512" }, - { - "PowerHint": "LAUNCH", - "Node": "TAUClampBoost", - "Duration": 5000, - "Value": "765" - }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", @@ -1044,6 +1059,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "TAAutoPreferFit", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH", "Node": "TAPreferredIdleMaskHigh", @@ -1052,9 +1073,33 @@ }, { "PowerHint": "LAUNCH", - "Node": "TAPreferredIdleMaskMid", + "Node": "TAUclampMinOnNiceEnable", "Duration": 5000, - "Value": "0xff" + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighValue", + "Duration": 5000, + "Value": "765" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighPrio", + "Duration": 5000, + "Value": "110" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidValue", + "Duration": 5000, + "Value": "590" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidPrio", + "Duration": 5000, + "Value": "139" }, { "PowerHint": "LAUNCH", @@ -1573,8 +1618,8 @@ { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "TAUclampMinOnNiceMidValue", - "Duration": 3000, - "Value": "600" + "Duration": 3000, + "Value": "600" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", @@ -1672,6 +1717,24 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "AutoPreferIdle", + "Duration": 100, + "Value": "0" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "TAPreferHighCap", @@ -1954,6 +2017,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "AutoPreferIdle", @@ -2104,6 +2173,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferIdle", @@ -2260,6 +2335,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "MemFreq", @@ -2314,6 +2395,18 @@ "Duration": 0, "Value": "4" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2440,6 +2533,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "AutoPreferIdle", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index e1790113..47ceaae8 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -333,7 +333,6 @@ "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", - "600", "1" ], "ResetOnInit": true @@ -347,11 +346,21 @@ ], "ResetOnInit": true }, + { + "Name": "TAUclampMinOnNiceHighValue", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_value", + "Values": [ + "765", + "0" + ], + "ResetOnInit": true + }, { "Name": "TAUclampMinOnNiceMidValue", "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_value", "Values": [ "600", + "590", "0" ], "ResetOnInit": true @@ -360,6 +369,7 @@ "Name": "TAUclampMinOnNiceHighPrio", "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_high_prio", "Values": [ + "110", "119", "120" ], @@ -370,6 +380,7 @@ "Path": "/proc/vendor_sched/groups/ta/uclamp_min_on_nice_mid_prio", "Values": [ "128", + "139", "130" ], "ResetOnInit": true @@ -484,6 +495,15 @@ ], "ResetOnInit": true }, + { + "Name": "TAAutoPreferFit", + "Path": "/proc/vendor_sched/groups/ta/auto_prefer_fit", + "Values": [ + "1", + "0" + ], + "ResetOnInit": true + }, { "Name": "TAPreferredIdleMaskHigh", "Path": "/proc/vendor_sched/groups/ta/preferred_idle_mask_high", @@ -938,6 +958,7 @@ "102400", "0" ], + "WriteOnly": true, "ResetOnInit": false }, { @@ -1044,12 +1065,6 @@ "Duration": 5000, "Value": "512" }, - { - "PowerHint": "LAUNCH", - "Node": "TAUClampBoost", - "Duration": 5000, - "Value": "765" - }, { "PowerHint": "LAUNCH", "Node": "FGUClampBoost", @@ -1120,6 +1135,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH", + "Node": "TAAutoPreferFit", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "LAUNCH", "Node": "TAPreferredIdleMaskHigh", @@ -1128,9 +1149,33 @@ }, { "PowerHint": "LAUNCH", - "Node": "TAPreferredIdleMaskMid", + "Node": "TAUclampMinOnNiceEnable", "Duration": 5000, - "Value": "0xff" + "Value": "1" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighValue", + "Duration": 5000, + "Value": "765" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceHighPrio", + "Duration": 5000, + "Value": "110" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidValue", + "Duration": 5000, + "Value": "590" + }, + { + "PowerHint": "LAUNCH", + "Node": "TAUclampMinOnNiceMidPrio", + "Duration": 5000, + "Value": "139" }, { "PowerHint": "LAUNCH", @@ -1655,8 +1700,8 @@ { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", "Node": "TAUclampMinOnNiceMidValue", - "Duration": 3000, - "Value": "600" + "Duration": 3000, + "Value": "600" }, { "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", @@ -1754,6 +1799,24 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "AutoPreferIdle", + "Duration": 100, + "Value": "0" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "TAPreferHighCap", @@ -2072,6 +2135,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_EXTREME", "Node": "AutoPreferIdle", @@ -2258,6 +2327,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "CDPreferIdle", @@ -2450,6 +2525,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "MemFreq", @@ -2504,6 +2585,18 @@ "Duration": 0, "Value": "4" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "TAPreferIdle", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "AutoPreferIdle", @@ -2666,6 +2759,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "AutoPreferIdle", @@ -3265,7 +3364,7 @@ "PowerHint": "GAME", "Node": "AutoPreferIdle", "Duration": 0, - "Value": "0" + "Value": "1" }, { "PowerHint": "GAME", @@ -3513,6 +3612,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_PROJECT11", + "Node": "FGPreferIdle", + "Duration": 0, + "Value": "1" + }, { "PowerHint": "CAMERA_PROJECT11", "Node": "MemFreq", diff --git a/perf/powerhint-zuma.json b/perf/powerhint-zuma.json index 996ecf97..1a75c204 100644 --- a/perf/powerhint-zuma.json +++ b/perf/powerhint-zuma.json @@ -796,6 +796,7 @@ "102400", "0" ], + "WriteOnly": true, "ResetOnInit": false } ], @@ -1319,6 +1320,18 @@ "Duration": 100, "Value": "0" }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "CDPreferIdle", + "Duration": 100, + "Value": "1" + }, + { + "PowerHint": "CAMERA_MULTICAM_BOOST", + "Node": "PMU_POLL", + "Duration": 100, + "Value": "0" + }, { "PowerHint": "GCA_CAMERA_SHOT_BIGCPU_RANK1", "Node": "TAPreferHighCap", diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index 7eaed015..d1ec90fb 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -282,12 +282,119 @@ "VirtualSensor": true, "ModelPath": "vt_prediction_lstm_model.tflite", "Formula": "USE_ML_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "PreviousSampleCount": 11, "OutputLabelCount": 6, "Multiplier": 0.001, "SupportUnderSampling": true, - "ValidateInput": true + "ValidateInput": true, + "SupportPrediction": true, + "SampleDuration": 7000, + "TimeResolution": 7000 + }, + { + "Name": "LSTM-VT-PREDICTION-7SEC-BACK", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Formula": "PREVIOUSLY_PREDICTED", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL"], + "PredictionDuration": 7000, + "Multiplier": 0.001 + }, + { + "Name": "LSTM-VT-PREDICTION-14SEC-BACK", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Formula": "PREVIOUSLY_PREDICTED", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL"], + "PredictionDuration": 14000, + "Multiplier": 0.001 + }, + { + "Name": "LSTM-VT-PREDICTION-21SEC-BACK", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Formula": "PREVIOUSLY_PREDICTED", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL"], + "PredictionDuration": 21000, + "Multiplier": 0.001 + }, + { + "Name": "LSTM-VT-PREDICTION-28SEC-BACK", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Formula": "PREVIOUSLY_PREDICTED", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL"], + "PredictionDuration": 28000, + "Multiplier": 0.001 + }, + { + "Name": "LSTM-VT-PREDICTION-35SEC-BACK", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Formula": "PREVIOUSLY_PREDICTED", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL"], + "PredictionDuration": 35000, + "Multiplier": 0.001 + }, + { + "Name": "LSTM-VT-PREDICTION-NOW", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Formula": "PREVIOUSLY_PREDICTED", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL"], + "PredictionDuration": 0, + "Multiplier": 0.001 + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-7SEC", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["LSTM-VT-PREDICTION-7SEC-BACK", "LSTM-VT-PREDICTION-NOW"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-14SEC", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["LSTM-VT-PREDICTION-14SEC-BACK", "LSTM-VT-PREDICTION-NOW"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-21SEC", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["LSTM-VT-PREDICTION-21SEC-BACK", "LSTM-VT-PREDICTION-NOW"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-28SEC", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["LSTM-VT-PREDICTION-28SEC-BACK", "LSTM-VT-PREDICTION-NOW"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-35SEC", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["LSTM-VT-PREDICTION-35SEC-BACK", "LSTM-VT-PREDICTION-NOW"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 }, { "Name": "STATS-UPDATOR", @@ -296,8 +403,22 @@ "Hidden": true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula": "WEIGHTED_AVG", - "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LSTM-MODEL"], - "Coefficient": [0.0, 0.0, 0.0, 0.0], + "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF"], + "Coefficient": [0.0, 0.0, 0.0], + "Multiplier": 1, + "SendPowerHint": true, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "Name": "STATS-UPDATOR-LSTM", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Formula": "WEIGHTED_AVG", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL", "LSTM-VT-PREDICTION-ERROR-7SEC", "LSTM-VT-PREDICTION-ERROR-14SEC", "LSTM-VT-PREDICTION-ERROR-21SEC", "LSTM-VT-PREDICTION-ERROR-28SEC", "LSTM-VT-PREDICTION-ERROR-35SEC"], + "Coefficient": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], "Multiplier": 1, "SendPowerHint": true, "PollingDelay": 300000, @@ -1483,6 +1604,46 @@ -4000, 4000, 5000, 6000, 7000, 8000, 9000, 10000, 11000, 12000 ] }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-7SEC", + "LoggingName": "LSTM-PREDICTION-ERROR-7SEC", + "Thresholds": [ + -4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0, + 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500 + ] + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-14SEC", + "LoggingName": "LSTM-PREDICTION-ERROR-14SEC", + "Thresholds": [ + -4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0, + 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500 + ] + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-21SEC", + "LoggingName": "LSTM-PREDICTION-ERROR-21SEC", + "Thresholds": [ + -4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0, + 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500 + ] + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-28SEC", + "LoggingName": "LSTM-PREDICTION-ERROR-28SEC", + "Thresholds": [ + -4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0, + 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500 + ] + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-35SEC", + "LoggingName": "LSTM-PREDICTION-ERROR-35SEC", + "Thresholds": [ + -4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0, + 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500 + ] + }, { "Name": "VIRTUAL-SKIN-CHARGE-DURING-WLC-STATS", "Thresholds": [-200, 15, 25, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55] diff --git a/thermal/thermal_info_config_caiman_wingboard.json b/thermal/thermal_info_config_caiman_wingboard.json index 753fa4ee..7da41c6f 100644 --- a/thermal/thermal_info_config_caiman_wingboard.json +++ b/thermal/thermal_info_config_caiman_wingboard.json @@ -314,7 +314,7 @@ "VirtualSensor": true, "ModelPath": "vt_prediction_lstm_model.tflite", "Formula": "USE_ML_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "PreviousSampleCount": 11, "OutputLabelCount": 6, "Multiplier": 0.001, diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index c329b20b..045e4ad8 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -272,13 +272,120 @@ "VirtualSensor": true, "ModelPath": "vt_prediction_lstm_model.tflite", "Formula": "USE_ML_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "PreviousSampleCount": 11, "OutputLabelCount": 6, "Multiplier": 0.001, "SupportUnderSampling": true, - "ValidateInput": true + "ValidateInput": true, + "SupportPrediction": true, + "SampleDuration": 7000, + "TimeResolution": 7000 }, + { + "Name": "LSTM-VT-PREDICTION-7SEC-BACK", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Formula": "PREVIOUSLY_PREDICTED", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL"], + "PredictionDuration": 7000, + "Multiplier": 0.001 + }, + { + "Name": "LSTM-VT-PREDICTION-14SEC-BACK", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Formula": "PREVIOUSLY_PREDICTED", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL"], + "PredictionDuration": 14000, + "Multiplier": 0.001 + }, + { + "Name": "LSTM-VT-PREDICTION-21SEC-BACK", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Formula": "PREVIOUSLY_PREDICTED", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL"], + "PredictionDuration": 21000, + "Multiplier": 0.001 + }, + { + "Name": "LSTM-VT-PREDICTION-28SEC-BACK", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Formula": "PREVIOUSLY_PREDICTED", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL"], + "PredictionDuration": 28000, + "Multiplier": 0.001 + }, + { + "Name": "LSTM-VT-PREDICTION-35SEC-BACK", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Formula": "PREVIOUSLY_PREDICTED", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL"], + "PredictionDuration": 35000, + "Multiplier": 0.001 + }, + { + "Name": "LSTM-VT-PREDICTION-NOW", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Formula": "PREVIOUSLY_PREDICTED", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL"], + "PredictionDuration": 0, + "Multiplier": 0.001 + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-7SEC", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["LSTM-VT-PREDICTION-7SEC-BACK", "LSTM-VT-PREDICTION-NOW"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-14SEC", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["LSTM-VT-PREDICTION-14SEC-BACK", "LSTM-VT-PREDICTION-NOW"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-21SEC", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["LSTM-VT-PREDICTION-21SEC-BACK", "LSTM-VT-PREDICTION-NOW"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-28SEC", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["LSTM-VT-PREDICTION-28SEC-BACK", "LSTM-VT-PREDICTION-NOW"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-35SEC", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["LSTM-VT-PREDICTION-35SEC-BACK", "LSTM-VT-PREDICTION-NOW"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 + }, { "Name": "STATS-UPDATOR", "Type": "UNKNOWN", @@ -286,8 +393,22 @@ "Hidden": true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula": "WEIGHTED_AVG", - "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LSTM-MODEL"], - "Coefficient": [0.0, 0.0, 0.0, 0.0], + "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF"], + "Coefficient": [0.0, 0.0, 0.0], + "Multiplier": 1, + "SendPowerHint": true, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "Name": "STATS-UPDATOR-LSTM", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Formula": "WEIGHTED_AVG", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL", "LSTM-VT-PREDICTION-ERROR-7SEC", "LSTM-VT-PREDICTION-ERROR-14SEC", "LSTM-VT-PREDICTION-ERROR-21SEC", "LSTM-VT-PREDICTION-ERROR-28SEC", "LSTM-VT-PREDICTION-ERROR-35SEC"], + "Coefficient": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], "Multiplier": 1, "SendPowerHint": true, "PollingDelay": 300000, @@ -1506,6 +1627,46 @@ -4000, 4000, 5000, 6000, 7000, 8000, 9000, 10000, 11000, 12000 ] }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-7SEC", + "LoggingName": "LSTM-PREDICTION-ERROR-7SEC", + "Thresholds": [ + -4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0, + 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500 + ] + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-14SEC", + "LoggingName": "LSTM-PREDICTION-ERROR-14SEC", + "Thresholds": [ + -4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0, + 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500 + ] + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-21SEC", + "LoggingName": "LSTM-PREDICTION-ERROR-21SEC", + "Thresholds": [ + -4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0, + 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500 + ] + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-28SEC", + "LoggingName": "LSTM-PREDICTION-ERROR-28SEC", + "Thresholds": [ + -4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0, + 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500 + ] + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-35SEC", + "LoggingName": "LSTM-PREDICTION-ERROR-35SEC", + "Thresholds": [ + -4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0, + 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500 + ] + }, { "Name": "VIRTUAL-SKIN-CHARGE-DURING-WLC-STATS", "Thresholds": [-200, 15, 25, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55] diff --git a/thermal/thermal_info_config_komodo_wingboard.json b/thermal/thermal_info_config_komodo_wingboard.json index c8655e87..41184369 100644 --- a/thermal/thermal_info_config_komodo_wingboard.json +++ b/thermal/thermal_info_config_komodo_wingboard.json @@ -304,7 +304,7 @@ "VirtualSensor": true, "ModelPath": "vt_prediction_lstm_model.tflite", "Formula": "USE_ML_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "PreviousSampleCount": 11, "OutputLabelCount": 6, "Multiplier": 0.001, diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json index 25aa5e78..05b1ead8 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -272,12 +272,119 @@ "VirtualSensor": true, "ModelPath": "vt_prediction_lstm_model.tflite", "Formula": "USE_ML_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "PreviousSampleCount": 11, "OutputLabelCount": 6, "Multiplier": 0.001, "SupportUnderSampling": true, - "ValidateInput": true + "ValidateInput": true, + "SupportPrediction": true, + "SampleDuration": 7000, + "TimeResolution": 7000 + }, + { + "Name": "LSTM-VT-PREDICTION-7SEC-BACK", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Formula": "PREVIOUSLY_PREDICTED", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL"], + "PredictionDuration": 7000, + "Multiplier": 0.001 + }, + { + "Name": "LSTM-VT-PREDICTION-14SEC-BACK", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Formula": "PREVIOUSLY_PREDICTED", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL"], + "PredictionDuration": 14000, + "Multiplier": 0.001 + }, + { + "Name": "LSTM-VT-PREDICTION-21SEC-BACK", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Formula": "PREVIOUSLY_PREDICTED", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL"], + "PredictionDuration": 21000, + "Multiplier": 0.001 + }, + { + "Name": "LSTM-VT-PREDICTION-28SEC-BACK", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Formula": "PREVIOUSLY_PREDICTED", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL"], + "PredictionDuration": 28000, + "Multiplier": 0.001 + }, + { + "Name": "LSTM-VT-PREDICTION-35SEC-BACK", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Formula": "PREVIOUSLY_PREDICTED", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL"], + "PredictionDuration": 35000, + "Multiplier": 0.001 + }, + { + "Name": "LSTM-VT-PREDICTION-NOW", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Formula": "PREVIOUSLY_PREDICTED", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL"], + "PredictionDuration": 0, + "Multiplier": 0.001 + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-7SEC", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["LSTM-VT-PREDICTION-7SEC-BACK", "LSTM-VT-PREDICTION-NOW"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-14SEC", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["LSTM-VT-PREDICTION-14SEC-BACK", "LSTM-VT-PREDICTION-NOW"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-21SEC", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["LSTM-VT-PREDICTION-21SEC-BACK", "LSTM-VT-PREDICTION-NOW"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-28SEC", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["LSTM-VT-PREDICTION-28SEC-BACK", "LSTM-VT-PREDICTION-NOW"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-35SEC", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["LSTM-VT-PREDICTION-35SEC-BACK", "LSTM-VT-PREDICTION-NOW"], + "Coefficient": [1.0, -1.0], + "Multiplier": 1 }, { "Name": "STATS-UPDATOR", @@ -286,8 +393,22 @@ "Hidden": true, "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula": "WEIGHTED_AVG", - "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LSTM-MODEL"], - "Coefficient": [0.0, 0.0, 0.0, 0.0], + "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF"], + "Coefficient": [0.0, 0.0, 0.0], + "Multiplier": 1, + "SendPowerHint": true, + "PollingDelay": 300000, + "PassiveDelay": 7000 + }, + { + "Name": "STATS-UPDATOR-LSTM", + "Type": "UNKNOWN", + "VirtualSensor": true, + "Hidden": true, + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Formula": "WEIGHTED_AVG", + "Combination": ["VIRTUAL-SKIN-LSTM-MODEL", "LSTM-VT-PREDICTION-ERROR-7SEC", "LSTM-VT-PREDICTION-ERROR-14SEC", "LSTM-VT-PREDICTION-ERROR-21SEC", "LSTM-VT-PREDICTION-ERROR-28SEC", "LSTM-VT-PREDICTION-ERROR-35SEC"], + "Coefficient": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0], "Multiplier": 1, "SendPowerHint": true, "PollingDelay": 300000, @@ -1440,6 +1561,46 @@ -4000, 4000, 5000, 6000, 7000, 8000, 9000, 10000, 11000, 12000 ] }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-7SEC", + "LoggingName": "LSTM-PREDICTION-ERROR-7SEC", + "Thresholds": [ + -4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0, + 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500 + ] + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-14SEC", + "LoggingName": "LSTM-PREDICTION-ERROR-14SEC", + "Thresholds": [ + -4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0, + 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500 + ] + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-21SEC", + "LoggingName": "LSTM-PREDICTION-ERROR-21SEC", + "Thresholds": [ + -4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0, + 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500 + ] + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-28SEC", + "LoggingName": "LSTM-PREDICTION-ERROR-28SEC", + "Thresholds": [ + -4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0, + 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500 + ] + }, + { + "Name": "LSTM-VT-PREDICTION-ERROR-35SEC", + "LoggingName": "LSTM-PREDICTION-ERROR-35SEC", + "Thresholds": [ + -4500, -4000, -3500, -3000, -2500, -2000, -1500, -1000, -500, 0, + 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500 + ] + }, { "Name": "VIRTUAL-SKIN-CHARGE-DURING-WLC-STATS", "Thresholds": [-200, 15, 25, 31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51, 53, 55] diff --git a/thermal/thermal_info_config_tokay_wingboard.json b/thermal/thermal_info_config_tokay_wingboard.json index 2bc582b3..995f3b4a 100644 --- a/thermal/thermal_info_config_tokay_wingboard.json +++ b/thermal/thermal_info_config_tokay_wingboard.json @@ -293,7 +293,7 @@ "VirtualSensor": true, "ModelPath": "vt_prediction_lstm_model.tflite", "Formula": "USE_ML_MODEL", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "PreviousSampleCount": 11, "OutputLabelCount": 6, "Multiplier": 0.001, diff --git a/thermal/vt_prediction_lstm_model_caiman.tflite b/thermal/vt_prediction_lstm_model_caiman.tflite index 14f07b5a..ace7a020 100644 Binary files a/thermal/vt_prediction_lstm_model_caiman.tflite and b/thermal/vt_prediction_lstm_model_caiman.tflite differ diff --git a/thermal/vt_prediction_lstm_model_komodo.tflite b/thermal/vt_prediction_lstm_model_komodo.tflite index 8a8e2611..ccab26a3 100644 Binary files a/thermal/vt_prediction_lstm_model_komodo.tflite and b/thermal/vt_prediction_lstm_model_komodo.tflite differ diff --git a/thermal/vt_prediction_lstm_model_tokay.tflite b/thermal/vt_prediction_lstm_model_tokay.tflite index 100d94e5..cd95c0cc 100644 Binary files a/thermal/vt_prediction_lstm_model_tokay.tflite and b/thermal/vt_prediction_lstm_model_tokay.tflite differ