zhunk 1 rok temu
rodzic
commit
7ce0949c7e

+ 9 - 2
Application_cbd_apm32f1/applications/control.c

@@ -77,6 +77,7 @@ uint8_t ctr_swz(uint8_t status_swz)
 //限位开关判断函数
 void turnlimit(void)
 {
+    if(device_status.temp_status==1) return;
     //Motor_shake(ON,0);
     Motor_Qingsao_R_PWM(ON);
     static uint16_t turn_timeout = 0;
@@ -907,6 +908,7 @@ void SunTest(void)
 /*上电初始化*/
 void ResetInit(void)
 {
+    ctr_photo(ON);
     //关闭电磁阀
     ctr_shake(OFF, 0);
     //关闭加热
@@ -967,7 +969,7 @@ u_int8_t alarmCheck(u_int8_t starthour,u_int8_t endhour,u_int8_t startmin,u_int8
 
 void WorkTask_BZYV2(void)
 {
-    if(device_status.ds==1){
+    if(device_status.ds==1&&device_status.temp_status==0){
         ctr_lamp(OFF,1);    //镇流器关=X轴开关:开
         ctr_swz(OFF);
         ctr_Collect_Fan(OFF);
@@ -982,6 +984,11 @@ void WorkTask_BZYV2(void)
             }else{
                 ctr_router(OFF);
             }
+            if(device_status.temp_status==1){
+                device_status.work_status = 0;
+                ctr_router(OFF);
+                break;
+            }
             rt_thread_delay(10000);
         }
         ctr_router(OFF);
@@ -1007,7 +1014,7 @@ void WorkTask_BZYV2(void)
 /* 入口函数-工作状态检测 */
 static void Work_status_thread_entry(void *parameter)
 {
-     while(device_status.ds==1)
+     while(device_status.ds==1&&device_status.temp_status==0)
      {
          while(alarmCheck(device_status.collecting_sh1,device_status.collecting_eh1,device_status.collt_min_sh1,device_status.collt_min_eh1) == ON)
          {

+ 2 - 2
Application_cbd_apm32f1/applications/control.h

@@ -17,7 +17,7 @@
 #define SENSOR_EN        0              //温湿度:0关闭,1打开
 ////////////////////////////////////////////////////////////////
 
-#define VERSION_BZY         "2.4.4"                   //孢子仪
+#define VERSION_BZY         "2.4.5"                   //孢子仪
 
 
 /*********************************************************************/
@@ -88,7 +88,7 @@ typedef struct  _packed
     int8_t tpl;              //低温保护
     uint8_t timeSwitch;      //模式0光控,1时控
     uint8_t link_sta;        //有线接入状态:0-未接入,1已接入
-    uint8_t heattem;         //加热仓温度(实时)
+    int8_t heattem;         //加热仓温度(实时)
     uint8_t hmi_fresh;       //是否启动屏幕
     uint8_t update_flag;     //是否启动升级
     uint8_t photo_type;      //相机类型,0-USB,1-海康,2-大华

+ 9 - 0
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -689,6 +689,15 @@ char * makeJson()
     //箱内温度
     rt_sprintf(utos, "%d",device_status.heattem);
     cJSON_AddStringToObject(pSubJson,"boxtem",utos);
+
+    rt_sprintf(utos, "%d",device_status.tpl);
+    cJSON_AddStringToObject(pSubJson,"tpl",utos);
+
+    rt_sprintf(utos, "%d",device_status.tph);
+    cJSON_AddStringToObject(pSubJson,"tph",utos);
+
+    rt_sprintf(utos, "%d",device_status.temp_status);
+    cJSON_AddStringToObject(pSubJson,"tps",utos);
     //湿度
     cJSON_AddStringToObject(pSubJson,"ah",device_status.humidity);
     //温度

+ 7 - 3
Application_cbd_apm32f1/applications/hmi.c

@@ -1556,8 +1556,8 @@ void Check_ParamConfig(void)
         device_status.sunBar = 9;       //光控定时时长
         device_status.startBar = 20;    //定时开始时间
         device_status.stopBar  = 0;     //定时结束时间
-        device_status.tph = 70;         //高温保护阈值
-        device_status.tpl = 5;          //低温保护阈值
+        device_status.tph = 60;         //高温保护阈值
+        device_status.tpl = 10;          //低温保护阈值
         device_status.shake_ws = 1;     //震动开关,默认开
         device_status.shake_sec = 1;    //震动时间,s
         device_status.vol = 7;          //音量
@@ -1819,6 +1819,10 @@ void ResetParamDefault(void)
     device_status.collt_min_sh3 = 0;
     device_status.collt_min_eh3 = 0;
     device_status.Power_Type = 0;
+    device_status.tph = 70;         //高温保护阈值
+    device_status.tpl = 10;          //低温保护阈值
+    ef_set_env_blob("tph", &device_status.tph, sizeof(device_status.tph));
+    ef_set_env_blob("tpl", &device_status.tpl, sizeof(device_status.tpl));
     ef_set_env_blob("Power_Type", &device_status.Power_Type, sizeof(device_status.Power_Type));
 
     ef_set_env_blob("dattim",&device_status.dattim,sizeof(device_status.dattim));        //上传时间
@@ -1854,7 +1858,7 @@ void ResetParamDefault_DC(void)
     device_status.shake_sec = 1;    //震动时间1-100ms
 
     device_status.tph = 70;         //高温保护阈值
-    device_status.tpl = -5;          //低温保护阈值
+    device_status.tpl = 10;          //低温保护阈值
     device_status.timeSwitch = 0;   //定时模式
     device_status.heatvalue=100;
     device_status.ds = 1;           //设备状态开机

+ 2 - 2
Application_cbd_apm32f1/applications/sht30_collect.c

@@ -148,12 +148,12 @@ static void sht30_collect_thread_entry(void *parameter)
     while (1)
     {
         //温控
-        if(atoi(device_status.tempture)>=device_status.tph||atoi(device_status.tempture)<=device_status.tpl)
+        if(device_status.heattem>=device_status.tph||device_status.heattem<=device_status.tpl)
         {
             device_status.C01 |= (1<<7);
             device_status.temp_status = 1;
         }
-        else if(atoi(device_status.tempture)>=(device_status.tpl+5)&&atoi(device_status.tempture)<=(device_status.tph-10))
+        else if(device_status.heattem>=(device_status.tpl+5)&&device_status.heattem<=(device_status.tph-10))
         {
             device_status.C01 &= ~(1<<7);
             device_status.temp_status = 0;

+ 3 - 0
Application_cbd_apm32f1/readme.md

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