MBIC Index 추가 ,MBIC Flash Write 함수 별도 추가 ,

Inc/MBIC_Bootloader.h

@@ -8,20 +8,7 @@
 #ifndef MBIC_BOOTLOADER_H_
 #define MBIC_BOOTLOADER_H_
 
-typedef enum{
-  MBIC_Notice_REQ = 0x10,
-  MBIC_Download_DATA_REQ,
-  MBIC_Download_Confirm_REQ,
-  MBIC_Complete_Notice_REQ_REQ,
-  MBIC_Reboot_Notice_REQ,
-}MBIC_Download_Req_L;
-typedef enum{
-  MBIC_Notice_RSP = 0x90,
-  MBIC_Download_DATA_RSP,
-  MBIC_Download_Confirm_RSP,
-  MBIC_Complete_Notice_RSP,
-  MBIC_Reboot_Notice_RSP,
-}MBIC_Download_Rsp_L;
+
 
 #define MBIC_HEADER_SIZE 22
 #define MBIC_TAIL_SIZE 3
@@ -43,6 +30,15 @@ typedef enum{
 #define MBIC_CHECKSHUM_INDEX MBIC_HEADER_SIZE - 1 //CheckSUM REMOVE INDEX
 #define MBIC_ETX 0x03
 #define MBIC_NODE_MU 0x80
+#define MARK_START_POSITION						0
+#define TYPE_START_POSITION						9	
+#define FILE_TYPE_START_POSITION				10
+#define VERSION_START_POSITION					11
+#define FILENAME_START_POSITION					14
+#define CREATION_TIME_START_POSITION			55
+#define LENGTH_START_POSITION					61
+#define CRC_START_POSITION						65
+#define RESERVED_START_POSITION					69
 
 typedef enum{
 	MBIC_PREAMBLE_0 = 0,
@@ -75,5 +71,29 @@ typedef enum{
 	 * PayLoadSTART
 	 */
 }MBICProt_st;
+typedef enum{
+  MBIC_Notice_REQ = 0x10,
+  MBIC_Download_DATA_REQ,
+  MBIC_Download_Confirm_REQ,
+  MBIC_Complete_Notice_REQ_REQ,
+  MBIC_Reboot_Notice_REQ,
+}MBIC_Download_Req_L;
+typedef enum{
+  MBIC_Notice_RSP = 0x90,
+  MBIC_Download_DATA_RSP,
+  MBIC_Download_Confirm_RSP,
+  MBIC_Complete_Notice_RSP,
+  MBIC_Reboot_Notice_RSP,
+}MBIC_Download_Rsp_L;
+
+
+
+
+
+typedef struct{
+    uint16_t Length;
+    uint16_t Crcchk;
+    bool FileChk;
+}BootLoaderDataCheck_st;
 
 #endif /* MBIC_BOOTLOADER_H_ */

Inc/flash.h

@@ -30,4 +30,5 @@
 #define FirmwareUpdateDelay 50
 
 
+
 #endif /* FLASH_H_ */

Inc/uart.h

@@ -31,5 +31,5 @@ void InitUartQueue(pUARTQUEUE pQueue);
 void GetDataFromUartQueue(UART_HandleTypeDef *huart);
 bool Get_UartRcv(void);
 void Set_UartRcv(bool);
-void Uart1_Data_Send(uint8_t* data,uint8_t size);
+void Uart1_Data_Send(uint8_t* data,uint16_t size);
 #endif /* UART_H_ */

STM32F103_ATTEN_PLL_Zig.elf.launch

@@ -45,4 +45,5 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
 <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
+<stringAttribute key="saved_expressions&lt;seperator&gt;Unknown" value="update_data_buf,data"/>
 </launchConfiguration>

Src/MBIC_Bootloader.c

@@ -11,20 +11,13 @@
 #include "main.h"
 #include "MBIC_Bootloader.h"
 #include "CRC16.h"
-#define MARK_START_POSITION						0
-#define TYPE_START_POSITION						9	
-#define FILE_TYPE_START_POSITION				10
-#define VERSION_START_POSITION					11
-#define FILENAME_START_POSITION					14
-#define CREATION_TIME_START_POSITION			55
-#define LENGTH_START_POSITION					61
-#define CRC_START_POSITION						65
-#define RESERVED_START_POSITION					69
-typedef struct{
-    uint16_t Length;
-    uint16_t Crcchk;
-    bool FileChk;
-}BootLoaderDataCheck_st;
+#include "uart.h"
+
+
+extern uint8_t Bank_Flash_write(uint8_t* data,uint32_t StartBankAddress);
+
+
+
 
 
 BootLoaderDataCheck_st MBIC_FileDataCheck(uint8_t* data){
@@ -118,7 +111,7 @@ BootLoaderDataCheck_st MBIC_FileDataCheck(uint8_t* data){
 
   ret.Crcchk = ((data[i++] << 8) & 0xFF00);
   ret.Crcchk += (data[i++]);
-  
+  /*ONLY DATA CRC*/  
   printf("CRC_H[%d] : %x\r\n",i,ret.Crcchk);
   printf("CRC_L[%d] : %x\r\n",i,ret.Crcchk);
 
@@ -137,7 +130,6 @@ uint8_t* MBIC_HeaderMergeFunction(uint8_t* data,uint16_t Length )
 {
     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));
@@ -177,28 +169,43 @@ uint8_t* MBIC_HeaderMergeFunction(uint8_t* data,uint16_t Length )
 
     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 < Length; i++){
+//        data[MBIC_PAYLOADSTART + i] = data[i];
+//    }
+    /*
+        MBIC Header Data input
+    */
     for(int i = 0; i < MBIC_HEADER_SIZE; i++){
+        if(i == MBIC_CMD_0) /*cmd exception*/
+            continue;
         data[i] = ret[i];
     }
+      /*
+          MBIC Tail Data input
+      */
+    
       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];
+//    for(int i = 0; i < Length; i++)
+//        printf("MBIC : %x \r\n",data[i]);
 
     return data;
 }
 
 void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
     uint8_t MBIC_DownLoadData[0xFFFF];
-    uint16_t cmd = data[MBIC_CMD_0];
+    uint8_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;    
+    uint32_t TotalFrame = 0;
+    uint32_t CurrFrame = 0;
+    
+    uint32_t i = 0 ;
 #if 0 // PYJ.2020.06.04_BEGIN -- 
     uint8_t dataTest[1024] = {
       0x4A,0x54,0x2D,0x4E,0x52,0x44,0x41,0x53,0x20,0x20,0x00,0x00,
@@ -214,7 +221,7 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
     };
     
 #endif // PYJ.2020.06.04_END -- 
-    MBIC_FileDataCheck(data);
+    
 
 //    printf("RX");
 //    for(int i = 0; i < 128; i++)
@@ -238,13 +245,19 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
             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;      
+//            printf("ccc\r\n");
         break;
         case MBIC_Download_DATA_REQ:
+            TotalFrame = data[MBIC_PAYLOADSTART + 0] << 24
+                        |data[MBIC_PAYLOADSTART + 1] << 16
+                        |data[MBIC_PAYLOADSTART + 2] << 8
+                        |data[MBIC_PAYLOADSTART + 3] << 0;
+//            MBIC_FileDataCheck(data);
             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 + 1];
             data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 2];
             data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 3];        
             /*Current Download Frame Number*/        
@@ -261,11 +274,13 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
             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]);
+            for(i = 0; i < Curr_Download_DataIndex - Prev_Download_DataIndex; i++){
+                    MBIC_DownLoadData[i] = data[MBIC_PAYLOADSTART + 12 +i];
+                    printf("%02x ",MBIC_DownLoadData[i]);
             }
-            
+//            printf("Data End\r\n");
+//            Bank_Flash_write(data,FLASH_USER_TEMPBANK_START_ADDR);
+//            HAL_Delay(100);
             Prev_Download_DataIndex  = Curr_Download_DataIndex;
             break;
         case MBIC_Download_Confirm_REQ:
@@ -332,5 +347,10 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
             return;
     }
     data[MBIC_CMD_0] = cmd;
-    MBIC_HeaderMergeFunction(data,index); // reponse
+    
+    data = MBIC_HeaderMergeFunction(data,index); // reponse
+//	HAL_UART_Transmit_DMA(&huart1, data,22 + 3 + index);
+
+    
+    Uart1_Data_Send(data ,22 + 3 + index);
 }

Src/flash.c

@@ -5,8 +5,10 @@
  *      Author: parkyj
  */
 #include "flash.h"
+#include "MBIC_Bootloader.h"
 uint8_t flashinit = 0;
 uint32_t Address = FLASH_USER_START_ADDR;
+volatile static uint32_t UserAddress;
 
 typedef void (*fptr)(void);
 fptr jump_to_app;
@@ -60,6 +62,7 @@ void Flash_InitRead(void) // ?占쏙옙湲고븿?占쏙옙
 #if 1 // PYJ.2020.05.20_BEGIN -- 
 uint8_t Flash_RGB_Data_Write(uint8_t* data){
     uint16_t Firmdata = 0;
+
     uint8_t ret = 0;
     for(int i = 0; i < data[bluecell_length] - 2; i+=2){
         Firmdata  = ((data[(bluecell_length + 1) + i]) & 0x00FF);
@@ -74,6 +77,31 @@ uint8_t Flash_RGB_Data_Write(uint8_t* data){
     }
     return ret;
 }
+uint8_t Flash_Data_Write(uint8_t* data){
+    uint16_t Firmdata = 0;
+    uint8_t ret = 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];
+    for(int i= 0; i <= Curr_Download_DataIndex - Prev_Download_DataIndex+1; 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;
+        }
+        UserAddress += 2;
+    }
+    Prev_Download_DataIndex = Curr_Download_DataIndex;
+    return ret;
+}
+
 uint8_t Flash_Bank_Data_Write(uint8_t* data){
     uint16_t Firmdata = 0;
     uint16_t Length = 0;
@@ -93,6 +121,7 @@ uint8_t Flash_Bank_Data_Write(uint8_t* data){
     return ret;
 }
 
+#if 0 // PYJ.2020.06.10_BEGIN -- 
 uint8_t Flash_Data_Write(uint8_t* data){
     uint64_t Firmdata = 0;
     uint8_t ret = 0;
@@ -130,6 +159,7 @@ uint8_t Flash_Data_Write(uint8_t* data){
     }
     return ret;
 }
+#endif // PYJ.2020.06.10_END -- 
 uint8_t Flash_DataTest_Write(uint8_t* data){
     uint32_t Firmdata = 0;
     uint8_t ret = 0;
@@ -236,12 +266,13 @@ uint8_t Bank_Flash_write(uint8_t* data,uint32_t StartBankAddress) // ?占쏙옙
     HAL_FLASH_Unlock(); // lock ??占�?
     if(flashinit == 0){
         flashinit= 1;
+        UserAddress = EraseInitStruct.PageAddress;
         //FLASH_PageErase(StartAddr);
         if (HAL_FLASHEx_Erase(&EraseInitStruct, &PAGEError) != HAL_OK){
             printf("Erase Failed \r\n");
         }
     }
-    ret = Flash_RGB_Data_Write(&data[bluecell_stx]);
+    ret = Flash_Data_Write(&data[MBIC_PREAMBLE_0]);
     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 */

Src/uart.c

@@ -50,9 +50,9 @@ void PutDataToUartQueue(UART_HandleTypeDef *huart, uint8_t data)
    // HAL_UART_Receive_DMA(&hTerminal,  pQueue->Buffer + pQueue->head, 10);
 }
 
+uint8_t update_data_buf[QUEUE_BUFFER_LENGTH];
 void GetDataFromUartQueue(UART_HandleTypeDef *huart)
 {
-    volatile static uint8_t update_data_buf[QUEUE_BUFFER_LENGTH];
     volatile static int cnt;
     uint16_t Length = 0;
     uint16_t CrcChk = 0;
@@ -107,7 +107,13 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
 
 }
 
-void Uart1_Data_Send(uint8_t* data,uint8_t size){
-	HAL_UART_Transmit_DMA(&huart1, data,size);
+void Uart1_Data_Send(uint8_t* data,uint16_t size){
+//    printf("size : %d \r\n",size);
+    HAL_UART_Transmit (&huart1, data, size, 0xFFFF);
+//    for(int i = 0; i < size; i++)
+//    if(HAL_UART_Transmit_DMA(&huart1, data, size) != HAL_OK){
+//        printf("ERROR \r\n");
+//    }
+//        printf("data : %x \r\n",data[i]);
 }