diff --git a/audio/husky/config/audio_platform_configuration.xml b/audio/husky/config/audio_platform_configuration.xml
index fca3509..84c045b 100644
--- a/audio/husky/config/audio_platform_configuration.xml
+++ b/audio/husky/config/audio_platform_configuration.xml
@@ -248,7 +248,7 @@
-
+
@@ -304,7 +304,7 @@
-
+
diff --git a/audio/husky/tuning/fortemedia/mcps.dat b/audio/husky/tuning/fortemedia/mcps.dat
index 6194de4..1c16314 100644
Binary files a/audio/husky/tuning/fortemedia/mcps.dat and b/audio/husky/tuning/fortemedia/mcps.dat differ
diff --git a/audio/shiba/config/audio_platform_configuration.xml b/audio/shiba/config/audio_platform_configuration.xml
index fca3509..84c045b 100644
--- a/audio/shiba/config/audio_platform_configuration.xml
+++ b/audio/shiba/config/audio_platform_configuration.xml
@@ -248,7 +248,7 @@
-
+
@@ -304,7 +304,7 @@
-
+
diff --git a/audio/shiba/tuning/fortemedia/mcps.dat b/audio/shiba/tuning/fortemedia/mcps.dat
index 6194de4..1c16314 100644
Binary files a/audio/shiba/tuning/fortemedia/mcps.dat and b/audio/shiba/tuning/fortemedia/mcps.dat differ
diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index 26ad93d..7517864 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -92,6 +92,15 @@
],
"ResetOnInit": true
},
+ {
+ "Name": "CPULittleClusterDownRateLimitUs",
+ "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us",
+ "Values": [
+ "2000",
+ "5000"
+ ],
+ "ResetOnInit": true
+ },
{
"Name": "CPUMidClusterMaxFreq",
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq",
@@ -124,6 +133,15 @@
],
"ResetOnInit": true
},
+ {
+ "Name": "CPUMidClusterDownRateLimitUs",
+ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us",
+ "Values": [
+ "2000",
+ "20000"
+ ],
+ "ResetOnInit": true
+ },
{
"Name": "CPUBigClusterMaxFreq",
"Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_max_freq",
@@ -158,6 +176,15 @@
],
"ResetOnInit": true
},
+ {
+ "Name": "CPUBigClusterDownRateLimitUs",
+ "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us",
+ "Values": [
+ "2000",
+ "20000"
+ ],
+ "ResetOnInit": true
+ },
{
"Name": "ReducePreferIdle",
"Path": "/proc/vendor_sched/reduce_prefer_idle",
@@ -567,9 +594,18 @@
],
"DefaultIndex": 0
},
+ {
+ "Name": "PMU_LIT_LIMIT_FREQ",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency",
+ "Values": [
+ "1328000"
+ ],
+ "DefaultIndex": 0,
+ "ResetOnInit": true
+ },
{
"Name": "PMU_LIT_LCPI_THRESHOLD",
- "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/lcpi_threshold",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold",
"Values": [
"2",
"0"
@@ -578,16 +614,17 @@
},
{
"Name": "PMU_LIT_SPC_THRESHOLD",
- "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/spc_threshold",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
"Values": [
"70",
+ "30",
"0"
],
"DefaultIndex": 0
},
{
"Name": "PMU_MID_LCPI_THRESHOLD",
- "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/lcpi_threshold",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/lcpi_threshold",
"Values": [
"6",
"3"
@@ -596,7 +633,7 @@
},
{
"Name": "PMU_MID_SPC_THRESHOLD",
- "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/spc_threshold",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold",
"Values": [
"65",
"50"
@@ -605,7 +642,7 @@
},
{
"Name": "PMU_BIG_LIMIT_FREQ",
- "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/limit_frequency",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency",
"Values": [
"2556000",
"1852000"
@@ -614,7 +651,7 @@
},
{
"Name": "PMU_BIG_LCPI_THRESHOLD",
- "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/lcpi_threshold",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/lcpi_threshold",
"Values": [
"5",
"3"
@@ -623,7 +660,7 @@
},
{
"Name": "PMU_BIG_SPC_THRESHOLD",
- "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/spc_threshold",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold",
"Values": [
"69",
"50"
@@ -1665,19 +1702,37 @@
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUBigClusterMaxFreq",
"Duration": 0,
- "Value": "1164000"
+ "Value": "2049000"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUMidClusterMaxFreq",
"Duration": 0,
- "Value": "1328000"
+ "Value": "1836000"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPULittleClusterMaxFreq",
"Duration": 0,
- "Value": "1328000"
+ "Value": "1704000"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "CPUBigClusterDownRateLimitUs",
+ "Duration": 0,
+ "Value": "2000"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "CPUMidClusterDownRateLimitUs",
+ "Duration": 0,
+ "Value": "2000"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "CPULittleClusterDownRateLimitUs",
+ "Duration": 0,
+ "Value": "2000"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
@@ -1707,7 +1762,7 @@
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CDCpuset",
"Duration": 0,
- "Value": "4-7"
+ "Value": "0-7"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
@@ -1721,6 +1776,30 @@
"Duration": 0,
"Value": "1100"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "PMU_POLL",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "PMU_LIT_LIMIT_FREQ",
+ "Duration": 0,
+ "Value": "1328000"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "PMU_LIT_LCPI_THRESHOLD",
+ "Duration": 0,
+ "Value": "2"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "PMU_LIT_SPC_THRESHOLD",
+ "Duration": 0,
+ "Value": "30"
+ },
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "NPITaskPacking",
diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json
index 122b0bf..2b5d43b 100644
--- a/perf/powerhint-ripcurrent.json
+++ b/perf/powerhint-ripcurrent.json
@@ -92,6 +92,15 @@
],
"ResetOnInit": true
},
+ {
+ "Name": "CPULittleClusterDownRateLimitUs",
+ "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us",
+ "Values": [
+ "2000",
+ "5000"
+ ],
+ "ResetOnInit": true
+ },
{
"Name": "CPUMidClusterMaxFreq",
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq",
@@ -120,6 +129,15 @@
],
"ResetOnInit": true
},
+ {
+ "Name": "CPUMidClusterDownRateLimitUs",
+ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us",
+ "Values": [
+ "2000",
+ "20000"
+ ],
+ "ResetOnInit": true
+ },
{
"Name": "CPUBigClusterMaxFreq",
"Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_max_freq",
@@ -148,6 +166,15 @@
],
"ResetOnInit": true
},
+ {
+ "Name": "CPUBigClusterDownRateLimitUs",
+ "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us",
+ "Values": [
+ "2000",
+ "20000"
+ ],
+ "ResetOnInit": true
+ },
{
"Name": "ReducePreferIdle",
"Path": "/proc/vendor_sched/reduce_prefer_idle",
@@ -557,9 +584,18 @@
],
"DefaultIndex": 0
},
+ {
+ "Name": "PMU_LIT_LIMIT_FREQ",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency",
+ "Values": [
+ "1328000"
+ ],
+ "DefaultIndex": 0,
+ "ResetOnInit": true
+ },
{
"Name": "PMU_LIT_LCPI_THRESHOLD",
- "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/lcpi_threshold",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold",
"Values": [
"2",
"0"
@@ -568,16 +604,17 @@
},
{
"Name": "PMU_LIT_SPC_THRESHOLD",
- "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/spc_threshold",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
"Values": [
"70",
+ "30",
"0"
],
"DefaultIndex": 0
},
{
"Name": "PMU_MID_LCPI_THRESHOLD",
- "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/lcpi_threshold",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/lcpi_threshold",
"Values": [
"6",
"3"
@@ -586,7 +623,7 @@
},
{
"Name": "PMU_MID_SPC_THRESHOLD",
- "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/spc_threshold",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold",
"Values": [
"65",
"50"
@@ -595,7 +632,7 @@
},
{
"Name": "PMU_BIG_LIMIT_FREQ",
- "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/limit_frequency",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency",
"Values": [
"2556000",
"1852000"
@@ -604,7 +641,7 @@
},
{
"Name": "PMU_BIG_LCPI_THRESHOLD",
- "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/lcpi_threshold",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/lcpi_threshold",
"Values": [
"5",
"3"
@@ -613,7 +650,7 @@
},
{
"Name": "PMU_BIG_SPC_THRESHOLD",
- "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/spc_threshold",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold",
"Values": [
"69",
"50"
@@ -1553,19 +1590,37 @@
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUBigClusterMaxFreq",
"Duration": 0,
- "Value": "1164000"
+ "Value": "2049000"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUMidClusterMaxFreq",
"Duration": 0,
- "Value": "1328000"
+ "Value": "1836000"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPULittleClusterMaxFreq",
"Duration": 0,
- "Value": "1328000"
+ "Value": "1704000"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "CPUBigClusterDownRateLimitUs",
+ "Duration": 0,
+ "Value": "2000"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "CPUMidClusterDownRateLimitUs",
+ "Duration": 0,
+ "Value": "2000"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "CPULittleClusterDownRateLimitUs",
+ "Duration": 0,
+ "Value": "2000"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
@@ -1595,7 +1650,7 @@
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CDCpuset",
"Duration": 0,
- "Value": "4-7"
+ "Value": "0-7"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
@@ -1609,6 +1664,30 @@
"Duration": 0,
"Value": "1100"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "PMU_POLL",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "PMU_LIT_LIMIT_FREQ",
+ "Duration": 0,
+ "Value": "1328000"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "PMU_LIT_LCPI_THRESHOLD",
+ "Duration": 0,
+ "Value": "2"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "PMU_LIT_SPC_THRESHOLD",
+ "Duration": 0,
+ "Value": "30"
+ },
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "NPITaskPacking",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index 3d8003d..05ee923 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -92,6 +92,15 @@
],
"ResetOnInit": true
},
+ {
+ "Name": "CPULittleClusterDownRateLimitUs",
+ "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us",
+ "Values": [
+ "2000",
+ "5000"
+ ],
+ "ResetOnInit": true
+ },
{
"Name": "CPUMidClusterMaxFreq",
"Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_max_freq",
@@ -120,6 +129,15 @@
],
"ResetOnInit": true
},
+ {
+ "Name": "CPUMidClusterDownRateLimitUs",
+ "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us",
+ "Values": [
+ "2000",
+ "20000"
+ ],
+ "ResetOnInit": true
+ },
{
"Name": "CPUBigClusterMaxFreq",
"Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_max_freq",
@@ -148,6 +166,15 @@
],
"ResetOnInit": true
},
+ {
+ "Name": "CPUBigClusterDownRateLimitUs",
+ "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/down_rate_limit_us",
+ "Values": [
+ "2000",
+ "20000"
+ ],
+ "ResetOnInit": true
+ },
{
"Name": "ReducePreferIdle",
"Path": "/proc/vendor_sched/reduce_prefer_idle",
@@ -380,8 +407,8 @@
"Name": "BigControlTempSet",
"Path": "/dev/thermal/tz-by-name/BIG/trip_point_2_temp",
"Values": [
- "85000",
- "80000"
+ "75000",
+ "70000"
],
"DefaultIndex": 0,
"ResetOnInit": false
@@ -390,8 +417,8 @@
"Name": "MidControlTempSet",
"Path": "/dev/thermal/tz-by-name/MID/trip_point_2_temp",
"Values": [
- "85000",
- "80000"
+ "75000",
+ "70000"
],
"DefaultIndex": 0,
"ResetOnInit": false
@@ -400,8 +427,8 @@
"Name": "LittleControlTempSet",
"Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_2_temp",
"Values": [
- "85000",
- "80000"
+ "75000",
+ "70000"
],
"DefaultIndex": 0,
"ResetOnInit": false
@@ -440,8 +467,8 @@
"Name": "BigSwitchOnTempSet",
"Path": "/dev/thermal/tz-by-name/BIG/trip_point_1_temp",
"Values": [
- "65000",
- "60000"
+ "55000",
+ "50000"
],
"DefaultIndex": 0,
"ResetOnInit": false
@@ -450,8 +477,8 @@
"Name": "MidSwitchOnTempSet",
"Path": "/dev/thermal/tz-by-name/MID/trip_point_1_temp",
"Values": [
- "65000",
- "60000"
+ "55000",
+ "50000"
],
"DefaultIndex": 0,
"ResetOnInit": false
@@ -460,8 +487,8 @@
"Name": "LittleSwitchOnTempSet",
"Path": "/dev/thermal/tz-by-name/LITTLE/trip_point_1_temp",
"Values": [
- "65000",
- "60000"
+ "55000",
+ "50000"
],
"DefaultIndex": 0,
"ResetOnInit": false
@@ -557,9 +584,18 @@
],
"DefaultIndex": 0
},
+ {
+ "Name": "PMU_LIT_LIMIT_FREQ",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency",
+ "Values": [
+ "1328000"
+ ],
+ "DefaultIndex": 0,
+ "ResetOnInit": true
+ },
{
"Name": "PMU_LIT_LCPI_THRESHOLD",
- "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/lcpi_threshold",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold",
"Values": [
"2",
"0"
@@ -568,16 +604,17 @@
},
{
"Name": "PMU_LIT_SPC_THRESHOLD",
- "Path": "/sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/spc_threshold",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold",
"Values": [
"70",
+ "30",
"0"
],
"DefaultIndex": 0
},
{
"Name": "PMU_MID_LCPI_THRESHOLD",
- "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/lcpi_threshold",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/lcpi_threshold",
"Values": [
"6",
"3"
@@ -586,7 +623,7 @@
},
{
"Name": "PMU_MID_SPC_THRESHOLD",
- "Path": "/sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/spc_threshold",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold",
"Values": [
"65",
"50"
@@ -595,7 +632,7 @@
},
{
"Name": "PMU_BIG_LIMIT_FREQ",
- "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/limit_frequency",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/limit_frequency",
"Values": [
"2556000",
"1852000"
@@ -604,7 +641,7 @@
},
{
"Name": "PMU_BIG_LCPI_THRESHOLD",
- "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/lcpi_threshold",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/lcpi_threshold",
"Values": [
"5",
"3"
@@ -613,7 +650,7 @@
},
{
"Name": "PMU_BIG_SPC_THRESHOLD",
- "Path": "/sys/devices/system/cpu/cpu8/cpufreq/sched_pixel/spc_threshold",
+ "Path": "/sys/devices/system/cpu/cpufreq/policy8/sched_pixel/spc_threshold",
"Values": [
"69",
"50"
@@ -1553,19 +1590,37 @@
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUBigClusterMaxFreq",
"Duration": 0,
- "Value": "1164000"
+ "Value": "2049000"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPUMidClusterMaxFreq",
"Duration": 0,
- "Value": "1328000"
+ "Value": "1836000"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CPULittleClusterMaxFreq",
"Duration": 0,
- "Value": "1328000"
+ "Value": "1704000"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "CPUBigClusterDownRateLimitUs",
+ "Duration": 0,
+ "Value": "2000"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "CPUMidClusterDownRateLimitUs",
+ "Duration": 0,
+ "Value": "2000"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "CPULittleClusterDownRateLimitUs",
+ "Duration": 0,
+ "Value": "2000"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
@@ -1595,7 +1650,7 @@
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CDCpuset",
"Duration": 0,
- "Value": "4-7"
+ "Value": "0-7"
},
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
@@ -1609,6 +1664,30 @@
"Duration": 0,
"Value": "1100"
},
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "PMU_POLL",
+ "Duration": 0,
+ "Value": "1"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "PMU_LIT_LIMIT_FREQ",
+ "Duration": 0,
+ "Value": "1328000"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "PMU_LIT_LCPI_THRESHOLD",
+ "Duration": 0,
+ "Value": "2"
+ },
+ {
+ "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
+ "Node": "PMU_LIT_SPC_THRESHOLD",
+ "Duration": 0,
+ "Value": "30"
+ },
{
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "NPITaskPacking",
@@ -1783,19 +1862,19 @@
"PowerHint": "LOW_POWER",
"Node": "BigControlTempSet",
"Duration": 0,
- "Value": "80000"
+ "Value": "70000"
},
{
"PowerHint": "LOW_POWER",
"Node": "MidControlTempSet",
"Duration": 0,
- "Value": "80000"
+ "Value": "70000"
},
{
"PowerHint": "LOW_POWER",
"Node": "LittleControlTempSet",
"Duration": 0,
- "Value": "80000"
+ "Value": "70000"
},
{
"PowerHint": "LOW_POWER",
@@ -1819,19 +1898,19 @@
"PowerHint": "LOW_POWER",
"Node": "BigSwitchOnTempSet",
"Duration": 0,
- "Value": "60000"
+ "Value": "50000"
},
{
"PowerHint": "LOW_POWER",
"Node": "MidSwitchOnTempSet",
"Duration": 0,
- "Value": "60000"
+ "Value": "50000"
},
{
"PowerHint": "LOW_POWER",
"Node": "LittleSwitchOnTempSet",
"Duration": 0,
- "Value": "60000"
+ "Value": "50000"
},
{
"PowerHint": "LOW_POWER",
@@ -1926,19 +2005,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
"Node": "BigControlTempSet",
"Duration": 0,
- "Value": "80000"
+ "Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
"Node": "MidControlTempSet",
"Duration": 0,
- "Value": "80000"
+ "Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
"Node": "LittleControlTempSet",
"Duration": 0,
- "Value": "80000"
+ "Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
@@ -1962,19 +2041,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
"Node": "BigSwitchOnTempSet",
"Duration": 0,
- "Value": "60000"
+ "Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
"Node": "MidSwitchOnTempSet",
"Duration": 0,
- "Value": "60000"
+ "Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
"Node": "LittleSwitchOnTempSet",
"Duration": 0,
- "Value": "60000"
+ "Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_LIGHT",
@@ -2016,19 +2095,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
"Node": "BigControlTempSet",
"Duration": 0,
- "Value": "80000"
+ "Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
"Node": "MidControlTempSet",
"Duration": 0,
- "Value": "80000"
+ "Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
"Node": "LittleControlTempSet",
"Duration": 0,
- "Value": "80000"
+ "Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
@@ -2052,19 +2131,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
"Node": "BigSwitchOnTempSet",
"Duration": 0,
- "Value": "60000"
+ "Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
"Node": "MidSwitchOnTempSet",
"Duration": 0,
- "Value": "60000"
+ "Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
"Node": "LittleSwitchOnTempSet",
"Duration": 0,
- "Value": "60000"
+ "Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE",
@@ -2106,19 +2185,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
"Node": "BigControlTempSet",
"Duration": 0,
- "Value": "80000"
+ "Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
"Node": "MidControlTempSet",
"Duration": 0,
- "Value": "80000"
+ "Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
"Node": "LittleControlTempSet",
"Duration": 0,
- "Value": "80000"
+ "Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
@@ -2142,19 +2221,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
"Node": "BigSwitchOnTempSet",
"Duration": 0,
- "Value": "60000"
+ "Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
"Node": "MidSwitchOnTempSet",
"Duration": 0,
- "Value": "60000"
+ "Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
"Node": "LittleSwitchOnTempSet",
"Duration": 0,
- "Value": "60000"
+ "Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE",
@@ -2196,19 +2275,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
"Node": "BigControlTempSet",
"Duration": 0,
- "Value": "80000"
+ "Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
"Node": "MidControlTempSet",
"Duration": 0,
- "Value": "80000"
+ "Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
"Node": "LittleControlTempSet",
"Duration": 0,
- "Value": "80000"
+ "Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
@@ -2232,19 +2311,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
"Node": "BigSwitchOnTempSet",
"Duration": 0,
- "Value": "60000"
+ "Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
"Node": "MidSwitchOnTempSet",
"Duration": 0,
- "Value": "60000"
+ "Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
"Node": "LittleSwitchOnTempSet",
"Duration": 0,
- "Value": "60000"
+ "Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL",
@@ -2304,19 +2383,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "BigControlTempSet",
"Duration": 0,
- "Value": "80000"
+ "Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "MidControlTempSet",
"Duration": 0,
- "Value": "80000"
+ "Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "LittleControlTempSet",
"Duration": 0,
- "Value": "80000"
+ "Value": "70000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
@@ -2340,19 +2419,19 @@
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "BigSwitchOnTempSet",
"Duration": 0,
- "Value": "60000"
+ "Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "MidSwitchOnTempSet",
"Duration": 0,
- "Value": "60000"
+ "Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
"Node": "LittleSwitchOnTempSet",
"Duration": 0,
- "Value": "60000"
+ "Value": "50000"
},
{
"PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY",
diff --git a/shiba/overlay/frameworks/base/core/res/res/values/config.xml b/shiba/overlay/frameworks/base/core/res/res/values/config.xml
index 7e91ef1..a82e841 100644
--- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml
@@ -157,6 +157,19 @@
120
+
+
+
+ - 181
+
+
+
+ - 50000
+
+
+
+ 120
- 2
diff --git a/thermal/thermal_info_config_charge_husky.json b/thermal/thermal_info_config_charge_husky.json
index 13a8c62..ed8e176 100644
--- a/thermal/thermal_info_config_charge_husky.json
+++ b/thermal/thermal_info_config_charge_husky.json
@@ -143,33 +143,33 @@
{
"Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN",
- "Version":"2.0",
+ "Version":"2.1",
"VirtualSensor":true,
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"],
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
- "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 47, 55.0],
- "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
+ "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
+ "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":60000,
- "PassiveDelay":60000,
+ "PassiveDelay":7000,
"PIDInfo": {
- "K_Po":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"],
- "K_Pu":["NAN", "NAN", 30, "NAN", "NAN", "NAN", "NAN"],
- "K_I":["NAN", "NAN", 40, "NAN", "NAN", "NAN", "NAN"],
+ "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
+ "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
+ "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
- "I_Max":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"],
- "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"],
+ "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"],
+ "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
- "MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"],
- "I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"],
- "I_Default":2000
+ "MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"],
+ "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
+ "I_Default":1302
},
"ExcludedPowerInfo": [
{
"PowerRail": "PARTIAL_SYSTEM_POWER",
- "PowerWeight": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0]
+ "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24]
}
],
"BindedCdevInfo": [
@@ -178,8 +178,8 @@
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
- "CdevCeiling": [0, 5, 8, 8, 9, 9, 9],
- "LimitInfo": [0, 0, 0, 0, 0, 9, 9]
+ "CdevCeiling": [0, 25, 25, 25, 26, 26, 26],
+ "LimitInfo": [0, 0, 1, 1, 1, 26, 26]
}
]
},
diff --git a/thermal/thermal_info_config_charge_shiba.json b/thermal/thermal_info_config_charge_shiba.json
index 4fb6451..43ec1aa 100644
--- a/thermal/thermal_info_config_charge_shiba.json
+++ b/thermal/thermal_info_config_charge_shiba.json
@@ -154,33 +154,33 @@
{
"Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN",
- "Version":"2.0",
+ "Version":"2.1",
"VirtualSensor":true,
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "usb_pwr_therm"],
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
- "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 47, 55.0],
- "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
+ "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
+ "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":60000,
- "PassiveDelay":60000,
+ "PassiveDelay":7000,
"PIDInfo": {
- "K_Po":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"],
- "K_Pu":["NAN", "NAN", 30, "NAN", "NAN", "NAN", "NAN"],
- "K_I":["NAN", "NAN", 40, "NAN", "NAN", "NAN", "NAN"],
+ "K_Po":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"],
+ "K_Pu":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"],
+ "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
- "I_Max":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"],
- "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"],
+ "I_Max":["NAN", "NAN", 1099, "NAN", "NAN", "NAN", "NAN"],
+ "S_Power":["NAN", "NAN", 2404, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
- "MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"],
- "I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"],
- "I_Default":2000
+ "MaxAllocPower":["NAN", "NAN", 5519, "NAN", "NAN", "NAN", "NAN"],
+ "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
+ "I_Default":1099
},
"ExcludedPowerInfo": [
{
"PowerRail": "PARTIAL_SYSTEM_POWER",
- "PowerWeight": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0]
+ "PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2]
}
],
"BindedCdevInfo": [
@@ -189,8 +189,8 @@
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
- "CdevCeiling": [0, 5, 8, 8, 9, 9, 9],
- "LimitInfo": [0, 0, 0, 0, 0, 9, 9]
+ "CdevCeiling": [0, 25, 25, 25, 26, 26, 26],
+ "LimitInfo": [0, 0, 1, 1, 1, 26, 26]
}
]
},
diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json
index 64f02cd..8b5ea88 100644
--- a/thermal/thermal_info_config_husky.json
+++ b/thermal/thermal_info_config_husky.json
@@ -351,7 +351,10 @@
"Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
"Coefficient":[0.09, 0.01, 0, 0.18, 0.2, 0.21, 0, 0.35, 0.03],
"Offset":-4990,
- "Multiplier":0.001
+ "HotThreshold":["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+ "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0],
+ "Multiplier":0.001,
+ "SendCallback":true
},
{
"Name":"VIRTUAL-SKIN",
@@ -552,33 +555,33 @@
{
"Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN",
- "Version":"2.0",
+ "Version":"2.1",
"VirtualSensor":true,
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm"],
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
- "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 47, 55.0],
- "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
+ "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
+ "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":60000,
- "PassiveDelay":60000,
+ "PassiveDelay":7000,
"PIDInfo": {
- "K_Po":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"],
- "K_Pu":["NAN", "NAN", 30, "NAN", "NAN", "NAN", "NAN"],
- "K_I":["NAN", "NAN", 40, "NAN", "NAN", "NAN", "NAN"],
+ "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
+ "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"],
+ "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
- "I_Max":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"],
- "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"],
+ "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"],
+ "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
- "MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"],
- "I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"],
- "I_Default":2000
+ "MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"],
+ "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
+ "I_Default":1302
},
"ExcludedPowerInfo": [
{
"PowerRail": "PARTIAL_SYSTEM_POWER",
- "PowerWeight": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0]
+ "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24]
}
],
"BindedCdevInfo": [
@@ -587,8 +590,8 @@
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
- "CdevCeiling": [0, 5, 8, 8, 9, 9, 9],
- "LimitInfo": [0, 0, 0, 0, 0, 9, 9]
+ "CdevCeiling": [0, 25, 25, 25, 26, 26, 26],
+ "LimitInfo": [0, 0, 1, 1, 1, 26, 26]
}
]
},
@@ -774,5 +777,37 @@
"PowerSampleDelay":7000,
"PowerSampleCount":5
}
- ]
+ ],
+ "Stats": {
+ "Sensors": {
+ "RecordWithDefaultThreshold": ["VIRTUAL-SKIN", "VIRTUAL-SKIN-CHARGE"],
+ "RecordWithThreshold": [
+ {
+ "Name": "VIRTUAL-BTS-WINDOW-PARTIAL",
+ "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+ },
+ {
+ "Name": "VIRTUAL-SKIN-SPEAKER",
+ "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+ },
+ {
+ "Name": "VIRTUAL-SKIN",
+ "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+ },
+ {
+ "Name": "VIRTUAL-SKIN-CHARGE",
+ "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+ },
+ {
+ "Name": "VIRTUAL-USB-THROTTLING",
+ "Thresholds": [3.0]
+ }
+ ]
+ },
+ "CoolingDevices": {
+ "RecordVotePerSensor": {
+ "DefaultThresholdEnableAll": true
+ }
+ }
+ }
}
diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json
index 418208b..b7a83f2 100644
--- a/thermal/thermal_info_config_shiba.json
+++ b/thermal/thermal_info_config_shiba.json
@@ -330,7 +330,10 @@
"Combination":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "battery", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
"Coefficient":[0.06, 0, 0.31, 0.08, 0.29, 0.1, 0, 0.16, 0],
"Offset":-1970,
- "Multiplier":0.001
+ "HotThreshold":["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
+ "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0],
+ "Multiplier":0.001,
+ "SendCallback":true
},
{
"Name":"VIRTUAL-SKIN",
@@ -529,33 +532,33 @@
{
"Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN",
- "Version":"2.0",
+ "Version":"2.1",
"VirtualSensor":true,
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "usb_pwr_therm"],
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
- "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 47, 55.0],
- "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
+ "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
+ "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001,
"PollingDelay":60000,
- "PassiveDelay":60000,
+ "PassiveDelay":7000,
"PIDInfo": {
- "K_Po":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"],
- "K_Pu":["NAN", "NAN", 30, "NAN", "NAN", "NAN", "NAN"],
- "K_I":["NAN", "NAN", 40, "NAN", "NAN", "NAN", "NAN"],
+ "K_Po":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"],
+ "K_Pu":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"],
+ "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
- "I_Max":["NAN", "NAN", 2000, "NAN", "NAN", "NAN", "NAN"],
- "S_Power":["NAN", "NAN", 3600, "NAN", "NAN", "NAN", "NAN"],
+ "I_Max":["NAN", "NAN", 1099, "NAN", "NAN", "NAN", "NAN"],
+ "S_Power":["NAN", "NAN", 2404, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
- "MaxAllocPower":["NAN", "NAN", 10000, "NAN", "NAN", "NAN", "NAN"],
- "I_Cutoff":["NAN", "NAN", 14, "NAN", "NAN", "NAN", "NAN"],
- "I_Default":2000
+ "MaxAllocPower":["NAN", "NAN", 5519, "NAN", "NAN", "NAN", "NAN"],
+ "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
+ "I_Default":1099
},
"ExcludedPowerInfo": [
{
"PowerRail": "PARTIAL_SYSTEM_POWER",
- "PowerWeight": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0]
+ "PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2]
}
],
"BindedCdevInfo": [
@@ -564,8 +567,8 @@
"CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1],
"MaxReleaseStep": 1,
"MaxThrottleStep": 1,
- "CdevCeiling": [0, 5, 8, 8, 9, 9, 9],
- "LimitInfo": [0, 0, 0, 0, 0, 9, 9]
+ "CdevCeiling": [0, 25, 25, 25, 26, 26, 26],
+ "LimitInfo": [0, 0, 1, 1, 1, 26, 26]
}
]
},
@@ -751,5 +754,33 @@
"PowerSampleDelay":7000,
"PowerSampleCount":5
}
- ]
+ ],
+ "Stats": {
+ "Sensors": {
+ "RecordWithDefaultThreshold": ["VIRTUAL-SKIN", "VIRTUAL-SKIN-CHARGE"],
+ "RecordWithThreshold": [
+ {
+ "Name": "VIRTUAL-SKIN-SPEAKER",
+ "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+ },
+ {
+ "Name": "VIRTUAL-SKIN",
+ "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+ },
+ {
+ "Name": "VIRTUAL-SKIN-CHARGE",
+ "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
+ },
+ {
+ "Name": "VIRTUAL-USB-THROTTLING",
+ "Thresholds": [3.0]
+ }
+ ]
+ },
+ "CoolingDevices": {
+ "RecordVotePerSensor": {
+ "DefaultThresholdEnableAll": true
+ }
+ }
+ }
}