MBIC KDDI /DOCOMO / SOFTBANK 별로 Type 구분하여 Factory Set 적용

Bluecell_Inc/Bluecell_operate.h

@@ -566,13 +566,41 @@ ULO_ALC_Atten,
 
 #define ATTEN_OFFSET_DEFAULT -30
 #define DLI_ATTEN_HIGHTHREADHOLD_DEFAULT 60
+#define DLI_ATTEN_HIGHTHREADHOLD_DOCOMO_DEFAULT 120
+#define DLI_ATTEN_HIGHTHREADHOLD_KDDI_DEFAULT 90
+#define DLI_ATTEN_HIGHTHREADHOLD_SBM_DEFAULT 120
+
+
+
 #define DLI_ATTEN_LOWTHREADHOLD_DEFAULT -250
+#define DLI_ATTEN_LOWTHREADHOLD_DOCOMO_DEFAULT -250
+#define DLI_ATTEN_LOWTHREADHOLD_KDDI_DEFAULT -250
+#define DLI_ATTEN_LOWTHREADHOLD_SBM_DEFAULT -250
+
+
+
 #define DLI_FRBT_DAY_DEFAULT 7
 #define DLI_FRBT_ATTEN_DEFALUT 0 ;
 #define DLI_AGC_ONOFF_DEFAULT true
+
+
+/*AGC Card Type Version*/
+
 #define DLI_AGC_THREADHOLD_DEFAULT -100
+#define DLI_AGC_THREADHOLD_DOCOMO_DEFAULT -40
+#define DLI_AGC_THREADHOLD_KDDI_DEFAULT -70
+#define DLI_AGC_THREADHOLD_SBM_DEFAULT -40
+
+
+
 #define DLI_SHUTDOWN_ONOFF_DEFAULT true
+#define DLI_SHUTDOWN_THREADHOLD_DOCOMO_DEFAULT 130
+#define DLI_SHUTDOWN_THREADHOLD_KDDI_DEFAULT 100
+#define DLI_SHUTDOWN_THREADHOLD_SBM_DEFAULT 130
 #define DLI_SHUTDOWN_THREADHOLD_DEFAULT 70
+
+
+
 #define ULO_LEVEL_HIGH_THREADHOLD_DEFAULT -190
 #define SELFTEST_DEFALULT_DEFAULT false
 #define ULO_ALC_ONOFF_DEFAULT true

Bluecell_Src/Bluecell_operate.c

@@ -4295,6 +4295,11 @@ uint32_t MBIC_DataSend(uint8_t* data){
 
 void Factory_Set(){
     int16_t tempdata = 0;
+    uint8_t type = 0;
+    type =   HAL_GPIO_ReadPin(UNIT_ID0_GPIO_Port,UNIT_ID0_Pin);
+    type +=  HAL_GPIO_ReadPin(UNIT_ID1_GPIO_Port,UNIT_ID1_Pin) << 1;
+    type +=  HAL_GPIO_ReadPin(UNIT_ID2_GPIO_Port,UNIT_ID2_Pin) << 2;
+    type +=  HAL_GPIO_ReadPin(UNIT_ID3_GPIO_Port,UNIT_ID3_Pin) << 3;
 //    printf("Factory Set Start \r\n");
     /*ALARM MASK*/
     bluecell_Currdatastatus.ALARM_MASK1 = 0x80;
@@ -4338,11 +4343,40 @@ void Factory_Set(){
     bluecell_Currdatastatus.bluecell_User_DL4_L = ((tempdata & 0x00FF));      
 #endif // PYJ.2020.09.11_END -- 
 
-    tempdata  = DLI_ATTEN_HIGHTHREADHOLD_DEFAULT;
+    if(type == BLUECELL_SBM){
+        tempdata  = DLI_ATTEN_HIGHTHREADHOLD_SBM_DEFAULT;
+    }
+    else if(type == BLUECELL_DCM){
+        tempdata  = DLI_ATTEN_HIGHTHREADHOLD_DOCOMO_DEFAULT;
+    }
+    else if(type == BLUECELL_KDDI){
+        tempdata  = DLI_ATTEN_HIGHTHREADHOLD_KDDI_DEFAULT;
+    }else{
+        tempdata  = DLI_ATTEN_HIGHTHREADHOLD_DEFAULT;
+
+    }
+
+
     bluecell_Currdatastatus.DLI_Level_High_Threshold_H = ((tempdata & 0xFF00) >> 8);
     bluecell_Currdatastatus.DLI_Level_High_Threshold_L = ((tempdata & 0x00FF));
 
-    tempdata  = DLI_ATTEN_LOWTHREADHOLD_DEFAULT;
+
+    if(type == BLUECELL_SBM){
+        tempdata  = DLI_ATTEN_LOWTHREADHOLD_SBM_DEFAULT;
+    }
+    else if(type == BLUECELL_DCM){
+        tempdata  = DLI_ATTEN_LOWTHREADHOLD_DOCOMO_DEFAULT;
+
+    }
+    else if(type == BLUECELL_KDDI){
+        tempdata  = DLI_ATTEN_LOWTHREADHOLD_KDDI_DEFAULT;
+    }else{
+        tempdata  = DLI_ATTEN_LOWTHREADHOLD_DEFAULT;
+
+    }
+    //printf("temp data : %d \r\n",tempdata);
+
+
     bluecell_Currdatastatus.DLI_Level_Low_Threshold_H = ((tempdata & 0xFF00) >> 8);
     bluecell_Currdatastatus.DLI_Level_Low_Threshold_L = ((tempdata & 0x00FF));
 
@@ -4362,14 +4396,44 @@ void Factory_Set(){
 
     bluecell_Currdatastatus.DLI_AGC_ON_OFF = DLI_AGC_ONOFF_DEFAULT;   
 
+//Card Type	    Carrier	AGC Limit	Shutdown Limit	High Limit	Low Limit
+//MBIC-3.52G	DoCoMo |  -4      |         13	   |   12	  |    -25   |
+//MBIC-3.56G	KDDI   |  -7      |         10	   |    9	  |    -25   |
+//MBIC-3.6G	    SBM	   |  -4      |         13	   |   12	  |    -25   |
 
-    tempdata  = DLI_AGC_THREADHOLD_DEFAULT;
+
+    if(type == BLUECELL_SBM){
+        tempdata  = DLI_AGC_THREADHOLD_SBM_DEFAULT;
+    }
+    else if(type == BLUECELL_DCM){
+        tempdata  = DLI_AGC_THREADHOLD_DOCOMO_DEFAULT;
+    }
+    else if(type == BLUECELL_KDDI){
+        tempdata  = DLI_AGC_THREADHOLD_KDDI_DEFAULT;
+    }else{
+        tempdata  = DLI_AGC_THREADHOLD_DEFAULT;
+    }
+    
     bluecell_Currdatastatus.DLI_AGC_Threshold_H = ((tempdata & 0xFF00) >> 8);        
     bluecell_Currdatastatus.DLI_AGC_Threshold_L = ((tempdata & 0x00FF));            
 
     bluecell_Currdatastatus.DLI_Shutdown_ON_OFF = DLI_SHUTDOWN_ONOFF_DEFAULT;
+
+
+    if(type == BLUECELL_SBM){
+        tempdata  = DLI_SHUTDOWN_THREADHOLD_SBM_DEFAULT;
+    }
+    else if(type == BLUECELL_DCM){
+        tempdata  = DLI_SHUTDOWN_THREADHOLD_DOCOMO_DEFAULT;
+    }
+    else if(type == BLUECELL_KDDI){
+        tempdata  = DLI_SHUTDOWN_THREADHOLD_KDDI_DEFAULT;
+    }else{
+        tempdata  = DLI_SHUTDOWN_THREADHOLD_DEFAULT;
+    }
+    //printf("Shutdown : %d \r\n",tempdata);
     
-    tempdata  = DLI_SHUTDOWN_THREADHOLD_DEFAULT;
+    //tempdata  = DLI_SHUTDOWN_THREADHOLD_DEFAULT;
     bluecell_Currdatastatus.DLI_Shutdown_Threshold_H = ((tempdata & 0xFF00) >> 8);        
     bluecell_Currdatastatus.DLI_Shutdown_Threshold_L = ((tempdata & 0x00FF));            
 //    bluecell_Currdatastatus.DLI_Shutdown_Retry_Count1 = 0;