DCT 프로토콜 부트 작업 완료 내용

Bluecell_Inc/Bluecell_operate.h

@@ -156,6 +156,18 @@ typedef enum{
     ALC_Table_UL4_Ref_Index,            
     ALC_Table_UL_Ref_Index_MAX,      
 };
+    
+typedef enum{
+    Table_DL1_Ref_Index = 0,
+    Table_DL2_Ref_Index,        
+    Table_DL3_Ref_Index,        
+    Table_DL4_Ref_Index,            
+    Table_UL1_Ref_Index,
+    Table_UL2_Ref_Index,        
+    Table_UL3_Ref_Index,        
+    Table_UL4_Ref_Index,            
+    Table_ATT_Ref_Index_MAX,      
+};
 
 typedef enum{
 	Alarm_Bit_List = 0x00,

Bluecell_Src/Bluecell_operate.c

@@ -399,26 +399,33 @@ double TableAtteGuarantee(uint8_t* Table,double AttenValue){
 
 #if 1 // PYJ.2020.05.25_BEGIN -- 
 AGC_dBm_t AGC_Table_ref[AGC_Table_DL_Ref_Index_MAX] = {
-     5   ,    4   ,    3   ,    2   ,
-     1   ,    0   ,    -1  ,    -2  ,
-    -3  ,    -4  ,    -5  ,    -6  ,
-    -7  ,    -8  ,    -9  ,    -10 ,
-    -11 ,    -12 ,    -13 ,    -14 ,
-    -15 ,    -16 ,    -17 ,    -18 ,
-    -19 ,    -20 ,    -21 ,    -22 ,
-    -23 ,    -24 ,    -25 ,  
+   {  5  ,} , {   4  ,} ,  { 3   ,}, {  2 ,} ,
+   {  1  ,} , {   0  ,} ,  { -1  ,}, {  -2,} ,
+   { -3  ,},  {  -4  ,},   {-5  , }, { -6 ,},
+   { -7  ,},  {  -8  ,},   {-9  , }, { -10,},
+   { -11 ,},  {  -12 ,},   {-13 , }, { -14,},
+   { -15 ,},  {  -16 ,},   {-17 , }, { -18,},
+   { -19 ,},  {  -20 ,},   {-21 , }, { -22,},
+   { -23 ,},  {  -24 ,},   {-25 , }
 
 }; 
 ALC_dBm_t ALC_Table_ref[ALC_Table_UL_Ref_Index_MAX] = {
-    -15 ,    -16 ,    -17 ,    -18 ,  -19 ,
-    -20 ,    -21 ,    -22 ,    -23 ,  -24 ,    -25 ,    -26 ,    -27 ,
-    -28 ,    -29 ,    -30 ,    -31 ,  -32 ,    -33 ,    -34 ,    -35 ,
-    -36 ,    -37 ,    -38 ,    -39 ,  -40 ,    -41 ,    -42 ,    -43 ,
-    -44 ,    -45 ,    -46 ,    -47 ,  -48 ,    -49 ,    -50 ,    -51 ,
-    -52 ,    -53 ,    -54 ,    -55 ,  -56 ,    -57 ,    -58 ,    -59 ,
-    -60 ,
+    {15,} ,   { -16,} ,   { -17 ,},    {-18,} , { -19,} ,
+    {20,} ,   { -21,} ,   { -22 ,},    {-23,} , { -24,} ,   { -25,} ,   { -26,} ,   { -27,} ,
+    {28,} ,   { -29,} ,   { -30 ,},    {-31,} , { -32,} ,   { -33,} ,   { -34,} ,   { -35,} ,
+    {36,} ,   { -37,} ,   { -38 ,},    {-39,} , { -40,} ,   { -41,} ,   { -42,} ,   { -43,} ,
+    {44,} ,   { -45,} ,   { -46 ,},    {-47,} , { -48,} ,   { -49,} ,   { -50,} ,   { -51,} ,
+    {52,} ,   { -53,} ,   { -54 ,},    {-55,} , { -56,} ,   { -57,} ,   { -58,} ,   { -59,} ,
+    {60,} 
 
 };
+#if 0 // PYJ.2020.06.29_BEGIN -- 
+ATT_TABLE_st Atten_Table_ref[Table_ATT_Ref_Index_MAX] = { 
+
+
+}
+#endif // PYJ.2020.06.29_END -- 
+
 #define TableDataSetting_ATT_DL_STEP 0.5 * 10
 #define TableDataSetting_ATT_UL_STEP 0.5 * 10
 #define TableDataSetting_ATT_DL_LEVEL_STEP 1 * 10
@@ -4592,8 +4599,9 @@ bool MBIC_Operate(uint8_t* data){
     }
     else{
         MBIC_Bootloader_FirmwareUpdate(data);
+        
         /*NOP*/
-        printf("DATA ERR\r\n");
+        printf("DATA Updating\r\n");
     }
 //    Uart1_Data_Send(&data[0], data[BLUECELL_LENGTH] + 3);
 	return true;

Bluecell_Src/MBIC_Bootloader.c

@@ -164,6 +164,7 @@ uint8_t* MBIC_HeaderMergeFunction(uint8_t* data,uint16_t Length )
     ret[MBIC_TIME_4] = data[MBIC_TIME_4];
     ret[MBIC_TIME_5] = data[MBIC_TIME_5];
     ret[MBIC_ERRRESPONSE_0] = MBIC_ERRRESPONSE;
+    ret[MBIC_CMD_0] = data[MBIC_CMD_0];
 
 
 
@@ -210,6 +211,8 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
     static uint32_t Prev_Download_DataIndex = 0;    
     uint32_t TotalFrame = 0;
     uint32_t CurrFrame = 0;
+    uint32_t PrevFrame = 0 ;
+    static uint32_t prevFrame = 0xFF;
     
     uint16_t DataLength = 0;
     uint16_t Crcret = 0;
@@ -217,7 +220,7 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
     uint32_t i = 0 ;
     uint32_t FirmFile_Length  = 0;
     uint32_t  CurrApiAddress = 0,Bank1Address=0,Bank2Address = 0;
-    uint8_t BankNum = 0;
+    static uint8_t BankNum = 0;
     static bool CRCERR = false;
     CurrApiAddress = FLASH_MBICUSER_START_ADDR;
     Bank1Address = FLASH_USER_BANK1_START_ADDR;
@@ -246,19 +249,24 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
 //        printf("%c",*data++);
     switch(cmd){
         case MBIC_Notice_REQ:
+            Download_Option = 0;
+            Curr_Download_DataIndex = 0;
+            Prev_Download_DataIndex = 0;
+            
             printf("MBIC DOWNLOAD REQUEST \r\n");
             cmd = MBIC_Notice_RSP;
             CRCERR = false;
+            EraseInit = false;
             /*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];
+            data[MBIC_PAYLOADSTART + index++] = 1;
             Download_Option = data[MBIC_PAYLOADSTART + 4];
             /*DOWNLOAD DELAY REQUEST*/
-            data[MBIC_PAYLOADSTART + index++] = 3;
+            data[MBIC_PAYLOADSTART + index++] = 10;
             /*DOWNLOAD Reserve*/
             data[MBIC_PAYLOADSTART + index++] = 0;
             data[MBIC_PAYLOADSTART + index++] = 0;
@@ -316,17 +324,19 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
               }else{
                 BankNum = HFR_BANK1;
               }
-              MBIC_APIFLASH_Func(&data[MBIC_PAYLOADSTART + 12],Curr_Download_DataIndex - Prev_Download_DataIndex,BankNum);
-              printf("Bank1data[MBIC_BOOT_MARK] : %d \r\n",Bank1data[MBIC_BOOT_MARK]);
-              if(BankNum == HFR_BANK1)
-                  Crcret = CRC16_Generate(&Bank1data[MBIC_BOOT_MARK], TotalFrame);
-              else
-                Crcret = CRC16_Generate(&Bank2data[MBIC_BOOT_MARK], TotalFrame);
-                printf("CurrFrame : %d ,FirmFile_Length : %x \r\n",CurrFrame,TotalFrame);
+              MBIC_APIFLASH_Func(&data[MBIC_PAYLOADSTART + 12],1024,BankNum);
+              printf("Bank1data[MBIC_BOOT_MARK] : %d \r\n",Bank2data[MBIC_BOOT_MARK]);
+//              if(BankNum == HFR_BANK1)
+//                  Crcret = CRC16_Generate(&Bank1data[MBIC_BOOT_MARK], TotalFrame);
+//              else
+//                Crcret = CRC16_Generate(&Bank2data[MBIC_BOOT_MARK], TotalFrame);
+                printf("CurrFrame : %d ,FirmFile_Length : %d \r\n",CurrFrame,TotalFrame);
                 printf("FILE CRC RET : %x \r\n",Crcret);              
 
 //            HAL_Delay(100);
             Prev_Download_DataIndex  = Curr_Download_DataIndex + 1;
+            prevFrame = CurrFrame;
+
             break;
         case MBIC_Download_Confirm_REQ:
             EraseInit = true;
@@ -338,13 +348,15 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
                                 | Bank1data[MBIC_BOOT_LENGTH + 2] << 8
                                 | Bank1data[MBIC_BOOT_LENGTH + 3];
                 Crcret = CRC16_Generate(&Bank1data[MBIC_BOOT_MARK], FirmFile_Length);
+                printf("Bank 1 CRC Calc\r\n");                
             }
-            else if(BankNum == HFR_BANK2){
+            else {
                  FirmFile_Length = (Bank2data[MBIC_BOOT_LENGTH + 0] << 24)
                                 | Bank2data[MBIC_BOOT_LENGTH + 1] << 16
                                 | Bank2data[MBIC_BOOT_LENGTH + 2] << 8
                                 | Bank2data[MBIC_BOOT_LENGTH + 3];           
-                Crcret = CRC16_Generate(&Bank2data[MBIC_BOOT_MARK], FirmFile_Length);
+                Crcret = CRC16_Generate(&Bank2data[MBIC_BOOT_MARK], FirmFile_Length - 1);
+                printf("Bank 2 CRC Calc\r\n");
             }
             RecvCrc = data[MBIC_PAYLOADSTART] << 8 | data[MBIC_PAYLOADSTART + 1];
 
@@ -353,6 +365,7 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
         
             data[MBIC_PAYLOADSTART + index++] = ((Crcret & 0xFF00) >> 8);
             data[MBIC_PAYLOADSTART + index++] = ((Crcret & 0x00FF));
+#if 0 // PYJ.2020.06.29_BEGIN -- 
             if(Crcret != RecvCrc){
                 CRCERR = true;
                 printf("CRC ERROR : MBIC : %x / MDOC : %x \r\n",Crcret,RecvCrc);
@@ -362,8 +375,9 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
                 printf("CRC Success : MBIC : %x / MDOC : %x \r\n",Crcret,RecvCrc);
                 data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 2] = 1;
             }
+#endif // PYJ.2020.06.29_END -- 
             
-            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 3] = 0;        
+            data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 3] = 1;        
             /*DOWNLOAD OPTION*/        
             data[MBIC_PAYLOADSTART + index++] = data[MBIC_PAYLOADSTART + 4] = 0;
             data[MBIC_PAYLOADSTART + index++] = 0;
@@ -399,12 +413,12 @@ void MBIC_Bootloader_FirmwareUpdate(uint8_t* data){
     for(int i =0; i < 22 + 3 + index; i++){
         MBIC_Resp[i] = data[i];
     }
-//	HAL_UART_Transmit_DMA(&huart1, data,22 + 3 + index);
     DataLength = 22 + 3 + index;
-     Crcret =CRC16_Generate(&data[MBIC_PAYLOADSTART], DataLength - 25);
+    Crcret =CRC16_Generate(&data[MBIC_PAYLOADSTART], DataLength - 25);
     MBIC_Resp[(DataLength - 1) - 2] = (Crcret & 0xFF00) >> 8;  
     MBIC_Resp[(DataLength - 1) - 1] = (Crcret & 0x00FF);       
     
     
     Uart1_Data_Send(MBIC_Resp ,22 + 3 + index);
+    MBIC_DataErase_Func(BankNum);
 }

Bluecell_Src/flash.c

@@ -655,8 +655,6 @@ uint8_t MBIC_APIFLASH_Func(uint8_t* data,uint32_t size,uint8_t bank_num){
        {
            printf("HAL_FLASH_Program Error\r\n");
            printf("Flash Failed %x \r\n",MBIC_Address);
-           if(downindex / 64)
-                HAL_Delay(5);
        }
      }
 

Bluecell_Src/uart.c

@@ -11,7 +11,7 @@
 
 #include "string.h"
 #include "Bluecell_operate.h"
-
+#include "CRC.h"
 
 
 UARTQUEUE TerminalQueue;
@@ -19,6 +19,8 @@ UARTQUEUE WifiQueue;
 uart_hal_tx_type uart_hal_tx;
 extern volatile uint32_t UartRxTimerCnt;
 extern bool Bluecell_Operate(uint8_t* data);
+extern void MBIC_Operate(uint8_t * data);
+
 void InitUartQueue(pUARTQUEUE pQueue)
 {
   pQueue->data = pQueue->head = pQueue->tail = 0;
@@ -103,7 +105,7 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
             for(int i = 0; i < cnt; i++){
                 printf("%02x ",uart_buf[i]);
             }
-            printf("                       CNT : %d \r\n",cnt);
+            printf(ANSI_COLOR_GREEN"\r\n CNT : %d \r\n"ANSI_COLOR_RESET,cnt);
 #endif // PYJ.2019.07.15_END --
             if(uart_buf[0] == 0xbe){
                 Length = uart_buf[BLUECELL_LENGTH_H] << 8  |  uart_buf[BLUECELL_LENGTH_L] ;
@@ -144,6 +146,7 @@ void Uart_Check(void){
 
 void Uart1_Data_Send(uint8_t* data,uint16_t size){
 //    HAL_UART_Transmit(&hTerminal, &data[0],size,0xFFFF);
+//    HAL_UART_Transmit(&hTerminal, &data[0],size,0xFFFF);
 //    HAL_UART_Transmit(&hTest, &data[0],size,0xFFFF);
       HAL_UART_Transmit_DMA(&hTerminal, &data[0],size);
 
@@ -155,6 +158,13 @@ void Uart1_Data_Send(uint8_t* data,uint16_t size){
 //        printf(",0x%02x ",data[i]);
 //    printf("};\r\n\tCOUNT : %d \r\n",size);
 //    printf("\r\n");
+//    printf("\r\n [TX] : {");
+//    for(int i = 0; i< size; i++){
+//        printf(",%02x ",data[i]);
+//        data[i] = 0;
+//    }
+//    printf("};\r\n\tCOUNT : %d \r\n",size);
+//    printf("\r\n");
     
 }
 

STM32F103ZET_JDASMBIC.elf.launch

@@ -57,5 +57,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="uart_buf,0x08005000,0x8005000,Bank2data"/>
+<stringAttribute key="saved_expressions&lt;seperator&gt;Unknown" value="uart_buf,0x08005000,0x8005000,Bank2data,data"/>
 </launchConfiguration>

STM32F103ZE_FLASH.ld

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