Fix the thermal zone offsets for thermalHAL in wahoo.
We added four new thermal zones in wahoo. First 4 thermal_zone (0-3)
now are:
mnh_ipu1, mnh_ipu2, mnh_cpu, mnh_lpddr
so we need to shift all our thermal zone offsets by 4. This is also
causing an IO error whenever we call getTemperatures() since the battery
sensor tries to read mnh_ipu1:
taimen:/ # cat /sys/class/thermal/thermal_zone0/type
mnh_ipu1
taimen:/ # cat /sys/class/thermal/thermal_zone0/temp
cat: /sys/class/thermal/thermal_zone0/temp: I/O error
taimen:/ # cat /sys/class/thermal/thermal_zone4/type
battery
taimen:/ # cat /sys/class/thermal/thermal_zone4/temp
19800
Bug: 75842171
Test: VtsHalThermalV1_0TargetTest pass
Change-Id: Iaa54bd69caaa3b9a16324709d6b858a7dec6200e
diff --git a/thermal/thermal-helper.h b/thermal/thermal-helper.h
index 3b86efe..be3ae86 100644
--- a/thermal/thermal-helper.h
+++ b/thermal/thermal-helper.h
@@ -46,30 +46,29 @@
constexpr const char *kCpuOnlineFileFormat = "/sys/devices/system/cpu/cpu%d/online";
// thermal-engine.conf
-constexpr unsigned int kWalleyeSkinSensorNum = 9;
+constexpr unsigned int kWalleyeSkinSensorNum = 13;
constexpr auto kWalleyeSkinSensorType = "back_therm";
-constexpr unsigned int kWalleyeTsensOffset = 11;
+constexpr unsigned int kWalleyeTsensOffset = 15;
constexpr unsigned int kWalleyeSkinThrottlingThreshold = 40;
constexpr unsigned int kWalleyeSkinShutdownThreshold = 56;
constexpr unsigned int kWalleyeVrThrottledBelowMin = 52;
-constexpr unsigned int kTaimenRabSkinSensorNum = 8;
+constexpr unsigned int kTaimenRabSkinSensorNum = 12;
constexpr auto kTaimenRabSkinSensorType = "bd_therm";
-constexpr unsigned int kTaimenRabTsensOffset = 9;
+constexpr unsigned int kTaimenRabTsensOffset = 13;
constexpr unsigned int kTaimenRabSkinThrottlingThreshold = 49;
constexpr unsigned int kTaimenRabSkinShutdownThreshold = 66;
constexpr unsigned int kTaimenRabVrThrottledBelowMin = 62;
-constexpr unsigned int kTaimenRcSkinSensorNum = 8;
+constexpr unsigned int kTaimenRcSkinSensorNum = 12;
constexpr auto kTaimenRcSkinSensorType = "bd_therm2";
-constexpr unsigned int kTaimenRcTsensOffset = 9;
+constexpr unsigned int kTaimenRcTsensOffset = 13;
constexpr unsigned int kTaimenRcSkinThrottlingThreshold = 38;
constexpr unsigned int kTaimenRcSkinShutdownThreshold = 54;
constexpr unsigned int kTaimenRcVrThrottledBelowMin = 50;
-
-constexpr unsigned int kBatterySensorNum = 0;
constexpr unsigned int kUsbcSensorNum = 5;
+constexpr unsigned int kBatterySensorNum = 4;
constexpr unsigned int kGpuTsensOffset = 11;
constexpr unsigned int kCpuNum = 8;
