BootLoader CRC Index 추가 / Header 파일에 CRC 관련 Lib 추가 / Uart1 Lib Header 추가 / Signal 담당 지역변수 전역변수로 변경 / Uart Timer Delay 30ms 변경

Inc/Bootloader.h

@@ -50,6 +50,7 @@ typedef enum{
     bluecell_stx = 0,
     bluecell_type = 1,
     bluecell_length,
+	bluecell_CrcIndex,
     bluecell_crc,
     bluecell_ext,   
 }FirmwareUpdate_t;

Inc/CRC16.h

@@ -18,4 +18,6 @@ typedef enum{
 
 uint16_t CRC16_Generate(uint8_t *buf_ptr, int32_t len);
 etError CRC16_Check(uint8_t *buf_ptr, int32_t len,uint16_t checksum);
+uint8_t STH30_CreateCrc(uint8_t *data, uint8_t nbrOfBytes);
+uint8_t STH30_CreateCrc(uint8_t *data, uint8_t nbrOfBytes);
 #endif /* CRC16_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);
 #endif /* UART_H_ */

Src/Bootloader.c

@@ -13,31 +13,31 @@ uint16_t updatecnt = 0;
 #define Bluecell_BootStart 0x0b
 
 
+uint8_t BootStartdata[6] = {0xbe,Bluecell_BootStart,0x03,4,0,0xeb};
 void Firmware_BootStart_Signal(){
-    uint8_t bootdata[5] = {0xbe,Bluecell_BootStart,0x02,0,0xeb};
-    bootdata[bluecell_crc] = STH30_CreateCrc(&bootdata[bluecell_type],bootdata[bluecell_length]);
-    Uart1_Data_Send(&bootdata[bluecell_stx],bootdata[bluecell_length] + 3); 
+	BootStartdata[bluecell_crc] = STH30_CreateCrc(&BootStartdata[bluecell_type],BootStartdata[bluecell_length]);
+    Uart1_Data_Send(&BootStartdata[bluecell_stx],BootStartdata[bluecell_length] + 3);
 }
 
+    uint8_t AckData_Buf[6] = {0xbe,FirmwareUpdataAck,0x03,5,0,0xbe};
 void FirmwareUpdateStart(uint8_t* data){
     uint8_t ret = 0,crccheck = 0;
-    uint8_t tempdata[5] = {0xbe,FirmwareUpdataAck,0x02,0,0xbe};
     crccheck = STH30_CheckCrc(&data[bluecell_type],data[bluecell_length],data[data[bluecell_length] + 1]);
     if(crccheck == NO_ERROR){
-        tempdata[bluecell_type] = FirmwareUpdataAck;
+        AckData_Buf[bluecell_type] = FirmwareUpdataAck;
         if(data[bluecell_type] == 0xDD || data[bluecell_type] == 0xEE)//Start Firmware byte
             ret = Flash_write(&data[0]);
         if(ret == 1)
-            tempdata[bluecell_type] = FirmwareUpdataNak;
+            AckData_Buf[bluecell_type] = FirmwareUpdataNak;
     }else{
         for(uint8_t i = 0; i < data[bluecell_length] + 3; i++)
             printf("%02x ",data[i]);
         printf("Check Sum error \n");
-        tempdata[bluecell_type] = FirmwareUpdataNak;
+        AckData_Buf[bluecell_type] = FirmwareUpdataNak;
     }
-    tempdata[bluecell_crc] = STH30_CreateCrc(&tempdata[bluecell_type],tempdata[bluecell_length]);
+    AckData_Buf[bluecell_crc] = STH30_CreateCrc(&AckData_Buf[bluecell_type],AckData_Buf[bluecell_length]);
     if(data[bluecell_type] != 0xEE && data[bluecell_type] != Bluecell_Reset){
-        Uart1_Data_Send(&tempdata[bluecell_stx],tempdata[bluecell_length] + 3); 
+        Uart1_Data_Send(&AckData_Buf[bluecell_stx],AckData_Buf[bluecell_length] + 3);
     }
     if(data[bluecell_type] == 0xEE)
         printf("update Complete \n");

Src/main.c

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

Src/uart.c

@@ -67,7 +67,7 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
     pQueue->data--;
     
     if(pQueue->data == 0){
-        HAL_UART_Transmit_DMA(dst, &temp_buf[BLUECELL_HEADER00], 11);
+        //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]);
@@ -86,6 +86,6 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
 }
 
 void Uart1_Data_Send(uint8_t* data,uint8_t size){
-    HAL_UART_Transmit(&huart1, data,size, 10); 
+	HAL_UART_Transmit_DMA(&huart1, data,size);
 }