bluecell 검수 후 문제 점 수정

Low Thread Hold 알람 울리는 문제 수정

Bluecell_Src/Bluecell_operate.c

@@ -2725,12 +2725,24 @@ bool Bluecell_Operate(uint8_t* data){
 #endif // PYJ.2020.04.22_END --   
 #if 1 // PYJ.2020.07.01_BEGIN -- 
         printf("===================START=======================\r\n");
-        printf("ALC ON %d                     | AGC ON %d\r\n",bluecell_Currdatastatus.ULO_ALC_ON_OFF,bluecell_Currdatastatus.DLI_AGC_ON_OFF);
-        printf("Shutdown DL ON OFF %d         | Shutdown UL ON OFF %d \r\n",bluecell_Currdatastatus.DLI_Shutdown_ON_OFF,bluecell_Currdatastatus.ULO_Shutdown_ON_OFF);
+        printf("ALC ON %d                   | AGC ON %d\r\n",bluecell_Currdatastatus.ULO_ALC_ON_OFF,bluecell_Currdatastatus.DLI_AGC_ON_OFF);
+        printf("Shutdown DL ON OFF %d       | Shutdown UL ON OFF %d \r\n",bluecell_Currdatastatus.DLI_Shutdown_ON_OFF,bluecell_Currdatastatus.ULO_Shutdown_ON_OFF);
         printf("PATH1 %d|Shutdown DL1 CNT %d  | PATH1 %d|Shutdown UL1 CNT %d\r\n",bluecell_Currdatastatus.ATT_DL1_PATH,bluecell_Currdatastatus.DLI_Shutdown_Retry_Count1,bluecell_Currdatastatus.ATT_DL1_PATH,bluecell_Currdatastatus.ULO_Shutdown_Retry_Count1);
-        printf("PATH2 %d|Shutdown DL2 CNT %d  | PATH2 %d|Shutdown UL2 CNT %d\r\n",bluecell_Currdatastatus.ATT_DL2_PATH,bluecell_Currdatastatus.DLI_Shutdown_Retry_Count2,bluecell_Currdatastatus.ATT_UL2_PATH,bluecell_Currdatastatus.ULO_Shutdown_Retry_Count2);
-        printf("PATH3 %d|Shutdown DL3 CNT %d  | PATH3 %d|Shutdown UL3 CNT %d\r\n",bluecell_Currdatastatus.ATT_DL3_PATH,bluecell_Currdatastatus.DLI_Shutdown_Retry_Count3,bluecell_Currdatastatus.ATT_UL3_PATH,bluecell_Currdatastatus.ULO_Shutdown_Retry_Count3);
-        printf("PATH4 %d|Shutdown DL4 CNT %d  | PATH4 %d|Shutdown UL4 CNT %d\r\n",bluecell_Currdatastatus.ATT_DL4_PATH,bluecell_Currdatastatus.DLI_Shutdown_Retry_Count4,bluecell_Currdatastatus.ATT_UL4_PATH,bluecell_Currdatastatus.ULO_Shutdown_Retry_Count4);
+//        printf("PATH2 %d|Shutdown DL2 CNT %d  | PATH2 %d|Shutdown UL2 CNT %d\r\n",bluecell_Currdatastatus.ATT_DL2_PATH,bluecell_Currdatastatus.DLI_Shutdown_Retry_Count2,bluecell_Currdatastatus.ATT_UL2_PATH,bluecell_Currdatastatus.ULO_Shutdown_Retry_Count2);
+//        printf("PATH3 %d|Shutdown DL3 CNT %d  | PATH3 %d|Shutdown UL3 CNT %d\r\n",bluecell_Currdatastatus.ATT_DL3_PATH,bluecell_Currdatastatus.DLI_Shutdown_Retry_Count3,bluecell_Currdatastatus.ATT_UL3_PATH,bluecell_Currdatastatus.ULO_Shutdown_Retry_Count3);
+//        printf("PATH4 %d|Shutdown DL4 CNT %d  | PATH4 %d|Shutdown UL4 CNT %d\r\n",bluecell_Currdatastatus.ATT_DL4_PATH,bluecell_Currdatastatus.DLI_Shutdown_Retry_Count4,bluecell_Currdatastatus.ATT_UL4_PATH,bluecell_Currdatastatus.ULO_Shutdown_Retry_Count4);
+        tempdata = (( bluecell_Currdatastatus.DLI_Level_Low_Threshold_H << 8) & 0xFF00) ;
+        tempdata +=  bluecell_Currdatastatus.DLI_Level_Low_Threshold_L ;
+        tempdata /= 10;    
+        printf("DL Thread Hold : %d \r\n",tempdata);
+
+        tempdata = (( bluecell_Currdatastatus.DLI_Level1_H << 8) & 0xFF00) ;
+        tempdata +=  bluecell_Currdatastatus.DLI_Level1_L ;
+//        tempdata *= 0.1;    
+        printf("DLI_Level1 : %d \r\n",tempdata);        
+
+        printf("DL HIGH ALARM : %d \r\n", bluecell_Currdatastatus.DLI_Level_High_Alarm1);
+        printf("DL LOW ALARM : %d \r\n", bluecell_Currdatastatus.DLI_Level_Low_Alarm1);
         tempdata = (( bluecell_Currdatastatus.DLI_Shutdown_Threshold_H << 8) & 0xFF00) ;
         tempdata +=  bluecell_Currdatastatus.DLI_Shutdown_Threshold_L ;
         tempdata /= 10;
@@ -2765,57 +2777,57 @@ bool Bluecell_Operate(uint8_t* data){
 
         
 //        printf("Temp Alarm %d \r\n");
-        printf("ALC  Alarm 1: %d 2:  %d 3: %d 4: %d\r\n",
-            bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & ALARM_ALC_P1,
-            bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & ALARM_ALC_P2,
-            bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & ALARM_ALC_P3,
-            bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & ALARM_ALC_P4);
-            ALC_TEMP[0] = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L;
-            ALC_TEMP[1] = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_L;
-            ALC_TEMP[2] = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_L;
-            ALC_TEMP[3] = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_L;
-            printf("ALC%d ATTEN : %d \r\n",1,ALC_TEMP[0]);
-            printf("ALC%d ATTEN : %d \r\n",2,ALC_TEMP[1]);
-            printf("ALC%d ATTEN : %d \r\n",3,ALC_TEMP[2]);
-            printf("ALC%d ATTEN : %d \r\n",4,ALC_TEMP[3]);
-            printf("AGC  Alarm 1: %d 2:  %d 3: %d 4: %d\r\n",
-            bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P1,
-            bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P2,
-            bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P3,
-            bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P4
-            );
-
-        printf("Shutdown DL Alarm 1: %d 2:  %d 3: %d 4: %d\r\n",
-            bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P1,
-            bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P2,
-            bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P3,
-            bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P4
-            );
-        printf("Shutdown UL Alarm 1: %d 2:  %d 3: %d 4: %d\r\n",
-            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P1,
-            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P2,
-            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P3,
-            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P4
-        );
-        printf("DLI HIGH Threas High Hold 1: %d 2:  %d 3: %d 4: %d\r\n",
-            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P1_LEVEL_HIGH,
-            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P2_LEVEL_HIGH,
-            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P3_LEVEL_HIGH,
-            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P4_LEVEL_HIGH
-        );        
-
-        printf("DLI LOW Threas High Hold 1: %d 2:  %d 3: %d 4: %d\r\n",
-            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P1_LEVEL_LOW,
-            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P2_LEVEL_LOW,
-            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P3_LEVEL_LOW,
-            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P4_LEVEL_LOW
-        );              
-        printf("ULO HIGH Threas High Hold 1: %d 2:  %d 3: %d 4: %d\r\n",
-            bluecell_Currdatastatus.ALARM_ULO_Level & ALARM_ULO_P1_LEVEL_HIGH,
-            bluecell_Currdatastatus.ALARM_ULO_Level & ALARM_ULO_P2_LEVEL_HIGH,
-            bluecell_Currdatastatus.ALARM_ULO_Level & ALARM_ULO_P3_LEVEL_HIGH,
-            bluecell_Currdatastatus.ALARM_ULO_Level & ALARM_ULO_P4_LEVEL_HIGH
-        );        
+//        printf("ALC  Alarm 1: %d 2:  %d 3: %d 4: %d\r\n",
+//            bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & ALARM_ALC_P1,
+//            bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & ALARM_ALC_P2,
+//            bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & ALARM_ALC_P3,
+//            bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & ALARM_ALC_P4);
+//            ALC_TEMP[0] = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L;
+//            ALC_TEMP[1] = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_L;
+//            ALC_TEMP[2] = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_L;
+//            ALC_TEMP[3] = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_L;
+//            printf("ALC%d ATTEN : %d \r\n",1,ALC_TEMP[0]);
+//            printf("ALC%d ATTEN : %d \r\n",2,ALC_TEMP[1]);
+//            printf("ALC%d ATTEN : %d \r\n",3,ALC_TEMP[2]);
+//            printf("ALC%d ATTEN : %d \r\n",4,ALC_TEMP[3]);
+//            printf("AGC  Alarm 1: %d 2:  %d 3: %d 4: %d\r\n",
+//            bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P1,
+//            bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P2,
+//            bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P3,
+//            bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P4
+//            );
+//
+//        printf("Shutdown DL Alarm 1: %d 2:  %d 3: %d 4: %d\r\n",
+//            bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P1,
+//            bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P2,
+//            bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P3,
+//            bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P4
+//            );
+//        printf("Shutdown UL Alarm 1: %d 2:  %d 3: %d 4: %d\r\n",
+//            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P1,
+//            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P2,
+//            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P3,
+//            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P4
+//        );
+//        printf("DLI HIGH Threas High Hold 1: %d 2:  %d 3: %d 4: %d\r\n",
+//            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P1_LEVEL_HIGH,
+//            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P2_LEVEL_HIGH,
+//            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P3_LEVEL_HIGH,
+//            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P4_LEVEL_HIGH
+//        );        
+//
+//        printf("DLI LOW Threas High Hold 1: %d 2:  %d 3: %d 4: %d\r\n",
+//            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P1_LEVEL_LOW,
+//            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P2_LEVEL_LOW,
+//            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P3_LEVEL_LOW,
+//            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P4_LEVEL_LOW
+//        );              
+//        printf("ULO HIGH Threas High Hold 1: %d 2:  %d 3: %d 4: %d\r\n",
+//            bluecell_Currdatastatus.ALARM_ULO_Level & ALARM_ULO_P1_LEVEL_HIGH,
+//            bluecell_Currdatastatus.ALARM_ULO_Level & ALARM_ULO_P2_LEVEL_HIGH,
+//            bluecell_Currdatastatus.ALARM_ULO_Level & ALARM_ULO_P3_LEVEL_HIGH,
+//            bluecell_Currdatastatus.ALARM_ULO_Level & ALARM_ULO_P4_LEVEL_HIGH
+//        );        
         printf("===================END=======================\r\n");
 #endif // PYJ.2020.07.01_END -- 
 
@@ -5085,27 +5097,41 @@ void DET_LevelAlarmCheck(){
         }
 #else
         uint8_t* AlarmStatus = &bluecell_Currdatastatus.DLI_Level_Low_Alarm1;
+        uint8_t* PathStatus = &bluecell_Currdatastatus.ATT_DL1_PATH;
         for(int i = 0 ; i < DET_Alarm_DL_Index_MAX; i++){
-            if((LimitData_DL_Low >= Res_DL_dBm[DET_Alarm_DL1_Index + i])
-                || ((AlarmStatus[DET_Alarm_DL1_Index + i] == true) && (LimitData_DL_Low + 1 >= Res_DL_dBm[DET_Alarm_DL1_Index + i])) ){
-                    ADC_Alarm_DL_Low_Set[DET_Alarm_DL1_Index + i] = true;
-                    
+            if(PathStatus[DET_Alarm_DL1_Index + i] == false){
+                 ADC_Alarm_DL_Low_Set[DET_Alarm_DL1_Index + i] = false;
+                 continue;
             }
-            else{
-                if(LimitData_DL_Low + 2 <= Res_DL_dBm[DET_Alarm_DL1_Index + i])
+            if(AlarmStatus[DET_Alarm_DL1_Index + i] == false){
+                if(LimitData_DL_Low >= Res_DL_dBm[DET_Alarm_DL1_Index + i])
+                {
+                    ADC_Alarm_DL_Low_Set[DET_Alarm_DL1_Index + i] = true;
+                }
+                if(LimitData_DL_Low + 2 <= Res_DL_dBm[DET_Alarm_DL1_Index + i]){
                     ADC_Alarm_DL_Low_Set[DET_Alarm_DL1_Index + i] = false;
-        
+                }
+            }else{
+                if(LimitData_DL_Low + 1 >= Res_DL_dBm[DET_Alarm_DL1_Index + i])
+                {
+                    ADC_Alarm_DL_Low_Set[DET_Alarm_DL1_Index + i] = true;
+                }
+                if(LimitData_DL_Low + 2 <= Res_DL_dBm[DET_Alarm_DL1_Index + i]){
+                    ADC_Alarm_DL_Low_Set[DET_Alarm_DL1_Index + i] = false;
+                }
             }
 
 
 #endif // PYJ.2020.06.23_END -- 
         
 #if 0 // PYJ.2020.06.22_BEGIN -- 
-        printf("LimitData_DL_Low: %d Res_DL_dBm [%d] : %d ,Value : %d\r\n",
+        printf("=========================================================\r\n");
+        printf("LimitData_DL_Low: %d Res_DL_dBm [%d] : %d ,Value : %d Real Alamr : %d \r\n",
         LimitData_DL_Low,
         DET_Alarm_UL1_Index + i,
         Res_DL_dBm[DET_Alarm_DL1_Index + i],
-        ADC_Alarm_DL_Low_Set[DET_Alarm_DL1_Index + i]);            
+        ADC_Alarm_DL_Low_Set[DET_Alarm_DL1_Index + i],
+        AlarmStatus[DET_Alarm_DL1_Index + i]);            
 #endif // PYJ.2020.06.22_END -- 
     }       
     

STM32F103ZET_JDASMBIC.elf.launch

@@ -57,5 +57,5 @@
 </listAttribute>
 <stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;reserved-for-future-use&quot;/&gt;&#13;&#10;"/>
 <stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
-<stringAttribute key="saved_expressions&lt;seperator&gt;Unknown" value="0x08005000,0x8005000,Bank2data,data,Currdata,Currdata[MBIC_BOOT_VERSION + 2],Bank1data,retrycnt,MBIC_DL_ShutdownCount,MBIC_DL_ShutdownCount[3],MBIC_DL_ShutdownCount[0],MBIC_DL_ShutdownCount[1],MBIC_DL_ShutdownCount[2],MBIC_DL_ShutdownCount[4],ALC_AlarmSet"/>
+<stringAttribute key="saved_expressions&lt;seperator&gt;Unknown" value="Bank2data,data,Currdata,Currdata[MBIC_BOOT_VERSION + 2],Bank1data,retrycnt,MBIC_DL_ShutdownCount,MBIC_DL_ShutdownCount[3],MBIC_DL_ShutdownCount[0],MBIC_DL_ShutdownCount[1],MBIC_DL_ShutdownCount[2],MBIC_DL_ShutdownCount[4],ALC_AlarmSet,AlarmStatus,bluecell_Currdatastatus.DLI_Level_Low_Alarm1"/>
 </launchConfiguration>