添加温度sensor检测函数。
authorsnickersun <scy@incartech.cn>
Tue, 21 Jul 2020 17:48:49 +0000 (01:48 +0800)
committersnickersun <scy@incartech.cn>
Tue, 21 Jul 2020 17:48:49 +0000 (01:48 +0800)
app/src/main/java/com/ic/jni/ICJniUtils.java
app/src/main/jni/jni_interface/com_ic_jni_ICJniUtils.h
app/src/main/jni/native-lib.c
app/src/main/jni/native-lib.h
app/src/main/jni/temperature_hal.c
app/src/main/libs/armeabi-v7a/libICJniUtils.so

index 338a64c..af93c61 100644 (file)
@@ -85,4 +85,7 @@ public class ICJniUtils {
     /*根据环境参考温度和腕温换算 体温*/\r
     public static native double getBodyTempFromWristTemp(double wrist_temp,double ref_temp);\r
 \r
+    /*有体温检测功能则返回1, 否则返回0 */\r
+    public static native int isTemperatureDevAvailable();\r
+\r
 }\r
index 947bea4..d1650bf 100644 (file)
@@ -191,6 +191,14 @@ JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_getTemperatureValidFlag
 JNIEXPORT jdouble JNICALL Java_com_ic_jni_ICJniUtils_getBodyTempFromWristTemp\r
   (JNIEnv *, jclass, jdouble, jdouble);\r
 \r
+/*\r
+ * Class:     com_ic_jni_ICJniUtils\r
+ * Method:    isTemperatureDevAvailable\r
+ * Signature: ()I\r
+ */\r
+JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_isTemperatureDevAvailable\r
+  (JNIEnv *, jclass);\r
+\r
 #ifdef __cplusplus\r
 }\r
 #endif\r
index 20ab220..d80d539 100644 (file)
@@ -251,3 +251,14 @@ JNIEXPORT jdouble JNICALL Java_com_ic_jni_ICJniUtils_getBodyTempFromWristTemp
 \r
 \r
 \r
+/*\r
+ * Class:     com_ic_jni_ICJniUtils\r
+ * Method:    isTemperatureDevAvailable\r
+ * Signature: ()I\r
+ */\r
+JNIEXPORT jint JNICALL Java_com_ic_jni_ICJniUtils_isTemperatureDevAvailable\r
+        (JNIEnv *env, jclass jobj){\r
+\r
+    return (isTemperaturedevAvalable()==0);\r
+}\r
+\r
index 3e40b26..741c48f 100644 (file)
@@ -84,7 +84,7 @@ int getTemperatureValidFlag();
 
 double get_bodytemp_from_wristtemp(double wrist_temp, double env_temp);
 
-
+int isTemperaturedevAvalable();
 
 
 
index c5bfde1..f39173c 100644 (file)
@@ -57,6 +57,7 @@ double getTemperature();
 double getTemperatureOrigin();\r
 int setTemperatureAdjustValue(double value);\r
 double getTemperatureAdjustValue();\r
+int isTemperaturedevAvalable();\r
 /*设置当前温度标志位,实际上就是按照二进制位来定义的。\r
   0、可以测温\r
   第一位为1,0x1、充电超过2分钟或者充电超过2分钟后拔除5分钟内    0001\r
@@ -158,6 +159,11 @@ double adjust_temp_value(double input_temp){
 double get_bodytemp_from_wristtemp(double wrist_temp, double env_temp){\r
     double environment_temp,body_temp;\r
     environment_temp = env_temp;\r
+\r
+    if (wrist_temp>42.0f || wrist_temp < 31.0f){\r
+        LOGD("input wrist_temp %.2lf , out of range [31.0,42.0] \n",wrist_temp);\r
+        return -1;\r
+    }\r
 //    body_temp = 0.02411 * body_temp * body_temp * body_temp - 2.288 * body_temp * body_temp - 0.004356 *body_temp * body_temp * environment_temp\r
 //                + 0.2851 * body_temp * environment_temp - 4.702 * environment_temp + 72.46 * body_temp - 728.9;\r
     body_temp = 0.02411 * wrist_temp * wrist_temp * wrist_temp - 2.288 * wrist_temp * wrist_temp - 0.004356 *wrist_temp * wrist_temp * environment_temp\r
@@ -257,6 +263,12 @@ double getTemperatureOrigin() {
        }else{\r
                dtemp=(double)(tmp&0xFFFF)*0.01f;\r
        }\r
+\r
+       if (dtemp < 31.0f)\r
+           dtemp=0.0f;\r
+       else if (dtemp >43.0f)\r
+           dtemp=43.0f;\r
+\r
     /*char buf[50]={0};\r
        sprintf(buf,"%d.%d",((char*)&tmp)[1],((char*)&tmp)[0]);\r
     sscanf(buf,"%lf",&dtemp);\r
@@ -293,4 +305,22 @@ int getTemperatureValidFlag(){
     LOGD("get Temperature flag  0x%02x , ret %d, readlen %d\n",tempd, ret,lenRead);\r
     return tempd;\r
 \r
+}\r
+\r
+\r
+int isTemperaturedevAvalable(){\r
+        int dev_fd;\r
+        dev_fd = open(NST175_DEV_PATH_NAME , O_RDWR | O_SYNC);\r
+        if (dev_fd < 0) {\r
+            fprintf(stderr, "cannot open %s\n", NST175_DEV_PATH_NAME);\r
+            temp_dev_type=TEMP_DEV_TYPE_IC68;\r
+            dev_fd = open(IC68_DEV_PATH_NAME , O_RDWR | O_SYNC);\r
+            if (dev_fd < 0) {\r
+                fprintf(stderr, "cannot open %s\n", IC68_DEV_PATH_NAME);\r
+                return -1;\r
+            }\r
+        }\r
+        close(dev_fd);\r
+\r
+        return 0;\r
 }
\ No newline at end of file
index 06fdb68..f789b0c 100644 (file)
Binary files a/app/src/main/libs/armeabi-v7a/libICJniUtils.so and b/app/src/main/libs/armeabi-v7a/libICJniUtils.so differ