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

BIN
Application_CBD/.settings/.rtmenus


+ 3 - 3
Application_CBD/.settings/projcfg.ini

@@ -1,9 +1,9 @@
 #RT-Thread Studio Project Configuration
-#Thu Dec 23 13:43:28 CST 2021
+#Wed Feb 22 16:39:11 CST 2023
+output_project_path=D\:\\RT-ThreadStudio\\workspace\\Application_CBD
 mcu_name=STM32F103RETX
-output_project_path=D\:/RT-ThreadStudio/workspace
 hardware_adapter=ST-LINK
-selected_rtt_version=v4.0.2
 mcu_base_nano_proj=false
+selected_rtt_version=v4.0.2
 project_base_bsp=false
 cfg_version=v2.0

+ 7 - 4
Application_CBD/applications/beep.c

@@ -133,12 +133,15 @@ void Motor_shake(uint8_t status_shake,uint16_t shake_sec)
 {
     beep_init();
     rt_pwm_set(pwm_device, PB1_TIM3_CH, 200000, 100000);//channel,period,pulse
-    if(status_shake==ON&&device_status.shake_ws==1)
+    if(status_shake==ON)
     {
         rt_pwm_enable(pwm_device, PB1_TIM3_CH);
-        rt_thread_delay(shake_sec*50);
-        rt_pwm_disable(pwm_device, PB1_TIM3_CH);
-        HMI_WRITE("cangWei.switchShake.val=%d",0);
+        if(shake_sec!=0)
+        {
+            rt_thread_delay(shake_sec*1000);
+            rt_pwm_disable(pwm_device, PB1_TIM3_CH);
+            HMI_WRITE("cangWei.switchShake.val=%d",0);
+        }
     }
     else {
         rt_pwm_disable(pwm_device, PB1_TIM3_CH);

+ 234 - 94
Application_CBD/applications/control.c

@@ -64,38 +64,191 @@ uint8_t ctr_Fan_IN(uint8_t status_ws)
     return 0;
 }
 /****************************定制色诱*************************************/
-void ctr_Color_Key(uint8_t key_num)
+/**/
+uint8_t Read_Color_Key(rt_base_t key_pin)
 {
-    if(key_num==0)
+    rt_uint32_t sta_s = 0;
+    rt_pin_mode(key_pin, PIN_MODE_INPUT);
+    while(rt_pin_read(key_pin)==1)
     {
-        rt_pin_mode(LIMIT_CLOSE, PIN_MODE_INPUT);
-        while(rt_pin_read(LIMIT_CLOSE)==1)
+        sta_s++;
+        /*持续的*/
+        rt_thread_delay(50);
+    }
+    while(rt_pin_read(key_pin)==0)
+    {
+        rt_thread_delay(50);
+        if(sta_s>0) break;
+    }
+    LOG_W("检测到IO0翻转!!!");
+    return 1;
+
+}
+/*读限位开关状态*/
+uint8_t Read_Color_Limit(rt_base_t pin_limit)
+{
+    uint8_t l_sta = 0;
+    rt_pin_mode(pin_limit, PIN_MODE_INPUT);
+    l_sta = rt_pin_read(pin_limit);
+    rt_thread_delay(20);
+    l_sta = rt_pin_read(pin_limit);
+    return l_sta;
+}
+/*色诱板*/
+int ctr_Color_board(uint8_t forward,uint16_t time_board)
+{
+    if(forward==CLOSE)  //归位
+    {
+        if(device_status.cul_time>7) device_status.cul_time=7;
+        if(device_status.cul_time!=7)
         {
-            /*持续的*/
-            rt_thread_delay(50);
+            uint8_t ct = device_status.cul_time;
+            while(1)
+            {
+                Beep_Tip(100);
+                rt_thread_delay(100);
+                ct--;
+                if(ct==0) break;
+            }
+            //return device_status.cul_time;
         }
-        LOG_W("检测到IO0翻转为0!!!");
-        while(rt_pin_read(LIMIT_CLOSE)==0)
+        if(Read_Color_Limit(LIMIT_RESET)==0)
         {
-            rt_thread_delay(50);
+            LOG_W("已在初始位置!");
+            Beep_Tip(1000);
+            return 0;
+            //黄板已经在复位状态,直接返回0;
+        }
+        ctr_cangmen_up(CLOSE);
+        rt_thread_delay(10000);
+        ctr_cangmen_up(OFF);
+        if(device_status.cul_time==7&&Read_Color_Limit(LIMIT_BOARD)==0)
+        {
+            LOG_W("第七天!!!");
+            ctr_cangmen_down(CLOSE);
+            rt_thread_delay(500);
+        }
+        LOG_W("先打开运行到限位的右侧!");
+        while(Read_Color_Limit(LIMIT_BOARD)==0)
+        {
+            LOG_W("归位:到达限位中间");
+            ctr_cangmen_down(CLOSE);
+            if(Read_Color_Limit(LIMIT_RESET)==0)
+            {
+                ctr_cangmen_down(OFF);
+                break;
+            }
         }
-        LOG_W("检测到IO0翻转为1!!!");
+        //先打开运行到限位的右侧
+        while(Read_Color_Limit(LIMIT_BOARD)==1)
+        {
+            LOG_W("归位:运行!");
+            ctr_cangmen_down(CLOSE);
+            if(Read_Color_Limit(LIMIT_RESET)==0)
+            {
+                ctr_cangmen_down(OFF);
+                break;
+            }
+
+        }
+        while(Read_Color_Limit(LIMIT_BOARD)==0)    //到达限位中间 继续运行
+        {
+            LOG_W("归位:到达限位中间");
+            ctr_cangmen_down(CLOSE);
+            if(Read_Color_Limit(LIMIT_RESET)==0)
+            {
+                ctr_cangmen_down(OFF);
+                break;
+            }
+        }
+        if(Read_Color_Limit(LIMIT_RESET)==0) return 0;
+            LOG_W("到达限位左侧!");
+            //停止电机
+            ctr_cangmen_down(OFF);
+            rt_thread_delay(2000);
+            //将推杆电机归位
+            LOG_D("*推杆电机归位*");
+            /*推杆电机伸出*/
+            ctr_cangmen_up(OPEN);
+            rt_thread_delay(10000);
+            ctr_cangmen_up(OFF);
+        if(device_status.cul_time>1)
+        device_status.cul_time--;
+        ef_set_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time));     //采集时间
+        return 2;
     }
-    else {
-        rt_pin_mode(LIMIT_OPEN, PIN_MODE_INPUT);
-        while(rt_pin_read(LIMIT_OPEN)==1)
+    else if(forward==OPEN)
+    {
+        if(device_status.cul_time==7)
+        {
+            Beep_Tip(5000);
+            return 7;
+        }
+        LOG_W("打开推杆电机!");
+        if(Read_Color_Limit(LIMIT_BOARD)==0)
         {
-            /*持续的*/
+            LOG_D("*推杆电机归位*");
+            /*推杆电机归位*/
+            ctr_cangmen_up(CLOSE);
+            rt_thread_delay(10000);
+            ctr_cangmen_up(OFF);
+        }
+        while(Read_Color_Limit(LIMIT_BOARD)==0)
+        {
+            ctr_cangmen_down(forward);
             rt_thread_delay(50);
         }
-        LOG_W("检测到IO1翻转为0!!!");
-        while(rt_pin_read(LIMIT_OPEN)==0)
+        while(Read_Color_Limit(LIMIT_BOARD)==1)
         {
+            time_board--;
+            if(time_board==0) break;
+            ctr_cangmen_down(forward);
             rt_thread_delay(50);
         }
-        LOG_W("检测到IO1翻转为1!!!");
-    }
+        ctr_cangmen_down(OFF);
+        rt_thread_delay(1000);
 
+        ctr_cangmen_up(OPEN);
+        rt_thread_delay(10000);
+        ctr_cangmen_up(OFF);
+        if(device_status.cul_time<7)
+        device_status.cul_time++;
+        ef_set_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time));     //采集时间
+        return OPEN;
+    }
+    else if (forward==RESET) {
+        if(Read_Color_Limit(LIMIT_RESET)==0)
+        {
+            device_status.cul_time = 0;
+            //ef_set_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time));     //采集时间
+            LOG_W("已在初始位置!");
+            Beep_Tip(1000);
+            ctr_cangmen_up(CLOSE);
+            rt_thread_delay(10000);
+            ctr_cangmen_up(OFF);
+            return 0;
+            //黄板已经在复位状态,直接返回0;
+        }
+        //if(Read_Color_Limit(LIMIT_BOARD)==0)
+        {
+            LOG_D("*推杆电机归位*");
+            /*推杆电机归位*/
+            ctr_cangmen_up(CLOSE);
+            rt_thread_delay(10000);
+            ctr_cangmen_up(OFF);
+        }
+        while(Read_Color_Limit(LIMIT_RESET)==1)
+        {
+            time_board--;
+            if(time_board==0) break;
+            ctr_cangmen_down(CLOSE);
+            rt_thread_delay(20);
+        }
+        ctr_cangmen_down(OFF);
+    }
+    device_status.cul_time = 0;
+    ef_set_env_blob("cul_time",&device_status.cul_time,sizeof(device_status.cul_time));     //采集时间
+    return RESET;   //复位返回0
 }
 /**************************机器人********************************/
 void ctr_Motor_Robot(uint8_t status_ws)
@@ -221,65 +374,29 @@ void ctr_JD_Clear(uint8_t shake_sw)
 {
     rt_uint16_t turn_timeout = 0;
     rt_pin_mode(MOTOR_C_LIMIT,PIN_MODE_INPUT);
-
+    if(shake_sw==ON)
+    {
+        Motor_shake(ON, 0);
+    }
+    else {
+        Motor_shake(OFF, 0);
+    }
     while(rt_pin_read(MOTOR_C_LIMIT)==0)
-       {
-
-           rt_thread_delay(20);
-           while(rt_pin_read(MOTOR_C_LIMIT)==0)
-           {
-
-               Motor_Juandai(ON);
-               if(shake_sw==ON)
-               {
-                   Motor_shake(ON, 1);
-               }
-               else {
-                   rt_thread_delay(50);
-               }
-               turn_timeout++;
-               if(turn_timeout==1000) break;
-           }
-           break;
-       }
-       while(rt_pin_read(MOTOR_C_LIMIT)==1)
-       {
-           rt_thread_delay(20);
-           while(rt_pin_read(MOTOR_C_LIMIT)==1)
-           {
-               if(shake_sw==ON)
-               {
-                   Motor_shake(ON, 1);
-               }
-               else {
-                   rt_thread_delay(50);
-               }
-               Motor_Juandai(ON);
-               turn_timeout++;
-               if(turn_timeout==1000) break;
-           }
-           break;
-       }
-       while(rt_pin_read(MOTOR_C_LIMIT)==0)
-       {
-
-           if(shake_sw==ON)
-           {
-               Motor_shake(ON, 1);
-           }
-           else {
-               rt_thread_delay(20);
-           }
-           if(rt_pin_read(MOTOR_C_LIMIT)==0)
-           {
-               Motor_Juandai(OFF);
-               break;
-           }
-           else {
-               break;
-           }
-       }
-    rt_pin_write(SHAKE_SW, OFF);
+    {
+       Motor_Juandai(ON);
+       rt_thread_delay(50);
+       turn_timeout++;
+       if(turn_timeout==1000) break;
+    }
+    turn_timeout = 0;
+    while(rt_pin_read(MOTOR_C_LIMIT)==1)
+    {
+       Motor_Juandai(ON);
+       turn_timeout++;
+       rt_thread_delay(50);
+       if(turn_timeout==1000) break;
+    }
+    Motor_shake(OFF, 1);
     Motor_Juandai(OFF);
 }
 //工作任务流程
@@ -297,7 +414,7 @@ void WorkTask_XCT(void)
         {
             photo_fre --;
             rt_thread_delay(1000);
-            rt_kprintf("收集中,等待开始拍照:%d\n",photo_fre);
+            LOG_I("收集中,等待开始拍照:%d",photo_fre);
         }
         //卷带
         ctr_JD_Clear(OFF);
@@ -311,12 +428,12 @@ void WorkTask_XCT(void)
         //卷带
         ctr_JD_Clear(ON);
         //震动
-        Motor_shake(ON, device_status.shake_sec*20);
+        Motor_shake(ON, device_status.shake_sec);
     }
     //关闭风机
     ctr_Motor_xichong(OFF);
     ctr_Motor_xifu(OFF);
-    rt_kprintf("不在工作时间,未工作!!!\n");
+    LOG_I("不在工作时间,未工作!!!");
 }
 /**********************************************************************/
 /*光控*/
@@ -1292,17 +1409,27 @@ void HardWare_Init(uint8_t boot)
 void HK_TakePhoto(void)
 {
     //打开补光灯
-    ctr_led(ON);
     DTU_Write("takephoto.mp3");
-    //延时
-    rt_thread_delay(1000*15);
-    rt_kprintf("\n测试拍照!\n");
+    rt_thread_delay(1000);
     char *takephotojson = makeJson_takephoto();
     DTU_Write("%s",takephotojson);
     rt_free(takephotojson);
+    //吸虫塔
+    if(device_status.version_type!=6)
+    {
+        ctr_led(ON);
+        rt_thread_delay(1000*15);
+    }
     //触发海康相机拍照
     Hk_Take_io();
-    rt_thread_delay(1000*45);
+    if(device_status.version_type!=6)
+    {
+        rt_thread_delay(1000*45);
+    }
+    else {
+        ctr_led(ON);
+        rt_thread_delay(1000*19);
+    }
     ctr_led(OFF);
 }
 //光控测试任务
@@ -1621,13 +1748,6 @@ void WorkCheck(void)
 }
 void WorkTask_BZY(void)
 {
-    rt_uint8_t wait_cnt = 0;
-    while(1)
-    {
-        wait_cnt++;
-        if(wait_cnt==30)    break;
-        rt_thread_delay(1000);
-    }
     if(device_status.ds==1)
     {
         //时间段判断
@@ -2101,6 +2221,7 @@ static void Work_Loop_thread_entry(void *parameter)
 /*入口函数清扫*/
 static void Control_Clear_thread_entry(void *parameter)
 {
+
     while(1)
     {
         #if ROBOT_EN ==1
@@ -2108,7 +2229,12 @@ static void Control_Clear_thread_entry(void *parameter)
         rt_thread_delay(100);
         #else
         #if Color_EN ==1
-        ctr_Color_Key(0);
+        /*复位*/
+        if(Read_Color_Key(KEY_RESET)==1)
+        {
+            ctr_Color_board(RESET, 800);
+            rt_thread_delay(5000);
+        }
         #else
         if(device_status.clear_status==1)
         {
@@ -2127,11 +2253,13 @@ static void Control_Heat_thread_entry(void *parameter)
     #if ROBOT_EN == 1
     static uint8_t key_on = 0;
     #else
+    #if Color_EN == 0
     while(device_status.work_status==0)
     {
         rt_thread_delay(1000);
     }
     #endif
+    #endif
     while(1)
     {
         #if ROBOT_EN == 1
@@ -2170,6 +2298,15 @@ static void Control_Heat_thread_entry(void *parameter)
             rt_pin_write(EMS_Dir, 1);
         }
         #else
+        #if Color_EN == 1
+        /*黄板归位*/
+        if(Read_Color_Key(KEY_BACK)==1)
+        {
+            LOG_W("黄板归位!");
+            ctr_Color_board(CLOSE, 300);
+            rt_thread_delay(5000);
+        }
+        #else
         if(device_status.work_status==1&&device_status.heat_sw==1)
         {
             ctr_lamp(ON, 1);
@@ -2180,8 +2317,9 @@ static void Control_Heat_thread_entry(void *parameter)
         {
             LOG_I("Not calorstat!");
         }
-        #endif
         rt_thread_delay(1000);
+        #endif
+        #endif
     }
 }
 /*清扫线程*/
@@ -2239,10 +2377,12 @@ int Work_Loop_Task(void)
                                 WORK_LOOP_THREAD_STACK_SIZE,       //2048
                                 WORK_LOOP_THREAD_PRIORITY,         //12
                                 WORK_LOOP_THREAD_TIMESLICE);       //5
-    if(tid_workloop!=RT_NULL&&Color_EN==0)
+    #if Color_EN == 0
+    if(tid_workloop!=RT_NULL)
     {
         rt_thread_startup(tid_workloop);
     }
+    #endif
     return 0;
 }
 MSH_CMD_EXPORT(HardWare_Check,HardWare_Check<ON|OFF>);

+ 13 - 6
Application_CBD/applications/control.h

@@ -22,12 +22,12 @@
 #if LAMP_EN == 1
     #define VERSION_HK          "1.(3ledv4).41(HK)" //4.0海康-三色光源
 #else
-    #define VERSION_HK          "1.47.41(HK)"       //4.0海康
+    #define VERSION_HK          "1.48.41(HK)"       //4.0海康
 #endif
-#define VERSION_HK_2000W    "1.44.4(2000W)"         //4.0水稻
+#define VERSION_HK_2000W    "1.45.4(2000W)"         //4.0水稻
 #define VERSION_ZP          "1.40.1(ZP)"            //1.0转盘
 #define VERSION_GK          "1.38.1(GK)"            //1.0高空
-#define VERSION_XCT         "1.10.6(HK)"            //吸虫塔-海康
+#define VERSION_XCT         "1.11.6(HK)"            //吸虫塔-海康
 #define VERSION_V5          "1.2.5(HK)"             //5.0
 #define VERSION_Robot       "1.0(robot)"            //展厅机器人
 
@@ -203,9 +203,10 @@ typedef struct  _packed
 #define ROUTER_P   GET_PIN(B,10)
 #define LED_P      GET_PIN(B,11)
 
-#define PC7_TIM3_CH 2
-#define PC8_TIM3_CH 3
-#define PB1_TIM3_CH  4
+#define PC7_TIM3_CH 2   //pwm8
+#define PC8_TIM3_CH 3   //pwm8
+
+#define PB1_TIM3_CH 4   //pwm3
 
 #define MOTOR1_CTR_PIN GET_PIN(C,9)        //吸虫电机IO
 #define MOTOR2_CTR_PIN GET_PIN(B,2)        //吸附电机IO
@@ -257,6 +258,12 @@ uint8_t ctr_Fan_PUT(uint8_t status_ws);
 #define Motor_Direction_Ctr GET_PIN(B,15)               //IO输出,控制电机运动方向
 #define EMS_Dir GET_PIN(B,14)
 void ctr_Motor_Robot(uint8_t status_ws);
+/****************************定制色诱***************************************************/
+#define LIMIT_RESET GET_PIN(C,13)
+#define LIMIT_BOARD GET_PIN(B,9)
+#define KEY_RESET   GET_PIN(B,8)
+#define KEY_BACK    GET_PIN(B,5)
+int ctr_Color_board(uint8_t forward,uint16_t time_board);
 /***************************************************************/
 /***************************************************************/
 uint8_t ctr_Heat(uint8_t status_heat);          //加热

+ 12 - 3
Application_CBD/applications/dtu_uart2.c

@@ -795,10 +795,11 @@ int parseDtu(char *json_string)
                   //对焦拍照
                   else if(strstr(type->valuestring,"auto_takephoto")!=RT_NULL)
                   {
+                      device_status.autotakepic = 1;
+                      rt_thread_delay(2000);
                       char *auto_takephoto = makeJson_Warn("send cmd success:auto_takephoto","control");
                       DTU_Write("%s",auto_takephoto);
                       rt_free(auto_takephoto);
-                      device_status.autotakepic = 1;
                   }
                   else if(strstr(type->valuestring,"takephoto")!=RT_NULL)
                   {
@@ -811,10 +812,14 @@ int parseDtu(char *json_string)
                   //{"ext": {"type": "turn"}, "cmd": "ctrl"}   转仓
                   else if(strstr(type->valuestring,"turn")!=RT_NULL)
                   {
+                      #if Color_EN == 0
                       char *turn_zp = makeJson_Warn("send cmd success:turn_zp","control");
                       DTU_Write("%s",turn_zp);
                       rt_free(turn_zp);
                       ctr_turn(90, 0);
+                      #else
+                      DTU_Write("黄板复位:%d",ctr_Color_board(RESET, 800));
+                      #endif
                   }
 
               }
@@ -960,9 +965,9 @@ int parseDtu(char *json_string)
               }
               else if (strstr(item_cmd->valuestring,"color")!=RT_NULL)
               {
-                  if(cJSON_GetObjectItem(item_ext,"turn")!=RT_NULL)
+                  if(item_ext!=RT_NULL&&strstr(item_ext->valuestring,"turn")!=RT_NULL)
                   {
-                      ctr_turn(90, 0);
+                      device_status.run_sta=5;
                   }
                   else {
                     LOG_W("Unknow cmd value!");
@@ -970,6 +975,7 @@ int parseDtu(char *json_string)
               }
               else if (strstr(item_cmd->valuestring,"synchronization")!=RT_NULL)
               {
+                  #if Color_EN == 0
                   if(device_status.dtype==7)
                   {
                       DTU_Write("%s","SwversionV7");
@@ -978,6 +984,7 @@ int parseDtu(char *json_string)
                   {
                       DTU_Write("%s","SwversionV4");
                   }
+                  #endif
                   device_status.refresh_timeout=0;
                   //driver_4g =  cJSON_GetObjectItem(item_ext,"version");
                   driver_4g = cJSON_GetObjectItem(item_ext,"dver");
@@ -1716,7 +1723,9 @@ void UpLoad_Data(void)
     char *updata = makeJson();
     LOG_I("upload data:%d%s",rt_strlen(updata),updata);
     rt_free(updata);
+    #if Color_EN ==0
     DTU_Write("%s",updata);
+    #endif
     list_mem();
     ctr_RTU_DTU(ON);
     //播放数据上传中语音

+ 30 - 5
Application_CBD/applications/hmi.c

@@ -413,7 +413,11 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     //打开电磁阀
     else if (strstr(rx_buffer,"putTest.switchDrop=1")!=NULL) {
         LOG_I("开始滴液!");
+        #if Color_EN == 1
+        device_status.run_sta = 5;
+        #else
         ctr_shake(ON, device_status.shake_sec);
+        #endif
     }
     //关闭电磁阀
     else if (strstr(rx_buffer,"putTest.switchDrop=0")!=NULL) {
@@ -519,7 +523,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     }
     //震动
     else if (strstr(rx_buffer,"putTest.switchShake=1")!=NULL) {
-        rt_kprintf("\n震动!\n");
+        LOG_I("震动!");
         if(device_status.version_type==6)
         {
             Motor_shake(ON, device_status.shake_sec);
@@ -1128,8 +1132,6 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
             device_status.version_type = 7;
             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("SwversionV7");
             MA_save();
         }
     }
@@ -1193,7 +1195,6 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
 static void Ctr_Mortor_entry(void* parameter)
 {
    //rt_uint32_t limit_current = 3000;     //推杆电击限制电流1A
-   rt_uint32_t rtc_err_cnt = 0;
    //rt_uint16_t power_current = 0;
    rt_uint16_t num_up_open = 200;    //20s
    rt_uint16_t num_up_close = 200;   //
@@ -1202,8 +1203,21 @@ static void Ctr_Mortor_entry(void* parameter)
    rt_uint16_t photo_led_sec = 450;  //45S
    /*孢子仪拍照数量*/
    rt_uint16_t photo_setup = 0;
+   #if Color_EN ==1
+   if(device_status.cul_time==0)
+   ctr_Color_board(RESET, 800);
+   #endif
     while(1)
     {
+        #if Color_EN ==1
+        //定时执行把粘虫板更换的操作,每天一次
+        if(device_status.run_sta==5)
+        {
+            rt_thread_delay(2000);
+            device_status.run_sta = 0;
+            ctr_Color_board(OPEN, 1000);
+        }
+        #endif
         time_t time_reset12V;
         time(&time_reset12V);
         static struct tm alarm_reset12V;
@@ -1764,6 +1778,7 @@ void Check_ParamConfig(void)
         Hmi_Fresh();
         #if Color_EN == 1
         Control_clear();
+        Control_heat();
         #endif
         if(device_status.dtype!=7)
         {
@@ -1780,7 +1795,7 @@ void Check_ParamConfig(void)
         //等待联网,
         while(atoi(device_status.net)==1)
         {
-            ctr_DTU_Power(ON);
+
             if(device_status.dtype==7)
             HMI_WRITE("sysTest.auto_flag.txt=\"0\"");
             char *readinfo =  makeJson_ReadInfo();
@@ -1801,6 +1816,16 @@ void Check_ParamConfig(void)
             if(tm.tm_year>=2021)
             break;
         }
+        connect_num = 0;
+        while(atoi(device_status.net)==0)
+        {
+            char *readinfo =  makeJson_ReadInfo();
+            DTU_Write("%s",readinfo);
+            rt_free(readinfo);
+            rt_thread_delay(2000);
+            connect_num++;
+            if(connect_num>5) break;
+        }
         if(device_status.version_type==6) device_status.timeSwitch = 1;
         DTU_Write("%s",makeJson_Warn("turnon", "device_stm32"));
         rt_thread_delay(1000);

+ 3 - 4
Application_CBD/applications/main.c

@@ -64,17 +64,14 @@ int main(void)
         if(device_status.version_type!=30)
         HardWare_Check(0);
         //工作状态置位线程
-
         if(device_status.dtype!=7&&device_status.version_type!=30)
         Workstatus_check();
-
-        /***************/
+        /********************/
         //工作流程
         if(device_status.version_type!=30)
         Work_Loop_Task();
         /*******************/
     }
-
     //看门狗初始化
      wdt_init();
      //打印内存占用
@@ -115,6 +112,7 @@ static int wdt_init(void)
 static void idle_hook(void)
 {
     #if 1
+    #if Color_EN == 0
     time_t now;
     time(&now);
     static struct tm alarm_new;
@@ -126,6 +124,7 @@ static void idle_hook(void)
         #endif
     }
     #endif
+    #endif
 //    else {
 //        rt_kprintf("%d:%d:%d\n",alarm_new.tm_hour,alarm_new.tm_min,alarm_new.tm_sec);
 //    }

+ 1 - 1
Application_CBD/applications/sht30_collect.c

@@ -264,7 +264,7 @@ int Read_Real_Current(void)
     adc_dev = (rt_adc_device_t)rt_device_find(ADC_DEV_NAME);
     if (adc_dev == RT_NULL)
     {
-        rt_kprintf("adc sample run failed! can't find %s device!\n", ADC_DEV_NAME);
+        LOG_E("adc sample run failed! can't find %s device!", ADC_DEV_NAME);
         return RT_ERROR;// adc 采样值不可能为负值,返回负值表示出错
     }
     HAL_ADCEx_Calibration_Start(adc_dev->parent.user_data);

+ 21 - 17
Application_CBD/drivers/board.c

@@ -140,18 +140,22 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim)
   /* USER CODE BEGIN TIM3_MspPostInit 0 */
 
   /* USER CODE END TIM3_MspPostInit 0 */
-  __HAL_RCC_GPIOC_CLK_ENABLE();
+   __HAL_RCC_GPIOB_CLK_ENABLE();
+   __HAL_RCC_GPIOC_CLK_ENABLE();
   /**TIM3 GPIO Configuration
-  PC6     ------> TIM3_CH1
-  PC7     ------> TIM3_CH2
-  PC8     ------> TIM3_CH3
-  */
-  GPIO_InitStruct.Pin = GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_8;
-  GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
-
-  __HAL_AFIO_REMAP_TIM3_ENABLE();
+    PB0     ------> TIM3_CH3
+    PB1     ------> TIM3_CH4
+    PB4/PC6     ------> TIM3_CH1
+    */
+    GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+    GPIO_InitStruct.Pin = GPIO_PIN_6;
+    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+    HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+    //__HAL_AFIO_REMAP_TIM3_ENABLE();
 
   /* USER CODE BEGIN TIM3_MspPostInit 1 */
 
@@ -188,7 +192,7 @@ static void MX_TIM3_Init(void)
 {
 
   /* USER CODE BEGIN TIM3_Init 0 */
-
+  HAL_TIM_Base_MspInit(&htim3);
   /* USER CODE END TIM3_Init 0 */
 
   TIM_ClockConfigTypeDef sClockSourceConfig = {0};
@@ -199,9 +203,9 @@ static void MX_TIM3_Init(void)
 
   /* USER CODE END TIM3_Init 1 */
   htim3.Instance = TIM3;
-  htim3.Init.Prescaler = 72-1;
+  htim3.Init.Prescaler = 72;
   htim3.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim3.Init.Period = 500-1;
+  htim3.Init.Period = 1000;
   htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
   htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_ENABLE;
   if (HAL_TIM_Base_Init(&htim3) != HAL_OK)
@@ -224,18 +228,18 @@ static void MX_TIM3_Init(void)
     Error_Handler();
   }
   sConfigOC.OCMode = TIM_OCMODE_PWM1;
-  sConfigOC.Pulse = 0;
+  sConfigOC.Pulse = 100;
   sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
   sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
   if (HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_1) != HAL_OK)
   {
     Error_Handler();
   }
-  if (HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_2) != HAL_OK)
+  if (HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_3) != HAL_OK)
   {
     Error_Handler();
   }
-  if (HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_3) != HAL_OK)
+  if (HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_4) != HAL_OK)
   {
     Error_Handler();
   }

+ 1 - 1
Application_CBD/packages/ota_downloader-latest/tools/ota_packager/rt_ota_packaging_tool.exe.config

@@ -6,5 +6,5 @@
   <runtime>
     <enforceFIPSPolicy enabled="false" />
   </runtime>
-  <configs SELEFILE="D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\Debug\Application_CBD.bin" SAVEFILE="D:\RT-ThreadStudio\workspace\IOT_CBD_BZY_CTRL\Application_CBD\Debug\rtthread.rbl" COMPRESS="1" CRYPT="1" KEY="0123456789ABCDEF0123456789ABCDEF" IV="0123456789ABCDEF" NAME="app" VERSION="2.3" />
+  <configs SELEFILE="D:\RT-ThreadStudio\workspace\Application_CBD\Debug\Application_CBD.bin" SAVEFILE="D:\RT-ThreadStudio\workspace\Application_CBD\Debug\rtthread.rbl" COMPRESS="1" CRYPT="1" KEY="0123456789ABCDEF0123456789ABCDEF" IV="0123456789ABCDEF" NAME="app" VERSION="2.3" />
 </configuration>