HFR 검수 전 마지막 수정 사항

1. Typedef enum 이름 없는 index 이름 할당
2.UL Shutdown operate  Package 생성
3. 필요없는 지역 변수 삭제
4.

.cproject

@@ -73,7 +73,7 @@
 								<option id="com.atollic.truestudio.common_options.target.fpu.829683864" name="Floating point" superClass="com.atollic.truestudio.common_options.target.fpu" useByScannerDiscovery="false" value="com.atollic.truestudio.common_options.target.fpu.soft" valueType="enumerated"/>
 								<option id="com.atollic.truestudio.common_options.target.fpucore.1297069055" name="FPU" superClass="com.atollic.truestudio.common_options.target.fpucore" useByScannerDiscovery="false" value="com.atollic.truestudio.common_options.target.fpucore.None" valueType="enumerated"/>
 								<option id="com.atollic.truestudio.ld.misc.genmapfile.683707994" name="Create map file" superClass="com.atollic.truestudio.ld.misc.genmapfile" useByScannerDiscovery="false"/>
-								<option id="com.atollic.truestudio.ld.optimization.malloc_page_size.1413827241" superClass="com.atollic.truestudio.ld.optimization.malloc_page_size" useByScannerDiscovery="false" value="com.atollic.truestudio.ld.optimization.malloc_page_size.4096" valueType="enumerated"/>
+								<option id="com.atollic.truestudio.ld.optimization.malloc_page_size.1413827241" name="Page size allocation for malloc() " superClass="com.atollic.truestudio.ld.optimization.malloc_page_size" useByScannerDiscovery="false" value="com.atollic.truestudio.ld.optimization.malloc_page_size.4096" valueType="enumerated"/>
 								<inputType id="com.atollic.truestudio.ld.input.1372975870" name="Input" superClass="com.atollic.truestudio.ld.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -155,7 +155,7 @@
 							<option id="com.atollic.truestudio.toolchain_options.mcu.341415387" name="Microcontroller" superClass="com.atollic.truestudio.toolchain_options.mcu" value="STM32F103ZE" valueType="string"/>
 							<option id="com.atollic.truestudio.toolchain_options.vendor.2021888636" name="Vendor name" superClass="com.atollic.truestudio.toolchain_options.vendor" value="STMicroelectronics" valueType="string"/>
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.atollic.truestudio.exe.release.toolchain.platform.2054752829" isAbstract="false" name="Release platform" superClass="com.atollic.truestudio.exe.release.toolchain.platform"/>
-							<builder buildPath="${workspace_loc:/STM32F103ZET_JDASMBIC}/Release" id="com.atollic.truestudio.mbs.builder1.1222194476" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="com.atollic.truestudio.mbs.builder1">
+							<builder buildPath="${workspace_loc:/STM32F103ZET_JDASMBIC}/Release" customBuilderProperties="toolChainpathString=C:\\Program Files (x86)\\Atollic\\TrueSTUDIO for STM32 9.3.0\\ARMTools\\bin|toolChainpathType=1|" id="com.atollic.truestudio.mbs.builder1.1222194476" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="com.atollic.truestudio.mbs.builder1">
 								<outputEntries>
 									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="Release"/>
 								</outputEntries>
@@ -179,6 +179,7 @@
 									<listOptionValue builtIn="false" value="../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Device/ST/STM32F1xx/Include"/>
 									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/STM32F103ZET_JDASMBIC/Bluecell_Inc}&quot;"/>
 								</option>
 								<option id="com.atollic.truestudio.gcc.symbols.defined.1670122205" name="Defined symbols" superClass="com.atollic.truestudio.gcc.symbols.defined" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
@@ -331,5 +332,18 @@
 				</scannerInfoProvider>
 			</profile>
 		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.atollic.truestudio.configuration.release.1518366166;com.atollic.truestudio.configuration.release.1518366166.2031504340;com.atollic.truestudio.exe.release.toolchain.gcc.1836874447;com.atollic.truestudio.gcc.input.850396938">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.atollic.truestudio.mbs.ARMToolsPerProjectProfileC"/>
+			<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+				<buildOutputProvider>
+					<openAction enabled="true" filePath=""/>
+					<parser enabled="true"/>
+				</buildOutputProvider>
+				<scannerInfoProvider id="makefileGenerator">
+					<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+					<parser enabled="true"/>
+				</scannerInfoProvider>
+			</profile>
+		</scannerConfigBuildInfo>
 	</storageModule>
 </cproject>

.settings/org.eclipse.cdt.managedbuilder.core.prefs

@@ -1,10 +1,20 @@
 eclipse.preferences.version=1
+environment/buildEnvironmentInclude/com.atollic.truestudio.configuration.release.1518366166/CPATH/delimiter=;
+environment/buildEnvironmentInclude/com.atollic.truestudio.configuration.release.1518366166/CPATH/operation=remove
+environment/buildEnvironmentInclude/com.atollic.truestudio.configuration.release.1518366166/C_INCLUDE_PATH/delimiter=;
+environment/buildEnvironmentInclude/com.atollic.truestudio.configuration.release.1518366166/C_INCLUDE_PATH/operation=remove
+environment/buildEnvironmentInclude/com.atollic.truestudio.configuration.release.1518366166/append=true
+environment/buildEnvironmentInclude/com.atollic.truestudio.configuration.release.1518366166/appendContributed=true
 environment/buildEnvironmentInclude/com.atollic.truestudio.exe.debug.1518366166/CPATH/delimiter=;
 environment/buildEnvironmentInclude/com.atollic.truestudio.exe.debug.1518366166/CPATH/operation=remove
 environment/buildEnvironmentInclude/com.atollic.truestudio.exe.debug.1518366166/C_INCLUDE_PATH/delimiter=;
 environment/buildEnvironmentInclude/com.atollic.truestudio.exe.debug.1518366166/C_INCLUDE_PATH/operation=remove
 environment/buildEnvironmentInclude/com.atollic.truestudio.exe.debug.1518366166/append=true
 environment/buildEnvironmentInclude/com.atollic.truestudio.exe.debug.1518366166/appendContributed=true
+environment/buildEnvironmentLibrary/com.atollic.truestudio.configuration.release.1518366166/LIBRARY_PATH/delimiter=;
+environment/buildEnvironmentLibrary/com.atollic.truestudio.configuration.release.1518366166/LIBRARY_PATH/operation=remove
+environment/buildEnvironmentLibrary/com.atollic.truestudio.configuration.release.1518366166/append=true
+environment/buildEnvironmentLibrary/com.atollic.truestudio.configuration.release.1518366166/appendContributed=true
 environment/buildEnvironmentLibrary/com.atollic.truestudio.exe.debug.1518366166/LIBRARY_PATH/delimiter=;
 environment/buildEnvironmentLibrary/com.atollic.truestudio.exe.debug.1518366166/LIBRARY_PATH/operation=remove
 environment/buildEnvironmentLibrary/com.atollic.truestudio.exe.debug.1518366166/append=true

Bluecell_Inc/Bluecell_operate.h

@@ -134,21 +134,21 @@ typedef enum{
     AGC_Alarm_DL3_Index,        
     AGC_Alarm_DL4_Index,            
     AGC_Alarm_DL_Index_MAX,      
-};
+}AGC_Alarm_I;
 typedef enum{
     ALC_Alarm_UL1_Index = 0,
     ALC_Alarm_UL2_Index,        
     ALC_Alarm_UL3_Index,        
     ALC_Alarm_UL4_Index,            
     ALC_Alarm_UL_Index_MAX,            
-};
+}ALC_Alarm_I;
 typedef enum{
     AGC_Table_DL1_Ref_Index = 0,
     AGC_Table_DL2_Ref_Index,        
     AGC_Table_DL3_Ref_Index,        
     AGC_Table_DL4_Ref_Index,            
     AGC_Table_DL_Ref_Index_MAX,      
-};
+}AGC_Table_I;
 #define TABLE_MAX_VALUE 0     
 #define TABLE_LENGTH_MAX 70    
 typedef enum{
@@ -1525,14 +1525,14 @@ typedef enum{
     DET_Alarm_DL3_Index,
     DET_Alarm_DL4_Index,
     DET_Alarm_DL_Index_MAX,
-};
+}DET_Alarm_DL_I;
 typedef enum{
     DET_Alarm_UL1_Index = 0,
     DET_Alarm_UL2_Index,
     DET_Alarm_UL3_Index,
     DET_Alarm_UL4_Index,
     DET_Alarm_UL_Index_MAX,
-};
+}DET_Alarm_UL_I;
 typedef enum{
     DET_Alarm_DL1_Shutdown_Index = 0,
     DET_Alarm_DL2_Shutdown_Index,

Bluecell_Src/Bluecell_operate.c

@@ -26,6 +26,11 @@ extern HAL_StatusTypeDef EEPROM_M24C08_Zerowrite(uint8_t devid,uint16_t Address)
 extern uint8_t Chksum_Create(uint8_t *data);
 extern uint16_t CRC16_Generate(uint8_t* buf_ptr, int len);
 extern uint8_t MBIC_APIFLASH_Func(uint8_t* data,uint32_t size);
+extern void MBIC_Bootloader_FirmwareUpdate(uint8_t* data);
+extern uint8_t* MBIC_HeaderMergeFunction(uint8_t* data,uint16_t Length );
+extern void PE43711_atten_ctrl2(PE43711_st* ATT ,uint8_t data);
+extern void PE43711_UL4_atten_ctrl(uint8_t data);
+
 
 /***************************************************************************************/
 /*                                  Extern Valuable                                    */
@@ -958,7 +963,7 @@ void CompareAttenData(BLUESTATUS_st Curr,BLUESTATUS_st Prev){
                                 MBIC_Val,// Hidden Atten Low bit
                                MBIC_UserVal,
                                MBIC_ALC_Val);// User Atten Low Bit
-            printf("%d val = %x \r\n",__LINE__,val);
+//            printf("%d val = %x \r\n",__LINE__,val);
             PE43711_UL4_atten_ctrl(val);
     }
 //    memcpy(&bluecell_Prevdatastatus.ATT_DL1_H,&bluecell_Currdatastatus.ATT_DL1_H,32);
@@ -1763,7 +1768,7 @@ void Bluecell_TableSave(uint8_t* data,uint8_t type){
             break;
         case ULO_P4_ATT_Temp_guarantee_Table_Number:printf("Function : %s Line %d \r\n",__func__,__LINE__);
             Bluecell_DataCopy(&Temp_UL4.Table_1_Temp,&data[BLUECELL_DATA + 1],sizeof(TEMP_TABLE_st));
-            EEPROM_M24C08_write(EEPROM_M24C08_ID ,(EEPROM_TEMP_UL3_TABLE_ADDRESDS),&Temp_UL4.Table_1_Temp,sizeof(TEMP_TABLE_st));                                
+            EEPROM_M24C08_write((uint8_t)EEPROM_M24C08_ID ,(EEPROM_TEMP_UL3_TABLE_ADDRESDS),&Temp_UL4.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));                                        
             break;
     }
@@ -2624,18 +2629,19 @@ bool Bluecell_Operate(uint8_t* data){
         }
         bluecell_Currdatastatus.ATT_UL4_PATH = data[BLUECELL_DATA];
 #else
-        bluecell_Currdatastatus.ATT_DL4_PATH = data[BLUECELL_DATA]; 
-        bluecell_Currdatastatus.DLI_Shutdown_Retry_Count4 = 0;
-        bluecell_Prevdatastatus.DLI_Shutdown_Retry_Count4 = 0xFF;
+        bluecell_Currdatastatus.ATT_UL4_PATH = data[BLUECELL_DATA]; 
+        printf("PATH : %d \r\n",bluecell_Currdatastatus.ATT_UL4_PATH);
+        bluecell_Currdatastatus.ULO_Shutdown_Retry_Count4 = 0;
+        bluecell_Prevdatastatus.ULO_Shutdown_Retry_Count4 = 0xFF;
         if(data[BLUECELL_DATA]==0){
-            HAL_GPIO_WritePin(PATH_EN_DL4_GPIO_Port,PATH_EN_DL4_Pin,GPIO_PIN_RESET);//CLOCK        
-            DL_PathUserHandl[3] = true;
+            HAL_GPIO_WritePin(PATH_EN_UL4_GPIO_Port,PATH_EN_UL4_Pin,GPIO_PIN_RESET);//CLOCK        
+            UL_PathUserHandl[3] = true;
         }
         else{
-            bluecell_Prevdatastatus.ATT_DL4_H = 0xFF;
-            bluecell_Prevdatastatus.ATT_DL4_L =0xFF;
-            DL_PathUserHandl[3] = false;                    
-            HAL_GPIO_WritePin(PATH_EN_DL4_GPIO_Port,PATH_EN_DL4_Pin,GPIO_PIN_SET);//CLOCK
+            bluecell_Prevdatastatus.ATT_UL4_H = 0xFF;
+            bluecell_Prevdatastatus.ATT_UL4_L =0xFF;
+            UL_PathUserHandl[3] = false;                    
+            HAL_GPIO_WritePin(PATH_EN_UL4_GPIO_Port,PATH_EN_UL4_Pin,GPIO_PIN_SET);//CLOCK
         }                
         CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
 
@@ -2729,6 +2735,35 @@ bool Bluecell_Operate(uint8_t* data){
         tempdata +=  bluecell_Currdatastatus.DLI_Shutdown_Threshold_L ;
         tempdata /= 10;
         printf("DL Shutdown Threas : %d \r\n",tempdata);
+#if 0 // PYJ.2020.07.01_BEGIN -- 
+        tempdata = (( bluecell_Currdatastatus.ULO_Shutdown_Threshold_H << 8) & 0xFF00) ;
+        tempdata +=  bluecell_Currdatastatus.ULO_Shutdown_Threshold_L ;
+        tempdata /= 10;
+        printf("UL Shutdown Threas : %d \r\n",tempdata);        
+
+        tempdata = (( bluecell_Currdatastatus.ATT_UL1_H << 8) & 0xFF00) ;
+        tempdata +=  bluecell_Currdatastatus.ATT_UL1_L;
+        tempdata /= 10;
+        printf("UL1 Shutdown Threas : %d \r\n",tempdata);
+
+        tempdata = (( bluecell_Currdatastatus.ATT_UL2_H << 8) & 0xFF00) ;
+        tempdata +=  bluecell_Currdatastatus.ATT_UL2_L ;
+        tempdata /= 10;
+        printf("UL2 Shutdown Threas : %d \r\n",tempdata);
+
+        tempdata = (( bluecell_Currdatastatus.ATT_UL3_H << 8) & 0xFF00) ;
+        tempdata +=  bluecell_Currdatastatus.ATT_UL3_L ;
+        tempdata /= 10;
+        printf("UL3 Shutdown Threas : %d \r\n",tempdata);
+
+        tempdata = (( bluecell_Currdatastatus.ATT_UL4_H << 8) & 0xFF00) ;
+        tempdata +=  bluecell_Currdatastatus.ATT_UL4_L ;
+        tempdata /= 10;
+        printf("UL4 Shutdown Threas : %d \r\n",tempdata);   
+#endif // PYJ.2020.07.01_END -- 
+
+
+        
 //        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,
@@ -4078,7 +4113,25 @@ uint32_t MBIC_DataSend(uint8_t* data){
 
 }
 uint8_t TxData[2048] = {0,};
+#define ALAMASK_DEFAULT 1
+#define Temp_THREADHOLD_DEFAULT 80
+#define CARRIER_DEFAULT 1
+#define DLI_PATH_DEFAULT
+#define DLI_GAIN_ATT_DEFAULT 0
+
+
+
+void Factory_Set(){
+    bluecell_Currdatastatus.ALARM_MASK1 = ALAMASK_DEFAULT;
+    bluecell_Currdatastatus.ALARM_MASK2 = ALAMASK_DEFAULT;    
+    bluecell_Currdatastatus.ALARM_MASK3 = ALAMASK_DEFAULT;
+    bluecell_Currdatastatus.ALARM_MASK4 = ALAMASK_DEFAULT;    
+    bluecell_Currdatastatus.ALARM_MASK5 = ALAMASK_DEFAULT;  
+    bluecell_Currdatastatus.Temp_High_Threshold = Temp_THREADHOLD_DEFAULT;
+//    bluecell_Currdatastatus.Carrier_ON_OFF = 
+    
 
+}
 bool MBIC_Operate(uint8_t* data){
 	uint8_t datatype = data[MBIC_PAYLOADSTART + 1];
    // uint8_t Length = (data[MBIC_PROT_SUB_DATA_INDEX + 2]);
@@ -5844,20 +5897,20 @@ typedef enum{
     ULO_ALC_L,
 };
 void ALC_Package_Operate(uint8_t*ULO_ADC_Level,uint8_t* ULO_Level,DET_TABLEUL_st*      UL_Table,uint8_t TableIndex,uint8_t* ALC_Atten,uint8_t* UL_Main_Atten,uint8_t* GainOffset ){
+    /*static int16_t PrevLimitdata[ALC_Alarm_UL_Index_MAX] = {0,};
+    static int8_t* ALC_Table;
+    int16_t tmpcalc = 0;
+    static int16_t PrevIwillGiveAtten[ALC_Alarm_UL_Index_MAX] ={0,};*/
+    int16_t Gain_Atten = 0;
     double ret = 0;
     double CurrentATTENVALUE = 0;
     int16_t Limitdata = 0;
-    static int16_t PrevLimitdata[ALC_Alarm_UL_Index_MAX] = {0,};
     double ResdBm = 0;
     int16_t ResultData = 0;
     int16_t IwillGiveAtten = 0;
-    static int8_t* ALC_Table;
-    int16_t tmpcalc = 0;
     int16_t UL_Atten = 0;
     int16_t Main_Atten = 0;
-    int16_t Gain_Atten = 0;
     int16_t GiveAttenPlusULAtten = 0;
-    static int16_t PrevIwillGiveAtten[ALC_Alarm_UL_Index_MAX] ={0,};
 
     UL_Atten = ALC_Atten[ULO_ALC_H] << 8 | ALC_Atten[ULO_ALC_L];
     Main_Atten = UL_Main_Atten[ULO_ALC_H] << 8 | UL_Main_Atten[ULO_ALC_L];
@@ -5879,9 +5932,9 @@ void ALC_Package_Operate(uint8_t*ULO_ADC_Level,uint8_t* ULO_Level,DET_TABLEUL_st
     CurrentATTENVALUE = PE43711_Double(ALC_Atten[ULO_ALC_H],ALC_Atten[ULO_ALC_L]);
     ULO_Level[ULO_ALC_H] = (ResultData & 0xFF00) >> 8;
     ULO_Level[ULO_ALC_L] = (ResultData & 0x00FF);
-    printf("=============ALC ON =====START================\r\n");
+//    printf("=============ALC ON =====START================\r\n");
 //    printf("Current UL ADC VALUE : %f \r\n",ret);
-    printf("ResdBm : UL%d : %f \r\n",TableIndex + 1,ResdBm);    
+//    printf("ResdBm : UL%d : %f \r\n",TableIndex + 1,ResdBm);    
 //    printf("ORIGIN ResdBm : %f  %d\r\n",ResdBm,Main_Atten);
 //    printf("After ResdBm : %f \r\n",ResdBm);
     Limitdata += (Main_Atten * 0.1);
@@ -5951,7 +6004,7 @@ void ALC_Function(){ //DL
   //  int32_t CurrnALC_MAX_SettingValue = 0;
   //  int32_t CurrnALC_MIN_SettingValue = 0;
   //  int32_t ALC_Result = 0;
-    int16_t Limitdata = 0;
+/*    int16_t Limitdata = 0;
     static int16_t PrevLimitdata[ALC_Alarm_UL_Index_MAX] = {0,};
     double ResdBm = 0;
     int16_t ResultData = 0;
@@ -5959,11 +6012,11 @@ void ALC_Function(){ //DL
     int16_t IwillGiveAtten = 0;
     static int8_t* ALC_Table;
     int16_t tmpcalc = 0;
-    int16_t UL_Atten[ALC_Alarm_UL_Index_MAX] = {0,};
-    int16_t Main_Atten[ALC_Alarm_UL_Index_MAX] = {0,};
-    static int16_t PrevIwillGiveAtten[ALC_Alarm_UL_Index_MAX] ={0,};
+    static int16_t PrevIwillGiveAtten[ALC_Alarm_UL_Index_MAX] ={0,};*/
 //    uint8_t tempadc[256];
 
+    int16_t UL_Atten[ALC_Alarm_UL_Index_MAX] = {0,};
+    int16_t Main_Atten[ALC_Alarm_UL_Index_MAX] = {0,};
     
 //    Bluecell_StructCpy(&AutoControl_Save[0],&UL_DET_Table_ref[TABLE_MAX_VALUE],sizeof(ALC_dBm_t));
 //    Bluecell_StructCpy(&tempadc[0],&Det_UL1.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st));
@@ -6677,15 +6730,15 @@ void DL_Det_Function(uint8_t Table_Num,uint8_t* CurrADC_Level,DET_TABLEDL_st* DL
     Level[DL_Level_L] = (Levelret & 0x00FF);
 }
 void AGC_Function(){//DL
-    double ret = 0;
+    /*double ret = 0;
     int8_t ResdBm = 0;
-
     int16_t Levelret = 0;
     int i = 0;
-    int16_t Limitdata = 0;
     int16_t IwillgiveAtten = 0;
     int16_t ResultData = 0;
-    static int8_t* AGC_Table;// = &DL_DET_Table_ref[MBIC_Table_DL1_INDEX][TABLE_MAX_VALUE];
+    static int8_t* AGC_Table;// = &DL_DET_Table_ref[MBIC_Table_DL1_INDEX][TABLE_MAX_VALUE];*/
+
+    int16_t Limitdata = 0;
     int16_t DL_Curr_Atten[AGC_Alarm_DL_Index_MAX] = {
         bluecell_Currdatastatus.ATT_DL1_H  << 8 | bluecell_Currdatastatus.ATT_DL1_L,
         bluecell_Currdatastatus.ATT_DL2_H  << 8 | bluecell_Currdatastatus.ATT_DL2_L,
@@ -7409,8 +7462,8 @@ typedef enum{
 };
 
 void DL_Shutdown_Operate(uint8_t index,uint8_t* path,uint8_t* retrycnt,uint8_t* ShutdownAlarm,uint8_t* MainAtten){
-    GPIO_TypeDef *Port;
-    uint16_t Pin;
+    GPIO_TypeDef *Port = 0;
+    uint16_t Pin = 0;
     uint8_t AlarmFlag = 0;
 
 
@@ -7434,10 +7487,11 @@ void DL_Shutdown_Operate(uint8_t index,uint8_t* path,uint8_t* retrycnt,uint8_t*
             Port = PATH_EN_DL4_GPIO_Port;
             Pin = PATH_EN_DL4_Pin;        
             AlarmFlag = ALARM_DLI_SHUTDOWN_P4;
+//            printf("Timer : %d   | Retry Cnt : %d | PrevMBIC_DL_ShutdownCount[%d] %d | MBIC_DL_ShutdownCount[%d] %d | DL_PathUserHandl[index] %d \r\n",DET_DL_Shutdown_Off_AlarmTimerCnt[index],(*retrycnt),index + 1,PrevMBIC_DL_ShutdownCount[index],index + 1,MBIC_DL_ShutdownCount[index],DL_PathUserHandl[index]);
             break;
     }
-    if(MBIC_DL_ShutdownCount[index] < 3
-        && (PrevMBIC_DL_ShutdownCount[index] != MBIC_DL_ShutdownCount[index])
+    if((*retrycnt) < 3
+        /*&& (PrevMBIC_DL_ShutdownCount[index] != MBIC_DL_ShutdownCount[index])*/
         && DET_DL_Shutdown_Off_AlarmTimerCnt[index] >= MBIC_RECOVERY_SHUTDOWN_MAINTAIN_SEC
         && DL_PathUserHandl[index] == false
         && (*retrycnt) > 0){
@@ -7729,9 +7783,9 @@ UL_Shutdown_Operate(DET_Alarm_UL1_Shutdown_Index,
                         &bluecell_Currdatastatus.ULO_Shutdown_Alarm1);
 #endif // PYJ.2020.06.28_END -- 
 
-void UL_Shutdown_Operate(uint8_t Index,uint8_t* Path,uint8_t* PrevATT,uint8_t* RetryCnt,uint8_t* ShutdownAlarm){
-    GPIO_TypeDef *Port;
-    uint16_t Pin;
+void UL_Shutdown_Operate(uint8_t Index,uint8_t* Path,uint8_t* PrevATT,uint8_t* RetryCnt,uint8_t* ShutdownAlarm,uint8_t AlarmFlag){
+    GPIO_TypeDef *Port = 0;
+    uint16_t Pin = 0;
 
 
     switch(Index){
@@ -7750,20 +7804,24 @@ void UL_Shutdown_Operate(uint8_t Index,uint8_t* Path,uint8_t* PrevATT,uint8_t* R
         case DET_Alarm_UL4_Shutdown_Index: 
         Port = PATH_EN_UL4_GPIO_Port;
         Pin = PATH_EN_UL4_Pin;  
+//        printf("Timer : %d   | Retry Cnt : %d |  \r\n",DET_UL_Shutdown_Off_AlarmTimerCnt[Index],(*RetryCnt),Index + 1,PrevMBIC_UL_ShutdownCount[Index],Index + 1,MBIC_UL_ShutdownCount[Index]);        
         break;
 
     }
-    if(MBIC_UL_ShutdownCount[Index] < 3
-        && (PrevMBIC_UL_ShutdownCount[Index] != MBIC_UL_ShutdownCount[Index])
-        && DET_UL_Shutdown_Off_AlarmTimerCnt[Index] >= MBIC_RECOVERY_SHUTDOWN_MAINTAIN_SEC){
+    
+    if((*RetryCnt) < 3
+//        && (PrevMBIC_UL_ShutdownCount[Index] != MBIC_UL_ShutdownCount[Index])
+        && DET_UL_Shutdown_Off_AlarmTimerCnt[Index] >= MBIC_RECOVERY_SHUTDOWN_MAINTAIN_SEC
+        && (*RetryCnt) > 0){
         HAL_GPIO_WritePin(Port,Pin,GPIO_PIN_SET);//CLOCK
+//        printf();
         *Path = true;            
         PrevATT[UL_Shutdown_H] = 0xFF;
         PrevATT[UL_Shutdown_L] = 0xFF;
         PrevMBIC_UL_ShutdownCount[Index] = MBIC_UL_ShutdownCount[Index];
         CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus); 
     }
-    else if(MBIC_UL_ShutdownCount[Index] == 3
+    else if((*RetryCnt) == 3
         && DET_UL_Shutdown_Off_AlarmTimerCnt[Index] >= MBIC_RECOVERY_LAST_SHUTDOWN_MAINTAIN_SEC){
         HAL_GPIO_WritePin(Port,Pin,GPIO_PIN_SET);//CLOCK
         *Path = true;            
@@ -7781,7 +7839,7 @@ void UL_Shutdown_Operate(uint8_t Index,uint8_t* Path,uint8_t* PrevATT,uint8_t* R
         
         if((*RetryCnt) >= RETRYCNT_MAX){
             (*RetryCnt) = RETRYCNT_MAX;
-            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN |= ALARM_ULO_SHUTDOWN_P1;
+            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN |= AlarmFlag;
             *ShutdownAlarm       = true;
         }else{
         }
@@ -7790,10 +7848,11 @@ void UL_Shutdown_Operate(uint8_t Index,uint8_t* Path,uint8_t* PrevATT,uint8_t* R
     else{
         if(DET_UL_Shutdown_Off_AlarmTimerCnt[Index] >= MBIC_OFF_MAINTAIN_SEC
             && (*RetryCnt) != RETRYCNT_MAX){
-            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN &= ~ALARM_ULO_SHUTDOWN_P1;
+            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN &= ~AlarmFlag;
             *ShutdownAlarm       = false;            
         }
     } 
+
 }
 
 void ULO_ShutdownAlarmCheck(){
@@ -7854,6 +7913,35 @@ void ULO_ShutdownAlarmCheck(){
         
 #endif // PYJ.2020.06.21_END -- 
 #if 1 // PYJ.2020.06.19_BEGIN --
+#if 1 // PYJ.2020.07.01_BEGIN -- 
+    UL_Shutdown_Operate(DET_Alarm_UL1_Shutdown_Index,
+                            &bluecell_Currdatastatus.ATT_UL1_PATH,
+                            &bluecell_Prevdatastatus.ATT_UL1_H,
+                            &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count1,
+                            &bluecell_Currdatastatus.ULO_Shutdown_Alarm1,
+                            ALARM_ULO_SHUTDOWN_P1);
+    UL_Shutdown_Operate(DET_Alarm_UL2_Shutdown_Index,
+                            &bluecell_Currdatastatus.ATT_UL2_PATH,
+                            &bluecell_Prevdatastatus.ATT_UL2_H,
+                            &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count2,
+                            &bluecell_Currdatastatus.ULO_Shutdown_Alarm2,
+                            ALARM_ULO_SHUTDOWN_P2);
+    UL_Shutdown_Operate(DET_Alarm_UL3_Shutdown_Index,
+                    &bluecell_Currdatastatus.ATT_UL3_PATH,
+                    &bluecell_Prevdatastatus.ATT_UL3_H,
+                    &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count3,
+                    &bluecell_Currdatastatus.ULO_Shutdown_Alarm3,
+                    ALARM_ULO_SHUTDOWN_P3);
+    UL_Shutdown_Operate(DET_Alarm_UL4_Shutdown_Index,
+                            &bluecell_Currdatastatus.ATT_UL4_PATH,
+                            &bluecell_Prevdatastatus.ATT_UL4_H,
+                            &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count4,
+                            &bluecell_Currdatastatus.ULO_Shutdown_Alarm4,
+                            ALARM_ULO_SHUTDOWN_P4);
+#else
+
+
+
         /***************************************************************************************************************/
         /*                                             SHUTDOWN UL1                                                    */
         /***************************************************************************************************************/  
@@ -8066,6 +8154,8 @@ void ULO_ShutdownAlarmCheck(){
             }
         } 
         
+        
+#endif // PYJ.2020.07.01_END -- 
 
 #if 0 // PYJ.2020.06.21_BEGIN -- 
         if(ADC_Alarm_UL_Shutdown_Set[DET_Alarm_UL3_Shutdown_Index] == true

Bluecell_Src/eeprom.c

@@ -24,7 +24,7 @@ extern BLUESTATUS_st bluecell_Currdatastatus;
 
 
 uint8_t testdata[120];
-
+/*
 typedef enum{
     Test_DL1 = 0,
     Test_DL2 = 0,
@@ -36,9 +36,9 @@ typedef enum{
     Test_UL2 = 0,
     Test_UL3 = 0,
     Test_UL4 = 0,    
-};
+};*/
 void EEPROM_M24C08_Init(void){
-    uint8_t* data = 0;
+/*    uint8_t* data = 0;
     int16_t DL_Main_Atten[4] = {0,};
     int16_t DL_Offset_Atten[4] = {0,};
 
@@ -62,7 +62,7 @@ void EEPROM_M24C08_Init(void){
     bool UL_shutdown_Path = 0;
 
     int16_t DL_Shutdown_ThreadHold = 0;        
-    int16_t UL_Shutdown_ThreadHold = 0; 
+    int16_t UL_Shutdown_ThreadHold = 0;*/
 
 //    DL_High_ThreasHold = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_L;
 //    ALC_TEMP[0] = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L;
@@ -87,9 +87,9 @@ void EEPROM_M24C08_Init(void){
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_DET_DL2_TABLE_ADDRESDS,&Det_DL3.Table_Det5_dBm_H,sizeof(DET_TABLEDL_st) );
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_DET_DL3_TABLE_ADDRESDS,&Det_DL4.Table_Det5_dBm_H,sizeof(DET_TABLEDL_st) );
 
-    uint8_t* tmpdata;
+//    uint8_t* tmpdata;
     EEPROM_M24C08_Read(EEPROM_M24C08_ID,EEPROM_DET_DL4_TABLE_ADDRESDS,&Det_UL1.Table_Det_15_dBm_H,sizeof(DET_TABLEUL_st) );
-    tmpdata = &Det_UL1.Table_Det_15_dBm_H;
+    //tmpdata = &Det_UL1.Table_Det_15_dBm_H;
 //    for(int i =0; i < sizeof(DET_TABLEUL_st) ; i++){
 //        printf("[%d]%f \r\n",i,(tmpdata[i * 2] << 8 | tmpdata[i*2+1])*0.001);
 //    }
@@ -144,7 +144,7 @@ void EEPROM_M24C08_Init(void){
 //    printf("UL3\r\n");    Table_DET_DataSetting(&UL_Table_ref[ALC_Table_UL3_Ref_Index][DLUL_TABLE_MAX_VALUE],Det_UL3.Table_Ref ,TableDataSetting_ATT_DET_STEP,Det_UL3.Table_Length);
 //    printf("UL4\r\n");    Table_DET_DataSetting(&UL_Table_ref[ALC_Table_UL4_Ref_Index][DLUL_TABLE_MAX_VALUE],Det_UL4.Table_Ref ,TableDataSetting_ATT_DET_STEP,Det_UL4.Table_Length);
 
-#if 1// PYJ.2020.06.28_BEGIN -- 
+#if 0// PYJ.2020.06.28_BEGIN --
     DL_Main_Atten[Test_DL1] = (bluecell_Currdatastatus.ATT_DL1_H << 8) | bluecell_Currdatastatus.ATT_DL1_L;
     DL_Main_Atten[Test_DL2] = bluecell_Currdatastatus.ATT_DL2_H << 8 | bluecell_Currdatastatus.ATT_DL2_L;
     DL_Main_Atten[Test_DL3] = bluecell_Currdatastatus.ATT_DL3_H << 8 | bluecell_Currdatastatus.ATT_DL3_L;

Bluecell_Src/uart.c

@@ -100,7 +100,7 @@ void GetDataFromUartQueue(UART_HandleTypeDef *huart)
 //        printf("data cnt zero !!!  \r\n");
         //RF_Ctrl_Main(&uart_buf[Header]);
 //        HAL_UART_Transmit(dst, &temp_buf[BLUECELL_HEADER00], 11, 3000);
-#if 1// PYJ.2019.07.15_BEGIN --
+#if 0// PYJ.2019.07.15_BEGIN --
             printf("\r\n[RX]");
             for(int i = 0; i < cnt; i++){
                 printf("%02x ",uart_buf[i]);

Jdats-cppcheck-build-dir/__temp__.c

@@ -0,0 +1 @@
+int x;

Jdats-cppcheck-build-dir/__temp__.cpp

@@ -0,0 +1 @@
+int x;

Jdats-cppcheck-build-dir/lastResults.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<results version="2">
+    <cppcheck version="2.0"/>
+    <errors/>
+</results>

Jdats-cppcheck-build-dir/statistics.txt

@@ -0,0 +1,2 @@
+[01.07.2020]
+1593575672317

Jdats.cppcheck

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="1">
+    <builddir>Jdats-cppcheck-build-dir</builddir>
+    <platform>Unspecified</platform>
+    <importproject>.cproject</importproject>
+    <analyze-all-vs-configs>false</analyze-all-vs-configs>
+    <check-headers>true</check-headers>
+    <check-unused-templates>false</check-unused-templates>
+    <max-ctu-depth>10</max-ctu-depth>
+</project>

Release/Src/main.su

@@ -0,0 +1,11 @@
+main.c:171:10:ShutdownCnt_Get	0	static
+main.c:174:6:ShutdownCnt_Set	0	static
+main.c:178:6:Pol_Delay_us	8	static
+main.c:188:5:_write	8	static
+main.c:200:6:HAL_ADC_ConvCpltCallback	20	static
+main.c:406:6:SystemClock_Config	96	static
+main.c:241:5:main	104	static
+main.c:869:6:DL_Shutdown_Timer	0	static
+main.c:894:6:UL_Shutdown_Timer	0	static
+main.c:930:6:HAL_TIM_PeriodElapsedCallback	8	static
+main.c:1440:6:Error_Handler	0	static

Release/Src/stm32f1xx_hal_msp.su

@@ -0,0 +1,9 @@
+stm32f1xx_hal_msp.c:75:6:HAL_MspInit	8	static
+stm32f1xx_hal_msp.c:101:6:HAL_ADC_MspInit	56	static
+stm32f1xx_hal_msp.c:203:6:HAL_ADC_MspDeInit	8	static
+stm32f1xx_hal_msp.c:268:6:HAL_I2C_MspInit	32	static
+stm32f1xx_hal_msp.c:302:6:HAL_I2C_MspDeInit	0	static
+stm32f1xx_hal_msp.c:331:6:HAL_TIM_Base_MspInit	8	static
+stm32f1xx_hal_msp.c:353:6:HAL_TIM_Base_MspDeInit	0	static
+stm32f1xx_hal_msp.c:378:6:HAL_UART_MspInit	48	static
+stm32f1xx_hal_msp.c:510:6:HAL_UART_MspDeInit	8	static

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="uart_buf,0x08005000,0x8005000,Bank2data,data,Currdata,Currdata[MBIC_BOOT_VERSION + 2],Bank1data"/>
+<stringAttribute key="saved_expressions&lt;seperator&gt;Unknown" value="uart_buf,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]"/>
 </launchConfiguration>

Src/main.c

@@ -238,7 +238,7 @@ extern const uint16_t crc16_tab[256];
 
 
 
-main(void)  {
+int main(void)  {
   /* USER CODE BEGIN 1 */
 
   /* USER CODE END 1 */
@@ -866,7 +866,7 @@ static void MX_GPIO_Init(void)
 }
 
 /* USER CODE BEGIN 4 */
-void DL_Shutdown_Timer(uint8_t* pdata,uint8_t Table_num){
+void DL_Shutdown_Timer(uint8_t Table_num){
     if(bluecell_Currdatastatus.DLI_Shutdown_ON_OFF == true){
           if(ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + Table_num] == true){
               DET_DL_Shutdown_Off_AlarmTimerCnt[DET_Alarm_DL1_Shutdown_Index + Table_num] = 0; // OFF CNT = 0;
@@ -891,7 +891,7 @@ void DL_Shutdown_Timer(uint8_t* pdata,uint8_t Table_num){
           }
   }
 }
-void UL_Shutdown_Timer(uint8_t* pdata,uint8_t Table_num){
+void UL_Shutdown_Timer(uint8_t Table_num){
     if(bluecell_Currdatastatus.ULO_Shutdown_ON_OFF == true){
           if(ADC_Alarm_UL_Shutdown_Set[DET_Alarm_UL1_Shutdown_Index + Table_num] == true){
               DET_UL_Shutdown_Off_AlarmTimerCnt[DET_Alarm_UL1_Shutdown_Index + Table_num] = 0; // OFF CNT = 0;
@@ -930,7 +930,7 @@ void UL_Shutdown_Timer(uint8_t* pdata,uint8_t Table_num){
 void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
 {
   /* USER CODE BEGIN Callback 0 */
-    uint8_t* pdata;
+  //  uint8_t* pdata;
   /* USER CODE END Callback 0 */
   if (htim->Instance == TIM2) {
     HAL_IncTick();
@@ -945,22 +945,22 @@ void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim)
       AGCTimerCnt++;
       
 //    pdata = &bluecell_Currdatastatus.ATT_UL1_PATH;
-    UL_Shutdown_Timer(pdata,DET_Alarm_UL1_Shutdown_Index);
+    UL_Shutdown_Timer(DET_Alarm_UL1_Shutdown_Index);
 //    pdata = &bluecell_Currdatastatus.ATT_UL2_PATH;
-    UL_Shutdown_Timer(pdata,DET_Alarm_UL2_Shutdown_Index);
+    UL_Shutdown_Timer(DET_Alarm_UL2_Shutdown_Index);
 //    pdata = &bluecell_Currdatastatus.ATT_UL3_PATH;
-    UL_Shutdown_Timer(pdata,DET_Alarm_UL3_Shutdown_Index);
+    UL_Shutdown_Timer(DET_Alarm_UL3_Shutdown_Index);
 //    pdata = &bluecell_Currdatastatus.ATT_UL4_PATH;
-    UL_Shutdown_Timer(pdata,DET_Alarm_UL4_Shutdown_Index);
+    UL_Shutdown_Timer(DET_Alarm_UL4_Shutdown_Index);
 
 //    pdata = &bluecell_Currdatastatus.ATT_DL1_PATH;
-    DL_Shutdown_Timer(pdata,DET_Alarm_DL1_Shutdown_Index);
+    DL_Shutdown_Timer(DET_Alarm_DL1_Shutdown_Index);
 //    pdata = &bluecell_Currdatastatus.ATT_DL2_PATH;
-    DL_Shutdown_Timer(pdata,DET_Alarm_DL2_Shutdown_Index);
+    DL_Shutdown_Timer(DET_Alarm_DL2_Shutdown_Index);
 //    pdata = &bluecell_Currdatastatus.ATT_DL3_PATH;
-    DL_Shutdown_Timer(pdata,DET_Alarm_DL3_Shutdown_Index);
+    DL_Shutdown_Timer(DET_Alarm_DL3_Shutdown_Index);
 //    pdata = &bluecell_Currdatastatus.ATT_DL4_PATH;
-    DL_Shutdown_Timer(pdata,DET_Alarm_DL4_Shutdown_Index);
+    DL_Shutdown_Timer(DET_Alarm_DL4_Shutdown_Index);
   
       /*ALC Alarm timer start*/
       if(ALC_AlarmSet[ALC_Alarm_UL1_Index] == true){