Sfoglia il codice sorgente

HFR 검수 수정 사항
- Type ID data Read 시 중간에 사라지는 문제 (Data 요청 할 때 마다 Read 하여 읽도록 수정 )

PYJ 5 anni fa
parent
commit
8ec961e26d
3 ha cambiato i file con 33 aggiunte e 30 eliminazioni
  1. 30 30
      Bluecell_Src/Bluecell_operate.c
  2. 2 0
      Bluecell_Src/eeprom.c
  3. 1 0
      Src/main.c

+ 30 - 30
Bluecell_Src/Bluecell_operate.c

@@ -3450,50 +3450,49 @@ typedef enum{
3450 3450
     BLUECELL_4_9G     ,
3451 3451
     BLUECELL_5_0G     ,
3452 3452
  }Bluecell_CardType_t;
3453
-
3453
+void HFR_TypeInit(){
3454
+    bluecell_Currdatastatus.Type =   HAL_GPIO_ReadPin(UNIT_ID0_GPIO_Port,UNIT_ID0_Pin);
3455
+    bluecell_Currdatastatus.Type +=  HAL_GPIO_ReadPin(UNIT_ID1_GPIO_Port,UNIT_ID1_Pin) << 1;
3456
+    bluecell_Currdatastatus.Type +=  HAL_GPIO_ReadPin(UNIT_ID2_GPIO_Port,UNIT_ID2_Pin) << 2;
3457
+    bluecell_Currdatastatus.Type +=  HAL_GPIO_ReadPin(UNIT_ID3_GPIO_Port,UNIT_ID3_Pin) << 3;
3458
+//    printf("0: %d \r\n",HAL_GPIO_ReadPin(UNIT_ID0_GPIO_Port,UNIT_ID0_Pin));
3459
+//    printf("1: %d \r\n",HAL_GPIO_ReadPin(UNIT_ID1_GPIO_Port,UNIT_ID1_Pin));
3460
+//    printf("2: %d \r\n",HAL_GPIO_ReadPin(UNIT_ID2_GPIO_Port,UNIT_ID2_Pin));
3461
+//    printf("3: %d \r\n",HAL_GPIO_ReadPin(UNIT_ID3_GPIO_Port,UNIT_ID3_Pin));   
3462
+    switch(bluecell_Currdatastatus.Type){
3463
+        case BLUECELL_3_7G: bluecell_Currdatastatus.Type = 0x80;bluecell_Currdatastatus.Carrier_ID = 0x01 ;printf("Type BLUECELL_3_7G  Ready....\r\n"); break;
3464
+        case BLUECELL_3_8G: bluecell_Currdatastatus.Type = 0x81;bluecell_Currdatastatus.Carrier_ID = 0x02; printf("Type BLUECELL_3_8G  Ready....\r\n");break;
3465
+        case BLUECELL_3_9G: bluecell_Currdatastatus.Type = 0x82;bluecell_Currdatastatus.Carrier_ID = 0x04;printf("Type BLUECELL_3_9G  Ready....\r\n"); break;
3466
+        case BLUECELL_4_0G: bluecell_Currdatastatus.Type = 0x83;bluecell_Currdatastatus.Carrier_ID = 0x03; printf("Type BLUECELL_4_0G  Ready....\r\n");break;
3467
+        case BLUECELL_4_1G: bluecell_Currdatastatus.Type = 0x84;bluecell_Currdatastatus.Carrier_ID = 0x02; printf("Type BLUECELL_4_1G  Ready....\r\n");break;
3468
+        case BLUECELL_4_6G: bluecell_Currdatastatus.Type = 0x85;bluecell_Currdatastatus.Carrier_ID = 0x01; printf("Type BLUECELL_4_6G  Ready....\r\n");break;
3469
+        case BLUECELL_4_7G: bluecell_Currdatastatus.Type = 0x86;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_4_7G  Ready....\r\n");break;
3470
+        case BLUECELL_4_8G: bluecell_Currdatastatus.Type = 0x87;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_4_8G  Ready....\r\n");break;
3471
+        case BLUECELL_4_9G: bluecell_Currdatastatus.Type = 0x88;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_4_9G  Ready....\r\n");break;
3472
+        case BLUECELL_5_0G: bluecell_Currdatastatus.Type = 0x89;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_5_0G  Ready....\r\n");break;
3473
+        case BLUECELL_DCM : bluecell_Currdatastatus.Type = 0x8A;bluecell_Currdatastatus.Carrier_ID = 0x01;printf("Type BLUECELL_DCM  Ready....\r\n"); break;
3474
+        case BLUECELL_SBM : bluecell_Currdatastatus.Type = 0x8B;bluecell_Currdatastatus.Carrier_ID = 0x03; printf("Type BLUECELL_SBM  Ready....\r\n");break;
3475
+        case BLUECELL_KDDI: bluecell_Currdatastatus.Type = 0x8C;bluecell_Currdatastatus.Carrier_ID = 0x02;printf("Type BLUECELL_KDDI  Ready....\r\n"); break;
3476
+//        default : printf("Type %x  Ready....\r\n",bluecell_Currdatastatus.Type);break;
3477
+    }
3478
+//    printf("Type %x  Ready....\r\n",bluecell_Currdatastatus.Type);
3479
+//    printf("bluecell_Currdatastatus.Type : %02x \r\n",bluecell_Currdatastatus.Type);
3480
+}
3454 3481
  void Bluecell_DataInit(){
3455 3482
 /*
3456 3483
     MBIC Request List 
3457 3484
     Turn off all paths at boot
3458 3485
  */
3459 3486
    
3460
-   bluecell_Currdatastatus.Type =   HAL_GPIO_ReadPin(UNIT_ID0_GPIO_Port,UNIT_ID0_Pin);
3461
-   bluecell_Currdatastatus.Type +=  HAL_GPIO_ReadPin(UNIT_ID1_GPIO_Port,UNIT_ID1_Pin) << 1;
3462
-   bluecell_Currdatastatus.Type +=  HAL_GPIO_ReadPin(UNIT_ID2_GPIO_Port,UNIT_ID2_Pin) << 2;
3463
-   bluecell_Currdatastatus.Type +=  HAL_GPIO_ReadPin(UNIT_ID3_GPIO_Port,UNIT_ID3_Pin) << 3;
3464
-   printf("0: %d \r\n",HAL_GPIO_ReadPin(UNIT_ID0_GPIO_Port,UNIT_ID0_Pin));
3465
-   printf("1: %d \r\n",HAL_GPIO_ReadPin(UNIT_ID1_GPIO_Port,UNIT_ID1_Pin));
3466
-   printf("2: %d \r\n",HAL_GPIO_ReadPin(UNIT_ID2_GPIO_Port,UNIT_ID2_Pin));
3467
-   printf("3: %d \r\n",HAL_GPIO_ReadPin(UNIT_ID3_GPIO_Port,UNIT_ID3_Pin));   
3468
-    switch(bluecell_Currdatastatus.Type){
3469
-     case BLUECELL_3_7G: bluecell_Currdatastatus.Type = 0x80;bluecell_Currdatastatus.Carrier_ID = 0x01 ;printf("Type BLUECELL_3_7G  Ready....\r\n"); break;
3470
-     case BLUECELL_3_8G: bluecell_Currdatastatus.Type = 0x81;bluecell_Currdatastatus.Carrier_ID = 0x02; printf("Type BLUECELL_3_8G  Ready....\r\n");break;
3471
-     case BLUECELL_3_9G: bluecell_Currdatastatus.Type = 0x82;bluecell_Currdatastatus.Carrier_ID = 0x04;printf("Type BLUECELL_3_9G  Ready....\r\n"); break;
3472
-     case BLUECELL_4_0G: bluecell_Currdatastatus.Type = 0x83;bluecell_Currdatastatus.Carrier_ID = 0x03; printf("Type BLUECELL_4_0G  Ready....\r\n");break;
3473
-     case BLUECELL_4_1G: bluecell_Currdatastatus.Type = 0x84;bluecell_Currdatastatus.Carrier_ID = 0x02; printf("Type BLUECELL_4_1G  Ready....\r\n");break;
3474
-     case BLUECELL_4_6G: bluecell_Currdatastatus.Type = 0x85;bluecell_Currdatastatus.Carrier_ID = 0x01; printf("Type BLUECELL_4_6G  Ready....\r\n");break;
3475
-     case BLUECELL_4_7G: bluecell_Currdatastatus.Type = 0x86;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_4_7G  Ready....\r\n");break;
3476
-     case BLUECELL_4_8G: bluecell_Currdatastatus.Type = 0x87;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_4_8G  Ready....\r\n");break;
3477
-     case BLUECELL_4_9G: bluecell_Currdatastatus.Type = 0x88;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_4_9G  Ready....\r\n");break;
3478
-     case BLUECELL_5_0G: bluecell_Currdatastatus.Type = 0x89;bluecell_Currdatastatus.Carrier_ID = 0x00; printf("Type BLUECELL_5_0G  Ready....\r\n");break;
3479
-     case BLUECELL_DCM : bluecell_Currdatastatus.Type = 0x8A;bluecell_Currdatastatus.Carrier_ID = 0x01;printf("Type BLUECELL_DCM  Ready....\r\n"); break;
3480
-     case BLUECELL_SBM : bluecell_Currdatastatus.Type = 0x8B;bluecell_Currdatastatus.Carrier_ID = 0x03; printf("Type BLUECELL_SBM  Ready....\r\n");break;
3481
-     case BLUECELL_KDDI: bluecell_Currdatastatus.Type = 0x8C;bluecell_Currdatastatus.Carrier_ID = 0x02;printf("Type BLUECELL_KDDI  Ready....\r\n"); break;
3482
-     default : printf("Type %x  Ready....\r\n",bluecell_Currdatastatus.Type);break;
3483
-    }
3484 3487
     MBIC_UL_ShutdownCount = &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count1;   
3485 3488
     MBIC_DL_ShutdownCount = &bluecell_Currdatastatus.DLI_Shutdown_Retry_Count1;   
3486
-    
3489
+
3487 3490
     PrevMBIC_UL_ShutdownCount = &bluecell_Prevdatastatus.ULO_Shutdown_Retry_Count1;
3488 3491
     PrevMBIC_DL_ShutdownCount = &bluecell_Prevdatastatus.DLI_Shutdown_Retry_Count1;   
3489 3492
     for(int i = 0; i < DET_Alarm_DL_Shutdown_Index_MAX; i++){
3490 3493
         PrevMBIC_UL_ShutdownCount[i] = 0xFF;
3491 3494
         PrevMBIC_DL_ShutdownCount[i] = 0xFF;        
3492 3495
     }
3493
-
3494
-  printf("Type %x  Ready....\r\n",bluecell_Currdatastatus.Type);
3495
-
3496
-    printf("bluecell_Currdatastatus.Type : %02x \r\n",bluecell_Currdatastatus.Type);
3497 3496
 #if 1 // PYJ.2020.06.17_BEGIN -- 
3498 3497
     HAL_GPIO_WritePin(PATH_EN_DL1_GPIO_Port,PATH_EN_DL1_Pin,bluecell_Currdatastatus.ATT_DL1_PATH);   
3499 3498
     HAL_GPIO_WritePin(PATH_EN_DL2_GPIO_Port,PATH_EN_DL2_Pin,bluecell_Currdatastatus.ATT_DL2_PATH);   
@@ -4976,6 +4975,7 @@ bool MBIC_Operate(uint8_t* data){
4976 4975
             Bluecell_AttenInitialize();
4977 4976
             Initialize = true;
4978 4977
         }
4978
+        HFR_TypeInit();        
4979 4979
         data[MBIC_CMD_0] = 0x80;//MBIC_ERRRESPONSE;
4980 4980
         Length = MBIC_DataSend(data);
4981 4981
     }

+ 2 - 0
Bluecell_Src/eeprom.c

@@ -222,6 +222,8 @@ void EEPROM_M24C08_Init(void){
222 222
     bluecell_Currdatastatus.Selftest4 = false;    
223 223
 //    bluecell_Currdatastatus.DLI_FRBT_Status = 7;
224 224
     bluecell_Currdatastatus.ALARM_TESTMODE = 0;
225
+    bluecell_Currdatastatus.Type = 0;
226
+
225 227
 //    bluecell_Currdatastatus.CPUVERSION1 =  0;
226 228
 //    bluecell_Currdatastatus.CPUVERSION2 = 0;
227 229
 //    bluecell_Currdatastatus.CPUVERSION3 = 8;

+ 1 - 0
Src/main.c

@@ -395,6 +395,7 @@ int main(void)  {
395 395
     ADC_Check();       /*Det Calc + DL/UL Alarm Check Function*/
396 396
     Alarm_Check();     /*Function to check all alarm status variables*/
397 397
     FRBT_Operate();
398
+    
398 399
 //    Uart1_Data_Send("A",1);
399 400
 //    HAL_Delay(1);
400 401
     /* USER CODE END WHILE */