yf_zjb %!s(int64=5) %!d(string=hai) anos
pai
achega
3d5057fca2

+ 9 - 7
Application_CBD/applications/control.c

@@ -64,9 +64,10 @@ uint8_t ctr_cangmen_up(uint8_t status_up)
    rt_pin_mode(Collect_fan_L, PIN_MODE_OUTPUT);
    rt_pin_mode(Collect_fan_L, PIN_MODE_OUTPUT);
    if(status_up==OFF)
    if(status_up==OFF)
    {
    {
-       rt_pin_write(Collect_fan_R,OFF);
-       rt_pin_write(Collect_fan_L,OFF);
+       rt_pin_write(Collect_fan_R,ON);
+       rt_pin_write(Collect_fan_L,ON);
        device_status.ctr_up_motor = 0;
        device_status.ctr_up_motor = 0;
+       rt_thread_delay(1000);
    }
    }
    if(status_up==OPEN)
    if(status_up==OPEN)
    {
    {
@@ -93,9 +94,10 @@ uint8_t ctr_cangmen_down(uint8_t status_down)
     rt_pin_mode(C_DOWN_L, PIN_MODE_OUTPUT);
     rt_pin_mode(C_DOWN_L, PIN_MODE_OUTPUT);
     if(status_down==OFF)
     if(status_down==OFF)
        {
        {
-           rt_pin_write(C_DOWN_R,OFF);
-           rt_pin_write(C_DOWN_L,OFF);
+           rt_pin_write(C_DOWN_R,ON);
+           rt_pin_write(C_DOWN_L,ON);
            device_status.ctr_down_motor = 0;
            device_status.ctr_down_motor = 0;
+           rt_thread_delay(1000);
        }
        }
        if(status_down==OPEN)
        if(status_down==OPEN)
        {
        {
@@ -652,7 +654,7 @@ void ResetInit(void)
     if(device_status.version_type==4)
     if(device_status.version_type==4)
     {
     {
         if(ctr_clear(650)==0)
         if(ctr_clear(650)==0)
-        ctr_TG_Clear(250);
+        ctr_TG_Clear(350);
     }
     }
     else if (device_status.version_type==1) {
     else if (device_status.version_type==1) {
         turnzp();
         turnzp();
@@ -889,7 +891,7 @@ void WorkTast(void)
             rt_thread_delay(100);
             rt_thread_delay(100);
             rt_kprintf("等待下仓门打开!!!\n");
             rt_kprintf("等待下仓门打开!!!\n");
         }
         }
-        rt_thread_delay(1000);
+        rt_thread_delay(3000);
         //关闭下仓门
         //关闭下仓门
         device_status.ctr_down_motor = 2;
         device_status.ctr_down_motor = 2;
         while(device_status.ctr_down_motor!=0)
         while(device_status.ctr_down_motor!=0)
@@ -906,7 +908,7 @@ void WorkTast(void)
             HK_TakePhoto();
             HK_TakePhoto();
             //清扫
             //清扫
             if(ctr_clear(1200)==0)
             if(ctr_clear(1200)==0)
-            ctr_TG_Clear(250);
+            ctr_TG_Clear(350);
             //清扫失效则使用震动
             //清扫失效则使用震动
             ctr_shake(ON, 100);
             ctr_shake(ON, 100);
         }
         }

+ 3 - 3
Application_CBD/applications/control.h

@@ -14,10 +14,10 @@
 
 
 #include <rtdevice.h>
 #include <rtdevice.h>
 
 
-#define VERSION_HK "1.23.41(HK)"         //版本
-#define VERSION_ZP "1.23.1(ZP)"         //版本
+#define VERSION_HK "1.24.41(HK)"         //版本
+#define VERSION_ZP "1.24.1(ZP)"         //版本
 
 
-#define CompileTime "20210701"
+#define CompileTime "20210716"
 
 
 
 
 /*******************************测试任务****************************************/
 /*******************************测试任务****************************************/

+ 5 - 1
Application_CBD/applications/hmi.c

@@ -339,20 +339,24 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     //打开上仓门
     //打开上仓门
     else if(strstr(rx_buffer,"putTest.switchUp=1")!=NULL){
     else if(strstr(rx_buffer,"putTest.switchUp=1")!=NULL){
         rt_kprintf("Open UP!\n");
         rt_kprintf("Open UP!\n");
+        ctr_cangmen_up(OFF);
         device_status.ctr_up_motor = 1;
         device_status.ctr_up_motor = 1;
     }
     }
     //关闭上仓门
     //关闭上仓门
     else if(strstr(rx_buffer,"putTest.switchUp=0")!=NULL){
     else if(strstr(rx_buffer,"putTest.switchUp=0")!=NULL){
         rt_kprintf("CLOSE UP!\n");
         rt_kprintf("CLOSE UP!\n");
+        ctr_cangmen_up(OFF);
         device_status.ctr_up_motor = 2;
         device_status.ctr_up_motor = 2;
     }
     }
     //打开下仓门
     //打开下仓门
     else if(strstr(rx_buffer,"putTest.switchDown=1")!=NULL){
     else if(strstr(rx_buffer,"putTest.switchDown=1")!=NULL){
+        ctr_cangmen_down(OFF);
         device_status.ctr_down_motor = 1;
         device_status.ctr_down_motor = 1;
         rt_kprintf("Open down!\n");
         rt_kprintf("Open down!\n");
     }
     }
     //关闭下仓门
     //关闭下仓门
     else if(strstr(rx_buffer,"putTest.switchDown=0")!=NULL){
     else if(strstr(rx_buffer,"putTest.switchDown=0")!=NULL){
+        ctr_cangmen_down(OFF);
         device_status.ctr_down_motor = 2;
         device_status.ctr_down_motor = 2;
         rt_kprintf("CLOSE down!\n");
         rt_kprintf("CLOSE down!\n");
     }
     }
@@ -665,7 +669,7 @@ static void Ctr_Mortor_entry(void* parameter)
         {
         {
             device_status.clear_status = 0;
             device_status.clear_status = 0;
             if(ctr_clear(650)==0)
             if(ctr_clear(650)==0)
-            ctr_TG_Clear(250);
+            ctr_TG_Clear(350);
         }
         }
         if(device_status.sun_test==1)
         if(device_status.sun_test==1)
         {
         {

+ 15 - 1
Application_CBD/readme.md

@@ -1,3 +1,17 @@
+# 2021-07-16-版本:
+	define VERSION_HK "1.24.41(HK)"         //版本
+	define VERSION_ZP "1.24.1(ZP)"         //版本
+	define CompileTime "20210716"
+- 停止上下仓门使用刹车功能.
+- 下仓门打开到关闭的间隔由1S改为3S.
+- 屏幕操作上下仓门时先执行关闭电机输出,电机停转时增加1S延时,目的是保护电机驱动防止频繁正反转损坏电机驱动。
+# 2021-07-13-版本:
+	define VERSION_HK "1.24.41(HK)"         //版本
+	define VERSION_ZP "1.24.1(ZP)"         //版本
+	define CompileTime "20210713"
+- 针对PCB改动的清扫修改,推杆清扫的时间增加10S:
+	ctr_TG_Clear(250);
+	ctr_TG_Clear(350);
 # 版本说明
 # 版本说明
 #define VERSION_HK "1.1.4-(HK)"         //版本
 #define VERSION_HK "1.1.4-(HK)"         //版本
 #define VERSION_ZP "1.1.1-(ZP)"         //版本
 #define VERSION_ZP "1.1.1-(ZP)"         //版本
@@ -203,4 +217,4 @@ if (!(EXPR))                                                                   \
 }
 }
 #define CompileTime "20210701"
 #define CompileTime "20210701"
 - 路由器增加24V供电的接口。
 - 路由器增加24V供电的接口。
-- 修复RTU接网线CSQ为0导致的屏幕联网状态显示不正确问题。
+- 修复RTU接网线CSQ为0导致的屏幕联网状态显示不正确问题。

+ 1 - 1
Application_GK_CBD/applications/control.h

@@ -17,7 +17,7 @@
 #define VERSION_ZP "1.14.1(ZP)"         //版本
 #define VERSION_ZP "1.14.1(ZP)"         //版本
 #define VERSION "1.0.3(GK)"
 #define VERSION "1.0.3(GK)"
 
 
-#define CompileTime "20210604"
+#define CompileTime "20210708"
 
 
 /*******************************测试任务****************************************/
 /*******************************测试任务****************************************/
 /*********************************************************************/
 /*********************************************************************/

+ 3 - 2
Application_GK_CBD/applications/hmi.c

@@ -886,6 +886,7 @@ void Check_ParamConfig(void)
             rt_sprintf(device_status.driver, "%s",VERSION_HK);
             rt_sprintf(device_status.driver, "%s",VERSION_HK);
         }
         }
         device_status.version_type=3;
         device_status.version_type=3;
+        device_status.ds=1;
         rt_sprintf(device_status.driver, "GK3.0");
         rt_sprintf(device_status.driver, "GK3.0");
         rt_kprintf("SOFTWARE VERSION:%s-imei:%s--iccid:%s\n",device_status.driver,device_status.imei,device_status.iccid);
         rt_kprintf("SOFTWARE VERSION:%s-imei:%s--iccid:%s\n",device_status.driver,device_status.imei,device_status.iccid);
         rt_kprintf("read flash paramconfis:%d-%s-%s\r\n",device_status.version_type,device_status.driver_bl,device_status.driver_compile);
         rt_kprintf("read flash paramconfis:%d-%s-%s\r\n",device_status.version_type,device_status.driver_bl,device_status.driver_compile);
@@ -967,7 +968,7 @@ void ResetParamDefault(void)
     device_status.tpl = 5;          //低温保护阈值
     device_status.tpl = 5;          //低温保护阈值
     device_status.timeSwitch = 0;   //定时模式
     device_status.timeSwitch = 0;   //定时模式
     device_status.heatvalue=110;//加热温度
     device_status.heatvalue=110;//加热温度
-    device_status.ds = 0;           //设备状态开机
+    device_status.ds = 1;           //设备状态开机
     device_status.thsp = 300;
     device_status.thsp = 300;
     device_status.passWord = 8888;
     device_status.passWord = 8888;
     ef_set_env_blob("ds", &device_status.ds, sizeof(device_status.ds));
     ef_set_env_blob("ds", &device_status.ds, sizeof(device_status.ds));
@@ -1000,7 +1001,7 @@ void ResetParamDefault_DC(void)
     device_status.tpl = 5;          //低温保护阈值
     device_status.tpl = 5;          //低温保护阈值
     device_status.timeSwitch = 0;   //定时模式
     device_status.timeSwitch = 0;   //定时模式
     device_status.heatvalue=110;
     device_status.heatvalue=110;
-    device_status.ds = 0;           //设备状态开机
+    device_status.ds = 1;           //设备状态开机
     device_status.thsp = 300;
     device_status.thsp = 300;
     device_status.passWord = 8888;
     device_status.passWord = 8888;
     device_status.timeSwitch = 0;
     device_status.timeSwitch = 0;