From 7f84c535ce47bb927c2edc8f28c4abe5a9bb612b Mon Sep 17 00:00:00 2001 From: kfl_614 Date: Mon, 21 Dec 2020 10:29:40 +0800 Subject: [PATCH] update environment temperature algorithm. --- .../com/enqualcomm/support/utils/TempAlgUtil.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/enqualcomm/support/utils/TempAlgUtil.java b/app/src/main/java/com/enqualcomm/support/utils/TempAlgUtil.java index c0eabd0e..2618fcf5 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/TempAlgUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/TempAlgUtil.java @@ -134,18 +134,18 @@ public class TempAlgUtil { String envDy = Util.getSystemProperties("persist.sys.envAlgDy", ""); ICLogger.d("envSlope == > " + envSlope + " envDy == > " + envDy); double resultEnvTemp = evnTemp; - if (!TextUtils.isEmpty(envDy) && !TextUtils.isEmpty(envSlope) && boardTemp > 45) { + if (!TextUtils.isEmpty(envDy) && !TextUtils.isEmpty(envSlope) && boardTemp > 39) { //进行换算 ICLogger.d("env temp with board temp..."); resultEnvTemp = evnTemp - (Float.parseFloat(envSlope) * boardTemp + Float.parseFloat(envDy)); - } else if (boardTemp <= 45 && boardTemp >= 32) { - ICLogger.d("in range of 32 to 38"); + // resultEnvTemp = evnTemp - (0.8492 * boardTemp - 25.204); + } else if (boardTemp <= 39 && boardTemp >= 27) { + ICLogger.d("in range of 27 to 39"); //Ut = St-(Bt*0.869-27.167) Bt∈[32,38) - resultEnvTemp = evnTemp - (0.869 * boardTemp - 27.167); + resultEnvTemp = evnTemp - (0.2441 * boardTemp - 2.3248); } else { - //TODO:主板温度低于32度的,如果测试有这样的case,再采集数据 + //TODO:主板温度低于27度的,如果测试有这样的case,再采集数据 } - String bodySlope = Util.getSystemProperties("persist.sys.bodyAlgSlope", ""); String bodyDy = Util.getSystemProperties("persist.sys.bodyAlgDy", ""); ICLogger.d("bodySlope == > " + bodySlope + " bodyDy == > " + bodyDy); -- 2.17.1