yf_zjb 5 лет назад
Родитель
Сommit
16db0b412c

+ 133 - 77
Application_CBD/applications/control.c

@@ -33,6 +33,32 @@ rt_thread_t tid_workloop = RT_NULL;
 rt_thread_t tid_wkstc = RT_NULL;
 
 /*************************吸虫塔*********************************/
+//吸虫电机
+uint8_t ctr_Motor_xichong(uint8_t status_ws)
+{
+    rt_pin_mode(MOTOR1_CTR_PIN, PIN_MODE_OUTPUT);
+    if(status_ws==ON)
+    {
+        rt_pin_write(MOTOR1_CTR_PIN,ON);
+    }
+    else {
+        rt_pin_write(MOTOR1_CTR_PIN, OFF);
+    }
+    return 0;
+}
+//吸附电机
+uint8_t ctr_Motor_xifu(uint8_t status_ws)
+{
+    rt_pin_mode(MOTOR2_CTR_PIN, PIN_MODE_OUTPUT);
+    if(status_ws==ON)
+    {
+        rt_pin_write(MOTOR2_CTR_PIN,ON);
+    }
+    else {
+        rt_pin_write(MOTOR2_CTR_PIN, OFF);
+    }
+    return 0;
+}
 //清扫-卷带电机
 void ctr_JD_Clear()
 {
@@ -81,22 +107,30 @@ void ctr_JD_Clear()
 //工作任务流程
 void WorkTask_XCT(void)
 {
-    uint32_t photo_fre = 0;
-    photo_fre = device_status.dattim * 60;
-    //ctr_Motor_xichong(ON);
-    //ctr_Motor_xifu(ON);
-    while(photo_fre!=0)
+    if(device_status.work_status==1)
     {
-        photo_fre --;
-        rt_thread_delay(1000);
-        rt_kprintf("收集中,等待开始拍照:%d\n",photo_fre);
+        ctr_Motor_xichong(ON);
+        ctr_Motor_xifu(ON);
+        uint32_t photo_fre = 0;
+        photo_fre = device_status.dattim * 60;
+        while(photo_fre!=0)
+        {
+            photo_fre --;
+            rt_thread_delay(1000);
+            rt_kprintf("收集中,等待开始拍照:%d\n",photo_fre);
+        }
+        //卷带
+        ctr_JD_Clear();
+        //拍照
+        HK_TakePhoto();
+        //卷带
+        ctr_JD_Clear();
+        //震动
+        Motor_shake(ON, device_status.shake_sec);
+    }
+    else {
+        rt_kprintf("不在工作时间,未工作!!!\n");
     }
-    //卷带
-    ctr_JD_Clear();
-    //震动
-    Motor_shake(ON, device_status.shake_sec);
-    //拍照
-    HK_TakePhoto();
 }
 /**********************************************************************/
 /*光控*/
@@ -647,7 +681,6 @@ void HardWare_Init(uint8_t boot)
         HMI_WRITE("hardcheck.checktip.txt=\"12V供电已关闭!!!\"");
         rt_thread_delay(1000);
     }
-
 }
 //拍照
 void HK_TakePhoto(void)
@@ -656,7 +689,7 @@ void HK_TakePhoto(void)
     ctr_led(ON);
     DTU_Write("takephoto.mp3");
     //延时
-    rt_thread_delay(1000*10);
+    rt_thread_delay(1000*15);
     rt_kprintf("\n测试拍照!\n");
     char *takephotojson = makeJson_takephoto();
     DTU_Write("%s",takephotojson);
@@ -763,7 +796,7 @@ void ResetInit(void)
 //出厂前自检 0-开机自检  1-屏幕或指令下发手动自检
 void HardWare_Check(uint8_t boot)
 {
-    if(boot==0)
+    if(boot==0&&device_status.version_type!=6)
     {
         //停止所有动作                                      -完成
         HardWare_Init(boot);
@@ -934,6 +967,7 @@ void WorkTask(void)
 {
     ctr_router(ON); //打开路由器供电
     static int clt_time = 0; //收集时间差秒数
+    static uint16_t controltime = 6;
     rt_kprintf("工作状态:%d\n",device_status.work_status);
     rt_kprintf("开关机状态:%d\n",device_status.ds);
     while(device_status.work_status==1&&device_status.temp_status==0&&device_status.bat_status==0&&device_status.rain_status==0&&device_status.ds==1)
@@ -943,88 +977,110 @@ void WorkTask(void)
         //1.打开灯管
         ctr_lamp(ON);
         rt_kprintf("打开灯管!!!\n");
-        rt_thread_delay(5000);  //待灯管启动再往下执行,否则会触发电机过流
-        //2.打开上仓门
-        rt_kprintf("打开上仓门!!!\n");
-        device_status.ctr_up_motor = 1;
-        //3.收集
-        clt_time = device_status.clt_time * 60;
-        while(clt_time!=1)
+        if(device_status.version_type!=5)
         {
-            clt_time --;
-            rt_thread_delay(1000);
-            rt_kprintf("正在收集.....剩余时间:%d分-%d秒\n",device_status.clt_time,clt_time);
-            //如果触发异常
+            rt_thread_delay(5000);  //待灯管启动再往下执行,否则会触发电机过流
+            //2.打开上仓门
+            rt_kprintf("打开上仓门!!!\n");
+            device_status.ctr_up_motor = 1;
+            //3.收集
+            clt_time = device_status.clt_time * 60;
+            while(clt_time!=1)
+            {
+                clt_time --;
+                rt_thread_delay(1000);
+                rt_kprintf("正在收集.....剩余时间:%d分-%d秒\n",device_status.clt_time,clt_time);
+                //如果触发异常
+                if(device_status.bat_status == 1 || device_status.temp_status == 1|| device_status.rain_status==1)
+                {
+                    ctr_lamp(OFF);
+                    rt_kprintf("异常退出!!!\n");
+                    break;
+                }
+            }
+            clt_time = 1;
             if(device_status.bat_status == 1 || device_status.temp_status == 1|| device_status.rain_status==1)
             {
                 ctr_lamp(OFF);
                 rt_kprintf("异常退出!!!\n");
                 break;
             }
-        }
-        clt_time = 1;
-        if(device_status.bat_status == 1 || device_status.temp_status == 1|| device_status.rain_status==1)
-        {
-            ctr_lamp(OFF);
-            rt_kprintf("异常退出!!!\n");
-            break;
-        }
-        //4.关闭上仓门
-        device_status.ctr_up_motor = 2;
-        rt_kprintf("关闭上仓门!!!\n");
+            //4.关闭上仓门
+            device_status.ctr_up_motor = 2;
+            rt_kprintf("关闭上仓门!!!\n");
 //        while(device_status.ctr_up_motor!=0)
 //        {
 //            rt_thread_delay(100);
 //            rt_kprintf("等待上仓门关闭!!!\n");
 //        }
-        //5.加热
-        rt_kprintf("加热!!!\n");
-        calorstat(device_status.heattime*60);
-        //6.打开下仓门
-        if(device_status.rain_status==0)
-        {
-            device_status.ctr_down_motor =1;
-        }
-        //待下仓门完全打开
-        while(device_status.ctr_down_motor!=0)
-        {
-            rt_thread_delay(100);
-            rt_kprintf("等待下仓门打开!!!\n");
+            //5.加热
+            rt_kprintf("加热!!!\n");
+            calorstat(device_status.heattime*60);
+            //6.打开下仓门
+            if(device_status.rain_status==0)
+            {
+                device_status.ctr_down_motor =1;
+            }
+            //待下仓门完全打开
+            while(device_status.ctr_down_motor!=0)
+            {
+                rt_thread_delay(100);
+                rt_kprintf("等待下仓门打开!!!\n");
+            }
+            rt_thread_delay(3000);
+            //关闭下仓门
+            device_status.ctr_down_motor = 2;
+            while(device_status.ctr_down_motor!=0)
+            {
+                rt_thread_delay(100);
+                rt_kprintf("等待下仓门关闭!!!\n");
+            }
+            if(device_status.version_type==4)
+            {
+                //震动
+                ctr_shake(ON, 1);
+                //补光&&拍照
+                rt_kprintf("拍照!!!\n");
+                HK_TakePhoto();
+                //清扫
+                if(ctr_clear(1200)==0)
+                    ctr_TG_Clear(350);
+                //清扫失效则使用震动
+                //ctr_shake(ON, 100);
+            }
         }
-        rt_thread_delay(3000);
-        //关闭下仓门
-        device_status.ctr_down_motor = 2;
-        while(device_status.ctr_down_motor!=0)
-        {
-            rt_thread_delay(100);
-            rt_kprintf("等待下仓门关闭!!!\n");
+        else {
+                    //打开补光
+                    ctr_led(ON);
+                    rt_kprintf("打开补光!!!\n");
+                    rt_pin_mode(CLEAR_L_LIMIT,PIN_MODE_INPUT);
+                    //2.翻转清虫
+                    if (rt_pin_read(CLEAR_L_LIMIT)==0) //判断是否有触发信号
+                    {
+                      while(controltime!=0)
+                      {
+                       controltime--;
+                       rt_thread_delay(1000);
+                       rt_kprintf("延时中:%d\n",controltime);
+                      }
+                      controltime = 6;
+                      turnzp();  //翻转
+                      rt_kprintf("翻转清虫!!!\n");
+                    }
         }
-        if(device_status.version_type==4)
+   }
+        if(device_status.bat_status == 1 || device_status.temp_status == 1|| device_status.rain_status==1||device_status.ds==0)
         {
-            //震动
-            ctr_shake(ON, 1);
-            //补光&&拍照
-            rt_kprintf("拍照!!!\n");
-            HK_TakePhoto();
-            //清扫
-            if(ctr_clear(1200)==0)
-            ctr_TG_Clear(350);
-            //清扫失效则使用震动
-            //ctr_shake(ON, 100);
+            rt_kprintf("-------------------not work--------------------\n");
+            device_status.work_status = 0;
         }
-    }
-    if(device_status.bat_status == 1 || device_status.temp_status == 1|| device_status.rain_status==1||device_status.ds==0)
-    {
-        rt_kprintf("-------------------not work--------------------\n");
-        device_status.work_status = 0;
-    }
         //工作结束
         if(device_status.work_done==0&&device_status.work_status==0)
         {
             DTU_Write("workdone");
             ResetInit();
         }
-    rt_kprintf("***not work-device status:%d\n",device_status.ds);
+        rt_kprintf("***not work-device status:%d\n",device_status.ds);
 }
 /* 入口函数-工作状态检测 */
 static void Work_status_thread_entry(void *parameter)

+ 8 - 6
Application_CBD/applications/control.h

@@ -18,9 +18,9 @@
 #define VERSION_HK_2000W    "1.27.4(2000W)"         //4.0水稻
 #define VERSION_ZP          "1.27.1(ZP)"            //1.0转盘
 #define VERSION_GK          "1.27.1(GK)"            //1.0高空
-#define VERSION_XCT         "1.27.6(HK)"            //吸虫塔-海康
-#define CompileTime         "20210924"
-
+#define VERSION_XCT         "1.30.6(HK)"            //吸虫塔-海康
+#define VERSION_V5          "1.27.5(HK)"
+#define CompileTime         "20210930"              //编译时间,每次更新代码修改
 /*********************************************************************/
 typedef struct{
     uint8_t iSave;          //存储标志位
@@ -56,9 +56,9 @@ typedef struct{
     uint8_t stopBar;        //时控结束时间
     uint8_t tph;            //高温保护
     int8_t tpl;             //低温保护
-    uint8_t shake_sec;      //震动时间
+    uint16_t shake_sec;      //震动时间
     uint8_t timeSwitch;     //模式0光控,1时控
-    uint8_t dattim;         //数据上传间隔
+    uint16_t dattim;         //数据上传间隔
     uint8_t heattem;        //加热仓温度(实时)
     uint8_t hmi_fresh;      //是否启动屏幕
     uint8_t update_flag;    //是否启动升级
@@ -162,7 +162,9 @@ typedef struct{
 #define MOTOR_CL_PIN GET_PIN(C,8)
 
 #define MOTOR_C_LIMIT GET_PIN(C,13)       //卷带限位
-
+void ctr_JD_Clear(void);
+uint8_t ctr_Motor_xichong(uint8_t status_ws);
+uint8_t ctr_Motor_xifu(uint8_t status_ws);
 /***************************************************************/
 /***************************************************************/
 uint8_t ctr_Heat(uint8_t status_heat);          //加热

+ 23 - 14
Application_CBD/applications/dtu_uart2.c

@@ -403,6 +403,9 @@ char * makeJson()
     else if (device_status.version_type==11) {
         rt_sprintf(device_status.driver,"%s-%s",VERSION_GK,device_status.driver_4g);
     }
+    else if (device_status.version_type==5) {
+        rt_sprintf(device_status.driver,"%s-%s",VERSION_V5,device_status.driver_4g);
+    }
     else if (device_status.version_type==6) {
         rt_sprintf(device_status.driver,"%s-%s",VERSION_XCT,device_status.driver_4g);
     }
@@ -440,18 +443,9 @@ char * makeJson()
         //光控定时
         rt_sprintf(utos, "%d",device_status.sunBar);
         cJSON_AddStringToObject(pSubJson,"tt",utos);
-        //工作状态
-        rt_sprintf(utos, "%d",device_status.work_status);
-        cJSON_AddStringToObject(pSubJson,"ws",utos);
         //定时模式
         rt_sprintf(utos, "%d",device_status.timeSwitch);
         cJSON_AddStringToObject(pSubJson,"ts",utos);
-        //开始时间
-        rt_sprintf(utos, "%d",device_status.startBar);
-        cJSON_AddStringToObject(pSubJson,"st",utos);
-        //结束时间
-        rt_sprintf(utos, "%d",device_status.stopBar);
-        cJSON_AddStringToObject(pSubJson,"et",utos);
         //温控
         rt_sprintf(utos, "%d",device_status.temp_status);
         cJSON_AddStringToObject(pSubJson,"tps",utos);
@@ -527,10 +521,17 @@ char * makeJson()
         //数据上传间隔
         rt_sprintf(utos, "%d",device_status.dattim);
         cJSON_AddStringToObject(pSubJson,"dat_f",utos);
-
+        //开始时间
+        rt_sprintf(utos, "%d",device_status.startBar);
+        cJSON_AddStringToObject(pSubJson,"st",utos);
+        //结束时间
+        rt_sprintf(utos, "%d",device_status.stopBar);
+        cJSON_AddStringToObject(pSubJson,"et",utos);
         //信号强度
         cJSON_AddStringToObject(pSubJson,"csq",device_status.csq);
-
+        //工作状态
+        rt_sprintf(utos, "%d",device_status.work_status);
+        cJSON_AddStringToObject(pSubJson,"ws",utos);
 
     char * p = cJSON_PrintUnformatted(pJsonRoot);
     if(NULL == p)
@@ -780,8 +781,16 @@ void parseDtu(char *json_string)
                       rt_sprintf(device_status.gps,"%s",gps->valuestring);
                       if(atoi(gps->valuestring)!=0)
                       {
-                          sprintf(device_status.lat,"%s",lat->valuestring);
-                          sprintf(device_status.lng,"%s",lng->valuestring);
+                          if(atoi(lat->valuestring)==-1||atoi(lat->valuestring)==1)
+                          {
+                              sprintf(device_status.lat,"%s","34.8088073");
+                              sprintf(device_status.lng,"%s","113.6624298");
+                          }
+                          else {
+                              sprintf(device_status.lat,"%s",lat->valuestring);
+                              sprintf(device_status.lng,"%s",lng->valuestring);
+                        }
+
                       }else if(atoi(gps->valuestring)==0)
                       {
                           sprintf(device_status.lat,"%s","34.8088073");
@@ -895,7 +904,7 @@ void parseDtu(char *json_string)
                           }
                           if(shake_sec!=NULL)
                           {
-                              if(atoi(shake_sec->valuestring)>=1&&atoi(shake_sec->valuestring)<=10)
+                              if(atoi(shake_sec->valuestring)>=1&&atoi(shake_sec->valuestring)<=1000)
                               {
                                   device_status.shake_sec = atoi(shake_sec->valuestring);
                                   ef_set_env_blob("shake_sec", &device_status.shake_sec, sizeof(device_status.shake_sec));      //震动时间

+ 27 - 4
Application_CBD/applications/hmi.c

@@ -271,7 +271,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         //更新电压
         HMI_WRITE("menu.vbat.txt=\"%sV\"",device_status.voltage);
         //更新震动时间
-        HMI_WRITE("menu.shake_sec.txt=\"%s\"",device_status.shake_sec);
+        HMI_WRITE("menu.shake_sec.val=%d",device_status.shake_sec);
         //更新电流
          HMI_WRITE("menu.power.txt=\"%smA\"",device_status.power);
         //更新温湿度数据
@@ -311,11 +311,21 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         else if (device_status.version_type==1) {
             turnzp();
         }
+        else if (device_status.version_type==6) {
+            ctr_JD_Clear();
+        }
     }
     //震动
     else if (strstr(rx_buffer,"putTest.switchShake=1")!=NULL) {
         rt_kprintf("\n震动!\n");
-        ctr_shake(ON,device_status.shake_sec);
+        if(device_status.version_type==6)
+        {
+            Motor_shake(ON, device_status.shake_sec);
+        }
+        else{
+            ctr_shake(ON,device_status.shake_sec);
+        }
+
     }
     //打开补光
     else if (strstr(rx_buffer,"putTest.switchFill=1")!=NULL) {
@@ -529,11 +539,11 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     }
     else if (strstr(rx_buffer,"shakesec=")!=NULL)
     {
-        static char shakesec_str[3];
+        static char shakesec_str[4];
         rt_kprintf("震动时间设置!\n");
         var = strstr(rx_buffer,"=");
         var ++;
-        strncpy(shakesec_str,var,2);
+        strncpy(shakesec_str,var,3);
         if(atoi(shakesec_str)>=1&&atoi(shakesec_str)<=1000)
         {
             device_status.shake_sec =atoi(shakesec_str); //
@@ -623,6 +633,16 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
 
         }
     }
+    //5.0测报灯
+    else if (strstr(rx_buffer,"SwversionV5")!=NULL) {
+        if(device_status.version_type!=5)
+        {
+            device_status.version_type = 5;
+            sprintf(device_status.driver, "%s",VERSION_V5);
+            ef_set_env_blob("version_type",&device_status.version_type,sizeof(device_status.version_type));        //版本类型
+            MA_save();
+        }
+    }
     //吸虫塔
     else if (strstr(rx_buffer,"SwversionV6")!=NULL) {
         if(device_status.version_type != 6)
@@ -992,6 +1012,9 @@ void Check_ParamConfig(void)
         else if (device_status.version_type==41) {
             rt_sprintf(device_status.driver, "%s",VERSION_HK);
         }
+        else if (device_status.version_type==5) {
+            rt_sprintf(device_status.driver, "%s",VERSION_V5);
+        }
         else if (device_status.version_type==6)
         {
             rt_sprintf(device_status.driver, "%s",VERSION_XCT);

+ 3 - 4
Application_CBD/applications/main.c

@@ -66,10 +66,9 @@ int main(void)
         //开机自检
         HardWare_Check(0);
         //工作状态置位线程
-        if(device_status.version_type!=6)   //吸虫塔
-        {
-            Workstatus_check();
-        }
+
+        Workstatus_check();
+
         /***************/
         //工作流程
         Work_Loop_Task();

+ 4 - 4
Application_CBD/applications/sht30_collect.c

@@ -104,16 +104,16 @@ static void sht30_collect_thread_entry(void *parameter)
             }
             else {
                 sht3x_softreset(sht3x_device);
-                hum_value = 30;
-                tem_value = 25;
+                rt_sprintf(device_status.humidity,"30.0");
+                rt_sprintf(device_status.tempture,"25.0");
             }
 //          rt_kprintf("sht30 humidity   : %d.%d  ", (int)sht3x_device->humidity, (int)(sht3x_device->humidity * 10) % 10);
 //          rt_kprintf("temperature: %d.%d\n", (int)sht3x_device->temperature, (int)(sht3x_device->temperature * 10) % 10);
         }
         else
         {
-            hum_value = 30;
-            tem_value = 25;
+            rt_sprintf(device_status.humidity,"30.0");
+            rt_sprintf(device_status.tempture,"25.0");
             rt_kprintf("read sht3x fail.\r\n");
             //重新初始化
             sht3x_deinit(sht3x_device);

+ 31 - 1
Application_CBD/readme.md

@@ -1,3 +1,33 @@
+#define VERSION_V5 "1.27.5(HK)"            //测报灯5.0-海康
+#define CompileTime "20210930"
+## 更新说明
+- 增加兼容5.0测报灯的代码
+#define VERSION_XCT "1.30.6(HK)"            //吸虫塔-海康
+#define CompileTime "20210929"
+- 上传温湿度字段为空调整
+- 增加工作状态字段
+#define VERSION_XCT "1.30.6(HK)"            //吸虫塔-海康
+#define CompileTime "20210928"
+- 增加时间段控制工作开关,默认全天工作
+- 上传下发字段增加开始结束时间
+#define VERSION_XCT "1.29.6(HK)"            //吸虫塔-海康
+#define CompileTime "20210927"
+- 拍照前增加震动
+- 增加吸附电机控制
+- 屏幕震动时间设置优化
+- 下发设置的震动时长最大限制改为1000
+-----------------------------------
+# 2021-09-24-版本:
+#define VERSION_HK  "1.28.41(HK)"           //4.0海康
+#define VERSION_HK_2000W  "1.28.4(2000W)"   //4.0水稻
+#define VERSION_ZP  "1.27.1(ZP)"            //1.0转盘
+#define VERSION_GK  "1.27.1(GK)"            //1.0高空
+#define VERSION_XCT "1.28.6(HK)"            //吸虫塔-海康
+#define CompileTime "20210926"
+- 修复吸虫塔开机初始化
+- 修复吸虫塔屏幕清扫
+- 海康相机的触发拍照补光时间改为15s
+-------------------------------------
 # 2021-09-24-版本:
 #define VERSION_HK  "1.28.41(HK)"           //4.0海康
 #define VERSION_HK_2000W  "1.28.4(2000W)"   //4.0水稻
@@ -5,7 +35,7 @@
 #define VERSION_GK  "1.27.1(GK)"            //1.0高空
 #define VERSION_XCT "1.27.6(HK)"            //吸虫塔-海康
 #define CompileTime "20210924"
-- 水稻清扫取消限位预计检测的上传
+- 水稻清扫取消限位检测预警的上传
 - 增加打开关闭上下仓门的异常检测,上报预警信息.(如果打开仓门1S后检测不到电流增大,则判定为异常)
 - 取消freemodbus线程
 --------------------------------------