1.优化ota升级的优先级

diff --git a/App/src/iap.c b/App/src/iap.c
index fe052b2..34322d8 100644 (file)
--- a/App/src/iap.c
+++ b/App/src/iap.c
@@ -10,6 +10,8 @@
 IAP_CMD_REPLY_T iap_cmd;
 IAP_CMD_REPLY_T iap_reply;
 
+uint8_t iap_timeout_cnt = 0;//Ä£×éÉý¼¶Ö÷¿ØUSB²»ÔÊÐíÉý¼¶Ö÷¿Ø
+
 uint8_t iap_end_flag = 0;
 
 IAP_MOVE_T iap_move = {.move_enable = 0};
@@ -129,7 +131,7 @@ void Iap_Process(uint8_t* data, uint8_t len)
        memcpy(iap_cmd.other.buf, data, len);
        memcpy(iap_reply.other.buf, iap_cmd.other.buf, 3);
        iap_reply.cmd.status = REPLY_STATUS_NO_CMD;
-       if(iap_cmd.cmd.cmd1 != CMD1_IAP_PANEL)
+       if(iap_cmd.cmd.cmd1 != CMD1_IAP_PANEL || iap_timeout_cnt > 0)
        {
                return;
        }
@@ -485,6 +487,16 @@ uint8_t Iap_Lite_Verify(uint32_t addr, uint8_t packet_size, uint8_t* data)
        }
 }
 
+
+
+void Iap_Lite_Check_TimeOut(void)
+{
+       if(iap_timeout_cnt > 0)
+       {
+               iap_timeout_cnt--;
+       }
+}
+
 void Iap_Lite_Process(uint8_t* data, uint16_t len, uint8_t host_type)
 {
        IAP_LITE_CMD_T* iap_lite_cmd = (IAP_LITE_CMD_T*)data;
@@ -496,6 +508,7 @@ void Iap_Lite_Process(uint8_t* data, uint16_t len, uint8_t host_type)
        // ¼ì²éЭÒé°æ±¾
        if(iap_lite_cmd->payload.protocol_version == 0x01)
        {
+               iap_timeout_cnt=10;
                // ·ÖÎöÃüÁîÂë
                switch(iap_lite_cmd->payload.sub_cmd)
                {

diff --git a/RVMDK/RVMDKN32G45X/project_cfg.h b/RVMDK/RVMDKN32G45X/project_cfg.h
index b8e4340..d8dfa87 100644 (file)
--- a/RVMDK/RVMDKN32G45X/project_cfg.h
+++ b/RVMDK/RVMDKN32G45X/project_cfg.h
@@ -16,7 +16,7 @@
 
 #if (W_GTL == 1)
        // USB
-       #define FW_VERSION                      (0x0104)                //¹Ì¼þ°æ±¾
+       #define FW_VERSION                      (0x0105)                //¹Ì¼þ°æ±¾
        #define BUILD_VERSION                   (0x0001)
        #define USB_VID                                         (0x36E6)
        #define USB_PID_APP                                     (0xA00B)
@@ -443,6 +443,7 @@ typedef struct
                
                uint8_t data[112];
        };
+       
 }FW_FILE_HEADER_T;
 #pragma pack(pop)
 #endif