CRC Check 기능 추가 CheckSum 기능 추가 / MBIC Header Check 기능추가

Debug/Src/CRC16.su

@@ -1,4 +1,6 @@
-CRC16.c:50:10:CRC16_Generate	8	static
-CRC16.c:84:9:CRC16_Check	12	static
-CRC16.c:119:9:STH30_CreateCrc	8	static
-CRC16.c:137:9:STH30_CheckCrc	12	static
+CRC16.c:51:6:Chksum_Check	8	static
+CRC16.c:64:9:Chksum_Create	0	static
+CRC16.c:76:10:CRC16_Generate	8	static
+CRC16.c:110:9:CRC16_Check	12	static
+CRC16.c:145:9:STH30_CreateCrc	8	static
+CRC16.c:163:9:STH30_CheckCrc	12	static

Debug/Src/main.su

@@ -1,5 +1,5 @@
 main.c:74:6:HAL_TIM_PeriodElapsedCallback	0	static
 main.c:83:5:_write	8	static
-main.c:157:6:SystemClock_Config	72	static
-main.c:95:5:main	40	static
-main.c:358:6:Error_Handler	0	static
+main.c:161:6:SystemClock_Config	72	static
+main.c:99:5:main	40	static
+main.c:362:6:Error_Handler	0	static

Inc/CRC16.h

@@ -15,6 +15,8 @@ typedef enum{
     NO_ERROR
 }etError;
 
+bool Chksum_Check(uint8_t *data, uint32_t leng,uint8_t chkdata);
+uint8_t Chksum_Create(uint8_t *data);
 
 uint16_t CRC16_Generate(uint8_t *buf_ptr, int32_t len);
 etError CRC16_Check(uint8_t *buf_ptr, int32_t len,uint16_t checksum);

Inc/MBIC_Bootloader.h

@@ -23,6 +23,24 @@ typedef enum{
   MBIC_Reboot_Notice_RSP,
 }MBIC_Download_Rsp_L;
 
+#define MBIC_HEADER_SIZE 22
+#define MBIC_PREAMBLE0 0x16
+#define MBIC_PREAMBLE1 0x16
+#define MBIC_PREAMBLE2 0x16
+#define MBIC_PREAMBLE3 0x16
+#define MBIC_SUBUID0 0x00
+#define MBIC_SUBUID1 0xF1
+#define MBIC_RCODE
+#define MBIC_TRID
+#define MBIC_SEQNUM
+#define MBIC_TTL
+#define MBIC_TIME
+#define MBIC_ERRRESPONSE 0x00
+#define MBIC_CMD
+#define MBIC_LENGTH
+#define MBIC_CHECKSHUM_INDEX MBIC_HEADER_SIZE - 1 //CheckSUM REMOVE INDEX
+#define MBIC_ETX 0x03
+#define MBIC_NODE_MU 0x80
 
 typedef enum{
 	MBIC_PREAMBLE_0 = 0,

Inc/uart.h

@@ -11,7 +11,7 @@
 #include "main.h"
 #include "Bootloader.h"
 #define hTerminal    huart1
-#define hWifi        huart2
+#define hTest        huart2
 
 #define QUEUE_BUFFER_LENGTH 2048
 

Src/CRC16.c

@@ -5,6 +5,7 @@
  *      Author: parkyj
  */
 #include "CRC16.h"
+#include "MBIC_Bootloader.h"
 /*---------------------------------------------------------------------------------------*/
 /*									CRC16	TABLE						    			 */
 /*---------------------------------------------------------------------------------------*/
@@ -47,6 +48,31 @@ uint16_t Table_CRC16[]  = {
 //-----------------------------------------------
 //UART CRC üũ �Լ�
 //-----------------------------------------------
+bool Chksum_Check(uint8_t *data, uint32_t leng,uint8_t chkdata)
+{
+   uint8_t dataret = 0;
+   bool ret = false;
+   for(int i = MBIC_SUBUID_0; i < MBIC_HEADERCHECKSUM_0; i++){
+        dataret += data[i];
+   }
+   if(dataret == chkdata){
+        ret = true;
+   }
+//    printf("dataret : %x   chkdata : %x \r\n",dataret,chkdata);
+    return ret;
+}
+uint8_t Chksum_Create(uint8_t *data)
+{
+   uint8_t dataret = 0;
+
+   for(int i = MBIC_SUBUID_0; i < MBIC_HEADERCHECKSUM_0; i++){
+        dataret += data[i];
+//        printf("dataret : %x data[%d] : %x \r\n",dataret,i,data[i]);
+   }
+//    printf("dataret : %x \r\n",dataret);
+    return dataret;
+}
+
 uint16_t CRC16_Generate(uint8_t *buf_ptr, int32_t len)
 {
 	uint8_t dt = 0U;

Src/MBIC_Bootloader.c

@@ -7,13 +7,150 @@
 
 
 #include "main.h"
+#include <stdbool.h>
 #include "MBIC_Bootloader.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;
 
-void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
 
+BootLoaderDataCheck_st MBIC_FileDataCheck(uint8_t* data){
+  BootLoaderDataCheck_st ret = {0,0,false};
+  int8_t MBIC_Mark[9] = "JT-NRDAS ";
+  int8_t MBIC_FileName1[] = "jhfs-mbic-nrdas-v";
+  int8_t MBIC_FileName2[] = "v00.00.01.mbc";
+  uint8_t MBIC_type = 0x20;
+  uint8_t MBIC_FileType = 0x00;
+  int i = 0;
+  /***
+  MARK Check
+  ***/
+  for(i = MARK_START_POSITION; i < TYPE_START_POSITION; i++){
+    if(MBIC_Mark[i] != data[i]){
+      printf("Data Diff \r\n");
+      return ret;
+    }else{
+      printf("MARK Data Success \r\n");
+    }
+  }
+    /***
+  TYPE Check
+  ***/
+  for(i = TYPE_START_POSITION; i < FILE_TYPE_START_POSITION; i++){
+    if(MBIC_type != data[i]){
+      printf("Data Diff \r\n");
+      return ret;
+    }
+    else
+    printf("Type Data Success \r\n");
+  }  
+    /***
+  File Type Check
+  ***/
+  for(i = FILE_TYPE_START_POSITION; i < VERSION_START_POSITION; i++){
+    if(MBIC_FileType != data[i]){
+      printf("Data Diff \r\n");
+      return ret;
+    }
+    else
+      printf("File Type Data Success \r\n");
+  }  
+    /***
+  Version Check 
+  ***/
+  for(i = VERSION_START_POSITION; i < FILENAME_START_POSITION; i++){
+    printf("Version Data Success Version %x\r\n",data[i]);    
+  }
+  /***
+  File Name Check
+  ***/
+  for(i = FILENAME_START_POSITION; i < 30; i++){
+    if(MBIC_FileName1[i-14] != data[i]){
+      printf("Data Diff \r\n");
+      printf("MBIC_FileName1[%d] : %x, data[%d] :  %x\r\n",i - 14,MBIC_FileName1[i - 14],i,data[i]);
+      return ret;
+    }
+    else
+      printf("File Name Data Success %c\r\n",data[i]);
+  }  
+  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;
+    }
+    else
+      printf("File Name Data Success %c\r\n",data[i]);
+  }   
+
+  for(i = i; i < 49; i++){
+      printf("Creation Success %x\r\n",data[i]);
+  }
+  for(i = i; i < 55; i++){
+    printf("Creation Success data[%d] : %x\r\n",i,data[i]);
+  }
+  printf(" %d",data[i++]);
+  printf(" -%02d",data[i++]);
+  printf(" -%02d",data[i++]);
+  printf(" -%02d",data[i++]);
+  printf(" -%02d",data[i++]);
+  printf(" -%02d\r\n",data[i++]);
+  
+  
+  
+  ret.Length = ((data[i++] << 8) & 0xFF00);
+  ret.Length += (data[i++]);
+  printf("data[%d] : %d\r\n",i - 1,ret.Length);
+  printf("data[%d] : %d\r\n",i - 1,ret.Length);
+
+  ret.Crcchk = ((data[i++] << 8) & 0xFF00);
+  ret.Crcchk += (data[i++]);
+  
+  printf("CRC_H[%d] : %x\r\n",i,ret.Crcchk);
+  printf("CRC_L[%d] : %x\r\n",i,ret.Crcchk);
+
+  ret.FileChk = true;
+  return ret;
+}
+
+
+
+void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
     uint8_t datatype = data[MBIC_PAYLOADSTART];
 
+#if 0 // PYJ.2020.06.04_BEGIN -- 
+    uint8_t dataTest[1024] = {
+      0x4A,0x54,0x2D,0x4E,0x52,0x44,0x41,0x53,0x20,0x20,0x00,0x00,
+        0x00,0x01,0x6A,0x68,0x66,0x73,0x2D,0x6D,0x62,0x69,0x63,0x2D,
+        0x6E,0x72,0x64,0x61,0x73,0x2D,0x76,0x30,0x30,0x2E,0x30,0x30,0x2E,
+        0x30,0x31,0x2E,0x6D,0x62,0x63,0x20,0x20,0x20,0x20,0x20,0x20,0x20,
+        0x20,0x20,0x20,0x20,0x20,0x14,0x06,0x03,0x10,0x1F,0xC4,0x3C,0x49,
+        0x42,0x98,0xE0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+        0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
+    };
+    MBIC_FileDataCheck(dataTest);
+    
+#endif // PYJ.2020.06.04_END -- 
+
+
+//    printf("RX");
+//    for(int i = 0; i < 128; i++)
+//        printf("%c",*data++);
     switch(datatype){
         case MBIC_Notice_REQ:
             

Src/main.c

@@ -86,6 +86,10 @@ int _write (int file, uint8_t *ptr, uint16_t len)
     return len;
 }
 extern UARTQUEUE TerminalQueue;
+
+
+
+
 /* USER CODE END 0 */
 
 /**
@@ -140,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

@@ -6,7 +6,8 @@
  */
 
 #include "uart.h"
-
+#include "CRC16.h"
+#include "MBIC_Bootloader.h"
 UARTQUEUE TerminalQueue;
 UARTQUEUE WifiQueue;
 
@@ -18,6 +19,8 @@ void InitUartQueue(pUARTQUEUE pQueue)
     {
       //_Error_Handler(__FILE__, __LINE__);
     }
+
+
     //HAL_UART_Receive_DMA(&hTerminal,  TerminalQueue.Buffer, 1);
     //HAL_UART_Receive_IT(hTerminal, pQueue->Buffer + pQueue->head, 1);
 }
@@ -51,10 +54,10 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
 {
     volatile static uint8_t update_data_buf[QUEUE_BUFFER_LENGTH];
     volatile static int cnt;
-    uint8_t temp_buf[11];
-    
-//    UART_HandleTypeDef *dst = (huart->Instance == USART2 ? &hWifi:&hTerminal);
-    UART_HandleTypeDef *dst = &hTerminal;
+    uint16_t Length = 0;
+    uint16_t CrcChk = 0;
+    UART_HandleTypeDef *dst = (huart->Instance == USART2 ? &hTest:&hTerminal);
+//    UART_HandleTypeDef *dst = &hTerminal;
     pUARTQUEUE pQueue = &TerminalQueue;
 //    if (HAL_UART_Transmit(dst, pQueue->Buffer + pQueue->tail, 1, 3000) != HAL_OK)
 //    {
@@ -69,15 +72,32 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
     if(pQueue->data == 0){
         //HAL_UART_Transmit_DMA(dst, &temp_buf[BLUECELL_HEADER00], 11);
 #if 0 // PYJ.2019.07.15_BEGIN -- 
-//            for(int i = 0; i < cnt; i++){
-//                printf("%02x",update_data_buf[i]);
-//            }
+            for(int i = 0; i < 128; i++){
+                printf("%02x",update_data_buf[i]);
+            }
 #endif // PYJ.2019.07.15_END -- 
         cnt = 0;
-        if(update_data_buf[0] = 0xbe)
+        if(update_data_buf[0] == 0xbe){
             FirmwareUpdateStart(&update_data_buf[0]);
-        else
-            MBIC_Bootloader_FirmwareUpdate(&update_data_buf[0]);
+        }
+        else if(update_data_buf[0] == MBIC_PREAMBLE0
+               &&update_data_buf[1] == MBIC_PREAMBLE1
+               &&update_data_buf[2] == MBIC_PREAMBLE2
+               &&update_data_buf[3] == MBIC_PREAMBLE3){
+                   
+               if(Chksum_Check(update_data_buf,MBIC_HEADER_SIZE - 4,update_data_buf[MBIC_CHECKSHUM_INDEX])){
+                Length = ((update_data_buf[MBIC_LENGTH_0] << 8) | update_data_buf[MBIC_LENGTH_1]);
+                CrcChk = ((update_data_buf[MBIC_PAYLOADSTART + Length + 1] << 8) | (update_data_buf[MBIC_PAYLOADSTART + Length + 2]));
+                    if(CRC16_Check(&update_data_buf[MBIC_PAYLOADSTART], Length,CrcChk)){
+                       MBIC_Bootloader_FirmwareUpdate(&update_data_buf[0]);
+                    }else{
+                        printf("CRC ERR %x \r\n",CrcChk);
+                    }
+               }
+               else{
+                    printf("CHECK SUM ERR %x \r\n",update_data_buf[MBIC_CHECKSHUM_INDEX]);
+               }
+            }
         for(int i  = 0; i < QUEUE_BUFFER_LENGTH; i++)
             update_data_buf[i] = 0;