yf_zjb 3 лет назад
Родитель
Сommit
8e865b38e1

+ 9 - 3
Application_CBD/applications/control.c

@@ -362,16 +362,13 @@ uint8_t ctr_Collect_Fan(uint8_t status_collect)
 {
     device_status.collect_fan_status = status_collect;
     rt_pin_mode(Collect_Fan, PIN_MODE_OUTPUT);
-    rt_pin_mode(Cold_Pin,PIN_MODE_OUTPUT);
     if(status_collect==OFF)
     {
        rt_pin_write(Collect_Fan,OFF);
-       rt_pin_write(Cold_Pin,OFF);
     }
     if(status_collect==ON)
     {
        rt_pin_write(Collect_Fan,ON);
-       rt_pin_write(Cold_Pin,ON);
     }
     return device_status.collect_fan_status;
 }
@@ -437,6 +434,14 @@ void ctr_develop(void)
             if(device_status.stay_time / 60 == device_status.cul_time) device_status.develop_flag = 0;
             LOG_I("developed...................................%d分钟\n",device_status.stay_time);
         }
+        if(device_status.box_temp>50)
+        {
+            ctr_Cool_Fan(ON);
+        }
+        else if (device_status.box_temp<45)
+        {
+            ctr_Cool_Fan(OFF);
+        }
         rt_thread_delay(1000);
     }
     ctr_Cold(OFF);
@@ -1232,6 +1237,7 @@ void HardWare_Init(uint8_t boot)
     ctr_cangmen_down(OFF);
 
     //关闭镇流器
+    if(device_status.autotakepic==0)
     ctr_lamp(OFF,1);
 
     //关闭震动电机

+ 1 - 0
Application_CBD/applications/control.h

@@ -43,6 +43,7 @@ typedef struct  _packed
     uint8_t cul_time;             //培养时间
     uint8_t stay_time;            //已培养时间
     uint8_t pre_temp;             //培养仓温度
+    uint8_t box_temp;             //箱体温度
     uint8_t auto_test_sw;         //一键测试   0-关   1-开
     uint8_t cold_status;          //制冷状态   0-关   1-开
     uint8_t cold_sw;              //制冷开关   0-关   1-开

+ 4 - 4
Application_CBD/applications/dtu_uart2.c

@@ -214,7 +214,7 @@ static void dtu_thread_entry_send(void *parameter)
                     if(Read_Real_Voltage()/100<2&&device_status.power_status==1)
                     {
                         //确定网络状态
-                        if(device_status.net==0)
+                        if(atoi(device_status.net)==0)
                         {
                             DTU_Write("%s",makeJson_Warn("power down","power"));
                             device_status.power_status = 0;
@@ -378,7 +378,7 @@ char * makeJson_Rtutakephoto()
     tpubstring = cJSON_CreateObject();
     if(NULL==tpubstring)
     {
-        rt_kprintf("cJSON tpubstring NULL!!!\n");
+        LOG_E("cJSON tpubstring NULL!!!\n");
         return NULL;
     }
     cJSON_AddItemToObject(tJsonRoot, "ext", tpubstring);
@@ -431,7 +431,7 @@ char * makeJson()
     //如果设备工作并且电流小于500,并且不是上电启动灯管异常
     if(atoi(device_status.power)<400&&device_status.work_status==1&&makejson_sta!=0)
     {
-        rt_kprintf("power is:%d\n",atoi(device_status.power));
+        LOG_I("Current is:%d",atoi(device_status.power));
         if(atoi(device_status.power)>10)        //过滤电流检测芯片损坏导致电流直为0 的异常
         device_status.lamp_status = 1;
     }
@@ -608,7 +608,7 @@ char * makeJson()
         rt_sprintf(utos, "%d",device_status.run_sta);
         cJSON_AddStringToObject(pSubJson,"run_sta",utos);
         //箱体温度-box_tem
-        rt_sprintf(utos, "%d.%d",Get_Temprate()/100,Get_Temprate()%100);
+        rt_sprintf(utos, "%d",device_status.box_temp);
         cJSON_AddStringToObject(pSubJson,"box_tem",utos);
         //培养时间-cul_time
         rt_sprintf(utos, "%d",device_status.cul_time);

+ 31 - 15
Application_CBD/applications/hmi.c

@@ -307,8 +307,8 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
             //更新工作状态
             HMI_WRITE("workSta.work_sta.val=%d",device_status.work_status);
             //箱内温度-外壳
-            HMI_WRITE("workSta.box_tmp.txt=\"%d.%d\"",Get_Temprate()/100,Get_Temprate()%100);
-            HMI_WRITE("temHum.box_tmp.txt=\"%d.%d\"",Get_Temprate()/100,Get_Temprate()%100);
+            HMI_WRITE("workSta.box_tmp.txt=\"%d\"",device_status.box_temp);
+            HMI_WRITE("temHum.box_tmp.txt=\"%d\"",device_status.box_temp);
             //制冷开关
             HMI_WRITE("workSta.cold_sw.val=%d",device_status.cold_sw);
             HMI_WRITE("sysSet.cold_sw.val=%d",device_status.cold_sw);
@@ -577,7 +577,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         if(device_status.dtype==7)
         {
             ctr_lamp(ON, 1);
-            ctr_Motor_Driver(1, 0,500000,300);
+            ctr_Motor_Driver(1, 0,1000000,300);
             LOG_I("开始步进上行!");
         }
         else
@@ -608,7 +608,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         if(device_status.dtype==7)
         {
             ctr_lamp(ON, 1);
-            ctr_Motor_Driver(1, 1,500000,300);
+            ctr_Motor_Driver(1, 1,1000000,300);
             rt_kprintf("开始步进下行!\n");
         }
         else
@@ -1062,7 +1062,8 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
             device_status.version_type = 41;
             sprintf(device_status.driver, "%s",VERSION_HK);
             ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
-            ef_set_env_blob("dtype",&device_status.dtype,sizeof(device_status.dtype));        //版本类型
+            ef_set_env_blob("dtype",&device_status.dtype,sizeof(device_status.dtype));        //版本类型+
+            DTU_Write("SwversionV41");
             MA_save();
         }
         else {
@@ -1078,6 +1079,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
             sprintf(device_status.driver, "%s",VERSION_HK_2000W);
             ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
             ef_set_env_blob("dtype",&device_status.dtype,sizeof(device_status.dtype));        //版本类型
+            DTU_Write("SwversionV4");
             MA_save();
         }
         else {
@@ -1126,7 +1128,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
             ef_set_env_blob("dtype",&device_status.dtype,sizeof(device_status.dtype));        //设备类型
             ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
             //给DTU发送设备类型标记(自适应)
-            DTU_Write("dtye=7");
+            DTU_Write("SwversionV7");
             MA_save();
         }
     }
@@ -1344,12 +1346,13 @@ static void Ctr_Mortor_entry(void* parameter)
         if(device_status.autotakepic==1)
         {
             DTU_Write("autotakephoto");
+            HMI_WRITE("sysTest.auto_flag.txt=\"Autotest\"");
             //打开步进电机驱动器电源
             ctr_lamp(ON, 1);
             //打开补光灯
             ctr_led(ON);
             //电机向下运动
-            ctr_Motor_Driver(1, 1, 500000,300);
+            ctr_Motor_Driver(1, 1, 1000000,300);
             rt_thread_delay(1000);
             LOG_I("电机到达下方!!!");
             Hk_Take_io();
@@ -1357,30 +1360,36 @@ static void Ctr_Mortor_entry(void* parameter)
             LOG_I("电机开始向上!!!");
             rt_pin_write(Motor_EN, 1);
             rt_pin_write(Motor_DIR, 0);
-            beep_set(500000, 500000/5);      //2kzh - 50%
+            beep_set(1000000, 200000);      //2kzh - 50%
             while(rt_pin_read(LIMIT_UP)==1)
             {
                 HMI_WRITE("sysTest.result.txt=\"对焦拍照触发次数:%d\"",photo_setup);
-                rt_pin_write(Motor_EN, 0); //驱动器失能
-                Hk_Take_io();
-                rt_pin_write(Motor_EN, 1); //驱动器使能
-                if(photo_setup>300)
+                HMI_WRITE("sysTest.auto_flag.txt=\"AutoTeststart\"");
+                rt_pin_write(Motor_EN, 0);
+                beep_set(0, 0);//驱动器失能
+                Hk_Take_io();              //触发拍照
+                rt_thread_mdelay(200);   //10ms
+                rt_pin_write(Motor_EN, 1);
+                beep_set(1000000, 200000); //驱动器使能
+                rt_thread_mdelay(100);   //10ms
+                beep_set(0, 0); //驱动器失能
+                rt_pin_write(Motor_EN, 0);
+                if(photo_setup>300)         //限制最大拍照数量
                 {
                     ctr_led(OFF);
                     device_status.autotakepic=0;
                     rt_pin_write(Motor_EN, 0); //驱动器失能
-                    beep_set(500000, 0);      //2kzh - 50%
+                    beep_set(1000000, 0);      //2kzh - 50%
                     HMI_WRITE("sysTest.switchAutopic.val=%d",0);
                     break;
                 }
                 photo_setup++;
-                rt_thread_mdelay(10);
                 LOG_I("对焦拍照:%d",photo_setup);
             }
             DTU_Write("takephotodone");
             ctr_led(OFF);
             rt_pin_write(Motor_EN, 0); //驱动器失能
-            beep_set(500000, 0);      //2kzh - 50%
+            beep_set(1000000, 0);      //2kzh - 50%
             HMI_WRITE("sysTest.switchAutopic.val=%d",0);
             char w_temp[20];
             rt_sprintf(w_temp,"%s%d","autoTakePhoto success!!!",photo_setup);
@@ -1389,6 +1398,7 @@ static void Ctr_Mortor_entry(void* parameter)
             rt_free(autotake_warn);
             device_status.autotakepic=0;
             photo_setup = 0;
+            HMI_WRITE("sysTest.auto_flag.txt=\"\"");
             HMI_WRITE("sysTest.switchAutopic.val=%d",0);
             //关闭步进电机驱动器电源
             ctr_lamp(OFF, 0);
@@ -1403,6 +1413,7 @@ static void Ctr_Mortor_entry(void* parameter)
         //一键测试
         if(device_status.auto_test_sw==1)
         {
+            HMI_WRITE("sysTest.auto_flag.txt=\"Autotest\"");
             //转盘复位
             LOG_I("转盘复位!!!");
             HMI_WRITE("sysTest.result.txt=\"一键测试:转盘复位!\"");
@@ -1486,6 +1497,7 @@ static void Ctr_Mortor_entry(void* parameter)
             ctr_led(ON);
             device_status.autotakepic=1;
             device_status.auto_test_sw=0;
+            HMI_WRITE("sysTest.auto_flag.txt=\"\"");
         }
         rt_thread_delay(100);
     }
@@ -1763,6 +1775,8 @@ void Check_ParamConfig(void)
         rt_sprintf(device_status.sim,"1");
         ctr_router(ON);
         Hmi_Fresh();
+        //重启后解除屏幕测试界面的按钮锁定
+
         if(device_status.dtype!=7)
         {
             Control_clear();
@@ -1778,6 +1792,8 @@ void Check_ParamConfig(void)
         //等待联网,
         while(atoi(device_status.net)==1)
         {
+            if(device_status.dtype==7)
+            HMI_WRITE("sysTest.auto_flag.txt=\"0\"");
             char *readinfo =  makeJson_ReadInfo();
             DTU_Write("%s",readinfo);
             rt_free(readinfo);

+ 65 - 31
Application_CBD/applications/sht30_collect.c

@@ -157,13 +157,11 @@ static void Power_ReadCheck(void *parameter)
         if (Read_Real_Voltage()/100<12) {
                     //关闭外设
                     ctr_photo(OFF); //关闭相机供电
-                    ctr_lamp(OFF,1);//关闭镇流器
-                    ctr_Heat(OFF);  //关闭加热
                     ctr_led(OFF);   //关闭补光灯
-                    ctr_lamp(OFF,2);
-                    ctr_lamp(OFF,3);
-                    ctr_cangmen_down(OFF);  //关闭下仓门输出
-                    ctr_cangmen_up(OFF);    //关闭上仓门输出
+                    ctr_Heat(OFF);  //关闭加热
+                    ctr_Cold(OFF);  //关闭制冷
+                    ctr_cangmen_down(OFF);  //关闭下仓门输出(转盘)
+                    ctr_cangmen_up(OFF);    //关闭上仓门输出(散热)
                 }
         if(Read_Real_Voltage()/100<21)
         {
@@ -180,41 +178,77 @@ static void Power_ReadCheck(void *parameter)
             ctr_led(ON);
         #endif
         }
-        RV = 10000 * (4096 - Read_Ntc_Voltage()) / Read_Ntc_Voltage();
-        if(TempCalculate(RV, 3950, 10000)-TempCalculate(RV, 3950, 10000)>10)
+        //
+        if(device_status.dtype==7)
         {
-            LOG_E("temp value err!!!!");
+            //箱体温度
+            RV = 10000 * (4096 - Read_Rain_Voltage()) / Read_Rain_Voltage();
+            if(TempCalculate(RV, 3950, 10000)-TempCalculate(RV, 3950, 10000)>10)
+            {
+                LOG_E("temp value err!!!!");
+            }
+            else
+            {
+                device_status.box_temp = TempCalculate(RV, 3950, 10000);
+                if(device_status.box_temp>160)
+                {
+                    device_status.box_temp = 25;
+                }
+            }
+            //培养仓温度
+            RV = 10000 * (4096 - Read_Light_Voltage()) / Read_Light_Voltage();
+            if(TempCalculate(RV, 3950, 10000)-TempCalculate(RV, 3950, 10000)>10)
+            {
+                LOG_E("temp value err!!!!");
+            }
+            else
+            {
+                device_status.pre_temp = TempCalculate(RV, 3950, 10000);
+                if(device_status.pre_temp>160)
+                {
+                    device_status.pre_temp = 25;
+                }
+            }
         }
         else {
-            device_status.heattem = TempCalculate(RV, 3950, 10000);
-            if(device_status.heattem>160)
+            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 {
+                device_status.heattem = TempCalculate(RV, 3950, 10000);
+                if(device_status.heattem>160)
+                {
+                    device_status.heattem = 25;
+                }
+            }
+            //雨控
+            if(Read_Rain_Voltage()>100)
             {
-                device_status.heattem = 25;
+                device_status.rain_status = 1;
+                ctr_lamp(OFF,1);
+                ctr_lamp(OFF,2);
+                ctr_lamp(OFF,3);
+                rain_cnt = 0;
+            }
+            else {
+                rain_cnt++;
+                //雨控消抖,1分钟
+                LOG_D("rain_cnt:%d-value:%d",rain_cnt,Read_Rain_Voltage());
+                if(rain_cnt==60&&Read_Rain_Voltage()<100)
+                {
+                    rain_cnt = 0;
+                    device_status.rain_status = 0;
+                }
             }
         }
+
         #if ROBOT_EN == 0
         rt_sprintf(device_status.voltage,"%d.%02d",filter_voltage()/100,filter_voltage()%100);
         //LOG_D("voltage is:%sV",device_status.voltage);
         sprintf(device_status.fuse_voltage, "%d.%02d",Read_Fuse_Voltage()/100,Read_Fuse_Voltage()%100);
-        if(Read_Rain_Voltage()>100)
-        {
-            device_status.rain_status = 1;
-            ctr_lamp(OFF,1);
-            ctr_lamp(OFF,2);
-            ctr_lamp(OFF,3);
-            rain_cnt = 0;
-        }
-        else {
-            rain_cnt++;
-            //雨控消抖,1分钟
-            LOG_D("rain_cnt:%d-value:%d",rain_cnt,Read_Rain_Voltage());
-            if(rain_cnt==60&&Read_Rain_Voltage()<100)
-            {
-                rain_cnt = 0;
-                device_status.rain_status = 0;
-            }
-        }
-       #endif
+        #endif
         rt_thread_mdelay(10);
     }
 }