zhunk 1 year ago
parent
commit
bbeafb87a0

+ 5 - 10
Application_cbd_apm32f1/applications/sht30_collect.c

@@ -204,17 +204,12 @@ static void Power_ReadCheck(void *parameter)
         }
         }
         //
         //
        {
        {
-            RV = 10000 * (4096 - Read_Ntc_Voltage()) / Read_Ntc_Voltage();
-            if(TempCalculate(RV, 3950, 10000)-TempCalculate(RV, 3950, 10000)>10)
-            {
-                LOG_E("temp value err!!!!");
-            }
-            else {
+            int ntc_adc_read = Read_Ntc_Voltage();
+            if(ntc_adc_read==0){
+                   device_status.heattem = atoi(device_status.tempture);
+            }else{
+                RV = 10000 * (4096 - ntc_adc_read) / ntc_adc_read;
                 device_status.heattem = TempCalculate(RV, 3950, 10000);
                 device_status.heattem = TempCalculate(RV, 3950, 10000);
-                if(device_status.heattem>160)
-                {
-                    device_status.heattem = 25;
-                }
             }
             }
         }
         }
         if(bat_cnt>=15){  //持续10s
         if(bat_cnt>=15){  //持续10s

+ 1 - 1
Application_cbd_apm32f1/readme.md

@@ -1,6 +1,6 @@
 # 2025-09-18 更新说明
 # 2025-09-18 更新说明
 	#define VERSION_BZY         "2.4.5"                   //孢子仪
 	#define VERSION_BZY         "2.4.5"                   //孢子仪
-	1、增加温度保护;
+	1、增加温度保护,温湿度探头等相关字段;
 # 2025-09-15 更新说明
 # 2025-09-15 更新说明
 	#define VERSION_BZY         "2.4.4"                   //孢子仪
 	#define VERSION_BZY         "2.4.4"                   //孢子仪
 	1、DTU串口通信接收逻辑改进;
 	1、DTU串口通信接收逻辑改进;