Bläddra i källkod

bootloader&app

zhunk 1 år sedan
förälder
incheckning
8d905f24e6

+ 1 - 1
Application_cbd_apm32f1/applications/control.h

@@ -36,7 +36,7 @@
 #define VERSION_V5          "1.2.5(HK)"             //5.0
 #define VERSION_V5          "1.2.5(HK)"             //5.0
 #define VERSION_Robot       "1.0(robot)"            //展厅机器人
 #define VERSION_Robot       "1.0(robot)"            //展厅机器人
 
 
-#define VERSION_BZY         "2.60"                   //孢子仪
+#define VERSION_BZY         "2.0.0"                   //孢子仪
 
 
 
 
 /*********************************************************************/
 /*********************************************************************/

+ 4 - 1
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -122,7 +122,8 @@ static rt_err_t dtu_input(rt_device_t dev, rt_size_t size)
     if ( result == -RT_EFULL)
     if ( result == -RT_EFULL)
     {
     {
         /* 消息队列满 */
         /* 消息队列满 */
-        rt_kprintf("message queue full!\n");
+        LOG_E("message queue full!");
+        rt_mq_control(&rx_mq_dtu, RT_IPC_CMD_RESET, RT_NULL); // 清空队列
     }
     }
     return result;
     return result;
 }
 }
@@ -894,9 +895,11 @@ int parseDtu(char *json_string)
               //补光灯开灯和关灯
               //补光灯开灯和关灯
               if(strstr(item_cmd->valuestring,"ledon")!=RT_NULL){
               if(strstr(item_cmd->valuestring,"ledon")!=RT_NULL){
                   ctr_Cold(ON);
                   ctr_Cold(ON);
+                  ctr_led(ON);
               }
               }
               if(strstr(item_cmd->valuestring,"ledoff")!=RT_NULL){
               if(strstr(item_cmd->valuestring,"ledoff")!=RT_NULL){
                   ctr_Cold(OFF);
                   ctr_Cold(OFF);
+                  ctr_led(OFF);
                   slidelock();
                   slidelock();
               }
               }
               //采集风机开和关
               //采集风机开和关

+ 1 - 2
Application_cbd_apm32f1/packages/ota_downloader-v1.0.0/src/ymodem_ota.c

@@ -112,10 +112,9 @@ void ymodem_ota(uint8_t argc, char **argv)
             return;
             return;
         }
         }
     }
     }
-    rt_console_set_device("uart2");
     rt_kprintf("Warning: Ymodem has started! This operator will not recovery.\n");
     rt_kprintf("Warning: Ymodem has started! This operator will not recovery.\n");
     rt_kprintf("Please select the ota firmware file and use Ymodem to send.\n");
     rt_kprintf("Please select the ota firmware file and use Ymodem to send.\n");
-
+    rt_console_set_device("uart2");
     if (!rym_recv_on_device(&rctx, rt_console_get_device(), RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_INT_RX,
     if (!rym_recv_on_device(&rctx, rt_console_get_device(), RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_INT_RX,
                             ymodem_on_begin, ymodem_on_data, NULL, RT_TICK_PER_SECOND))
                             ymodem_on_begin, ymodem_on_data, NULL, RT_TICK_PER_SECOND))
     {
     {

+ 1 - 1
CBD_FOTA_BootLoader/applications/rt_fota.c

@@ -48,7 +48,7 @@
 #endif
 #endif
 
 
 #ifndef RT_FOTA_ALGO_BUFF_SIZE
 #ifndef RT_FOTA_ALGO_BUFF_SIZE
-#define RT_FOTA_ALGO_BUFF_SIZE				4096
+#define RT_FOTA_ALGO_BUFF_SIZE				2048 //
 #endif
 #endif
 
 
 /**
 /**