瀏覽代碼

Tempshutdown index Name Value change -> DLUL SUM PATH ON OFF

 DLUL SUM PATH ON OFF >> 상태 값 index 추가
PYJ 4 年之前
父節點
當前提交
a0d3e488e7
共有 3 個文件被更改,包括 25 次插入18 次删除
  1. 2 2
      .settings/language.settings.xml
  2. 3 3
      Bluecell_Inc/Bluecell_operate.h
  3. 20 13
      Bluecell_Src/Bluecell_operate.c

+ 2 - 2
.settings/language.settings.xml

@@ -4,7 +4,7 @@
4
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
4
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
5
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
5
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
6
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
6
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
7
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="1395387303521902045" 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">
7
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="775637718743193950" 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">
8
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
8
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
9
 				<language-scope id="org.eclipse.cdt.core.g++"/>
9
 				<language-scope id="org.eclipse.cdt.core.g++"/>
10
 			</provider>
10
 			</provider>
@@ -14,7 +14,7 @@
14
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
14
 		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
15
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
15
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
16
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
16
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
17
-			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="1395387303521902045" 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">
17
+			<provider class="com.atollic.truestudio.mbs.GCCSpecsDetectorAtollicArm" console="false" env-hash="775637718743193950" 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">
18
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
18
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
19
 				<language-scope id="org.eclipse.cdt.core.g++"/>
19
 				<language-scope id="org.eclipse.cdt.core.g++"/>
20
 			</provider>
20
 			</provider>

+ 3 - 3
Bluecell_Inc/Bluecell_operate.h

@@ -206,7 +206,7 @@ typedef enum{
206
     Serial_Number,
206
     Serial_Number,
207
     Manufacture,
207
     Manufacture,
208
     Manufacture_Date,
208
     Manufacture_Date,
209
-    Temp_Shutdown_Path_ON_OFF,
209
+    DL_UL_SUM_PATH_ON_OFF,
210
     Freq_ID,
210
     Freq_ID,
211
     Carrier_ID,
211
     Carrier_ID,
212
     Carrier_ON_OFF,
212
     Carrier_ON_OFF,
@@ -710,7 +710,7 @@ enum DATATYPE
710
     Bluecell_UL_Det_Path2_Offset,    
710
     Bluecell_UL_Det_Path2_Offset,    
711
     Bluecell_UL_Det_Path3_Offset,    
711
     Bluecell_UL_Det_Path3_Offset,    
712
     Bluecell_UL_Det_Path4_Offset, 
712
     Bluecell_UL_Det_Path4_Offset, 
713
-    Bluecell_Temp_Shutdown_Path_ON_OFF,
713
+    Bluecell_DL_UL_SUM_PATH_ON_OFF,
714
     Bluecell_Path1_GainValue,
714
     Bluecell_Path1_GainValue,
715
     Bluecell_Path2_GainValue,
715
     Bluecell_Path2_GainValue,
716
     Bluecell_Path3_GainValue,
716
     Bluecell_Path3_GainValue,
@@ -1087,7 +1087,7 @@ typedef struct{
1087
     uint8_t DL_Det_ALL_Offset;
1087
     uint8_t DL_Det_ALL_Offset;
1088
     uint8_t MBIC_Download_Auto_Restart_Set;    
1088
     uint8_t MBIC_Download_Auto_Restart_Set;    
1089
     uint8_t Path_TempSave_Bit;/*DL1 / DL 2 /DL3 /DL4 /UL1/UL2/UL3/UL4*/
1089
     uint8_t Path_TempSave_Bit;/*DL1 / DL 2 /DL3 /DL4 /UL1/UL2/UL3/UL4*/
1090
-    uint8_t Path_TempShutdown_Set;/*DL1 / DL 2 /DL3 /DL4 /UL1/UL2/UL3/UL4*/
1090
+    uint8_t DL_UL_Sum_Path_ON_OFF;/*DL1 / DL 2 /DL3 /DL4 /UL1/UL2/UL3/UL4*/
1091
     uint8_t SelfTest;
1091
     uint8_t SelfTest;
1092
     /**/
1092
     /**/
1093
     /*Add*/
1093
     /*Add*/

+ 20 - 13
Bluecell_Src/Bluecell_operate.c

@@ -185,9 +185,9 @@ bool UL_PathUserHandl[4] = {0,};
185
 typedef enum{
185
 typedef enum{
186
     DLI_FRBT_Time_Year = 0,
186
     DLI_FRBT_Time_Year = 0,
187
     DLI_FRBT_Time_Month,
187
     DLI_FRBT_Time_Month,
188
-    DLI_FRBT_Time_Minute,
189
-    DLI_FRBT_Time_Hour,
190
     DLI_FRBT_Time_Day,
188
     DLI_FRBT_Time_Day,
189
+    DLI_FRBT_Time_Hour,
190
+    DLI_FRBT_Time_Minute,
191
     DLI_FRBT_Time_Second,    
191
     DLI_FRBT_Time_Second,    
192
     DLI_FRBT_Time_Index_Max,        
192
     DLI_FRBT_Time_Index_Max,        
193
 };
193
 };
@@ -3046,11 +3046,11 @@ bool Bluecell_Operate(uint8_t* data){
3046
 //        printf("Bluecell_UL_Det_Path4_Offset : %d \r\n",bluecell_Currdatastatus.UL_Det_Path_Offset[3]);        
3046
 //        printf("Bluecell_UL_Det_Path4_Offset : %d \r\n",bluecell_Currdatastatus.UL_Det_Path_Offset[3]);        
3047
         break;
3047
         break;
3048
 #endif // PYJ.2020.09.03_END -- 
3048
 #endif // PYJ.2020.09.03_END -- 
3049
-    case Bluecell_Temp_Shutdown_Path_ON_OFF:
3050
-         bluecell_Currdatastatus.Path_TempShutdown_Set = data[BLUECELL_DATA];
3049
+    case Bluecell_DL_UL_SUM_PATH_ON_OFF:
3050
+         bluecell_Currdatastatus.DL_UL_Sum_Path_ON_OFF = data[BLUECELL_DATA];
3051
 //         printf("data[BLUECELL_DATA] : %d \r\n",data[BLUECELL_DATA]);
3051
 //         printf("data[BLUECELL_DATA] : %d \r\n",data[BLUECELL_DATA]);
3052
-//         printf("Path_TempShutdown_Set : %d \r\n",bluecell_Currdatastatus.Path_TempShutdown_Set);    
3053
-         Temp_Shutdown_ONOFF(bluecell_Currdatastatus.Path_TempShutdown_Set);
3052
+//         printf("DL_UL_Sum_Path_ON_OFF : %d \r\n",bluecell_Currdatastatus.DL_UL_Sum_Path_ON_OFF);    
3053
+         Temp_Shutdown_ONOFF(bluecell_Currdatastatus.DL_UL_Sum_Path_ON_OFF);
3054
         break;
3054
         break;
3055
   }
3055
   }
3056
   
3056
   
@@ -3058,7 +3058,7 @@ bool Bluecell_Operate(uint8_t* data){
3058
   && datatype != Bluecell_LED_TEST
3058
   && datatype != Bluecell_LED_TEST
3059
   && datatype != ATT_TableSet
3059
   && datatype != ATT_TableSet
3060
   && datatype != ATT_TableGet
3060
   && datatype != ATT_TableGet
3061
-  && datatype != Bluecell_Temp_Shutdown_Path_ON_OFF)
3061
+  && datatype != Bluecell_DL_UL_SUM_PATH_ON_OFF)
3062
   
3062
   
3063
   {
3063
   {
3064
 //      Bluecell_StructCpy(&DataWrite[0],&bluecell_Currdatastatus.bluecell_header,sizeof(BLUESTATUS_st));
3064
 //      Bluecell_StructCpy(&DataWrite[0],&bluecell_Currdatastatus.bluecell_header,sizeof(BLUESTATUS_st));
@@ -3714,6 +3714,13 @@ uint32_t MBIC_DataSend(uint8_t* data){
3714
     data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.Manufacture_Date[1];
3714
     data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.Manufacture_Date[1];
3715
     data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.Manufacture_Date[2];
3715
     data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.Manufacture_Date[2];
3716
 
3716
 
3717
+     /*Manufacture_Date*/
3718
+    data[MBIC_PAYLOADSTART + i++] = MBIC_AID;
3719
+    data[MBIC_PAYLOADSTART + i++] = DL_UL_SUM_PATH_ON_OFF;
3720
+    data[MBIC_PAYLOADSTART + i++] = 1; // LENGTH
3721
+    Length += 1   ;HeaderLength++;
3722
+    data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.DL_UL_Sum_Path_ON_OFF;
3723
+
3717
      /*Freq_ID*/
3724
      /*Freq_ID*/
3718
     data[MBIC_PAYLOADSTART + i++] = MBIC_AID;
3725
     data[MBIC_PAYLOADSTART + i++] = MBIC_AID;
3719
     data[MBIC_PAYLOADSTART + i++] = Freq_ID;
3726
     data[MBIC_PAYLOADSTART + i++] = Freq_ID;
@@ -4804,7 +4811,7 @@ void Carrier_ONOFF(uint8_t val){
4804
 }
4811
 }
4805
 void Temp_Shutdown_ONOFF(uint8_t val){
4812
 void Temp_Shutdown_ONOFF(uint8_t val){
4806
 //    printf("val :%d \r\n",val);
4813
 //    printf("val :%d \r\n",val);
4807
-//    printf("Path_TempShutdown_Set : %d \r\n",bluecell_Currdatastatus.Path_TempShutdown_Set);    
4814
+//    printf("DL_UL_Sum_Path_ON_OFF : %d \r\n",bluecell_Currdatastatus.DL_UL_Sum_Path_ON_OFF);    
4808
 //    printf(" bluecell_Currdatastatus.Path_TempSave_Bit : %x \r\n", bluecell_Currdatastatus.Path_TempSave_Bit);
4815
 //    printf(" bluecell_Currdatastatus.Path_TempSave_Bit : %x \r\n", bluecell_Currdatastatus.Path_TempSave_Bit);
4809
     if(val == 1){// ON //Path ON
4816
     if(val == 1){// ON //Path ON
4810
 #if 0 // PYJ.2020.08.14_BEGIN -- 
4817
 #if 0 // PYJ.2020.08.14_BEGIN -- 
@@ -5355,11 +5362,11 @@ bool MBIC_Operate(uint8_t* data){
5355
                 for(int i = 0 ; i < 3; i++)
5362
                 for(int i = 0 ; i < 3; i++)
5356
                     bluecell_Currdatastatus.Manufacture_Date[i] = data[MBIC_PAYLOADSTART + 3 + i]; 
5363
                     bluecell_Currdatastatus.Manufacture_Date[i] = data[MBIC_PAYLOADSTART + 3 + i]; 
5357
                 break;
5364
                 break;
5358
-            case Temp_Shutdown_Path_ON_OFF:
5359
-                bluecell_Currdatastatus.Path_TempShutdown_Set = data[MBIC_PAYLOADSTART + 3];
5360
-//                printf("bluecell_Currdatastatus.Path_TempShutdown_Set : %d \r\n",bluecell_Currdatastatus.Path_TempShutdown_Set);
5361
-                Temp_Shutdown_ONOFF(bluecell_Currdatastatus.Path_TempShutdown_Set);
5362
-//                printf("bluecell_Currdatastatus.Path_TempShutdown_Set : %d \r\n",bluecell_Currdatastatus.Path_TempShutdown_Set);                
5365
+            case DL_UL_SUM_PATH_ON_OFF:
5366
+                bluecell_Currdatastatus.DL_UL_Sum_Path_ON_OFF = data[MBIC_PAYLOADSTART + 3];
5367
+//                printf("bluecell_Currdatastatus.DL_UL_Sum_Path_ON_OFF : %d \r\n",bluecell_Currdatastatus.DL_UL_Sum_Path_ON_OFF);
5368
+                Temp_Shutdown_ONOFF(bluecell_Currdatastatus.DL_UL_Sum_Path_ON_OFF);
5369
+//                printf("bluecell_Currdatastatus.DL_UL_Sum_Path_ON_OFF : %d \r\n",bluecell_Currdatastatus.DL_UL_Sum_Path_ON_OFF);                
5363
 //                printf(" bluecell_Currdatastatus.ATT_DL1_PATH : %d \r\n", bluecell_Currdatastatus.ATT_DL1_PATH);
5370
 //                printf(" bluecell_Currdatastatus.ATT_DL1_PATH : %d \r\n", bluecell_Currdatastatus.ATT_DL1_PATH);
5364
                 break;
5371
                 break;
5365
             case  Carrier_ON_OFF                          :
5372
             case  Carrier_ON_OFF                          :