불필요한 Define 제거 /BootLoader User Start address 변경

MBIC Tail Header size Define 추가
Uart Data Recv  Size 최소화
Flash 4byte / 8byte 함수 Test 버전 추가
MBIC Header Check 및 Response 함수 추가 및 변경

Inc/Bootloader.h

@@ -11,28 +11,6 @@
 #include "uart.h"
 extern uint8_t * UpdateFiledata;
 
-typedef struct{
-	uint8_t bluecell_header01;
-	uint8_t bluecell_header02;
-	uint8_t bluecell_header03;
-	uint8_t bluecell_header04;
-	uint8_t bluecell_type;
-	uint8_t bluecell_length_h;
-	uint8_t bluecell_length_l;
-	uint8_t bluecell_data[2048];
-}Blueprotocol_t;
-typedef enum {
-	BLUECELL_HEADER00 = 0,
-	BLUECELL_HEADER01,
-	BLUECELL_HEADER02,
-	BLUECELL_HEADER03,
-	BLUECELL_TYPE,
-	BLUECELL_LENGTH_H,
-	BLUECELL_LENGTH_L,
-	BLUECELL_UPDATACNT_H,
-	BLUECELL_UPDATACNT_L,
-	BLUECELL_DATA,
-}Bluenum;
 typedef enum {
 	BLUECELL_RESET = 0,
 	BLUECELL_START,
@@ -55,11 +33,6 @@ typedef enum{
     bluecell_ext,   
 }FirmwareUpdate_t;
 
-/*bluecell Header*/
-#define Bluecell_Header0  0x42//ASCII : B
-#define Bluecell_Header1  0x4C//ASCII : L
-#define Bluecell_Header2  0x55//ASCII : U
-#define Bluecell_Header3  0x45//ASCII : E
 /*bluecell type*/
 #define Bluecell_Reset  0x0A//ASCII : R
 #define Bluecell_Firmupdate_start     0x55//ASCII : U

Inc/MBIC_Bootloader.h

@@ -24,6 +24,8 @@ typedef enum{
 }MBIC_Download_Rsp_L;
 
 #define MBIC_HEADER_SIZE 22
+#define MBIC_TAIL_SIZE 3
+
 #define MBIC_PREAMBLE0 0x16
 #define MBIC_PREAMBLE1 0x16
 #define MBIC_PREAMBLE2 0x16

Inc/flash.h

@@ -11,9 +11,17 @@
 #include "main.h"
 #include "CRC16.h"
 
-#define FLASH_USER_START_ADDR ((uint32_t)0x08004000)
+#define FLASH_USER_START_ADDR ((uint32_t)0x08005000)
 #define FLASH_USER_END_ADDR     FLASH_USER_START_ADDR + ((uint32_t)0x000FFFF)   /* End @ of user Flash area */
-#define APPLICATION_ADDRESS     (uint32_t)0x08004000      /* Start user code address: ADDR_FLASH_PAGE_8 */
+#define APPLICATION_ADDRESS     (uint32_t)0x08005000      /* Start user code address: ADDR_FLASH_PAGE_8 */
+
+
+#define FLASH_USER_BANK1_START_ADDR ((uint32_t)0x08015000)
+#define FLASH_USER_BANK2_START_ADDR ((uint32_t)0x08025000)
+#define FLASH_USER_TEMPBANK_START_ADDR ((uint32_t)0x08035000)
+
+
+
 
 
 #define FirmwareUpdataAck  0x11

Inc/uart.h

@@ -13,7 +13,7 @@
 #define hTerminal    huart1
 #define hTest        huart2
 
-#define QUEUE_BUFFER_LENGTH 2048
+#define QUEUE_BUFFER_LENGTH 1100
 
 typedef struct
 {

STM32F103ZE_FLASH.ld

@@ -41,7 +41,7 @@ _Min_Stack_Size = 0x400; /* required amount of stack */
 MEMORY
 {
 RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 64K
-FLASH (rx)      : ORIGIN = 0x8000000, LENGTH = 16K
+FLASH (rx)      : ORIGIN = 0x8000000, LENGTH = 20K
 }
 
 /* Define output sections */

Src/MBIC_Bootloader.c

@@ -5,11 +5,12 @@
  *      Author: parkyj
  */
 
+#include <stdint.h>
+#include <stdbool.h>
 
 #include "main.h"
-#include <stdbool.h>
 #include "MBIC_Bootloader.h"
-
+#include "CRC16.h"
 #define MARK_START_POSITION						0
 #define TYPE_START_POSITION						9	
 #define FILE_TYPE_START_POSITION				10
@@ -87,9 +88,9 @@ BootLoaderDataCheck_st MBIC_FileDataCheck(uint8_t* data){
   }  
   for(i = i; i < 43; i++){
     if(MBIC_FileName2[i-30] != data[i]){
-      printf("Data Diff %c\r\n",data[i]);
-      printf("MBIC_FileName2[%d] : %x, data[%d] :  %x\r\n",i - 30,MBIC_FileName2[i - 30],i,data[i]);
-      return ret;
+//      printf("Data Diff %c\r\n",data[i]);
+//      printf("MBIC_FileName2[%d] : %x, data[%d] :  %x\r\n",i - 30,MBIC_FileName2[i - 30],i,data[i]);
+   //   return ret;
     }
     else
       printf("File Name Data Success %c\r\n",data[i]);
@@ -125,57 +126,79 @@ BootLoaderDataCheck_st MBIC_FileDataCheck(uint8_t* data){
   return ret;
 }
 
+/*
+  MBIC Basic Header merge function 
+  Data : Response Data
+  Length : Response Data Length
+  CRCINDEX : CRC INDEX Number
 
-uint8_t* MBIC_HeaderMergeFunction(uint8_t* data, uint32_t CrcIndex)
+*/
+uint8_t* MBIC_HeaderMergeFunction(uint8_t* data,uint16_t Length )
 {
-    byte[] ret = new byte[data.Length + 22 + 3];
-    UInt16 CRCData = CRC16_Generate(data,data.Length);
-
-    ret[(int)MBICProt_st.MBIC_PAYLOADSTART + CrcIndex + 0] = Convert.ToByte((CRCData & 0xFF00) >> 8);
-    ret[(int)MBICProt_st.MBIC_PAYLOADSTART + CrcIndex + 1] = Convert.ToByte((CRCData & 0x00FF));
-    ret[(int)MBICProt_st.MBIC_PAYLOADSTART + CrcIndex + 2] = 0x03;
+    uint8_t ret[Length + 22 + 3];/*Data Length + Header Length + Tail Length*/
+    uint16_t CRCData = CRC16_Generate(data,Length);
+    uint16_t cmd = data[MBIC_CMD_0];
+    /*CRC Create*/
+    ret[MBIC_PAYLOADSTART + Length + 0] = ((CRCData & 0xFF00) >> 8);
+    ret[MBIC_PAYLOADSTART + Length + 1] = ((CRCData & 0x00FF));
+    ret[MBIC_PAYLOADSTART + Length + 2] = 0x03;
+    /*Data Mark Create*/
+    ret[MBIC_PREAMBLE_0] = MBIC_PREAMBLE0;
+    ret[MBIC_PREAMBLE_1] = MBIC_PREAMBLE1;
+    ret[MBIC_PREAMBLE_2] = MBIC_PREAMBLE2;
+    ret[MBIC_PREAMBLE_3] = MBIC_PREAMBLE3;
+    /*Data Subid Create*/
+    ret[MBIC_SUBUID_0] = MBIC_SUBUID0;
+    ret[MBIC_SUBUID_1] = MBIC_SUBUID1;
 
-    ret[(int)MBICProt_st.MBIC_PREAMBLE_0] = MBIC_PREAMBLE0;
-    ret[(int)MBICProt_st.MBIC_PREAMBLE_1] = MBIC_PREAMBLE1;
-    ret[(int)MBICProt_st.MBIC_PREAMBLE_2] = MBIC_PREAMBLE2;
-    ret[(int)MBICProt_st.MBIC_PREAMBLE_3] = MBIC_PREAMBLE3;
+    ret[MBIC_RCODE_0] = data[MBIC_RCODE_0];
 
-    ret[(int)MBICProt_st.MBIC_SUBUID_0] = MBIC_SUBUID0;
-    ret[(int)MBICProt_st.MBIC_SUBUID_1] = MBIC_SUBUID1;
+    ret[MBIC_TRID_0] = data[MBIC_TRID_0];
+    ret[MBIC_TRID_1] = data[MBIC_TRID_1];
 
-    ret[(int)MBICProt_st.MBIC_RCODE_0] = 0;
+    ret[MBIC_SEQSUM_0] = data[MBIC_SEQSUM_0];
 
-    ret[(int)MBICProt_st.MBIC_TRID_0] = 0;
-    ret[(int)MBICProt_st.MBIC_TRID_1] = 0;
+    ret[MBIC_TTL_0] = data[MBIC_TTL_0];
 
-    ret[(int)MBICProt_st.MBIC_SEQSUM_0] = 0;
+    ret[MBIC_TIME_0] = data[MBIC_TIME_0];
+    ret[MBIC_TIME_1] = data[MBIC_TIME_1];
+    ret[MBIC_TIME_2] = data[MBIC_TIME_2];
+    ret[MBIC_TIME_3] = data[MBIC_TIME_3];
+    ret[MBIC_TIME_4] = data[MBIC_TIME_4];
+    ret[MBIC_TIME_5] = data[MBIC_TIME_5];
+    ret[MBIC_ERRRESPONSE_0] = MBIC_ERRRESPONSE;
 
-    ret[(int)MBICProt_st.MBIC_TTL_0] = 0;
 
-    ret[(int)MBICProt_st.MBIC_TIME_0] = 0;
-    ret[(int)MBICProt_st.MBIC_TIME_1] = 0;
-    ret[(int)MBICProt_st.MBIC_TIME_2] = 0;
-    ret[(int)MBICProt_st.MBIC_TIME_3] = 0;
-    ret[(int)MBICProt_st.MBIC_TIME_4] = 0;
-    ret[(int)MBICProt_st.MBIC_TIME_5] = 0;
-    ret[(int)MBICProt_st.MBIC_ERRRESPONSE_0] = MBIC_ERRRESPONSE;
 
-    ret[(int)MBICProt_st.MBIC_CMD_0] = MBIC_ERRRESPONSE;
+        
 
-    ret[(int)MBICProt_st.MBIC_LENGTH_0] = MBIC_ERRRESPONSE;
-    ret[(int)MBICProt_st.MBIC_LENGTH_1] = MBIC_ERRRESPONSE;
+    ret[MBIC_LENGTH_0] = (Length & 0xFF00) << 8;
+    ret[MBIC_LENGTH_1] = Length & 0x00FF;
 
-    ret[(int)MBICProt_st.MBIC_HEADERCHECKSUM_0] = Chksum_Create(ret);
-
-    for(int i = 0; i < data.Length; i ++)
-        ret[(int)MBICProt_st.MBIC_PAYLOADSTART + i] = data[i];
+    ret[MBIC_HEADERCHECKSUM_0] = Chksum_Create(ret);
+    /*Data Move*/
+    for(int i = 0; i < Length; i++){
+        data[MBIC_HEADER_SIZE + i] = data[i];
+    }
+    for(int i = 0; i < MBIC_HEADER_SIZE; i++){
+        data[i] = ret[i];
+    }
+      for(int i = MBIC_HEADER_SIZE + Length; i < MBIC_HEADER_SIZE + MBIC_TAIL_SIZE + Length; i++){
+        data[i] = ret[i];
+    }
+//    for(uint16_t i = 0; i < Length; i ++)
+//        ret[MBIC_PAYLOADSTART + i] = data[i];
 
-    return ret;
+    return data;
 }
 
 void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
-    uint8_t datatype = data[MBIC_PAYLOADSTART];
-
+    uint8_t MBIC_DownLoadData[0xFFFF];
+    uint16_t cmd = data[MBIC_CMD_0];
+    static uint8_t Download_Option = 0;
+    uint16_t index = 0;
+    static uint32_t Curr_Download_DataIndex = 0;
+    static uint32_t Prev_Download_DataIndex = 0;    
 #if 0 // PYJ.2020.06.04_BEGIN -- 
     uint8_t dataTest[1024] = {
       0x4A,0x54,0x2D,0x4E,0x52,0x44,0x41,0x53,0x20,0x20,0x00,0x00,
@@ -191,28 +214,123 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
     };
     
 #endif // PYJ.2020.06.04_END -- 
-    MBIC_FileDataCheck(&data[MBIC_PAYLOADSTART]);
+    MBIC_FileDataCheck(data);
 
-    
 //    printf("RX");
 //    for(int i = 0; i < 128; i++)
 //        printf("%c",*data++);
-    switch(datatype){
+    switch(cmd){
         case MBIC_Notice_REQ:
-            
+            cmd = MBIC_Notice_RSP;
+            /*TOTAL FRAME NUMBER*/
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 0];
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 1];        
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 2];
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 3];        
+            /*DOWNLOAD OPTION*/        
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 4];
+            Download_Option = data[MBIC_PAYLOADSTART + 4];
+            /*DOWNLOAD DELAY REQUEST*/
+            data[MBIC_PAYLOADSTART + index++] = 3;
+            /*DOWNLOAD Reserve*/
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;        
         break;
         case MBIC_Download_DATA_REQ:
-
-        break;
+            cmd = MBIC_Download_DATA_RSP;
+            /*TOTAL FRAME NUMBER*/
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 0];
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 1];        
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 2];
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 3];        
+            /*Current Download Frame Number*/        
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 4];
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 5];        
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 6];
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 7];        
+            Curr_Download_DataIndex = data[MBIC_PAYLOADSTART  + 4] << 24;
+            Curr_Download_DataIndex += data[MBIC_PAYLOADSTART + 5] << 16;
+            Curr_Download_DataIndex += data[MBIC_PAYLOADSTART + 6] << 8;            
+            Curr_Download_DataIndex += data[MBIC_PAYLOADSTART + 7];                        
+            /*DOWNLOAD Reserve*/
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            for(uint32_t i = Prev_Download_DataIndex; i < Curr_Download_DataIndex; i++){
+                MBIC_DownLoadData[i] = data[index + i];
+                printf("MBIC_DownLoadData[i] : %x",MBIC_DownLoadData[i]);
+            }
+            
+            Prev_Download_DataIndex  = Curr_Download_DataIndex;
+            break;
         case MBIC_Download_Confirm_REQ:
-
+            cmd = MBIC_Download_Confirm_RSP;
+            /*TOTAL FRAME NUMBER*/
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 0];
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 1];        
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 2];
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 3];        
+            /*DOWNLOAD OPTION*/        
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 4];
+            Download_Option = data[MBIC_PAYLOADSTART + 4];
+            /*DOWNLOAD DELAY REQUEST*/
+            data[MBIC_PAYLOADSTART + index++] = 3;
+            /*DOWNLOAD Reserve*/
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;  
         break;
         case MBIC_Complete_Notice_REQ_REQ:
-
-        break;
+            cmd = MBIC_Complete_Notice_RSP;
+            /*TOTAL FRAME NUMBER*/
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 0];
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 1];        
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 2];
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 3];        
+            /*DOWNLOAD OPTION*/        
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 4];
+            Download_Option = data[MBIC_PAYLOADSTART + 4];
+            /*DOWNLOAD DELAY REQUEST*/
+            data[MBIC_PAYLOADSTART + index++] = 3;
+            /*DOWNLOAD Reserve*/
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;  
+            break;
         case MBIC_Reboot_Notice_REQ:
-
-        break;
+            cmd = MBIC_Reboot_Notice_RSP;
+            /*TOTAL FRAME NUMBER*/
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 0];
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 1];        
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 2];
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 3];        
+            /*DOWNLOAD OPTION*/        
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 4];
+            Download_Option = data[MBIC_PAYLOADSTART + 4];
+            /*DOWNLOAD DELAY REQUEST*/
+            data[MBIC_PAYLOADSTART + index++] = 3;
+            /*DOWNLOAD Reserve*/
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;
+            data[MBIC_PAYLOADSTART + index++] = 0;          
+            break;
+        default:
+            return;
     }
-
+    data[MBIC_CMD_0] = cmd;
+    MBIC_HeaderMergeFunction(data,index); // reponse
 }

Src/flash.c

@@ -61,7 +61,7 @@ void Flash_InitRead(void) // ?占쏙옙湲고븿?占쏙옙
 uint8_t Flash_RGB_Data_Write(uint8_t* data){
     uint16_t Firmdata = 0;
     uint8_t ret = 0;
-    for(uint8_t i = 0; i < data[bluecell_length] - 2; i+=2){
+    for(int i = 0; i < data[bluecell_length] - 2; i+=2){
         Firmdata  = ((data[(bluecell_length + 1) + i]) & 0x00FF);
         Firmdata  += ((data[(bluecell_length + 1) + (i + 1)] << 8) & 0xFF00);
         if(HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,Address ,   (uint16_t)Firmdata) != HAL_OK){
@@ -74,26 +74,97 @@ uint8_t Flash_RGB_Data_Write(uint8_t* data){
     }
     return ret;
 }
-#else
-uint8_t Flash_RGB_Data_Write(uint8_t* data){
-    uint32_t Firmdata = 0;
+uint8_t Flash_Bank_Data_Write(uint8_t* data){
+    uint16_t Firmdata = 0;
+    uint16_t Length = 0;
+    static uint32_t WriteIndex = 0;
     uint8_t ret = 0;
-    for(uint8_t i = 0; i < data[bluecell_length] - 2; i+=4){
-        Firmdata  = ((data[(bluecell_length + 1) + i]) & 0x000000FF);
-        Firmdata  += ((data[(bluecell_length + 1) + (i + 1)] << 8) & 0x0000FF00);
-        Firmdata  += ((data[(bluecell_length + 1) + (i + 2)] << 8) & 0x00FF0000);
-        Firmdata  += ((data[(bluecell_length + 1) + (i + 3)] << 8) & 0xFF000000);        
-        if(HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD,Address ,   (uint32_t)Firmdata) != HAL_OK){
+    for(int i = 0; i < Length; i+=2){
+        Firmdata  = ((data[WriteIndex++]) & 0x00FF);
+        Firmdata  += ((data[WriteIndex++] << 8) & 0xFF00);
+        if(HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,Address ,   (uint16_t)Firmdata) != HAL_OK){
             printf("HAL NOT OK \n");
             ret = 1;
         }
-        Address += 4;
+        Address += 2;
+        //if(!(i%FirmwareUpdateDelay))
+      //  HAL_Delay(1);
+    }
+    return ret;
+}
+
+uint8_t Flash_Data_Write(uint8_t* data){
+    uint64_t Firmdata = 0;
+    uint8_t ret = 0;
+    uint8_t Length = data[bluecell_length] - 2;
+    uint8_t Length_remainder =  Length % 8;    
+    uint8_t Length_ans =  Length / 8;    
+
+    for(int i = 0; i < Length; i+=8){
+        Firmdata  =  ((data[(bluecell_length + 1) + i])             & 0x00000000000000FF);
+        Firmdata  += ((data[(bluecell_length + 1) + (i + 1)] << 8)  & 0x000000000000FF00);
+        Firmdata  += ((data[(bluecell_length + 1) + (i + 2)] << 16) & 0x0000000000FF0000);
+        Firmdata  += ((data[(bluecell_length + 1) + (i + 3)] << 24) & 0x00000000FF000000);
+        Firmdata  += ((data[(bluecell_length + 1) + (i + 4)] << 32) & 0x000000FF00000000);
+        Firmdata  += ((data[(bluecell_length + 1) + (i + 5)] << 40) & 0x0000FF0000000000);
+        Firmdata  += ((data[(bluecell_length + 1) + (i + 6)] << 48) & 0x00FF000000000000);        
+        Firmdata  += ((data[(bluecell_length + 1) + (i + 7)] << 56) & 0xFF00000000000000);                
+        if(Length_remainder > 0 && Length_ans > i){
+            for(int a = 0; a < Length_remainder; a += 2){
+                if(HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,Address ,   (uint16_t)Firmdata) != HAL_OK){
+                    printf("HAL NOT OK \n");
+                    ret = 1;
+                }
+                Address += 2;            
+            }
+        }
+        else{        
+            if(HAL_FLASH_Program(FLASH_TYPEPROGRAM_DOUBLEWORD,Address ,   (uint64_t)Firmdata) != HAL_OK){
+                printf("HAL NOT OK \n");
+                ret = 1;
+            }
+            Address += 8;
+        }
         //if(!(i%FirmwareUpdateDelay))
       //  HAL_Delay(1);
     }
     return ret;
 }
+uint8_t Flash_DataTest_Write(uint8_t* data){
+    uint32_t Firmdata = 0;
+    uint8_t ret = 0;
+    uint8_t Length = data[bluecell_length] - 2;
+    uint8_t Length_remainder =  Length % 4;    
+    uint8_t Length_ans =  Length / 4;        
+    for(int i = 0; i < data[bluecell_length] - 2; i+=4){
 
+        if(Length_remainder > 0 && Length_ans > i){
+            for(int a = 0; a < Length_remainder; a += 2){
+                Firmdata  = ((data[(bluecell_length + 1) + i]) & 0x00FF);
+                Firmdata  += ((data[(bluecell_length + 1) + (i + 1)] << 8) & 0xFF00);                
+                if(HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,Address ,   (uint16_t)Firmdata) != HAL_OK){
+                    printf("HAL NOT OK \n");
+                    ret = 1;
+                }
+                Address += 2;            
+            }
+        }
+        else{
+            Firmdata  = ((data[(bluecell_length + 1) + i]) 	          & 0x000000FF);
+            Firmdata  += ((data[(bluecell_length + 1) + (i + 1)] << 8) & 0x0000FF00);
+            Firmdata  += ((data[(bluecell_length + 1) + (i + 2)] << 16) & 0x00FF0000);
+            Firmdata  += ((data[(bluecell_length + 1) + (i + 3)] << 24) & 0xFF000000);            
+            if(HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD,Address ,   (uint32_t)Firmdata) != HAL_OK){
+                printf("HAL NOT OK \n");
+                ret = 1;
+            }
+            Address += 4;
+        }
+        //if(!(i%FirmwareUpdateDelay))
+      //  HAL_Delay(1);
+    }
+    return ret;
+}
 #endif // PYJ.2020.05.20_END -- 
 
 uint8_t Flash_write(uint8_t* data) // ?占쏙옙湲고븿?占쏙옙
@@ -108,7 +179,7 @@ uint8_t Flash_write(uint8_t* data) // ?占쏙옙湲고븿?占쏙옙
     EraseInitStruct.PageAddress = FLASH_USER_START_ADDR;
     EraseInitStruct.NbPages     = (FLASH_USER_END_ADDR - FLASH_USER_START_ADDR) / FLASH_PAGE_SIZE;
 
-    __HAL_RCC_TIM6_CLK_DISABLE(); // 留ㅼ씤???占쏙옙癒몌옙?? ?占쏙옙占�??占쏙옙?占쏙옙?占쏙옙
+//    __HAL_RCC_TIM6_CLK_DISABLE(); // 留ㅼ씤???占쏙옙癒몌옙?? ?占쏙옙占�??占쏙옙?占쏙옙?占쏙옙
     HAL_FLASH_Unlock(); // lock ??占�?
     if(flashinit == 0){
         flashinit= 1;
@@ -119,9 +190,59 @@ uint8_t Flash_write(uint8_t* data) // ?占쏙옙湲고븿?占쏙옙
     }
 //    FLASH_If_Erase();
     ret = Flash_RGB_Data_Write(&data[bluecell_stx]);
+//    ret = Flash_DataTest_Write(&data[bluecell_stx]);
+
     HAL_FLASH_Lock(); // lock ?占쏙옙洹멸린
-    __HAL_RCC_TIM6_CLK_ENABLE(); // 留ㅼ씤???占쏙옙癒몌옙?? ?占쏙옙?占쏙옙?占쏙옙?占쏙옙?占쏙옙?占쏙옙
+//    __HAL_RCC_TIM6_CLK_ENABLE(); // 留ㅼ씤???占쏙옙癒몌옙?? ?占쏙옙?占쏙옙?占쏙옙?占쏙옙?占쏙옙?占쏙옙
 
     return ret;
+}
+
+
+uint8_t Bank_Flash_write(uint8_t* data,uint32_t StartBankAddress) // ?占쏙옙湲고븿?占쏙옙
+{
+
+    /*Variable used for Erase procedure*/
+    static FLASH_EraseInitTypeDef EraseInitStruct;
+    static uint32_t PAGEError = 0;
+    uint8_t ret = 0;
+    /* Fill EraseInit structure*/
+    switch(StartBankAddress){
+        case FLASH_USER_START_ADDR:
+            EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
+            EraseInitStruct.PageAddress = FLASH_USER_START_ADDR;
+            EraseInitStruct.NbPages     = (FLASH_USER_END_ADDR - FLASH_USER_START_ADDR) / FLASH_PAGE_SIZE;
+        break;
+        case FLASH_USER_BANK1_START_ADDR:
+            EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
+            EraseInitStruct.PageAddress = FLASH_USER_BANK1_START_ADDR;
+            EraseInitStruct.NbPages     = (FLASH_USER_END_ADDR - FLASH_USER_BANK1_START_ADDR) / FLASH_PAGE_SIZE;
+
+        break;
+        case FLASH_USER_BANK2_START_ADDR:
+            EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
+            EraseInitStruct.PageAddress = FLASH_USER_BANK2_START_ADDR;
+            EraseInitStruct.NbPages     = (FLASH_USER_END_ADDR - FLASH_USER_BANK2_START_ADDR) / FLASH_PAGE_SIZE;
+
+        break;
+        case FLASH_USER_TEMPBANK_START_ADDR:
+            EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
+            EraseInitStruct.PageAddress = FLASH_USER_TEMPBANK_START_ADDR;
+            EraseInitStruct.NbPages     = (FLASH_USER_END_ADDR - FLASH_USER_TEMPBANK_START_ADDR) / FLASH_PAGE_SIZE;
+        break;
+
+    }
 
+    HAL_FLASH_Unlock(); // lock ??占�?
+    if(flashinit == 0){
+        flashinit= 1;
+        //FLASH_PageErase(StartAddr);
+        if (HAL_FLASHEx_Erase(&EraseInitStruct, &PAGEError) != HAL_OK){
+            printf("Erase Failed \r\n");
+        }
+    }
+    ret = Flash_RGB_Data_Write(&data[bluecell_stx]);
+    HAL_FLASH_Lock(); // lock ?占쏙옙洹멸린
+    return ret;
 }
+

Src/main.c

@@ -144,7 +144,7 @@ int main(void)
 	 // printf("Uart Start \r\n");
 	  if(LedTimerCnt > 500){HAL_GPIO_TogglePin(BOOT_LED_GPIO_Port,BOOT_LED_Pin);LedTimerCnt = 0;}
 	  while (TerminalQueue.data > 0 && UartTimerCnt > 30) GetDataFromUartQueue(&hTerminal);
-//	  while(FirmwareTimerCnt > 3000)  Jump_App();
+	  while(FirmwareTimerCnt > 3000)  Jump_App();
 
 	  //HAL_Delay(500);
     /* USER CODE END WHILE */