HFR Download Test 후 수정 사항

 - 알람 테스트 모드 구현
 - 알람 더미 실제로 사용 할 수 있도로 변경
 -  알람마스크 기능 구현

Bluecell_Src/Bluecell_operate.c

@@ -3101,26 +3101,52 @@ uint32_t MBIC_DataSend(uint8_t* data){
     data[MBIC_PAYLOADSTART + i++] = 10; // LENGTH
     
 
-    data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_MASK1 = 0x80;
-    data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_MASK2 = 0xFF;
-    data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_MASK3 = 0xFF;
-    data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_MASK4 = 0x0F;
-    data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_MASK5 = 0xFF;
-     if(bluecell_Currdatastatus.Carrier_ON_OFF == false){/*Carrier OFF -> Alarm OFF*/
-        data[MBIC_PAYLOADSTART + i++] = 0;
-        data[MBIC_PAYLOADSTART + i++] = 0;
-        data[MBIC_PAYLOADSTART + i++] = 0;
-        data[MBIC_PAYLOADSTART + i++] = 0;
-        data[MBIC_PAYLOADSTART + i++] = 0;
+    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;
+     if(bluecell_Currdatastatus.Carrier_ON_OFF == false || bluecell_Currdatastatus.ALARM_TESTMODE == true){/*Carrier OFF -> Alarm OFF*/
+        if(bluecell_Currdatastatus.ALARM_TESTMODE == false){
+            data[MBIC_PAYLOADSTART + i++] = 0;
+            data[MBIC_PAYLOADSTART + i++] = 0;
+            data[MBIC_PAYLOADSTART + i++] = 0;
+            data[MBIC_PAYLOADSTART + i++] = 0;
+            data[MBIC_PAYLOADSTART + i++] = 0;
+        }else{
+            data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_Test_Dummy1;
+            data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_Test_Dummy2;
+            data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_Test_Dummy3;
+            data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_Test_Dummy4;
+            data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_Test_Dummy5;
+
+        }
      }else{
-        data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_TEMP_HIGH;
-        data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_DLI_Level;
-        data[MBIC_PAYLOADSTART + i++] = (bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & 0xF0 )
-                                      | (bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & 0x0F);
+        if(bluecell_Currdatastatus.ALARM_MASK1 == true)
+            data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_TEMP_HIGH;
+        else
+            data[MBIC_PAYLOADSTART + i++] = 0;
         
-        data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_ULO_Level;
-        data[MBIC_PAYLOADSTART + i++] = (bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & 0xF0)
+        if(bluecell_Currdatastatus.ALARM_MASK2 == true)
+            data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_DLI_Level;
+        else
+            data[MBIC_PAYLOADSTART + i++] = 0;
+
+        if(bluecell_Currdatastatus.ALARM_MASK3 == true)
+            data[MBIC_PAYLOADSTART + i++] = (bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & 0xF0 )
+                                       | (bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & 0x0F);
+        else
+            data[MBIC_PAYLOADSTART + i++] = 0;    
+        if(bluecell_Currdatastatus.ALARM_MASK4 == true)                                      
+            data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.ALARM_ULO_Level;
+        else
+        data[MBIC_PAYLOADSTART + i++] = 0;
+
+        if(bluecell_Currdatastatus.ALARM_MASK5 == true)
+            data[MBIC_PAYLOADSTART + i++] = (bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & 0xF0)
                                         |(bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & 0x0F);
+        else
+            data[MBIC_PAYLOADSTART + i++] = 0;            
     }
     /*ALARM BIT MASK*/
     data[MBIC_PAYLOADSTART + i++] = MBIC_AID;
@@ -4481,6 +4507,7 @@ bool MBIC_Operate(uint8_t* data){
                 bluecell_Currdatastatus.ALARM_MASK5 = 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]; 
                 break;
             case  Alarm_Test_Dummy                        :
@@ -4489,6 +4516,11 @@ bool MBIC_Operate(uint8_t* data){
                 bluecell_Currdatastatus.ALARM_Test_Dummy3 = data[MBIC_PAYLOADSTART + 5];
                 bluecell_Currdatastatus.ALARM_Test_Dummy4 = data[MBIC_PAYLOADSTART + 6];
                 bluecell_Currdatastatus.ALARM_Test_Dummy5 = data[MBIC_PAYLOADSTART + 7];
+//                printf("Dummy 1 : %d \r\n",bluecell_Currdatastatus.ALARM_Test_Dummy1);
+//                printf("Dummy 2 : %d \r\n",bluecell_Currdatastatus.ALARM_Test_Dummy2);
+//                printf("Dummy 3 : %d \r\n",bluecell_Currdatastatus.ALARM_Test_Dummy3);
+//                printf("Dummy 4 : %d \r\n",bluecell_Currdatastatus.ALARM_Test_Dummy4);
+//                printf("Dummy 5 : %d \r\n",bluecell_Currdatastatus.ALARM_Test_Dummy5);                
                 break;
             case  CPU_Bank_Select_Reboot_by               :
                 bluecell_Currdatastatus.CPU_Bank_Select = data[MBIC_PAYLOADSTART + 3]; 
@@ -7428,6 +7460,46 @@ void FRBT_Operate(){
         FRBT_Tracking_Package(DET_Alarm_DL4_Index,&bluecell_Currdatastatus.DLI_FRBT_Atten4_H,&bluecell_Currdatastatus.ATT_DL4_H,bluecell_Currdatastatus.ATT_DL4_PATH);
 //        printf("Tracking ... \r\n");
     }
+}
+void LED_Alarm_Check(){
+    if(bluecell_Currdatastatus.ALARM_TESTMODE == false){
+      if(  (bluecell_Currdatastatus.ALARM_TEMP_HIGH      > 0 && bluecell_Currdatastatus.ALARM_MASK1 == true) 
+        || (bluecell_Currdatastatus.ALARM_DLI_Level      > 0 && bluecell_Currdatastatus.ALARM_MASK2 == true)
+        || (bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN  > 0 && bluecell_Currdatastatus.ALARM_MASK3 == true)
+        || (bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm  > 0 && bluecell_Currdatastatus.ALARM_MASK3 == true)
+        || (bluecell_Currdatastatus.ALARM_ULO_Level      > 0 && bluecell_Currdatastatus.ALARM_MASK4 == true)
+        || (bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm  > 0 && bluecell_Currdatastatus.ALARM_MASK5 == true)
+        || (bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN  > 0 && bluecell_Currdatastatus.ALARM_MASK5 == true))
+        {
+    //        AlarmTimerOnSet = true;
+    //        AlarmTimerOffSet = false;
+    //        if(AlarmTimerOnCnt > 3000){
+                Alarm_LED_OnSet  = true;
+    //        }
+        }else{
+    //        AlarmTimerOffSet = true;// False 
+    //        if(AlarmTimerOffCnt > 10000){
+    //            AlarmTimerOnSet = false;
+                Alarm_LED_OnSet = false;
+    //            printf("=================AlarmTimerOffCnt=================\r\n");
+    //        }
+        }
+    }
+    else{
+        if(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)
+        {
+            Alarm_LED_OnSet  = true;
+        }
+        else{
+            Alarm_LED_OnSet = false;
+        }
+
+}
+
 }
 void Alarm_Check(){
    // double temp = 0;
@@ -7435,28 +7507,8 @@ void Alarm_Check(){
    // int8_t ResdBm[4] = {0,};
 
 
-    if(bluecell_Currdatastatus.ALARM_TEMP_HIGH             > 0 
-    || bluecell_Currdatastatus.ALARM_DLI_Level             > 0
-    || bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN         > 0
-    || bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm         > 0
-    || bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm         > 0
-    || bluecell_Currdatastatus.ALARM_ULO_Level             > 0
-    || bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN         > 0)
-    {
-//        AlarmTimerOnSet = true;
-//        AlarmTimerOffSet = false;
-//        if(AlarmTimerOnCnt > 3000){
-            Alarm_LED_OnSet  = true;
-//        }
-    }else{
-//        AlarmTimerOffSet = true;// False 
-//        if(AlarmTimerOffCnt > 10000){
-//            AlarmTimerOnSet = false;
-            Alarm_LED_OnSet = false;
-//            printf("=================AlarmTimerOffCnt=================\r\n");
-//        }
-    }
-
+  
+    LED_Alarm_Check();
     Temp_HighAlarmCheck();
     DLI_AGCAlarmCheck();
     ULO_ALCAlarmCheck();