MBIC Version 01.43

FRBT IDLE 상태일 때 Atten 제어 되도록 수정.
UL ALC Atten의 범위 적용Path#0이 아닌 모든 패스에 적용 하도록 수정

.settings/language.settings.xml

@@ -4,7 +4,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="1726537617709614172" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="-603886259554499058" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -14,7 +14,7 @@
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="1726537617709614172" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="-603886259554499058" id="com.atollic.truestudio.mbs.provider" keep-relative-paths="false" name="Atollic ARM Tools Language Settings" parameter="${COMMAND} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

Bluecell_Src/Bluecell_operate.c

@@ -5378,6 +5378,8 @@ bool MBIC_Operate(uint8_t* data){
     int16_t Tmpdata = 0;
     int16_t Tmpdata2 = 0;    
 	int16_t tempdata = 0;
+    uint8_t* UL_Atten;
+    uint8_t* ALC_Atten;
     /*Day Save*/
     TimeSetting(&data[MBIC_TIME_0]);
     
@@ -5627,7 +5629,7 @@ bool MBIC_Operate(uint8_t* data){
                 if(bluecell_Currdatastatus.SelfTest == true || bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_RUNNING)break;
                 tempdata = bluecell_Currdatastatus.DLI_FRBT_Atten1_H << 8 | bluecell_Currdatastatus.DLI_FRBT_Atten1_L;
                 Tmpdata2 = data[MBIC_PAYLOADSTART + 3] << 8 | data[MBIC_PAYLOADSTART + 4]; 
-                if(tempdata < Tmpdata2){
+                if(tempdata < Tmpdata2 && bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_TRACKING){
                     break;
                 }
 //                printf("DLI Gain Setting Complete: %d \r\n",Tmpdata2);
@@ -5643,7 +5645,7 @@ bool MBIC_Operate(uint8_t* data){
                 if(bluecell_Currdatastatus.SelfTest == true || bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_RUNNING)break;
                 tempdata = bluecell_Currdatastatus.DLI_FRBT_Atten2_H << 8 | bluecell_Currdatastatus.DLI_FRBT_Atten2_L;
                 Tmpdata2 = data[MBIC_PAYLOADSTART + 3] << 8 | data[MBIC_PAYLOADSTART + 4]; 
-                if(tempdata < Tmpdata2){
+                if(tempdata < Tmpdata2 && bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_TRACKING){
                     break;
                 }                
                 bluecell_Currdatastatus.ATT_DL2_H = data[MBIC_PAYLOADSTART + 3]; 
@@ -5658,7 +5660,7 @@ bool MBIC_Operate(uint8_t* data){
                 if(bluecell_Currdatastatus.SelfTest == true || bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_RUNNING)break;
                 tempdata = bluecell_Currdatastatus.DLI_FRBT_Atten3_H << 8 | bluecell_Currdatastatus.DLI_FRBT_Atten3_L;
                 Tmpdata2 = data[MBIC_PAYLOADSTART + 3] << 8 | data[MBIC_PAYLOADSTART + 4]; 
-                if(tempdata < Tmpdata2){
+                if(tempdata < Tmpdata2 && bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_TRACKING){
                     break;
                 }                
                 bluecell_Currdatastatus.ATT_DL3_H = data[MBIC_PAYLOADSTART + 3]; 
@@ -5671,7 +5673,7 @@ bool MBIC_Operate(uint8_t* data){
                 if(bluecell_Currdatastatus.SelfTest == true || bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_RUNNING)break;
                 tempdata = bluecell_Currdatastatus.DLI_FRBT_Atten4_H << 8 | bluecell_Currdatastatus.DLI_FRBT_Atten4_L;
                 Tmpdata2 = data[MBIC_PAYLOADSTART + 3] << 8 | data[MBIC_PAYLOADSTART + 4]; 
-                if(tempdata < Tmpdata2){
+                if(tempdata < Tmpdata2 && bluecell_Currdatastatus.DLI_FRBT_Status == FRBT_TRACKING){
                     break;
                 }                
                 bluecell_Currdatastatus.ATT_DL4_H = data[MBIC_PAYLOADSTART + 3]; 
@@ -5924,12 +5926,12 @@ bool MBIC_Operate(uint8_t* data){
                 bluecell_Currdatastatus.ATT_UL2_H = data[MBIC_PAYLOADSTART + 3]; 
                 bluecell_Currdatastatus.ATT_UL2_L = data[MBIC_PAYLOADSTART + 4]; 
 //                if(bluecell_Currdatastatus.ULO_ALC_ON_OFF == true){
-                    Tmpdata = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L;
-                    Tmpdata2 = bluecell_Currdatastatus.ATT_UL1_H << 8 | bluecell_Currdatastatus.ATT_UL1_L;
+                    Tmpdata = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_L;
+                    Tmpdata2 = bluecell_Currdatastatus.ATT_UL2_H << 8 | bluecell_Currdatastatus.ATT_UL2_L;
                     if(Tmpdata + Tmpdata2 <= -200){
                         Tmpdata2 = -200 + (Tmpdata * -1);
-                        bluecell_Currdatastatus.ATT_UL1_H = ((Tmpdata2 & 0xFF00) >> 8);
-                        bluecell_Currdatastatus.ATT_UL1_L = Tmpdata2 & 0x00FF;                    
+                        bluecell_Currdatastatus.ATT_UL2_H = ((Tmpdata2 & 0xFF00) >> 8);
+                        bluecell_Currdatastatus.ATT_UL2_L = Tmpdata2 & 0x00FF;                    
                     }                    
                     UL_ALC_GainAttenSet[ALC_Alarm_UL2_Index] = true;
                     ALC_Level_Save[ALC_Alarm_UL2_Index] = bluecell_Currdatastatus.ULO_Level2_H << 8 | bluecell_Currdatastatus.ULO_Level2_L;
@@ -5943,12 +5945,12 @@ bool MBIC_Operate(uint8_t* data){
                 bluecell_Currdatastatus.ATT_UL3_H = data[MBIC_PAYLOADSTART + 3]; 
                 bluecell_Currdatastatus.ATT_UL3_L = data[MBIC_PAYLOADSTART + 4]; 
 //                if(bluecell_Currdatastatus.ULO_ALC_ON_OFF == true){
-                    Tmpdata = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L;
-                    Tmpdata2 = bluecell_Currdatastatus.ATT_UL1_H << 8 | bluecell_Currdatastatus.ATT_UL1_L;
+                    Tmpdata = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_L;
+                    Tmpdata2 = bluecell_Currdatastatus.ATT_UL3_H << 8 | bluecell_Currdatastatus.ATT_UL3_L;
                     if(Tmpdata + Tmpdata2 <= -200){
                         Tmpdata2 = -200 + (Tmpdata * -1);
-                        bluecell_Currdatastatus.ATT_UL1_H = ((Tmpdata2 & 0xFF00) >> 8);
-                        bluecell_Currdatastatus.ATT_UL1_L = Tmpdata2 & 0x00FF;                    
+                        bluecell_Currdatastatus.ATT_UL3_H = ((Tmpdata2 & 0xFF00) >> 8);
+                        bluecell_Currdatastatus.ATT_UL3_L = Tmpdata2 & 0x00FF;                    
                     }                    
                     UL_ALC_GainAttenSet[ALC_Alarm_UL3_Index] = true;
                     ALC_Level_Save[ALC_Alarm_UL3_Index] = bluecell_Currdatastatus.ULO_Level3_H << 8 | bluecell_Currdatastatus.ULO_Level3_L;
@@ -5962,12 +5964,12 @@ bool MBIC_Operate(uint8_t* data){
                 bluecell_Currdatastatus.ATT_UL4_H = data[MBIC_PAYLOADSTART + 3]; 
                 bluecell_Currdatastatus.ATT_UL4_L = data[MBIC_PAYLOADSTART + 4]; 
 //                if(bluecell_Currdatastatus.ULO_ALC_ON_OFF == true){
-                    Tmpdata = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L;
-                    Tmpdata2 = bluecell_Currdatastatus.ATT_UL1_H << 8 | bluecell_Currdatastatus.ATT_UL1_L;
+                    Tmpdata = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_L;
+                    Tmpdata2 = bluecell_Currdatastatus.ATT_UL4_H << 8 | bluecell_Currdatastatus.ATT_UL4_L;
                     if(Tmpdata + Tmpdata2 <= -200){
                         Tmpdata2 = -200 + (Tmpdata * -1);
-                        bluecell_Currdatastatus.ATT_UL1_H = ((Tmpdata2 & 0xFF00) >> 8);
-                        bluecell_Currdatastatus.ATT_UL1_L = Tmpdata2 & 0x00FF;                    
+                        bluecell_Currdatastatus.ATT_UL4_H = ((Tmpdata2 & 0xFF00) >> 8);
+                        bluecell_Currdatastatus.ATT_UL4_L = Tmpdata2 & 0x00FF;                    
                     }                    
                     UL_ALC_GainAttenSet[ALC_Alarm_UL4_Index] = true;
                     ALC_Level_Save[ALC_Alarm_UL4_Index] = bluecell_Currdatastatus.ULO_Level4_H << 8 | bluecell_Currdatastatus.ULO_Level4_L  ;                      
@@ -6075,6 +6077,7 @@ bool MBIC_Operate(uint8_t* data){
 			    bluecell_Currdatastatus.ULO_Shutdown_Threshold_L = ((tempdata & 0x00FF));    
                 break;
             case ULO_ALC_Atten:
+         
                 bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H = data[MBIC_PAYLOADSTART + 3]; 
                 bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L = data[MBIC_PAYLOADSTART + 4]; 
                 bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_H = data[MBIC_PAYLOADSTART + 5]; 
@@ -6083,6 +6086,22 @@ bool MBIC_Operate(uint8_t* data){
                 bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_L = data[MBIC_PAYLOADSTART + 8];                 
                 bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_H = data[MBIC_PAYLOADSTART + 9]; 
                 bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_L = data[MBIC_PAYLOADSTART + 10];  
+
+
+
+                ALC_Atten = &bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H;
+                UL_Atten = &bluecell_Currdatastatus.ATT_UL1_H;
+                for(int aa = 0; aa < 4; aa++){
+                    Tmpdata = ALC_Atten[aa * 2] << 8 | ALC_Atten[aa * 2 + 1];
+                    Tmpdata2 =UL_Atten[aa * 2] << 8 | UL_Atten[aa * 2 + 1];
+//                    printf("%d : ALC : %d / Atten : %d \r\n",aa,Tmpdata,Tmpdata2);
+                    if(Tmpdata + Tmpdata2 <= -200){
+                        
+                        Tmpdata = -200 + (Tmpdata2 * -1);
+                        ALC_Atten[aa * 2] = ((Tmpdata & 0xFF00) >> 8);
+                        ALC_Atten[aa * 2 + 1] = Tmpdata & 0x00FF;          
+                    }  
+                }
                 CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
                 break;
         }