From 050d1035b403c431fcd58d9f062158db33e64bd3 Mon Sep 17 00:00:00 2001 From: Miguel de Dios Date: Tue, 27 Mar 2018 10:42:19 -0700 Subject: [PATCH] Fix the thermal zone numbers for thermalHAL in wahoo. There is a new thermal zone called usb. We need to increment the thermalHAL thermal zone numbers to correspond with this change. Bug: 76107808 Test: manual - manually check thermal zone types on walleye and taimen. Change-Id: If4a867269870ce08fc94b9e541f6ee1a0c3069ac --- thermal/thermal-helper.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/thermal/thermal-helper.h b/thermal/thermal-helper.h index be3ae861..46fc8349 100644 --- a/thermal/thermal-helper.h +++ b/thermal/thermal-helper.h @@ -46,29 +46,30 @@ constexpr const char *kTemperatureFileFormat = "/sys/class/thermal/thermal_zone% constexpr const char *kCpuOnlineFileFormat = "/sys/devices/system/cpu/cpu%d/online"; // thermal-engine.conf -constexpr unsigned int kWalleyeSkinSensorNum = 13; +constexpr unsigned int kWalleyeSkinSensorNum = 14; constexpr auto kWalleyeSkinSensorType = "back_therm"; -constexpr unsigned int kWalleyeTsensOffset = 15; +constexpr unsigned int kWalleyeTsensOffset = 16; constexpr unsigned int kWalleyeSkinThrottlingThreshold = 40; constexpr unsigned int kWalleyeSkinShutdownThreshold = 56; constexpr unsigned int kWalleyeVrThrottledBelowMin = 52; -constexpr unsigned int kTaimenRabSkinSensorNum = 12; +constexpr unsigned int kTaimenRabSkinSensorNum = 13; constexpr auto kTaimenRabSkinSensorType = "bd_therm"; -constexpr unsigned int kTaimenRabTsensOffset = 13; +constexpr unsigned int kTaimenRabTsensOffset = 14; constexpr unsigned int kTaimenRabSkinThrottlingThreshold = 49; constexpr unsigned int kTaimenRabSkinShutdownThreshold = 66; constexpr unsigned int kTaimenRabVrThrottledBelowMin = 62; -constexpr unsigned int kTaimenRcSkinSensorNum = 12; +constexpr unsigned int kTaimenRcSkinSensorNum = 13; constexpr auto kTaimenRcSkinSensorType = "bd_therm2"; -constexpr unsigned int kTaimenRcTsensOffset = 13; +constexpr unsigned int kTaimenRcTsensOffset = 14; constexpr unsigned int kTaimenRcSkinThrottlingThreshold = 38; constexpr unsigned int kTaimenRcSkinShutdownThreshold = 54; constexpr unsigned int kTaimenRcVrThrottledBelowMin = 50; -constexpr unsigned int kUsbcSensorNum = 5; -constexpr unsigned int kBatterySensorNum = 4; +constexpr unsigned int kUsbcSensorNum = 6; +constexpr unsigned int kBatterySensorNum = 5; +// The gpu thermal sensor is tsens_tz_sensor13. constexpr unsigned int kGpuTsensOffset = 11; constexpr unsigned int kCpuNum = 8;