Data 동시 설정 시 Length 덮어 쓰는 문제 수정 / 알람마스크 수정

Bluecell_Src/Bluecell_operate.c

@@ -2566,7 +2566,7 @@ bool Bluecell_Operate(uint8_t* data){
 //        Txdata[sizeof(BLUESTATUS_st) - 2] = STH30_CreateCrc(&Txdata[BLUECELL_TYPE], sizeof(BLUESTATUS_st) - 3);
 //        Uart1_Data_Send(&Txdata[0], sizeof(BLUESTATUS_st));        
         EEPROM_M24C08_Zerowrite(EEPROM_M24C08_ID ,(EEPROM_ATT_BASE));
-//        printf("ZERO WRITE COMPLETE");
+        printf("ZERO WRITE COMPLETE\r\n Reset Start \r\n");
 
          NVIC_SystemReset();
 
@@ -3253,11 +3253,11 @@ uint32_t MBIC_DataSend(uint8_t* data){
     data[MBIC_PAYLOADSTART + i++] = 10; // LENGTH
     
 
-    data[MBIC_PAYLOADSTART + i++] = 0x80;
-    data[MBIC_PAYLOADSTART + i++] = 0xFF;
-    data[MBIC_PAYLOADSTART + i++] = 0xFF;
-    data[MBIC_PAYLOADSTART + i++] = 0x0F;
-    data[MBIC_PAYLOADSTART + i++] = 0xFF;
+    data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_MASK1;
+    data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_MASK2;
+    data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_MASK3;
+    data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_MASK4;
+    data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_MASK5;
     if(bluecell_Currdatastatus.SelfTest == true){
         data[MBIC_PAYLOADSTART + i++] = 0;
         data[MBIC_PAYLOADSTART + i++] = 0;
@@ -4817,7 +4817,8 @@ void Carrier_ONOFF(uint8_t val){
 
 //        HAL_Delay(10);
         CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
-    }else{
+    }
+    else{
         bluecell_Currdatastatus.ATT_DL1_PATH = false;    
         bluecell_Currdatastatus.ATT_DL2_PATH = false;    
         bluecell_Currdatastatus.ATT_DL3_PATH = false;    
@@ -5396,10 +5397,20 @@ bool MBIC_Operate(uint8_t* data){
 //                printf("bluecell_Currdatastatus.ALARM_MASK5 : %x \r\n",data[MBIC_PAYLOADSTART + 7]);                                
                 break;
             case  Alarm_Test_Mode                         :
-//                printf("bluecell_Currdatastatus.ALsARM_TESTMODE : %d \r\n",bluecell_Currdatastatus.ALARM_TESTMODE);
                 bluecell_Currdatastatus.ALARM_TESTMODE = data[MBIC_PAYLOADSTART + 3]; 
-//                printf("data[MBIC_PAYLOADSTART + 3];  : %d \r\n",data[MBIC_PAYLOADSTART + 3]);
-//                printf("bluecell_Currdatastatus.ALARM_TESTMODE : %d \r\n",bluecell_Currdatastatus.ALARM_TESTMODE);
+//                printf("Alarm Test mode Data : ");
+//                for(int i = 0 ; i < 8 ; i++){
+//                    printf("%x ",data[MBIC_PAYLOADSTART + 3 + i]);
+//                }
+//                printf("\r\n");
+                if(bluecell_Currdatastatus.ALARM_TESTMODE == false){
+                    bluecell_Currdatastatus.ALARM_Test_Dummy1 = 0;
+                    bluecell_Currdatastatus.ALARM_Test_Dummy2 = 0;
+                    bluecell_Currdatastatus.ALARM_Test_Dummy3 = 0;
+                    bluecell_Currdatastatus.ALARM_Test_Dummy4 = 0;
+                    bluecell_Currdatastatus.ALARM_Test_Dummy5 = 0;
+                }
+//                printf("Alarm Test Mode start");
                 break;
             case  Alarm_Test_Dummy                        :
                 bluecell_Currdatastatus.ALARM_Test_Dummy1 = data[MBIC_PAYLOADSTART + 3]; 
@@ -5426,14 +5437,14 @@ bool MBIC_Operate(uint8_t* data){
                 Bluecell_StructCpy(&DataWrite[0],&bluecell_Currdatastatus.bluecell_header,sizeof(BLUESTATUS_st));
                 EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_WINDOW_STATUS_ADDRESDS),&DataWrite[0],sizeof(BLUESTATUS_st));
                 EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_WINDOW_STATUS_ADDRESDS,&bluecell_Currdatastatus.bluecell_header,sizeof(BLUESTATUS_st) );
-//                printf("bluecell_Currdatastatus.CPU_Bank_Select : %d \r\n",bluecell_Currdatastatus.CPU_Bank_Select);
-//                printf("I will Booting Bank : %d \r\n",bluecell_Currdatastatus.CPU_Current_Bank);
-//                printf("Reset : \r\n");
+                printf("bluecell_Currdatastatus.CPU_Bank_Select : %d \r\n",bluecell_Currdatastatus.CPU_Bank_Select);
+                printf("I will Booting Bank : %d \r\n",bluecell_Currdatastatus.CPU_Current_Bank);
+                printf("Reset : \r\n");
                 NVIC_SystemReset();
                 break;
             case  SW_Reset                                :
 //                Table_LengSet();
-//                printf("SoftWare Reset Start \r\n");
+                printf("MBIC SoftWare Reset Start \r\n");
                 bluecell_Currdatastatus.S_W_Reset = data[MBIC_PAYLOADSTART + 3]; 
                 NVIC_SystemReset();
                 break;
@@ -5983,10 +5994,11 @@ bool MBIC_Operate(uint8_t* data){
                 CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
                 break;
         }
-        if(data[MBIC_PAYLOADSTART + data[MBIC_PAYLOADSTART + 2] + 3 ] == 0xE0 && occurlen > 0){
-            occurlen -= data[MBIC_PAYLOADSTART + 2] + 3;
+        uint8_t tmpLength = data[MBIC_PAYLOADSTART + 2];
+        if(data[MBIC_PAYLOADSTART + tmpLength + 3 ] == 0xE0 && occurlen > 0){
+            occurlen -= tmpLength + 3;
             for(int k = 0; k < occurlen; k++){
-                data[MBIC_PAYLOADSTART + k] = data[MBIC_PAYLOADSTART + data[MBIC_PAYLOADSTART + 2] + 3 + k];
+                data[MBIC_PAYLOADSTART + k] = data[MBIC_PAYLOADSTART + tmpLength+ 3 + k];
             }
             goto protocolReplay;
         }

Bluecell_Src/uart.c

@@ -168,7 +168,7 @@ void Uart1_Data_Send(uint8_t* data,uint16_t size){
   //HAL_UART_Transmit_IT(&hTerminal, &data[0],size);
 //    printf("data[278] : %x \r\n",data[278]);
 ////    HAL_Delay(1);   
-#if 0 // PYJ.2020.07.19_BEGIN -- 
+#if 0 // PYJ.2020.07.19_BEGIN --
     printf("\r\n [TX] : ");
     for(int i = 0; i< size; i++)
         printf("%02x ",data[i]);