Flash 주소 변경

Bluecell_Inc/flash.h

@@ -16,9 +16,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 FLASH_USER_BANK1_START_ADDR ((uint32_t)0x08025000)
+#define FLASH_USER_BANK2_START_ADDR ((uint32_t)0x08045000)
 
 
 

Bluecell_Src/flash.c

@@ -30,7 +30,7 @@ void Jump_App(void){
 void Flash_InitRead(void) // ?占쏙옙湲고븿?占쏙옙
 {
     uint32_t  Address = 0;
-    Address = FLASH_USER_TEMPBANK_START_ADDR;
+    Address = FLASH_USER_BANK1_START_ADDR;
     for(uint32_t i = 0; i < 300; i++ ){
         printf("%08x : %02X \n",Address ,*(uint8_t*)Address);
         Address++;
@@ -55,6 +55,7 @@ uint8_t Flash_Data_Write(uint8_t* data){
     uint16_t Firmdata = 0;
     uint8_t ret = 0;
     int i = 0;
+    static uint8_t Errcnt = 0;
     static uint32_t Curr_Download_DataIndex = 0;
     static uint32_t Prev_Download_DataIndex = 0;  
     
@@ -66,16 +67,21 @@ uint8_t Flash_Data_Write(uint8_t* data){
 //    data[MBIC_PAYLOADSTART + 12 +i];
    
     returntoFirst:
-    UserAddress -= i;
     for(i= 0; i <= Curr_Download_DataIndex - Prev_Download_DataIndex; i+=2){
         Firmdata  = ((data[MBIC_PAYLOADSTART + 12 +i]) & 0x00FF);
         Firmdata  += ((data[MBIC_PAYLOADSTART + 12 +i + 1] << 8) & 0xFF00);
-        if(HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,UserAddress ,   (uint16_t)Firmdata) != HAL_OK){
+        if(HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,UserAddress ,   (uint16_t)Firmdata) != HAL_OK)
+        {
             printf("HAL NOT OK \n");
             ret = 1;
             HAL_Delay(1000);
+            if(Errcnt == 0xFF)
+                return;
+            
+            Errcnt++;
             goto returntoFirst;
         }else{
+            Errcnt = 0; //Err Cnt Init;
             UserAddress += 2;
         }
     }
@@ -83,6 +89,43 @@ uint8_t Flash_Data_Write(uint8_t* data){
     return ret;
 }
 
+uint8_t API_Flash_Data_Write(uint8_t* data){
+    uint16_t Firmdata = 0;
+    uint8_t ret = 0;
+    int i = 0;
+    static uint8_t Errcnt = 0;
+    static uint32_t Curr_Download_DataIndex = 0;
+    static uint32_t Prev_Download_DataIndex = 0;  
+    
+    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];      
+
+//    data[MBIC_PAYLOADSTART + 12 +i];
+   
+    returntoFirst:
+    for(i= 0; i <= Curr_Download_DataIndex - Prev_Download_DataIndex; i+=2){
+        Firmdata  = ((data[MBIC_PAYLOADSTART + 12 +i]) & 0x00FF);
+        Firmdata  += ((data[MBIC_PAYLOADSTART + 12 +i + 1] << 8) & 0xFF00);
+        if(HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD,UserAddress ,   (uint16_t)Firmdata) != HAL_OK)
+        {
+            printf("HAL NOT OK \n");
+            ret = 1;
+            HAL_Delay(1000);
+            if(Errcnt == 0xFF)
+                return;
+            
+            Errcnt++;
+            goto returntoFirst;
+        }else{
+            Errcnt = 0; //Err Cnt Init;
+            UserAddress += 2;
+        }
+    }
+    Prev_Download_DataIndex = Curr_Download_DataIndex + 1;
+    return ret;
+}
 
 
 
@@ -118,11 +161,6 @@ uint8_t Bank_Flash_write(uint8_t* data,uint32_t StartBankAddress) // ?占쏙옙
                 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 - 128;
-                EraseInitStruct.NbPages     = (FLASH_USER_END_ADDR - FLASH_USER_TEMPBANK_START_ADDR) / FLASH_PAGE_SIZE;
-            break;
 
         }        
         
@@ -136,10 +174,10 @@ uint8_t Bank_Flash_write(uint8_t* data,uint32_t StartBankAddress) // ?占쏙옙
     HAL_FLASH_Lock(); // lock ?占쏙옙洹멸린
     return ret;
 }
-#define DATA_32                 ((uint32_t)0x12345678)
+#define DATA_32                 ((uint32_t)0x33333333)
 __IO bool EraseInit = false;
 
-void MBIC_APIFLASH_test(){
+void MBIC_APIFLASH_test(uint8_t* data,uint32_t size){
     static FLASH_EraseInitTypeDef EraseInitStruct;
     static uint32_t Address = 0, PAGEError = 0;
         
@@ -153,8 +191,8 @@ void MBIC_APIFLASH_test(){
     /* Fill EraseInit structure*/
     if(EraseInit == false){
         EraseInitStruct.TypeErase   = FLASH_TYPEERASE_PAGES;
-        EraseInitStruct.PageAddress = FLASH_USER_TEMPBANK_START_ADDR;
-        EraseInitStruct.NbPages     = ((FLASH_USER_TEMPBANK_START_ADDR + ((uint32_t)0x000FFFF)) - FLASH_USER_TEMPBANK_START_ADDR) / FLASH_PAGE_SIZE;
+        EraseInitStruct.PageAddress = FLASH_USER_BANK1_START_ADDR;
+        EraseInitStruct.NbPages     = ((FLASH_USER_BANK1_START_ADDR + ((uint32_t)0x000FFFF)) - FLASH_USER_BANK1_START_ADDR) / FLASH_PAGE_SIZE;
         printf("Erase Start\r\n");
         if (HAL_FLASHEx_Erase(&EraseInitStruct, &PAGEError) != HAL_OK)
         {
@@ -179,13 +217,13 @@ void MBIC_APIFLASH_test(){
     /* Program the user Flash area word by word
       (area defined by FLASH_USER_START_ADDR and FLASH_USER_END_ADDR) ***********/
     
-    Address = FLASH_USER_TEMPBANK_START_ADDR;
+    Address = FLASH_USER_BANK1_START_ADDR;
     printf("HAL_FLASH_Program Start\r\n");
-    while (Address < ((FLASH_USER_TEMPBANK_START_ADDR + ((uint32_t)0x000FFFF))))
+    while (Address < ((FLASH_USER_BANK1_START_ADDR + 12)))
     {
       if (HAL_FLASH_Program(FLASH_TYPEPROGRAM_HALFWORD, Address, DATA_32) == HAL_OK)
       {
-        Address = Address + 2;
+        Address = Address + 4;
       }
       else
       {
@@ -208,34 +246,34 @@ void MBIC_APIFLASH_test(){
     /* Check if the programmed data is OK
         MemoryProgramStatus = 0: data programmed correctly
         MemoryProgramStatus != 0: number of words not programmed correctly ******/
-    Address = FLASH_USER_TEMPBANK_START_ADDR;
+    Address = FLASH_USER_BANK1_START_ADDR;
     MemoryProgramStatus = 0x0;
     
-    while (Address < ((FLASH_USER_TEMPBANK_START_ADDR + ((uint32_t)0x000FFFF))))
-    {
-      data32 = *(__IO uint32_t *)Address;
-       printf("%08x : %02X \n",Address ,*(uint8_t*)Address);
-      if (data32 != DATA_32)
-      {
-        MemoryProgramStatus++;
-      }
-      Address = Address + 4;
-    }
-    
-    /*Check if there is an issue to program data*/
-    if (MemoryProgramStatus == 0)
-    {
-        printf("DATA OK \r\n");
-      /* No error detected. Switch on LED2*/
-    }
-    else
-    {
-      /* Error detected. LED2 will blink with 1s period */
-      while (1)
-      {
-         printf("Read Error\r\n");
-      }
-    }
+//    while (Address < ((FLASH_USER_BANK1_START_ADDR + 12)))
+//    {
+//      data32 = *(__IO uint32_t *)Address;
+//       printf("%08x : %02X \n",Address ,*(uint8_t*)Address);
+//      if (data32 != DATA_32)
+//      {
+//        MemoryProgramStatus++;
+//      }
+//      Address = Address + 4;
+//    }
+//    
+//    /*Check if there is an issue to program data*/
+//    if (MemoryProgramStatus == 0)
+//    {
+//        printf("DATA OK \r\n");
+//      /* No error detected. Switch on LED2*/
+//    }
+//    else
+//    {
+//      /* Error detected. LED2 will blink with 1s period */
+//      while (1)
+//      {
+//         printf("Read Error\r\n");
+//      }
+//    }
 
 
 }

STM32F103ZE_FLASH.ld

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