주석추가 / 알람 리포트 Length 오류 수정

Bluecell_Src/Bluecell_operate.c

@@ -4998,12 +4998,13 @@ void Temp_Shutdown_ONOFF(uint8_t val){
 
 #define OVERPOWER_STR "Overpower"
 #define OVER_INPUT_STR "Over-Input"
+#define ALARM_REPORT_LENGTH 42
 //uint8_t AlarmReport_History[Alarm_type_IndexMax] = {0,};
+volatile uint8_t Alarm_ReportData[40 + 2 + 22 + 3] = {0,}; // 40 Alarm Data + 2 UNIT ID, 21 Header , 3 Tail
 uint8_t* Alarm_Report_Send(uint16_t Alarm_type,uint8_t val){
 //    if(AlarmReport_History[Alarm_type] != true){
 //        return;
 //    }
-    static uint8_t Alarm_ReportData[40 + 2 + 21 + 3] = {0,}; // 40 Alarm Data + 2 UNIT ID, 21 Header , 3 Tail
     uint8_t index = 0;
     Alarm_ReportData[MBIC_PAYLOADSTART + index++] = 0x00;       //UNIT ID0
     Alarm_ReportData[MBIC_PAYLOADSTART + index++] = 0xF1;       //UNIT ID1
@@ -5029,7 +5030,7 @@ uint8_t* Alarm_Report_Send(uint16_t Alarm_type,uint8_t val){
     Alarm_ReportData[MBIC_PAYLOADSTART + index++] = 0;//Alarm SeqNum1 RF Board Default 0   
 
     // 0~ 19 
-    for(int i = MBIC_PAYLOADSTART + 22; i < MBIC_PAYLOADSTART + 42; i++)
+    for(int i = MBIC_PAYLOADSTART + 22; i < MBIC_PAYLOADSTART + ALARM_REPORT_LENGTH; i++)
         Alarm_ReportData[i] = 0;
     
 
@@ -5152,8 +5153,8 @@ 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("Type : %x  size length : %d \r\n",Alarm_type,sizeof(Alarm_ReportData));
-//    MBIC_HeaderMergeFunction(Alarm_ReportData,42);
+//    printf("Type : %x  size length : %d \r\n",Alarm_type,sizeof(Alarm_ReportData));
+//    MBIC_HeaderMergeFunction(Alarm_ReportData,ALARM_REPORT_LENGTH);
     Alarm_ReportData[MBIC_PREAMBLE_0] = MBIC_PREAMBLE0;
     Alarm_ReportData[MBIC_PREAMBLE_1] = MBIC_PREAMBLE1;
     Alarm_ReportData[MBIC_PREAMBLE_2] = MBIC_PREAMBLE2;
@@ -5184,19 +5185,23 @@ uint8_t* Alarm_Report_Send(uint16_t Alarm_type,uint8_t val){
 
 
 
-    Alarm_ReportData[MBIC_LENGTH_0] = (sizeof(Alarm_ReportData) & 0xFF00) >> 8;
-    Alarm_ReportData[MBIC_LENGTH_1] = sizeof(Alarm_ReportData) & 0x00FF;
+    Alarm_ReportData[MBIC_LENGTH_0] = (ALARM_REPORT_LENGTH & 0xFF00) >> 8;
+    Alarm_ReportData[MBIC_LENGTH_1] = ALARM_REPORT_LENGTH & 0x00FF;
 
     Alarm_ReportData[MBIC_HEADERCHECKSUM_0] = Chksum_Create(Alarm_ReportData);    
 
     
-    uint16_t crcret = ((CRC16_Generate(&Alarm_ReportData[MBIC_PAYLOADSTART], 42) ) );
+    uint16_t crcret =CRC16_Generate(&Alarm_ReportData[MBIC_PAYLOADSTART], ALARM_REPORT_LENGTH);
     
 //                        printf("\r\n crc ret : %x \r\n",crcret);
-    Alarm_ReportData[MBIC_PAYLOADSTART + 41] =(( crcret  & 0xFF00)>> 8);  
-    Alarm_ReportData[MBIC_PAYLOADSTART + 42] = (( crcret  & 0x00FF));  
-    Alarm_ReportData[MBIC_PAYLOADSTART + 43] = 0x03; 
-    Uart1_Data_Send(Alarm_ReportData,sizeof(Alarm_ReportData));
+    Alarm_ReportData[MBIC_PAYLOADSTART + 42] =(( crcret  & 0xFF00)>> 8);  
+//        printf(" Alarm_ReportData[MBIC_PAYLOADSTART + 41] : %x \r\n", Alarm_ReportData[MBIC_PAYLOADSTART + 41]);
+    Alarm_ReportData[MBIC_PAYLOADSTART + 43] = (( crcret  & 0x00FF));  
+//        printf(" Alarm_ReportData[MBIC_PAYLOADSTART + 42] : %x \r\n", Alarm_ReportData[MBIC_PAYLOADSTART + 42]);    
+    Alarm_ReportData[MBIC_PAYLOADSTART + 44] = 0x03; 
+//        printf(" Alarm_ReportData[MBIC_PAYLOADSTART + 43] : %x \r\n", Alarm_ReportData[MBIC_PAYLOADSTART + 43]);    
+    Uart1_Data_Send(&Alarm_ReportData[0],sizeof(Alarm_ReportData));
+            printf(" Alarm_ReportData[MBIC_PAYLOADSTART + 42] : %x \r\n", Alarm_ReportData[MBIC_PAYLOADSTART + 42]);
 }
 
 bool MBIC_Operate(uint8_t* data){

Src/main.c

@@ -330,7 +330,7 @@ int main(void)
   Booting_LedInit();
   InitUartQueue(&TerminalQueue);
   bluecell_Currdatastatus.LED_TEST = true;
-  Led_ToggleCntSet = 6;
+  Led_ToggleCntSet = 6; // Booting Led 3Cnt  ,Led Test 10Cnt
 
 
 #if 1 // PYJ.2020.05.06_BEGIN --