MBIC ALC Atten Value 구조체 추가 / PE 43711 계산식 ALC Value 인자 값 추가 / MBIC Data Send 할 때 ALC Atten 값 올려 주도록 수정 / ALC 알고리즘 재구축 / EEPROM Table Length Init 부분 추가 /

Bluecell_Inc/Bluecell_operate.h

@@ -451,7 +451,7 @@ ULO_Shutdown_Alarm1,
 ULO_Shutdown_Alarm2,
 ULO_Shutdown_Alarm3,
 ULO_Shutdown_Alarm4,
-
+ULO_ALC_Atten,
 }SERIAL_UL_t;
 
 
@@ -885,14 +885,14 @@ typedef struct{
     uint8_t ULO_Shutdown_Alarm2;
     uint8_t ULO_Shutdown_Alarm3;
     uint8_t ULO_Shutdown_Alarm4;
-    int8_t MBIC_DLI_P1_Table_Ref;
-    int8_t MBIC_DLI_P2_Table_Ref;
-    int8_t MBIC_DLI_P3_Table_Ref;
-    int8_t MBIC_DLI_P4_Table_Ref;
-    int8_t MBIC_ULO_P1_Table_Ref;
-    int8_t MBIC_ULO_P2_Table_Ref;
-    int8_t MBIC_ULO_P3_Table_Ref;
-    int8_t MBIC_ULO_P4_Table_Ref;
+    uint8_t MBIC_ULO_ALC_Atten1_H;
+    uint8_t MBIC_ULO_ALC_Atten1_L;
+    uint8_t MBIC_ULO_ALC_Atten2_H;
+    uint8_t MBIC_ULO_ALC_Atten2_L;
+    uint8_t MBIC_ULO_ALC_Atten3_H;
+    uint8_t MBIC_ULO_ALC_Atten3_L;
+    uint8_t MBIC_ULO_ALC_Atten4_H;
+    uint8_t MBIC_ULO_ALC_Atten4_L;
     int8_t MBIC_DLI_P1_Level_Table_Ref;
     int8_t MBIC_DLI_P2_Level_Table_Ref;
     int8_t MBIC_DLI_P3_Level_Table_Ref;
@@ -1205,7 +1205,7 @@ typedef struct{
     uint8_t Table_Length	;
 }DET_TABLEDL_st;
 typedef struct{
-    uint8_t Table_Det_15_dBm_H  ;   
+      uint8_t Table_Det_15_dBm_H  ;   
       uint8_t Table_Det_15_dBm_L    ;
       uint8_t Table_Det_16_dBm_H    ;   
       uint8_t Table_Det_16_dBm_L    ;

Bluecell_Src/eeprom.c

@@ -23,7 +23,18 @@ extern BLUESTATUS_st bluecell_Currdatastatus;
 
 
 
-
+uint8_t testdata[120];
+#define ATTENTABLEDLUL_LENGTH 64
+#define ATTENTABLEDET_DL_LENGTH 31
+#define ATTENTABLEDET_UL_LENGTH 46
+
+#define ATTENTABLE_TEMP_LENGTH 10
+
+#define ATTENTABLEDL_REF   0
+#define ATTENTABLEUL_REF   0
+#define ATTENTABLEDET_DL_REF 5
+#define ATTENTABLEDET_UL_REF -15
+#define ATTENTABLE_TEMP_REF  -10
 void EEPROM_M24C08_Init(void){
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_WINDOW_STATUS_ADDRESDS,&bluecell_Currdatastatus.bluecell_header,sizeof(BLUESTATUS_st) );
 
@@ -59,66 +70,121 @@ void EEPROM_M24C08_Init(void){
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_TEMP_UL1_TABLE_ADDRESDS,&Temp_UL2.Table_1_Temp,sizeof(TEMP_TABLE_st) );
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_TEMP_UL2_TABLE_ADDRESDS,&Temp_UL3.Table_1_Temp,sizeof(TEMP_TABLE_st) );
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_TEMP_UL3_TABLE_ADDRESDS,&Temp_UL4.Table_1_Temp,sizeof(TEMP_TABLE_st) );
-
-
     
-#if 0 // PYJ.2020.06.19_BEGIN -- 
-    Att_DL1.Table_Length  = 64;
-    Att_DL2.Table_Length  = 64;
-    Att_DL3.Table_Length  = 64;
-    Att_DL4.Table_Length  = 64;
-    Att_UL1.Table_Length  = 64;
-    Att_UL2.Table_Length  = 64;
-    Att_UL3.Table_Length  = 64;
-    Att_UL4.Table_Length  = 64;
-    Det_DL1.Table_Length  = 31;
-    Det_DL2.Table_Length  = 31;
-    Det_DL3.Table_Length  = 31;
-    Det_DL4.Table_Length  = 31;
-    Det_UL1.Table_Length  = 31;
-    Det_UL2.Table_Length  = 31;
-    Det_UL3.Table_Length  = 31;
-    Det_UL4.Table_Length  = 31;
-    Temp_DL1.Table_Length = 10;
-    Temp_DL2.Table_Length = 10;
-    Temp_DL3.Table_Length = 10;
-    Temp_DL4.Table_Length = 10;
-    Temp_UL1.Table_Length = 10;
-    Temp_UL2.Table_Length = 10;
-    Temp_UL3.Table_Length = 10;
-    Temp_UL4.Table_Length = 10;
-    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) );
-    EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_DL3_TABLE_ADDRESDS,&Att_DL4.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
-
-    EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_DL4_TABLE_ADDRESDS,&Att_UL1.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
-    EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_UL1_TABLE_ADDRESDS,&Att_UL2.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
-    EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_UL2_TABLE_ADDRESDS,&Att_UL3.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
-    EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_UL3_TABLE_ADDRESDS,&Att_UL4.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
-
-    EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_UL4_TABLE_ADDRESDS,&Det_DL1.Table_Det5_dBm_H,sizeof(DET_TABLEDL_st) );
-    EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_DL1_TABLE_ADDRESDS,&Det_DL2.Table_Det5_dBm_H,sizeof(DET_TABLEDL_st) );
-    EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_DL2_TABLE_ADDRESDS,&Det_DL3.Table_Det5_dBm_H,sizeof(DET_TABLEDL_st) );
-    EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_DL3_TABLE_ADDRESDS,&Det_DL4.Table_Det5_dBm_H,sizeof(DET_TABLEDL_st) );
-
-
-    EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_DL4_TABLE_ADDRESDS,&Det_UL1.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st) );
-    EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_UL1_TABLE_ADDRESDS,&Det_UL2.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st) );
-    EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_UL2_TABLE_ADDRESDS,&Det_UL3.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st) );
-    EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_UL3_TABLE_ADDRESDS,&Det_UL4.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st) );
-
-
-    EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_UL4_TABLE_ADDRESDS,&Temp_DL1.Table_1_Temp,sizeof(TEMP_TABLE_st) );
-    EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_TEMP_DL1_TABLE_ADDRESDS,&Temp_DL2.Table_1_Temp,sizeof(TEMP_TABLE_st) );
-    EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_TEMP_DL2_TABLE_ADDRESDS,&Temp_DL3.Table_1_Temp,sizeof(TEMP_TABLE_st) );
-    EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_TEMP_DL3_TABLE_ADDRESDS,&Temp_DL4.Table_1_Temp,sizeof(TEMP_TABLE_st) );
-
-
-    EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_TEMP_DL4_TABLE_ADDRESDS,&Temp_UL1.Table_1_Temp,sizeof(TEMP_TABLE_st) );
-    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) );
+    /*Table Initial Length Setting */
+        printf("Init Temp_UL3 Length : %d \r\n",Temp_UL3.Table_Length);
+        Bluecell_DataCopy(testdata, &Temp_UL3.Table_1_Temp,sizeof(TEMP_TABLE_st) );
+        for(int i = 0; i < sizeof(TEMP_TABLE_st); i++){
+            printf("\r\n testdata[%d] : %x ",i,testdata[i]);
+        }
+#if 1 // 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_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) );
+      EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_DL3_TABLE_ADDRESDS,&Att_DL4.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
+
+      EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_DL4_TABLE_ADDRESDS,&Att_UL1.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
+      EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_UL1_TABLE_ADDRESDS,&Att_UL2.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
+      EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_UL2_TABLE_ADDRESDS,&Att_UL3.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
+      EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_UL3_TABLE_ADDRESDS,&Att_UL4.Table_0_0_dBm,sizeof(ATT_TABLE_st) );
+
+      EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_ATT_UL4_TABLE_ADDRESDS,&Det_DL1.Table_Det5_dBm_H,sizeof(DET_TABLEDL_st) );
+      EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_DL1_TABLE_ADDRESDS,&Det_DL2.Table_Det5_dBm_H,sizeof(DET_TABLEDL_st) );
+      EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_DL2_TABLE_ADDRESDS,&Det_DL3.Table_Det5_dBm_H,sizeof(DET_TABLEDL_st) );
+      EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_DL3_TABLE_ADDRESDS,&Det_DL4.Table_Det5_dBm_H,sizeof(DET_TABLEDL_st) );
+
+
+      EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_DL4_TABLE_ADDRESDS,&Det_UL1.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st) );
+      EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_UL1_TABLE_ADDRESDS,&Det_UL2.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st) );
+      EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_UL2_TABLE_ADDRESDS,&Det_UL3.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st) );
+      EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_UL3_TABLE_ADDRESDS,&Det_UL4.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st) );
+
+
+      EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_DET_UL4_TABLE_ADDRESDS,&Temp_DL1.Table_1_Temp,sizeof(TEMP_TABLE_st) );
+      EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_TEMP_DL1_TABLE_ADDRESDS,&Temp_DL2.Table_1_Temp,sizeof(TEMP_TABLE_st) );
+      EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_TEMP_DL2_TABLE_ADDRESDS,&Temp_DL3.Table_1_Temp,sizeof(TEMP_TABLE_st) );
+      EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_TEMP_DL3_TABLE_ADDRESDS,&Temp_DL4.Table_1_Temp,sizeof(TEMP_TABLE_st) );
+
+
+      EEPROM_M24C08_write(EEPROM_M24C08_ID,EEPROM_TEMP_DL4_TABLE_ADDRESDS,&Temp_UL1.Table_1_Temp,sizeof(TEMP_TABLE_st) );
+      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_Src/uart.c

@@ -142,11 +142,11 @@ void Uart1_Data_Send(uint8_t* data,uint16_t size){
     HAL_UART_Transmit(&hTerminal, &data[0],size,0xFFFF);
   //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("%02x ",data[i]);
-    printf("\r\n\tCOUNT : %d \r\n",size);
+//    HAL_Delay(1);   
+//    printf("\r\n [TX] : ");
+//    for(int i = 0; i< size; i++)
+//        printf("%02x ",data[i]);
+//    printf("\r\n\tCOUNT : %d \r\n",size);
 //    printf("\r\n");
     
 }

Src/main.c

@@ -134,7 +134,7 @@ static void MX_NVIC_Init(void);
 extern void Booting_LedInit(void);
 extern void Bluecell_AttenInitialize();
 extern void DET_LevelAlarmCheck();
-extern void Alarm_Check();
+
 /* USER CODE END PFP */
 
 /* Private user code ---------------------------------------------------------*/
@@ -324,8 +324,7 @@ extern void Booting_LED_Check(void);
   * @brief  The application entry point.
   * @retval int
   */
-int main(void)
-  {
+int main(void)  {
   /* USER CODE BEGIN 1 */
 
   /* USER CODE END 1 */
@@ -339,6 +338,7 @@ int main(void)
 
   /* USER CODE END Init */
 
+
   /* Configure the system clock */
   SystemClock_Config();