부팅시 LED Cnt 3번 LED TEST 시 LED Cnt 10번으로 변경

Bluecell_Src/Bluecell_operate.c

@@ -89,6 +89,8 @@ volatile uint8_t Selftest_UL_PrevAttenSave[8] = {0,};
 uint8_t TempShutdown_DL_SaveData[4] = {false,};
 uint8_t TempShutdown_UL_SaveData[4] = {false,};    
 
+extern volatile uint32_t AlarmReport_TimerCnt;
+extern uint8_t Led_ToggleCntSet;
 
 /***************************************************************************************/
 /*                                  Function                                           */
@@ -341,8 +343,9 @@ void Boot_LED_Toggle(void){
             LED_TestCnt++;
             LedTimerCnt = 0;
           /*Set LED TEST variable False after 12 flashes*/
-          if(LED_TestCnt >= 20){
+          if(LED_TestCnt >= Led_ToggleCntSet){
             bluecell_Currdatastatus.LED_TEST = false;
+            Led_ToggleCntSet = 20;
             LED_TestCnt = 0;
           }
         }
@@ -2860,7 +2863,7 @@ bool Bluecell_Operate(uint8_t* data){
         }
         break;
     case Bluecell_LED_TEST  :                                 
-        bluecell_Currdatastatus.LED_TEST = data[BLUECELL_DATA + i++];
+        bluecell_Currdatastatus.LED_TEST = true;
 //        printf("%s : %d Value : %d \r\n",__func__,__LINE__,bluecell_Currdatastatus.LED_TEST);
         break;
     case Bluecell_Temperature_Offset                      :   
@@ -5114,14 +5117,14 @@ uint8_t* Alarm_Report_Send(uint16_t Alarm_type,uint8_t val){
  
     switch(Alarm_type){
         case Temp_High:             sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"Temp:%d, Th:%d",bluecell_Currdatastatus.DET_TEMP,bluecell_Currdatastatus.Temp_High_Threshold);    break;
-        case DLI_P4_Level_Low:      sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"DLI:%2.1f, Th:%2.1f",Res_DL_dBm[DET_Alarm_DL1_Index],LimitData_DL_Low);    break;
-        case DLI_P3_Level_Low:      sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"DLI:%2.1f, Th:%2.1f",Res_DL_dBm[DET_Alarm_DL2_Index],LimitData_DL_Low);    break;
-        case DLI_P2_Level_Low:      sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"DLI:%2.1f, Th:%2.1f",Res_DL_dBm[DET_Alarm_DL3_Index],LimitData_DL_Low);    break;
-        case DLI_P1_Level_Low:      sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"DLI:%2.1f, Th:%2.1f",Res_DL_dBm[DET_Alarm_DL4_Index],LimitData_DL_Low);    break;
-        case DLI_P4_Level_High:     sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"DLI:%2.1f, Th:%2.1f",Res_DL_dBm[DET_Alarm_DL1_Index],LimitData_DL_High);    break;
-        case DLI_P3_Level_High:     sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"DLI:%2.1f, Th:%2.1f",Res_DL_dBm[DET_Alarm_DL2_Index],LimitData_DL_High);    break;
-        case DLI_P2_Level_High:     sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"DLI:%2.1f, Th:%2.1f",Res_DL_dBm[DET_Alarm_DL3_Index],LimitData_DL_High);    break;
-        case DLI_P1_Level_High:     sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"DLI:%2.1f, Th:%2.1f",Res_DL_dBm[DET_Alarm_DL4_Index],LimitData_DL_High);    break;
+        case DLI_P4_Level_Low:      sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"DLI:%d, Th:%d",Res_DL_dBm[DET_Alarm_DL1_Index],LimitData_DL_Low);    break;
+        case DLI_P3_Level_Low:      sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"DLI:%d, Th:%d",Res_DL_dBm[DET_Alarm_DL2_Index],LimitData_DL_Low);    break;
+        case DLI_P2_Level_Low:      sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"DLI:%d, Th:%d",Res_DL_dBm[DET_Alarm_DL3_Index],LimitData_DL_Low);    break;
+        case DLI_P1_Level_Low:      sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"DLI:%d, Th:%d",Res_DL_dBm[DET_Alarm_DL4_Index],LimitData_DL_Low);    break;
+        case DLI_P4_Level_High:     sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"DLI:%d, Th:%d",Res_DL_dBm[DET_Alarm_DL1_Index],LimitData_DL_High);    break;
+        case DLI_P3_Level_High:     sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"DLI:%d, Th:%d",Res_DL_dBm[DET_Alarm_DL2_Index],LimitData_DL_High);    break;
+        case DLI_P2_Level_High:     sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"DLI:%d, Th:%d",Res_DL_dBm[DET_Alarm_DL3_Index],LimitData_DL_High);    break;
+        case DLI_P1_Level_High:     sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"DLI:%d, Th:%d",Res_DL_dBm[DET_Alarm_DL4_Index],LimitData_DL_High);    break;
         case DLI_P4_AGC_Alarm:
         case DLI_P3_AGC_Alarm:
         case DLI_P2_AGC_Alarm:
@@ -5130,10 +5133,10 @@ uint8_t* Alarm_Report_Send(uint16_t Alarm_type,uint8_t val){
         case DLI_P3_Shutdown_Alarm: sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],OVERPOWER_STR);    break;
         case DLI_P2_Shutdown_Alarm: sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],OVERPOWER_STR);    break;
         case DLI_P1_Shutdown_Alarm: sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],OVERPOWER_STR);    break;
-        case ULO_P4_Level_High:     sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"ULO:%2.1f, Th:%2.1f",Res_UL_dBm[DET_Alarm_UL1_Index],LimitData_UL_High);    break;
-        case ULO_P3_Level_High:     sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"ULO:%2.1f, Th:%2.1f",Res_UL_dBm[DET_Alarm_UL2_Index],LimitData_UL_High);    break;
-        case ULO_P2_Level_High:     sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"ULO:%2.1f, Th:%2.1f",Res_UL_dBm[DET_Alarm_UL3_Index],LimitData_UL_High);    break;
-        case ULO_P1_Level_High:     sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"ULO:%2.1f, Th:%2.1f",Res_UL_dBm[DET_Alarm_UL4_Index],LimitData_UL_High);    break;
+        case ULO_P4_Level_High:     sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"ULO:%d, Th:%d",Res_UL_dBm[DET_Alarm_UL1_Index],LimitData_UL_High);    break;
+        case ULO_P3_Level_High:     sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"ULO:%d, Th:%d",Res_UL_dBm[DET_Alarm_UL2_Index],LimitData_UL_High);    break;
+        case ULO_P2_Level_High:     sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"ULO:%d, Th:%d",Res_UL_dBm[DET_Alarm_UL3_Index],LimitData_UL_High);    break;
+        case ULO_P1_Level_High:     sprintf(&Alarm_ReportData[MBIC_PAYLOADSTART + 22],"ULO:%d, Th:%d",Res_UL_dBm[DET_Alarm_UL4_Index],LimitData_UL_High);    break;
         case ULO_P4_ALC_Alarm:
         case ULO_P3_ALC_Alarm:
         case ULO_P2_ALC_Alarm:
@@ -5149,7 +5152,7 @@ uint8_t* Alarm_Report_Send(uint16_t Alarm_type,uint8_t val){
 //    Alarm_ReportData[MBIC_PAYLOADSTART + 2] = val;        
     
     printf("%s \r\n",&Alarm_ReportData[MBIC_PAYLOADSTART + 22]);
-    printf("size length : %d \r\n",sizeof(Alarm_ReportData));
+    printf("Type : %x  size length : %d \r\n",Alarm_type,sizeof(Alarm_ReportData));
 //    MBIC_HeaderMergeFunction(Alarm_ReportData,42);
     Alarm_ReportData[MBIC_PREAMBLE_0] = MBIC_PREAMBLE0;
     Alarm_ReportData[MBIC_PREAMBLE_1] = MBIC_PREAMBLE1;
@@ -9375,48 +9378,52 @@ void Alarm_Compare(uint8_t* Prev_Data,uint8_t* Curr_data,uint16_t mode,uint8_t f
         else{
             Alarm_Report_Send(mode,false);
         }
+        *Prev_Data = *Curr_data;
     }
-     *Prev_Data = *Curr_data;
 
 }
 void AlarmLog_Report(){
-    
+
+    if(AlarmReport_TimerCnt < 100)
+        return;
+    else
+        AlarmReport_TimerCnt = 0;
     Alarm_Compare(&Curr_Alarm_Status_Save.Temperature_Status,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x80);
 
 #if 1 // PYJ.2020.08.18_BEGIN -- 
-    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path4_Low,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x80);
-    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path3_Low,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x40);
-    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path2_Low,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x20);
-    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path1_Low,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x10);
-    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path4_High,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x08);    
-    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path4_High,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x04);
-    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path4_High,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x02);
-    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path4_High,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x01);
-
-
-    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path1_AGC,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x80);
-    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path2_AGC,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x40);
-    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path3_AGC,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x20);
-    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path4_AGC,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x10);
-    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path1_Shutdown,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x08);
-    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path2_Shutdown,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x04);
-    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path3_Shutdown,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x02);
-    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path4_Shutdown,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x01);
-
-    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path1_High,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x08);
-    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path2_High,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x04);
-    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path3_High,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x02);
-    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path4_High,&bluecell_Currdatastatus.ALARM_TEMP_HIGH,Temp_High,0x01);
-
-    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path1_ALC,&bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm,Temp_High,0x80);
-    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path2_ALC,&bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm,Temp_High,0x40);
-    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path3_ALC,&bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm,Temp_High,0x20);
-    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path4_ALC,&bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm,Temp_High,0x10);
-
-    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path1_Shutdown,&bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN,Temp_High,0x08);
-    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path2_Shutdown,&bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN,Temp_High,0x04);
-    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path3_Shutdown,&bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN,Temp_High,0x02);
-    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path4_Shutdown,&bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN,Temp_High,0x01);
+    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path4_Low,&bluecell_Currdatastatus.ALARM_DLI_Level,DLI_P4_Level_Low,0x80);
+    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path3_Low,&bluecell_Currdatastatus.ALARM_DLI_Level,DLI_P3_Level_Low,0x40);
+    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path2_Low,&bluecell_Currdatastatus.ALARM_DLI_Level,DLI_P2_Level_Low,0x20);
+    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path1_Low,&bluecell_Currdatastatus.ALARM_DLI_Level,DLI_P1_Level_Low,0x10);
+    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path4_High,&bluecell_Currdatastatus.ALARM_DLI_Level,DLI_P4_Level_High,0x08);    
+    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path4_High,&bluecell_Currdatastatus.ALARM_DLI_Level,DLI_P3_Level_High,0x04);
+    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path4_High,&bluecell_Currdatastatus.ALARM_DLI_Level,DLI_P2_Level_High,0x02);
+    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path4_High,&bluecell_Currdatastatus.ALARM_DLI_Level,DLI_P1_Level_High,0x01);
+
+
+    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path1_AGC,&bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm,DLI_P4_AGC_Alarm,0x80);
+    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path2_AGC,&bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm,DLI_P3_AGC_Alarm,0x40);
+    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path3_AGC,&bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm,DLI_P2_AGC_Alarm,0x20);
+    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path4_AGC,&bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm,DLI_P1_AGC_Alarm,0x10);
+    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path1_Shutdown,&bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN,DLI_P4_Shutdown_Alarm,0x08);
+    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path2_Shutdown,&bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN,DLI_P3_Shutdown_Alarm,0x04);
+    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path3_Shutdown,&bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN,DLI_P2_Shutdown_Alarm,0x02);
+    Alarm_Compare(&Curr_Alarm_Status_Save.DLI_Path4_Shutdown,&bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN,DLI_P1_Shutdown_Alarm,0x01);
+
+    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path1_High,&bluecell_Currdatastatus.ALARM_ULO_Level,ULO_P4_Level_High,0x08);
+    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path2_High,&bluecell_Currdatastatus.ALARM_ULO_Level,ULO_P3_Level_High,0x04);
+    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path3_High,&bluecell_Currdatastatus.ALARM_ULO_Level,ULO_P2_Level_High,0x02);
+    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path4_High,&bluecell_Currdatastatus.ALARM_ULO_Level,ULO_P1_Level_High,0x01);
+
+    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path1_ALC,&bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm,ULO_P4_ALC_Alarm,0x80);
+    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path2_ALC,&bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm,ULO_P3_ALC_Alarm,0x40);
+    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path3_ALC,&bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm,ULO_P2_ALC_Alarm,0x20);
+    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path4_ALC,&bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm,ULO_P1_ALC_Alarm,0x10);
+
+    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path1_Shutdown,&bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN,ULO_P4_Shutdown,0x08);
+    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path2_Shutdown,&bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN,ULO_P3_Shutdown,0x04);
+    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path3_Shutdown,&bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN,ULO_P2_Shutdown,0x02);
+    Alarm_Compare(&Curr_Alarm_Status_Save.ULO_Path4_Shutdown,&bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN,ULO_P1_Shutdown,0x01);
 #endif // PYJ.2020.08.18_END -- 
 
 }

Bluecell_Src/uart.c

@@ -155,7 +155,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 1 // 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]);

Src/main.c

@@ -128,6 +128,7 @@ volatile uint32_t SelfTestLifeCnt[4] = {0,};
 
 volatile uint32_t ADC_100ms_Cnt = 0;
 
+volatile uint32_t AlarmReport_TimerCnt = 0;
 
 
 
@@ -150,6 +151,7 @@ uint8_t* MBIC_UL_ShutdownCount;
 uint8_t* MBIC_DL_ShutdownCount;
 uint8_t* PrevMBIC_UL_ShutdownCount;
 uint8_t* PrevMBIC_DL_ShutdownCount;
+uint8_t Led_ToggleCntSet = 0;
 
 
 /* USER CODE END PV */
@@ -328,6 +330,7 @@ int main(void)
   Booting_LedInit();
   InitUartQueue(&TerminalQueue);
   bluecell_Currdatastatus.LED_TEST = true;
+  Led_ToggleCntSet = 6;
 
 
 #if 1 // PYJ.2020.05.06_BEGIN --
@@ -974,7 +977,7 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
       ALCTimerCnt++;
       AGCTimerCnt++;
       ADC_100ms_Cnt++;
-
+      AlarmReport_TimerCnt++;
 //    pdata = &bluecell_Currdatastatus.ATT_UL1_PATH;
     UL_Shutdown_Timer(DET_Alarm_UL1_Shutdown_Index);
 //    pdata = &bluecell_Currdatastatus.ATT_UL2_PATH;