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