ALC 1, 2,3,4 적용 DLI Level 수정 Cpu Version UP 부팅시 자동으로 EEPROM Table Length 적용 /Uart Tx Data 출력

Bluecell_Src/Bluecell_operate.c

@@ -5598,6 +5598,30 @@ void ALC_Function(){ //DL
                             &bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H,
                             &bluecell_Currdatastatus.ATT_UL1_H,
                             &bluecell_Currdatastatus.bluecell_User_UL1_H);
+        ALC_Package_Operate(&bluecell_Currdatastatus.ULO_P2_Level2_H,
+                            &bluecell_Currdatastatus.ULO_Level2_H,
+                            &Det_UL2.Table_Det_15_dBm_H,
+                            ALC_Alarm_UL2_Index,
+                            &bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_H,
+                            &bluecell_Currdatastatus.ATT_UL2_H,
+                            &bluecell_Currdatastatus.bluecell_User_UL2_H);
+        ALC_Package_Operate(&bluecell_Currdatastatus.ULO_P3_Level3_H,
+                            &bluecell_Currdatastatus.ULO_Level3_H,
+                            &Det_UL3.Table_Det_15_dBm_H,
+                            ALC_Alarm_UL3_Index,
+                            &bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_H,
+                            &bluecell_Currdatastatus.ATT_UL3_H,
+                            &bluecell_Currdatastatus.bluecell_User_UL3_H);
+        ALC_Package_Operate(&bluecell_Currdatastatus.ULO_P4_Level4_H,
+                            &bluecell_Currdatastatus.ULO_Level4_H,
+                            &Det_UL4.Table_Det_15_dBm_H,
+                            ALC_Alarm_UL4_Index,
+                            &bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_H,
+                            &bluecell_Currdatastatus.ATT_UL4_H,
+                            &bluecell_Currdatastatus.bluecell_User_UL4_H);
+        
+        
+
 
 #endif // PYJ.2020.06.26_END -- 
 
@@ -6406,6 +6430,8 @@ void AGC_Function(){//DL
             Levelret = (int16_t)Bluecell_TestPro(AGC_AutoControl_ADC_Compare(ret,&Det_DL2.Table_Det5_dBm_H,Det_DL1.Table_Length * 2,AGC_Table));
             bluecell_Currdatastatus.DLI_Level2_H = (Levelret & 0xFF00) >> 8;
             bluecell_Currdatastatus.DLI_Level2_L = (Levelret & 0x00FF);
+
+            
             AGC_Table = &AGC_Table_ref[MBIC_Table_DL3_INDEX].DET_DL_0;
             ret  = bluecell_Currdatastatus.DLI_P3_Level3_H << 8;
             ret += bluecell_Currdatastatus.DLI_P3_Level3_L;   
@@ -6417,8 +6443,8 @@ void AGC_Function(){//DL
             bluecell_Currdatastatus.DLI_Level3_H = (Levelret & 0xFF00) >> 8;
             bluecell_Currdatastatus.DLI_Level3_L = (Levelret & 0x00FF);
             
-            ret  = bluecell_Currdatastatus.DLI_P3_Level3_H << 8;
-            ret += bluecell_Currdatastatus.DLI_P3_Level3_L;   
+            ret  = bluecell_Currdatastatus.DLI_P4_Level4_H << 8;
+            ret += bluecell_Currdatastatus.DLI_P4_Level4_L;   
             ret *= 0.001;
             
             

Bluecell_Src/eeprom.c

@@ -96,7 +96,7 @@ void EEPROM_M24C08_Init(void){
     bluecell_Currdatastatus.ULO_Shutdown_Retry_Count4 = 0;        
     bluecell_Currdatastatus.CPUVERSION1 =  0;
     bluecell_Currdatastatus.CPUVERSION2 = 0;
-    bluecell_Currdatastatus.CPUVERSION3 = 5;
+    bluecell_Currdatastatus.CPUVERSION3 = 6;
     Att_DL1.Table_Length  = ATTENTABLEDLUL_LENGTH;
     Att_DL2.Table_Length  = ATTENTABLEDLUL_LENGTH;
     Att_DL3.Table_Length  = ATTENTABLEDLUL_LENGTH;
@@ -145,105 +145,6 @@ void EEPROM_M24C08_Init(void){
     Temp_UL2.Table_Ref= ATTENTABLE_TEMP_REF;
     Temp_UL3.Table_Ref= ATTENTABLE_TEMP_REF;
     Temp_UL4.Table_Ref= ATTENTABLE_TEMP_REF;        
-#if 0 // PYJ.2020.06.19_BEGIN --
-    if(
-    Att_DL1.Table_Length    == 0||
-    Att_DL2.Table_Length    == 0||
-    Att_DL3.Table_Length    == 0||
-    Att_DL4.Table_Length    == 0||
-    Att_UL1.Table_Length    == 0||
-    Att_UL2.Table_Length    == 0||
-    Att_UL3.Table_Length    == 0||
-    Att_UL4.Table_Length    == 0||
-    Det_DL1.Table_Length    == 0||
-    Det_DL2.Table_Length    == 0||
-    Det_DL3.Table_Length    == 0||
-    Det_DL4.Table_Length    == 0||
-    Det_UL1.Table_Length    == 0||
-    Det_UL2.Table_Length    == 0||
-    Det_UL3.Table_Length    == 0||
-    Det_UL4.Table_Length    == 0||
-    Temp_DL1.Table_Length   == 0||
-    Temp_DL2.Table_Length   == 0||
-    Temp_DL3.Table_Length   == 0||
-    Temp_DL4.Table_Length   == 0||
-    Temp_UL1.Table_Length   == 0||
-    Temp_UL2.Table_Length   == 0||
-    Temp_UL3.Table_Length   == 0||
-    Temp_UL4.Table_Length   == 0||
-     Att_DL1.Table_Ref  != ATTENTABLEDL_REF||
-      Att_DL2.Table_Ref != ATTENTABLEDL_REF||
-      Att_DL3.Table_Ref != ATTENTABLEDL_REF||
-      Att_DL4.Table_Ref != ATTENTABLEDL_REF||
-      Att_UL1.Table_Ref != ATTENTABLEUL_REF||
-      Att_UL2.Table_Ref != ATTENTABLEUL_REF||
-      Att_UL3.Table_Ref != ATTENTABLEUL_REF||
-      Att_UL4.Table_Ref != ATTENTABLEUL_REF||
-      Det_DL1.Table_Ref != ATTENTABLEDET_DL_REF||
-      Det_DL2.Table_Ref != ATTENTABLEDET_DL_REF||
-      Det_DL3.Table_Ref != ATTENTABLEDET_DL_REF||
-      Det_DL4.Table_Ref != ATTENTABLEDET_DL_REF||
-      Det_UL1.Table_Ref != ATTENTABLEDET_UL_REF||
-      Det_UL2.Table_Ref != ATTENTABLEDET_UL_REF||
-      Det_UL3.Table_Ref != ATTENTABLEDET_UL_REF||
-      Det_UL4.Table_Ref != ATTENTABLEDET_UL_REF||
-      Temp_DL1.Table_Ref!= ATTENTABLE_TEMP_REF||
-      Temp_DL2.Table_Ref!= ATTENTABLE_TEMP_REF||
-      Temp_DL3.Table_Ref!= ATTENTABLE_TEMP_REF||
-      Temp_DL4.Table_Ref!= ATTENTABLE_TEMP_REF||
-      Temp_UL1.Table_Ref!= ATTENTABLE_TEMP_REF||
-      Temp_UL2.Table_Ref!= ATTENTABLE_TEMP_REF||
-      Temp_UL3.Table_Ref!= ATTENTABLE_TEMP_REF||
-      Temp_UL4.Table_Ref!= ATTENTABLE_TEMP_REF
-    ){
-      Att_DL1.Table_Length  = ATTENTABLEDLUL_LENGTH;
-      Att_DL2.Table_Length  = ATTENTABLEDLUL_LENGTH;
-      Att_DL3.Table_Length  = ATTENTABLEDLUL_LENGTH;
-      Att_DL4.Table_Length  = ATTENTABLEDLUL_LENGTH;
-      Att_UL1.Table_Length  = ATTENTABLEDLUL_LENGTH;
-      Att_UL2.Table_Length  = ATTENTABLEDLUL_LENGTH;
-      Att_UL3.Table_Length  = ATTENTABLEDLUL_LENGTH;
-      Att_UL4.Table_Length  = ATTENTABLEDLUL_LENGTH;
-      Det_DL1.Table_Length  = ATTENTABLEDET_DL_LENGTH;
-      Det_DL2.Table_Length  = ATTENTABLEDET_DL_LENGTH;
-      Det_DL3.Table_Length  = ATTENTABLEDET_DL_LENGTH;
-      Det_DL4.Table_Length  = ATTENTABLEDET_DL_LENGTH;
-      Det_UL1.Table_Length  = ATTENTABLEDET_UL_LENGTH;
-      Det_UL2.Table_Length  = ATTENTABLEDET_UL_LENGTH;
-      Det_UL3.Table_Length  = ATTENTABLEDET_UL_LENGTH;
-      Det_UL4.Table_Length  = ATTENTABLEDET_UL_LENGTH;
-      Temp_DL1.Table_Length = ATTENTABLE_TEMP_LENGTH;
-      Temp_DL2.Table_Length = ATTENTABLE_TEMP_LENGTH;
-      Temp_DL3.Table_Length = ATTENTABLE_TEMP_LENGTH;
-      Temp_DL4.Table_Length = ATTENTABLE_TEMP_LENGTH;
-      Temp_UL1.Table_Length = ATTENTABLE_TEMP_LENGTH;
-      Temp_UL2.Table_Length = ATTENTABLE_TEMP_LENGTH;
-      Temp_UL3.Table_Length = ATTENTABLE_TEMP_LENGTH;
-      Temp_UL4.Table_Length = ATTENTABLE_TEMP_LENGTH;
-      Att_DL1.Table_Ref = ATTENTABLEDL_REF;
-      Att_DL2.Table_Ref = ATTENTABLEDL_REF;
-      Att_DL3.Table_Ref = ATTENTABLEDL_REF;
-      Att_DL4.Table_Ref = ATTENTABLEDL_REF;
-      Att_UL1.Table_Ref = ATTENTABLEUL_REF;
-      Att_UL2.Table_Ref = ATTENTABLEUL_REF;
-      Att_UL3.Table_Ref = ATTENTABLEUL_REF;
-      Att_UL4.Table_Ref = ATTENTABLEUL_REF;
-      Det_DL1.Table_Ref = ATTENTABLEDET_DL_REF;
-      Det_DL2.Table_Ref = ATTENTABLEDET_DL_REF;
-      Det_DL3.Table_Ref = ATTENTABLEDET_DL_REF;
-      Det_DL4.Table_Ref = ATTENTABLEDET_DL_REF;
-      Det_UL1.Table_Ref = ATTENTABLEDET_UL_REF;
-      Det_UL2.Table_Ref = ATTENTABLEDET_UL_REF;
-      Det_UL3.Table_Ref = ATTENTABLEDET_UL_REF;
-      Det_UL4.Table_Ref = ATTENTABLEDET_UL_REF;
-      Temp_DL1.Table_Ref= ATTENTABLE_TEMP_REF;
-      Temp_DL2.Table_Ref= ATTENTABLE_TEMP_REF;
-      Temp_DL3.Table_Ref= ATTENTABLE_TEMP_REF;
-      Temp_DL4.Table_Ref= ATTENTABLE_TEMP_REF;
-      Temp_UL1.Table_Ref= ATTENTABLE_TEMP_REF;
-      Temp_UL2.Table_Ref= ATTENTABLE_TEMP_REF;
-      Temp_UL3.Table_Ref= ATTENTABLE_TEMP_REF;
-      Temp_UL4.Table_Ref= ATTENTABLE_TEMP_REF;
       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_BASE              ,&Att_DL1.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_DL1_TABLE_ADDRESDS,&Att_DL2.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_DL2_TABLE_ADDRESDS,&Att_DL3.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
@@ -276,8 +177,6 @@ void EEPROM_M24C08_Init(void){
       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_TEMP_UL1_TABLE_ADDRESDS,&Temp_UL2.Table_1_Temp,sizeof(TEMP_TABLE_st) );
       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_TEMP_UL2_TABLE_ADDRESDS,&Temp_UL3.Table_1_Temp,sizeof(TEMP_TABLE_st) );
       EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_TEMP_UL3_TABLE_ADDRESDS,&Temp_UL4.Table_1_Temp,sizeof(TEMP_TABLE_st) );
-    }
-#endif // PYJ.2020.06.19_END -- 
 
 
     bluecell_Currdatastatus.ALARM_TEMP_HIGH          = 0;

Bluecell_Src/uart.c

@@ -150,11 +150,11 @@ 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);   
-//    printf("\r\n [TX] : {");
-//    for(int i = 0; i< size; i++)
-//        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(",0x%02x ",data[i]);
+    printf("};\r\n\tCOUNT : %d \r\n",size);
+    printf("\r\n");
     
 }