Browse Source

HFR 수정 사항
STDIO 선언
warning 수정
FRBT 0 이면 FRBT OFF
Bank Select 에서 Bank Auto 선택시 정상 동작 안하던 문제 수정

PYJ 5 years ago
parent
commit
737030f467
2 changed files with 163 additions and 368 deletions
  1. 152 358
      Bluecell_Src/Bluecell_operate.c
  2. 11 10
      Bluecell_Src/flash.c

+ 152 - 358
Bluecell_Src/Bluecell_operate.c

@@ -100,9 +100,12 @@ void Booting_LED_Check(void);
100 100
 double Bluecell_TestPro(double value );
101 101
 double AGC_AutoControl_ADC_Compare(double CurrentAdc,uint8_t* CompareAdc,uint8_t size,int8_t* RefTable_Data);
102 102
 void ALC_Alarm_TimerSet(uint8_t num,int16_t threshold,int16_t CurrDet,int16_t CurrAtten,int16_t MainAtten);
103
-
104
-
105
-
103
+void Carrier_ONOFF(uint8_t val);
104
+void DL_Path_OnOff(uint8_t Index,uint8_t value,uint8_t* path,uint8_t* PrevAtten,uint8_t* retrycnt,uint8_t* PrevRetryCnt);
105
+void Factory_Set();
106
+void SelfTest_Ctrl(uint8_t num,uint8_t val,uint8_t* selftest,uint8_t* DL_Atten,uint8_t* UL_Atten);
107
+void TimeSetting(uint8_t* data);
108
+void UL_Path_OnOff(uint8_t Index,uint8_t value,uint8_t* path,uint8_t* PrevAtten,uint8_t* retrycnt,uint8_t* PrevRetryCnt);
106 109
 /***************************************************************************************/
107 110
 /*                                  Valuable                                           */
108 111
 /***************************************************************************************/
@@ -2484,7 +2487,7 @@ bool Bluecell_Operate(uint8_t* data){
2484 2487
         CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
2485 2488
 #else
2486 2489
        if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
2487
-              return;  
2490
+              return true;
2488 2491
 
2489 2492
        DL_Path_OnOff(Path1_OnOff,
2490 2493
             data[BLUECELL_DATA],
@@ -2512,7 +2515,7 @@ bool Bluecell_Operate(uint8_t* data){
2512 2515
         }
2513 2516
 #else
2514 2517
         if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
2515
-               return;  
2518
+               return true;
2516 2519
 
2517 2520
         UL_Path_OnOff(Path1_OnOff,
2518 2521
              data[BLUECELL_DATA],
@@ -2579,7 +2582,7 @@ bool Bluecell_Operate(uint8_t* data){
2579 2582
         CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
2580 2583
 #else
2581 2584
         if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
2582
-               return;  
2585
+          return true;
2583 2586
 
2584 2587
         DL_Path_OnOff(Path2_OnOff,
2585 2588
              data[BLUECELL_DATA],
@@ -2610,7 +2613,7 @@ bool Bluecell_Operate(uint8_t* data){
2610 2613
 //         printf("UL SHUTDOWN RECOVERY OPERATE PATH : %d \r\n",bluecell_Currdatastatus.ATT_UL2_PATH);
2611 2614
 #else
2612 2615
         if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
2613
-               return;  
2616
+          return true;
2614 2617
 
2615 2618
         UL_Path_OnOff(Path2_OnOff,
2616 2619
              data[BLUECELL_DATA],
@@ -2655,7 +2658,7 @@ bool Bluecell_Operate(uint8_t* data){
2655 2658
         CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
2656 2659
 #else
2657 2660
         if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
2658
-               return;  
2661
+          return true;
2659 2662
 
2660 2663
         DL_Path_OnOff(Path3_OnOff,
2661 2664
              data[BLUECELL_DATA],
@@ -2682,7 +2685,7 @@ bool Bluecell_Operate(uint8_t* data){
2682 2685
         bluecell_Currdatastatus.ATT_UL3_PATH = data[BLUECELL_DATA];
2683 2686
 #else
2684 2687
         if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
2685
-               return;  
2688
+          return true;
2686 2689
 
2687 2690
         UL_Path_OnOff(Path3_OnOff,
2688 2691
              data[BLUECELL_DATA],
@@ -2726,7 +2729,7 @@ bool Bluecell_Operate(uint8_t* data){
2726 2729
 //		printf("Function : %s Line %d \r\n",__func__,__LINE__);
2727 2730
 #else
2728 2731
         if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
2729
-               return;  
2732
+          return true;
2730 2733
 
2731 2734
         DL_Path_OnOff(Path4_OnOff,
2732 2735
              data[BLUECELL_DATA],
@@ -2756,7 +2759,7 @@ bool Bluecell_Operate(uint8_t* data){
2756 2759
         CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
2757 2760
 #else
2758 2761
         if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
2759
-               return;  
2762
+          return true;
2760 2763
 
2761 2764
         UL_Path_OnOff(Path4_OnOff,
2762 2765
              data[BLUECELL_DATA],
@@ -2850,25 +2853,25 @@ bool Bluecell_Operate(uint8_t* data){
2850 2853
         printf("\r\n");
2851 2854
 #endif // PYJ.2020.04.22_END --   
2852 2855
 #if 1 // PYJ.2020.07.01_BEGIN -- 
2853
-        printf("===================START=======================\r\n");
2854
-        printf("ALC ON %d                   | AGC ON %d\r\n",bluecell_Currdatastatus.ULO_ALC_ON_OFF,bluecell_Currdatastatus.DLI_AGC_ON_OFF);
2855
-        printf("Shutdown DL ON OFF %d       | Shutdown UL ON OFF %d \r\n",bluecell_Currdatastatus.DLI_Shutdown_ON_OFF,bluecell_Currdatastatus.ULO_Shutdown_ON_OFF);
2856
-        printf("PATH1 %d|Shutdown DL1 CNT %d  | PATH1 %d|Shutdown UL1 CNT %d\r\n",bluecell_Currdatastatus.ATT_DL1_PATH,bluecell_Currdatastatus.DLI_Shutdown_Retry_Count1,bluecell_Currdatastatus.ATT_DL1_PATH,bluecell_Currdatastatus.ULO_Shutdown_Retry_Count1);
2857
-        printf("PATH2 %d|Shutdown DL2 CNT %d  | PATH2 %d|Shutdown UL2 CNT %d\r\n",bluecell_Currdatastatus.ATT_DL2_PATH,bluecell_Currdatastatus.DLI_Shutdown_Retry_Count2,bluecell_Currdatastatus.ATT_UL2_PATH,bluecell_Currdatastatus.ULO_Shutdown_Retry_Count2);
2858
-        printf("PATH3 %d|Shutdown DL3 CNT %d  | PATH3 %d|Shutdown UL3 CNT %d\r\n",bluecell_Currdatastatus.ATT_DL3_PATH,bluecell_Currdatastatus.DLI_Shutdown_Retry_Count3,bluecell_Currdatastatus.ATT_UL3_PATH,bluecell_Currdatastatus.ULO_Shutdown_Retry_Count3);
2859
-        printf("PATH4 %d|Shutdown DL4 CNT %d  | PATH4 %d|Shutdown UL4 CNT %d\r\n",bluecell_Currdatastatus.ATT_DL4_PATH,bluecell_Currdatastatus.DLI_Shutdown_Retry_Count4,bluecell_Currdatastatus.ATT_UL4_PATH,bluecell_Currdatastatus.ULO_Shutdown_Retry_Count4);
2860
-        tempdata = (( bluecell_Currdatastatus.DLI_Level_Low_Threshold_H << 8) & 0xFF00) ;
2861
-        tempdata +=  bluecell_Currdatastatus.DLI_Level_Low_Threshold_L ;
2862
-        tempdata /= 10;    
2863
-//        printf("DL Thread Hold : %d \r\n",tempdata);
2864
-        tempdata = (( bluecell_Currdatastatus.ATT_DL1_H << 8) & 0xFF00) ;
2865
-        tempdata +=  bluecell_Currdatastatus.ATT_DL1_L ;
2866
-        tempdata /= 10;    
2867
-        printf("ATT_DL1 : %d \r\n",tempdata);
2868
-        tempdata = (( bluecell_Currdatastatus.ATT_DL4_H << 8) & 0xFF00) ;
2869
-        tempdata +=  bluecell_Currdatastatus.ATT_DL4_L ;
2870
-        tempdata /= 10;    
2871
-        printf("ATT_DL4 : %d \r\n",tempdata);
2856
+//        printf("===================START=======================\r\n");
2857
+//        printf("ALC ON %d                   | AGC ON %d\r\n",bluecell_Currdatastatus.ULO_ALC_ON_OFF,bluecell_Currdatastatus.DLI_AGC_ON_OFF);
2858
+//        printf("Shutdown DL ON OFF %d       | Shutdown UL ON OFF %d \r\n",bluecell_Currdatastatus.DLI_Shutdown_ON_OFF,bluecell_Currdatastatus.ULO_Shutdown_ON_OFF);
2859
+//        printf("PATH1 %d|Shutdown DL1 CNT %d  | PATH1 %d|Shutdown UL1 CNT %d\r\n",bluecell_Currdatastatus.ATT_DL1_PATH,bluecell_Currdatastatus.DLI_Shutdown_Retry_Count1,bluecell_Currdatastatus.ATT_DL1_PATH,bluecell_Currdatastatus.ULO_Shutdown_Retry_Count1);
2860
+//        printf("PATH2 %d|Shutdown DL2 CNT %d  | PATH2 %d|Shutdown UL2 CNT %d\r\n",bluecell_Currdatastatus.ATT_DL2_PATH,bluecell_Currdatastatus.DLI_Shutdown_Retry_Count2,bluecell_Currdatastatus.ATT_UL2_PATH,bluecell_Currdatastatus.ULO_Shutdown_Retry_Count2);
2861
+//        printf("PATH3 %d|Shutdown DL3 CNT %d  | PATH3 %d|Shutdown UL3 CNT %d\r\n",bluecell_Currdatastatus.ATT_DL3_PATH,bluecell_Currdatastatus.DLI_Shutdown_Retry_Count3,bluecell_Currdatastatus.ATT_UL3_PATH,bluecell_Currdatastatus.ULO_Shutdown_Retry_Count3);
2862
+//        printf("PATH4 %d|Shutdown DL4 CNT %d  | PATH4 %d|Shutdown UL4 CNT %d\r\n",bluecell_Currdatastatus.ATT_DL4_PATH,bluecell_Currdatastatus.DLI_Shutdown_Retry_Count4,bluecell_Currdatastatus.ATT_UL4_PATH,bluecell_Currdatastatus.ULO_Shutdown_Retry_Count4);
2863
+//        tempdata = (( bluecell_Currdatastatus.DLI_Level_Low_Threshold_H << 8) & 0xFF00) ;
2864
+//        tempdata +=  bluecell_Currdatastatus.DLI_Level_Low_Threshold_L ;
2865
+//        tempdata /= 10;    
2866
+////        printf("DL Thread Hold : %d \r\n",tempdata);
2867
+//        tempdata = (( bluecell_Currdatastatus.ATT_DL1_H << 8) & 0xFF00) ;
2868
+//        tempdata +=  bluecell_Currdatastatus.ATT_DL1_L ;
2869
+//        tempdata /= 10;    
2870
+//        printf("ATT_DL1 : %d \r\n",tempdata);
2871
+//        tempdata = (( bluecell_Currdatastatus.ATT_DL4_H << 8) & 0xFF00) ;
2872
+//        tempdata +=  bluecell_Currdatastatus.ATT_DL4_L ;
2873
+//        tempdata /= 10;    
2874
+//        printf("ATT_DL4 : %d \r\n",tempdata);
2872 2875
 
2873 2876
 #if 0 // PYJ.2020.07.03_BEGIN -- 
2874 2877
         tempdata = (( bluecell_Currdatastatus.DLI_FRBT_Atten1_H << 8) & 0xFF00) ;
@@ -2887,107 +2890,105 @@ bool Bluecell_Operate(uint8_t* data){
2887 2890
         printf("FRBT 3 : %d \r\n",tempdata);
2888 2891
 #endif // PYJ.2020.07.03_END -- 
2889 2892
 
2890
-        tempdata = (( bluecell_Currdatastatus.DLI_FRBT_Atten4_H << 8) & 0xFF00) ;
2891
-        tempdata +=  bluecell_Currdatastatus.DLI_FRBT_Atten4_L ;
2892
-         tempdata /= 10;    
2893
-        printf("FRBT 4 : %d \r\n",tempdata);
2894
-        printf("DLI_FRBT_D_Day : %d \r\n",FRBT_Day_Inc);
2895
-        printf("DLI_FRBT_Status : %d \r\n",bluecell_Currdatastatus.DLI_FRBT_Status);        
2896
-        tempdata = (( bluecell_Currdatastatus.DLI_Level1_H << 8) & 0xFF00) ;
2897
-        tempdata +=  bluecell_Currdatastatus.DLI_Level1_L ;
2898
-//        tempdata *= 0.1;    
2899
-        printf("DLI_Level1 : %d \r\n",tempdata);        
2900
-        tempdata = (( bluecell_Currdatastatus.DLI_Level4_H << 8) & 0xFF00) ;
2901
-        tempdata +=  bluecell_Currdatastatus.DLI_Level4_L ;
2902
-//        tempdata *= 0.1;    
2903
-        printf("DLI_Level4 : %d \r\n",tempdata);   
2904
-
2905
-//        printf("DL HIGH ALARM : %d \r\n", bluecell_Currdatastatus.DLI_Level_High_Alarm1);
2906
-//        printf("DL LOW ALARM : %d \r\n", bluecell_Currdatastatus.DLI_Level_Low_Alarm1);
2907
-        tempdata = (( bluecell_Currdatastatus.DLI_Shutdown_Threshold_H << 8) & 0xFF00) ;
2908
-        tempdata +=  bluecell_Currdatastatus.DLI_Shutdown_Threshold_L ;
2909
-        tempdata /= 10;
2910
-//        printf("DL Shutdown Threas : %d \r\n",tempdata);
2911
-#if 1 // PYJ.2020.07.01_BEGIN -- 
2912
-        tempdata = (( bluecell_Currdatastatus.ULO_Shutdown_Threshold_H << 8) & 0xFF00) ;
2913
-        tempdata +=  bluecell_Currdatastatus.ULO_Shutdown_Threshold_L ;
2914
-        tempdata /= 10;
2915
-        printf("UL ULO_Shutdown_Threshold : %d \r\n",tempdata);        
2916
-
2917
-        tempdata = (( bluecell_Currdatastatus.ATT_UL1_H << 8) & 0xFF00) ;
2918
-        tempdata +=  bluecell_Currdatastatus.ATT_UL1_L;
2919
-        tempdata /= 10;
2920
-        printf("UL1 ATT_UL1 : %d \r\n",tempdata);
2921
-
2922
-        tempdata = (( bluecell_Currdatastatus.ATT_UL2_H << 8) & 0xFF00) ;
2923
-        tempdata +=  bluecell_Currdatastatus.ATT_UL2_L ;
2924
-        tempdata /= 10;
2925
-        printf("UL2 ATT_UL2 : %d \r\n",tempdata);
2926
-
2927
-        tempdata = (( bluecell_Currdatastatus.ATT_UL3_H << 8) & 0xFF00) ;
2928
-        tempdata +=  bluecell_Currdatastatus.ATT_UL3_L ;
2929
-        tempdata /= 10;
2930
-        printf("UL3 ATT_UL3 : %d \r\n",tempdata);
2931
-
2932
-        tempdata = (( bluecell_Currdatastatus.ATT_UL4_H << 8) & 0xFF00) ;
2933
-        tempdata +=  bluecell_Currdatastatus.ATT_UL4_L ;
2934
-        tempdata /= 10;
2935
-        printf("UL4 ATT_U4 : %d \r\n",tempdata);   
2936
-#endif // PYJ.2020.07.01_END -- 
2937
-
2938
-
2939
-        
2940
-        printf("Temp Alarm %d \r\n",bluecell_Currdatastatus.ALARM_TEMP_HIGH);
2941
-        printf("ALC  Alarm 1: %d 2:  %d 3: %d 4: %d\r\n",
2942
-            bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & ALARM_ALC_P1,
2943
-            bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & ALARM_ALC_P2,
2944
-            bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & ALARM_ALC_P3,
2945
-            bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & ALARM_ALC_P4);
2946
-            ALC_TEMP[0] = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L;
2947
-            ALC_TEMP[1] = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_L;
2948
-            ALC_TEMP[2] = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_L;
2949
-            ALC_TEMP[3] = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_L;
2950
-            printf("ALC%d ATTEN : %d \r\n",1,ALC_TEMP[0]);
2951
-            printf("ALC%d ATTEN : %d \r\n",2,ALC_TEMP[1]);
2952
-            printf("ALC%d ATTEN : %d \r\n",3,ALC_TEMP[2]);
2953
-            printf("ALC%d ATTEN : %d \r\n",4,ALC_TEMP[3]);
2954
-//            printf("AGC  Alarm 1: %d \r\n",bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P1);
2955
-//            printf("AGC  Alarm 2: %d \r\n",bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P2);
2956
-//            printf("AGC  Alarm 3: %d \r\n",bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P3);
2957
-//            printf("AGC  Alarm 4: %d \r\n",bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P4);            
2958
-
2959
-        printf("Shutdown DL Alarm 1: %d \r\nShutdown DL Alarm 2:  %d \r\nShutdown DL Alarm 3: %d \r\nShutdown DL Alarm 4: %d\r\n",
2960
-            bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P1,
2961
-            bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P2,
2962
-            bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P3,
2963
-            bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P4
2964
-            );
2965
-        printf("Shutdown UL Alarm 1: %d \r\nShutdown UL Alarm 2:  %d \r\nShutdown UL Alarm 3: %d \r\nShutdown UL Alarm 4: %d\r\n",
2966
-            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P1,
2967
-            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P2,
2968
-            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P3,
2969
-            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P4
2970
-        );
2971
-        printf("DLI HIGH Threas High Hold 1: %d \r\nDLI HIGH Threas High Hold2:  %d \r\nDLI HIGH Threas High Hold3: %d \r\nDLI HIGH Threas High Hold4: %d\r\n",
2972
-            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P1_LEVEL_HIGH,
2973
-            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P2_LEVEL_HIGH,
2974
-            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P3_LEVEL_HIGH,
2975
-            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P4_LEVEL_HIGH
2976
-        );        
2977
-
2978
-        printf("DLI LOW Threas High Hold 1: %d \r\nDLI LOW Threas High Hold 2:  %d \r\nDLI LOW Threas High Hold 3: %d \r\nDLI LOW Threas High Hold 4: %d\r\n",
2979
-            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P1_LEVEL_LOW,
2980
-            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P2_LEVEL_LOW,
2981
-            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P3_LEVEL_LOW,
2982
-            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P4_LEVEL_LOW
2983
-        );              
2984
-        printf("ULO HIGH Threas High Hold 1: %d \r\nULO HIGH Threas High Hold 2:  %d \r\nULO HIGH Threas High Hold 3: %d \r\nULO HIGH Threas High Hold 4: %d\r\n",
2985
-            bluecell_Currdatastatus.ALARM_ULO_Level & ALARM_ULO_P1_LEVEL_HIGH,
2986
-            bluecell_Currdatastatus.ALARM_ULO_Level & ALARM_ULO_P2_LEVEL_HIGH,
2987
-            bluecell_Currdatastatus.ALARM_ULO_Level & ALARM_ULO_P3_LEVEL_HIGH,
2988
-            bluecell_Currdatastatus.ALARM_ULO_Level & ALARM_ULO_P4_LEVEL_HIGH
2989
-        );        
2990
-        printf("===================END=======================\r\n");
2893
+//        tempdata = (( bluecell_Currdatastatus.DLI_FRBT_Atten4_H << 8) & 0xFF00) ;
2894
+//        tempdata +=  bluecell_Currdatastatus.DLI_FRBT_Atten4_L ;
2895
+//         tempdata /= 10;    
2896
+//        printf("FRBT 4 : %d \r\n",tempdata);
2897
+//        printf("DLI_FRBT_D_Day : %d \r\n",FRBT_Day_Inc);
2898
+//        printf("DLI_FRBT_Status : %d \r\n",bluecell_Currdatastatus.DLI_FRBT_Status);        
2899
+//        tempdata = (( bluecell_Currdatastatus.DLI_Level1_H << 8) & 0xFF00) ;
2900
+//        tempdata +=  bluecell_Currdatastatus.DLI_Level1_L ;
2901
+////        tempdata *= 0.1;    
2902
+//        printf("DLI_Level1 : %d \r\n",tempdata);        
2903
+//        tempdata = (( bluecell_Currdatastatus.DLI_Level4_H << 8) & 0xFF00) ;
2904
+//        tempdata +=  bluecell_Currdatastatus.DLI_Level4_L ;
2905
+////        tempdata *= 0.1;    
2906
+//        printf("DLI_Level4 : %d \r\n",tempdata);   
2907
+//
2908
+////        printf("DL HIGH ALARM : %d \r\n", bluecell_Currdatastatus.DLI_Level_High_Alarm1);
2909
+////        printf("DL LOW ALARM : %d \r\n", bluecell_Currdatastatus.DLI_Level_Low_Alarm1);
2910
+//        tempdata = (( bluecell_Currdatastatus.DLI_Shutdown_Threshold_H << 8) & 0xFF00) ;
2911
+//        tempdata +=  bluecell_Currdatastatus.DLI_Shutdown_Threshold_L ;
2912
+//        tempdata /= 10;
2913
+////        printf("DL Shutdown Threas : %d \r\n",tempdata);
2914
+//        tempdata = (( bluecell_Currdatastatus.ULO_Shutdown_Threshold_H << 8) & 0xFF00) ;
2915
+//        tempdata +=  bluecell_Currdatastatus.ULO_Shutdown_Threshold_L ;
2916
+//        tempdata /= 10;
2917
+//        printf("UL ULO_Shutdown_Threshold : %d \r\n",tempdata);        
2918
+//
2919
+//        tempdata = (( bluecell_Currdatastatus.ATT_UL1_H << 8) & 0xFF00) ;
2920
+//        tempdata +=  bluecell_Currdatastatus.ATT_UL1_L;
2921
+//        tempdata /= 10;
2922
+//        printf("UL1 ATT_UL1 : %d \r\n",tempdata);
2923
+//
2924
+//        tempdata = (( bluecell_Currdatastatus.ATT_UL2_H << 8) & 0xFF00) ;
2925
+//        tempdata +=  bluecell_Currdatastatus.ATT_UL2_L ;
2926
+//        tempdata /= 10;
2927
+//        printf("UL2 ATT_UL2 : %d \r\n",tempdata);
2928
+//
2929
+//        tempdata = (( bluecell_Currdatastatus.ATT_UL3_H << 8) & 0xFF00) ;
2930
+//        tempdata +=  bluecell_Currdatastatus.ATT_UL3_L ;
2931
+//        tempdata /= 10;
2932
+//        printf("UL3 ATT_UL3 : %d \r\n",tempdata);
2933
+//
2934
+//        tempdata = (( bluecell_Currdatastatus.ATT_UL4_H << 8) & 0xFF00) ;
2935
+//        tempdata +=  bluecell_Currdatastatus.ATT_UL4_L ;
2936
+//        tempdata /= 10;
2937
+//        printf("UL4 ATT_U4 : %d \r\n",tempdata);   
2938
+//
2939
+//
2940
+//        
2941
+//        printf("Temp Alarm %d \r\n",bluecell_Currdatastatus.ALARM_TEMP_HIGH);
2942
+//        printf("ALC  Alarm 1: %d 2:  %d 3: %d 4: %d\r\n",
2943
+//            bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & ALARM_ALC_P1,
2944
+//            bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & ALARM_ALC_P2,
2945
+//            bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & ALARM_ALC_P3,
2946
+//            bluecell_Currdatastatus.ALARM_ULO_ALC_Alarm & ALARM_ALC_P4);
2947
+//            ALC_TEMP[0] = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_L;
2948
+//            ALC_TEMP[1] = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten2_L;
2949
+//            ALC_TEMP[2] = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten3_L;
2950
+//            ALC_TEMP[3] = bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_H << 8 | bluecell_Currdatastatus.MBIC_ULO_ALC_Atten4_L;
2951
+//            printf("ALC%d ATTEN : %d \r\n",1,ALC_TEMP[0]);
2952
+//            printf("ALC%d ATTEN : %d \r\n",2,ALC_TEMP[1]);
2953
+//            printf("ALC%d ATTEN : %d \r\n",3,ALC_TEMP[2]);
2954
+//            printf("ALC%d ATTEN : %d \r\n",4,ALC_TEMP[3]);
2955
+////            printf("AGC  Alarm 1: %d \r\n",bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P1);
2956
+////            printf("AGC  Alarm 2: %d \r\n",bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P2);
2957
+////            printf("AGC  Alarm 3: %d \r\n",bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P3);
2958
+////            printf("AGC  Alarm 4: %d \r\n",bluecell_Currdatastatus.ALARM_DLI_AGC_Alarm & ALARM_AGC_P4);            
2959
+//
2960
+//        printf("Shutdown DL Alarm 1: %d \r\nShutdown DL Alarm 2:  %d \r\nShutdown DL Alarm 3: %d \r\nShutdown DL Alarm 4: %d\r\n",
2961
+//            bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P1,
2962
+//            bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P2,
2963
+//            bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P3,
2964
+//            bluecell_Currdatastatus.ALARM_DLI_SHTUTDOWN & ALARM_DLI_SHUTDOWN_P4
2965
+//            );
2966
+//        printf("Shutdown UL Alarm 1: %d \r\nShutdown UL Alarm 2:  %d \r\nShutdown UL Alarm 3: %d \r\nShutdown UL Alarm 4: %d\r\n",
2967
+//            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P1,
2968
+//            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P2,
2969
+//            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P3,
2970
+//            bluecell_Currdatastatus.ALARM_ULO_SHTUTDOWN & ALARM_ULO_SHUTDOWN_P4
2971
+//        );
2972
+//        printf("DLI HIGH Threas High Hold 1: %d \r\nDLI HIGH Threas High Hold2:  %d \r\nDLI HIGH Threas High Hold3: %d \r\nDLI HIGH Threas High Hold4: %d\r\n",
2973
+//            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P1_LEVEL_HIGH,
2974
+//            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P2_LEVEL_HIGH,
2975
+//            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P3_LEVEL_HIGH,
2976
+//            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P4_LEVEL_HIGH
2977
+//        );        
2978
+//
2979
+//        printf("DLI LOW Threas High Hold 1: %d \r\nDLI LOW Threas High Hold 2:  %d \r\nDLI LOW Threas High Hold 3: %d \r\nDLI LOW Threas High Hold 4: %d\r\n",
2980
+//            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P1_LEVEL_LOW,
2981
+//            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P2_LEVEL_LOW,
2982
+//            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P3_LEVEL_LOW,
2983
+//            bluecell_Currdatastatus.ALARM_DLI_Level & ALARM_DLI_P4_LEVEL_LOW
2984
+//        );              
2985
+//        printf("ULO HIGH Threas High Hold 1: %d \r\nULO HIGH Threas High Hold 2:  %d \r\nULO HIGH Threas High Hold 3: %d \r\nULO HIGH Threas High Hold 4: %d\r\n",
2986
+//            bluecell_Currdatastatus.ALARM_ULO_Level & ALARM_ULO_P1_LEVEL_HIGH,
2987
+//            bluecell_Currdatastatus.ALARM_ULO_Level & ALARM_ULO_P2_LEVEL_HIGH,
2988
+//            bluecell_Currdatastatus.ALARM_ULO_Level & ALARM_ULO_P3_LEVEL_HIGH,
2989
+//            bluecell_Currdatastatus.ALARM_ULO_Level & ALARM_ULO_P4_LEVEL_HIGH
2990
+//        );        
2991
+//        printf("===================END=======================\r\n");
2991 2992
 #endif // PYJ.2020.07.01_END -- 
2992 2993
 
2993 2994
 //        printf("Level DL Alarm %d \r\n");
@@ -3669,7 +3670,8 @@ uint32_t MBIC_DataSend(uint8_t* data){
3669 3670
     data[MBIC_PAYLOADSTART + i++] = CPU_Bank1_Image_Name;
3670 3671
     data[MBIC_PAYLOADSTART + i++] = 32; // LENGTH
3671 3672
     Length += 32;  
3672
-    uint8_t* tmpstr = &bluecell_Currdatastatus.CPU_Bank1_Image_Name;
3673
+    uint8_t* tmpstr;
3674
+    tmpstr = &bluecell_Currdatastatus.CPU_Bank1_Image_Name;
3673 3675
     for(int a = 0; a < 32; a++){
3674 3676
         data[MBIC_PAYLOADSTART + i++] = bluecell_Currdatastatus.CPU_Bank1_Image_Name[a];
3675 3677
 //        printf("%x ",tmpstr[a]);
@@ -4685,16 +4687,21 @@ void UL_Path_OnOff(uint8_t Index,uint8_t value,uint8_t* path,uint8_t* PrevAtten,
4685 4687
 
4686 4688
 }
4687 4689
 void TimeSetting(uint8_t* data){
4690
+    if(bluecell_Currdatastatus.DLI_FRBT_Status == 0)
4691
+        return;
4692
+    
4688 4693
     printf("DLI_FRBT_Status : %d \r\n",bluecell_Currdatastatus.DLI_FRBT_Status);
4689 4694
     printf("DLI_AGC_ON_OFF : %d \r\n",bluecell_Currdatastatus.DLI_AGC_ON_OFF);    
4690 4695
     printf("DLI_FRBT_D_Day : %d \r\n",bluecell_Currdatastatus.DLI_FRBT_D_Day);    
4696
+    printf("Curr Day %d \r\n ",FRBT_Day_Inc);
4691 4697
     if(bluecell_Currdatastatus.DLI_AGC_ON_OFF == true 
4692 4698
     && FRBT_Day_Inc < bluecell_Currdatastatus.DLI_FRBT_D_Day
4693 4699
     && bluecell_Currdatastatus.DLI_FRBT_Status != FRBT_RUNNING){
4694 4700
         for(int i = 0; i < DLI_FRBT_Time_Index_Max; i++){
4695 4701
             FRBT_Day[DLI_FRBT_Time_Year + i] = data[i]; /* Curr day */
4696 4702
         }
4697
-printf("BLUECELL TIME APPLY : %d - %d - %d - %d - %d - %d \r\n",        
4703
+        
4704
+        printf("BLUECELL TIME APPLY : %d - %d - %d - %d - %d - %d \r\n",        
4698 4705
         FRBT_Day[DLI_FRBT_Time_Year],
4699 4706
         FRBT_Day[DLI_FRBT_Time_Month],
4700 4707
         FRBT_Day[DLI_FRBT_Time_Day],
@@ -4991,9 +4998,9 @@ bool MBIC_Operate(uint8_t* data){
4991 4998
                 if(bluecell_Currdatastatus.CPU_Bank_Select == HFR_AUTO_SEL){
4992 4999
                     printf("Curr Bank : %d \r\n",bluecell_Currdatastatus.CPU_Current_Bank);
4993 5000
                     if(bluecell_Currdatastatus.CPU_Current_Bank == HFR_BANK1_SEL){
4994
-                        bluecell_Currdatastatus.CPU_Current_Bank = HFR_BANK2_SEL;
5001
+                        bluecell_Currdatastatus.CPU_Bank_Select = HFR_BANK2_SEL;
4995 5002
                     }else{
4996
-                        bluecell_Currdatastatus.CPU_Current_Bank = HFR_BANK1_SEL;
5003
+                        bluecell_Currdatastatus.CPU_Bank_Select = HFR_BANK1_SEL;
4997 5004
                     }
4998 5005
                 }
4999 5006
                 Bluecell_StructCpy(&DataWrite[0],&bluecell_Currdatastatus.bluecell_header,sizeof(BLUESTATUS_st));
@@ -5038,7 +5045,7 @@ bool MBIC_Operate(uint8_t* data){
5038 5045
                 break;
5039 5046
             case  DLI_RF_Path1_ON_OFF             :
5040 5047
              if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
5041
-                    return;                  
5048
+               return true;
5042 5049
                 DL_Path_OnOff(Path1_OnOff,
5043 5050
                     data[MBIC_PAYLOADSTART + 3],
5044 5051
                     &bluecell_Currdatastatus.ATT_DL1_PATH,
@@ -5065,83 +5072,35 @@ bool MBIC_Operate(uint8_t* data){
5065 5072
                 break;
5066 5073
             case  DLI_RF_Path2_ON_OFF                     :
5067 5074
              if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
5068
-                    return;                  
5075
+                return true;
5069 5076
                 DL_Path_OnOff(Path2_OnOff,
5070 5077
                     data[MBIC_PAYLOADSTART + 3],
5071 5078
                     &bluecell_Currdatastatus.ATT_DL2_PATH,
5072 5079
                     &bluecell_Prevdatastatus.ATT_DL2_H,
5073 5080
                     &bluecell_Currdatastatus.DLI_Shutdown_Retry_Count2,
5074 5081
                     &bluecell_Prevdatastatus.DLI_Shutdown_Retry_Count2)  ;                  
5075
-#if 0 // PYJ.2020.07.03_BEGIN -- 
5076
-                bluecell_Currdatastatus.ATT_DL2_PATH = data[MBIC_PAYLOADSTART + 3]; 
5077
-                bluecell_Currdatastatus.DLI_Shutdown_Retry_Count2 = 0;
5078
-                bluecell_Prevdatastatus.DLI_Shutdown_Retry_Count2 = 0xFF;
5079
-               if(data[MBIC_PAYLOADSTART + 3]==0){
5080
-                   HAL_GPIO_WritePin(PATH_EN_DL2_GPIO_Port,PATH_EN_DL2_Pin,GPIO_PIN_RESET);//CLOCK        
5081
-                   DL_PathUserHandl[1] = true;
5082
-               }
5083
-               else{
5084
-                    bluecell_Prevdatastatus.ATT_DL2_H = 0xFF;
5085
-                    bluecell_Prevdatastatus.ATT_DL2_L = 0xFF;
5086
-                    DL_PathUserHandl[1] = false;                   
5087
-                   HAL_GPIO_WritePin(PATH_EN_DL2_GPIO_Port,PATH_EN_DL2_Pin,GPIO_PIN_SET);//CLOCK
5088
-               }
5089
-                CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
5090
-#endif // PYJ.2020.07.03_END -- 
5091 5082
 
5092 5083
                 break;
5093 5084
             case  DLI_RF_Path3_ON_OFF                     :
5094 5085
              if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
5095
-                    return;                  
5086
+               return true;
5096 5087
                 DL_Path_OnOff(Path3_OnOff,
5097 5088
                     data[MBIC_PAYLOADSTART + 3],
5098 5089
                     &bluecell_Currdatastatus.ATT_DL3_PATH,
5099 5090
                     &bluecell_Prevdatastatus.ATT_DL3_H,
5100 5091
                     &bluecell_Currdatastatus.DLI_Shutdown_Retry_Count3,
5101 5092
                     &bluecell_Prevdatastatus.DLI_Shutdown_Retry_Count3)  ;                  
5102
-#if 0 // PYJ.2020.07.03_BEGIN -- 
5103
-                bluecell_Currdatastatus.ATT_DL3_PATH = data[MBIC_PAYLOADSTART + 3]; 
5104
-                bluecell_Currdatastatus.DLI_Shutdown_Retry_Count3 = 0;
5105
-                bluecell_Prevdatastatus.DLI_Shutdown_Retry_Count3 = 0xFF;
5106
-                if(data[MBIC_PAYLOADSTART + 3]==0){
5107
-                    HAL_GPIO_WritePin(PATH_EN_DL3_GPIO_Port,PATH_EN_DL3_Pin,GPIO_PIN_RESET);//CLOCK        
5108
-                    DL_PathUserHandl[2] = true;                
5109
-                }
5110
-                else{
5111
-                    bluecell_Prevdatastatus.ATT_DL3_H = 0xFF;
5112
-                    bluecell_Prevdatastatus.ATT_DL3_L = 0xFF;
5113
-                    DL_PathUserHandl[2] = false;    
5114
-                    HAL_GPIO_WritePin(PATH_EN_DL3_GPIO_Port,PATH_EN_DL3_Pin,GPIO_PIN_SET);//CLOCK
5115
-                }
5116
-                CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
5117
-#endif // PYJ.2020.07.03_END -- 
5118 5093
 
5119 5094
                 break;
5120 5095
             case  DLI_RF_Path4_ON_OFF                     :
5121 5096
              if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
5122
-                    return;                  
5097
+               return true;
5123 5098
                 DL_Path_OnOff(Path4_OnOff,
5124 5099
                     data[MBIC_PAYLOADSTART + 3],
5125 5100
                     &bluecell_Currdatastatus.ATT_DL4_PATH,
5126 5101
                     &bluecell_Prevdatastatus.ATT_DL4_H,
5127 5102
                     &bluecell_Currdatastatus.DLI_Shutdown_Retry_Count4,
5128 5103
                     &bluecell_Prevdatastatus.DLI_Shutdown_Retry_Count4)  ;                  
5129
-#if 0 // PYJ.2020.07.03_BEGIN -- 
5130
-                bluecell_Currdatastatus.ATT_DL4_PATH = data[MBIC_PAYLOADSTART + 3]; 
5131
-                bluecell_Currdatastatus.DLI_Shutdown_Retry_Count4 = 0;
5132
-                bluecell_Prevdatastatus.DLI_Shutdown_Retry_Count4 = 0xFF;
5133
-                if(data[MBIC_PAYLOADSTART + 3]==0){
5134
-                    HAL_GPIO_WritePin(PATH_EN_DL4_GPIO_Port,PATH_EN_DL4_Pin,GPIO_PIN_RESET);//CLOCK        
5135
-                    DL_PathUserHandl[3] = true;                                
5136
-                }
5137
-                else{
5138
-                    bluecell_Prevdatastatus.ATT_DL4_H =0xFF;
5139
-                    bluecell_Prevdatastatus.ATT_DL4_L = 0xFF;
5140
-                    DL_PathUserHandl[3] = false;                    
5141
-                    HAL_GPIO_WritePin(PATH_EN_DL4_GPIO_Port,PATH_EN_DL4_Pin,GPIO_PIN_SET);//CLOCK
5142
-                }
5143
-                CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
5144
-#endif // PYJ.2020.07.03_END -- 
5145 5104
 
5146 5105
                 break;
5147 5106
             case  DLI_Gain_Atten1                         :
@@ -5179,8 +5138,6 @@ bool MBIC_Operate(uint8_t* data){
5179 5138
             case  DLI_Gain_Atten_Offset1                  :
5180 5139
                 bluecell_Currdatastatus.bluecell_User_DL1_H = data[MBIC_PAYLOADSTART + 3]; 
5181 5140
                 bluecell_Currdatastatus.bluecell_User_DL1_L = data[MBIC_PAYLOADSTART + 4]; 
5182
-//                printf("bluecell_Currdatastatus.bluecell_User_DL1_H : %x\r\n",bluecell_Currdatastatus.bluecell_User_DL1_H);
5183
-//                printf("bluecell_Currdatastatus.bluecell_User_DL1_L : %x\r\n",bluecell_Currdatastatus.bluecell_User_DL1_L); 
5184 5141
                 CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
5185 5142
 
5186 5143
                 break;
@@ -5302,12 +5259,11 @@ bool MBIC_Operate(uint8_t* data){
5302 5259
 			    tempdata  = DLI_SHUTDOWN_THREADHOLD_DEFAULT;
5303 5260
 			    bluecell_Currdatastatus.DLI_Shutdown_Threshold_H = ((tempdata & 0xFF00) >> 8);        
5304 5261
 			    bluecell_Currdatastatus.DLI_Shutdown_Threshold_L = ((tempdata & 0x00FF));  				
5305
-//                bluecell_Currdatastatus.DLI_Shutdown_Threshold_Default = data[MBIC_PAYLOADSTART + 3]; 
5306 5262
 
5307 5263
                 break;
5308 5264
             case  ULO_RF_Path1_ON_OFF            :
5309 5265
              if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
5310
-                    return;                  
5266
+               return true;
5311 5267
                 UL_Path_OnOff(Path1_OnOff,
5312 5268
                     data[MBIC_PAYLOADSTART + 3],
5313 5269
                     &bluecell_Currdatastatus.ATT_UL1_PATH,
@@ -5330,23 +5286,8 @@ bool MBIC_Operate(uint8_t* data){
5330 5286
 #endif // PYJ.2020.07.03_END -- 
5331 5287
                 break;
5332 5288
             case  ULO_RF_Path2_ON_OFF                    :
5333
-#if 0 // PYJ.2020.07.03_BEGIN -- 
5334
-                bluecell_Currdatastatus.ATT_UL2_PATH = data[MBIC_PAYLOADSTART + 3]; 
5335
-                bluecell_Currdatastatus.ULO_Shutdown_Retry_Count2 = 0;
5336
-                bluecell_Prevdatastatus.ULO_Shutdown_Retry_Count2 = 0xFF;
5337
-                printf("UL SHUTDOWN RECOVERY OPERATE PATH : %d \r\n",bluecell_Currdatastatus.ATT_UL2_PATH);
5338
-                if(data[MBIC_PAYLOADSTART + 3]==0){
5339
-                    HAL_GPIO_WritePin(PATH_EN_UL2_GPIO_Port,PATH_EN_UL2_Pin,GPIO_PIN_RESET);//CLOCK        
5340
-                }
5341
-                else{
5342
-                    bluecell_Prevdatastatus.ATT_UL2_H = 0xFF;
5343
-                    bluecell_Prevdatastatus.ATT_UL2_L = 0xFF;
5344
-                    HAL_GPIO_WritePin(PATH_EN_UL2_GPIO_Port,PATH_EN_UL2_Pin,GPIO_PIN_SET);//CLOCK
5345
-                }
5346
-                CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
5347
-#else
5348 5289
                 if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
5349
-                       return;  
5290
+                  return true;
5350 5291
 
5351 5292
                 UL_Path_OnOff(Path2_OnOff,
5352 5293
                     data[MBIC_PAYLOADSTART + 3],
@@ -5355,27 +5296,12 @@ bool MBIC_Operate(uint8_t* data){
5355 5296
                     &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count2,
5356 5297
                     &bluecell_Prevdatastatus.ULO_Shutdown_Retry_Count2)  ;  
5357 5298
 
5358
-#endif // PYJ.2020.07.03_END -- 
5359 5299
 
5360 5300
 
5361 5301
                 break;
5362 5302
             case  ULO_RF_Path3_ON_OFF                    :
5363
-#if 0 // PYJ.2020.07.03_BEGIN -- 
5364
-                bluecell_Currdatastatus.ATT_UL3_PATH = data[MBIC_PAYLOADSTART + 3]; 
5365
-                bluecell_Currdatastatus.ULO_Shutdown_Retry_Count3 = 0;
5366
-                bluecell_Prevdatastatus.ULO_Shutdown_Retry_Count3 = 0xFF;
5367
-                if(data[MBIC_PAYLOADSTART + 3]==0){
5368
-                    HAL_GPIO_WritePin(PATH_EN_UL3_GPIO_Port,PATH_EN_UL3_Pin,GPIO_PIN_RESET);//CLOCK        
5369
-                }
5370
-                else{
5371
-                    bluecell_Prevdatastatus.ATT_UL3_H = 0xFF;
5372
-                    bluecell_Prevdatastatus.ATT_UL3_L =0xFF;
5373
-                    HAL_GPIO_WritePin(PATH_EN_UL3_GPIO_Port,PATH_EN_UL3_Pin,GPIO_PIN_SET);//CLOCK
5374
-                }
5375
-                CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
5376
-#else
5377 5303
                 if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
5378
-                       return;  
5304
+                  return true;
5379 5305
 
5380 5306
                 UL_Path_OnOff(Path3_OnOff,
5381 5307
                     data[MBIC_PAYLOADSTART + 3],
@@ -5384,27 +5310,12 @@ bool MBIC_Operate(uint8_t* data){
5384 5310
                     &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count3,
5385 5311
                     &bluecell_Prevdatastatus.ULO_Shutdown_Retry_Count3)  ;  
5386 5312
 
5387
-#endif // PYJ.2020.07.03_END -- 
5388 5313
 
5389 5314
 
5390 5315
                 break;
5391 5316
             case  ULO_RF_Path4_ON_OFF                    :
5392
-#if 0 // PYJ.2020.07.03_BEGIN -- 
5393
-                bluecell_Currdatastatus.ATT_UL4_PATH = data[MBIC_PAYLOADSTART + 3]; 
5394
-                bluecell_Currdatastatus.ULO_Shutdown_Retry_Count4 = 0;
5395
-                bluecell_Prevdatastatus.ULO_Shutdown_Retry_Count4 = 0xFF;
5396
-                if(data[MBIC_PAYLOADSTART + 3]==0){
5397
-                    HAL_GPIO_WritePin(PATH_EN_UL4_GPIO_Port,PATH_EN_UL4_Pin,GPIO_PIN_RESET);//CLOCK        
5398
-                }
5399
-                else{
5400
-                    bluecell_Prevdatastatus.ATT_UL4_H = 0xFF;
5401
-                    bluecell_Prevdatastatus.ATT_UL4_L = 0xFF;
5402
-                    HAL_GPIO_WritePin(PATH_EN_UL4_GPIO_Port,PATH_EN_UL4_Pin,GPIO_PIN_SET);//CLOCK
5403
-                }
5404
-                CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
5405
-#else
5406 5317
                 if(bluecell_Currdatastatus.Carrier_ON_OFF == false)
5407
-                       return;  
5318
+                  return true;
5408 5319
 
5409 5320
                 UL_Path_OnOff(Path4_OnOff,
5410 5321
                     data[MBIC_PAYLOADSTART + 3],
@@ -5413,9 +5324,6 @@ bool MBIC_Operate(uint8_t* data){
5413 5324
                     &bluecell_Currdatastatus.ULO_Shutdown_Retry_Count4,
5414 5325
                     &bluecell_Prevdatastatus.ULO_Shutdown_Retry_Count4)  ;  
5415 5326
 
5416
-#endif // PYJ.2020.07.03_END -- 
5417
-
5418
-
5419 5327
                 break;
5420 5328
             case  ULO_Gain_Atten1                         :
5421 5329
                 bluecell_Currdatastatus.ATT_UL1_H = data[MBIC_PAYLOADSTART + 3]; 
@@ -5497,9 +5405,6 @@ bool MBIC_Operate(uint8_t* data){
5497 5405
             case  ULO_Gain_Atten_Offset2                  :
5498 5406
                 bluecell_Currdatastatus.bluecell_User_UL2_H = data[MBIC_PAYLOADSTART + 3]; 
5499 5407
                 bluecell_Currdatastatus.bluecell_User_UL2_L = data[MBIC_PAYLOADSTART + 4]; 
5500
-                printf("ATTEN OFFSET START \r\n");
5501
-                printf("OFFSET HIGH : %02X \r\n", bluecell_Currdatastatus.bluecell_User_UL2_H);
5502
-                printf("OFFSET LOW : %02X \r\n", bluecell_Currdatastatus.bluecell_User_UL2_L);                
5503 5408
                 CompareAttenData(bluecell_Currdatastatus,bluecell_Prevdatastatus);
5504 5409
 
5505 5410
                 break;
@@ -5518,8 +5423,6 @@ bool MBIC_Operate(uint8_t* data){
5518 5423
             case  ULO_Level_High_Threshold                :
5519 5424
                 bluecell_Currdatastatus.ULO_Level_High_Threshold_H = data[MBIC_PAYLOADSTART + 3]; 
5520 5425
                 bluecell_Currdatastatus.ULO_Level_High_Threshold_L = data[MBIC_PAYLOADSTART + 4]; 
5521
-                printf("bluecell_Currdatastatus.ULO_Level_High_Threshold_H : %x \r\n",bluecell_Currdatastatus.ULO_Level_High_Threshold_H);
5522
-                printf("bluecell_Currdatastatus.ULO_Level_High_Threshold_L : %x \r\n",bluecell_Currdatastatus.ULO_Level_High_Threshold_L);    
5523 5426
                 break;
5524 5427
             case  ULO_Level_High_Threshold_default        :
5525 5428
 			    tempdata  = ULO_LEVEL_HIGH_THREADHOLD_DEFAULT;
@@ -5544,52 +5447,15 @@ bool MBIC_Operate(uint8_t* data){
5544 5447
 #endif // PYJ.2020.07.05_END -- 
5545 5448
                 break;
5546 5449
             case ULO_SelfTest2:
5547
-#if 0 // PYJ.2020.07.05_BEGIN -- 
5548
-                if(data[MBIC_PAYLOADSTART + 3]==0){
5549
-                    HAL_GPIO_WritePin(_PATH_SW2_GPIO_Port,_PATH_SW2_Pin,GPIO_PIN_RESET);//CLOCK
5550
-                    HAL_GPIO_WritePin(PATH_SW2_GPIO_Port,PATH_SW2_Pin,GPIO_PIN_SET);//CLOCK
5551
-                }
5552
-                else{
5553
-                    HAL_GPIO_WritePin(_PATH_SW2_GPIO_Port,_PATH_SW2_Pin,GPIO_PIN_SET);//CLOCK
5554
-                    HAL_GPIO_WritePin(PATH_SW2_GPIO_Port,PATH_SW2_Pin,GPIO_PIN_RESET);//CLOCK
5555
-                }
5556
-                bluecell_Currdatastatus.Selftest2 = data[MBIC_PAYLOADSTART + 3];                
5557
-#else
5558 5450
                 SelfTest_Ctrl(SelfTest2,data[MBIC_PAYLOADSTART + 3],&bluecell_Currdatastatus.Selftest2,&bluecell_Currdatastatus.ATT_DL2_H,&bluecell_Currdatastatus.ATT_UL2_H);
5559 5451
 
5560
-#endif // PYJ.2020.07.05_END -- 
5561 5452
                 break;
5562 5453
             case ULO_SelfTest3:
5563
-#if 0 // PYJ.2020.07.05_BEGIN -- 
5564
-                if(data[MBIC_PAYLOADSTART + 3]==0){
5565
-                    HAL_GPIO_WritePin(_PATH_SW3_GPIO_Port,_PATH_SW3_Pin,GPIO_PIN_RESET);//CLOCK
5566
-                    HAL_GPIO_WritePin(PATH_SW3_GPIO_Port,PATH_SW3_Pin,GPIO_PIN_SET);//CLOCK
5567
-                }
5568
-                else{
5569
-                    HAL_GPIO_WritePin(_PATH_SW3_GPIO_Port,_PATH_SW3_Pin,GPIO_PIN_SET);//CLOCK
5570
-                    HAL_GPIO_WritePin(PATH_SW3_GPIO_Port,PATH_SW3_Pin,GPIO_PIN_RESET);//CLOCK
5571
-                }
5572
-                bluecell_Currdatastatus.Selftest3 = data[MBIC_PAYLOADSTART + 3];                
5573
-#else         
5574 5454
                 SelfTest_Ctrl(SelfTest3,data[MBIC_PAYLOADSTART + 3],&bluecell_Currdatastatus.Selftest3,&bluecell_Currdatastatus.ATT_DL3_H,&bluecell_Currdatastatus.ATT_UL3_H);
5575 5455
 
5576
-#endif // PYJ.2020.07.05_END -- 
5577 5456
                 break;
5578 5457
             case ULO_SelfTest4:
5579
-#if 0 // PYJ.2020.07.05_BEGIN -- 
5580
-                if(data[MBIC_PAYLOADSTART + 3]==0){
5581
-                    HAL_GPIO_WritePin(_PATH_SW4_GPIO_Port,_PATH_SW4_Pin,GPIO_PIN_RESET);//CLOCK
5582
-                    HAL_GPIO_WritePin(PATH_SW4_GPIO_Port,PATH_SW4_Pin,GPIO_PIN_SET);//CLOCK
5583
-                }
5584
-                else{
5585
-                    HAL_GPIO_WritePin(_PATH_SW4_GPIO_Port,_PATH_SW4_Pin,GPIO_PIN_SET);//CLOCK
5586
-                    HAL_GPIO_WritePin(PATH_SW4_GPIO_Port,PATH_SW4_Pin,GPIO_PIN_RESET);//CLOCK
5587
-                }
5588
-                bluecell_Currdatastatus.Selftest4 = data[MBIC_PAYLOADSTART + 3];                
5589
-#else
5590 5458
                 SelfTest_Ctrl(SelfTest4,data[MBIC_PAYLOADSTART + 3],&bluecell_Currdatastatus.Selftest4,&bluecell_Currdatastatus.ATT_DL4_H,&bluecell_Currdatastatus.ATT_UL4_H);
5591
-
5592
-#endif // PYJ.2020.07.05_END -- 
5593 5459
                 break;
5594 5460
             case  ULO_ALC_ON_OFF                   :
5595 5461
                 bluecell_Currdatastatus.ULO_ALC_ON_OFF = data[MBIC_PAYLOADSTART + 3]; 
@@ -5607,7 +5473,6 @@ bool MBIC_Operate(uint8_t* data){
5607 5473
 			    bluecell_Currdatastatus.ULO_ALC_Threshold_H = ((tempdata & 0xFF00) >> 8);    
5608 5474
 			    bluecell_Currdatastatus.ULO_ALC_Threshold_L = ((tempdata & 0x00FF));  	
5609 5475
                 printf("ALC DEFAULT VALUE SETTING COMPLETE \r\n");
5610
-//                bluecell_Currdatastatus.ULO_ALC_Threshold_Default = data[MBIC_PAYLOADSTART + 3]; 
5611 5476
                 break;
5612 5477
             case  ULO_Shutdown_ON_OFF                     :
5613 5478
                 bluecell_Currdatastatus.ULO_Shutdown_ON_OFF = data[MBIC_PAYLOADSTART + 3]; 
@@ -5622,10 +5487,6 @@ bool MBIC_Operate(uint8_t* data){
5622 5487
 			    tempdata  = ULO_SHUTDOWN_THREADHOLD_DEFAULT;
5623 5488
 			    bluecell_Currdatastatus.ULO_Shutdown_Threshold_H = ((tempdata & 0xFF00) >> 8);        
5624 5489
 			    bluecell_Currdatastatus.ULO_Shutdown_Threshold_L = ((tempdata & 0x00FF));    
5625
- 								
5626
-                //bluecell_Currdatastatus.ULO_Shutdown_Threshold_Default = data[MBIC_PAYLOADSTART + 3]; 
5627
-
5628
-            
5629 5490
                 break;
5630 5491
             case ULO_ALC_Atten:
5631 5492
                 bluecell_Currdatastatus.MBIC_ULO_ALC_Atten1_H = data[MBIC_PAYLOADSTART + 3]; 
@@ -5694,7 +5555,7 @@ bool MBIC_Operate(uint8_t* data){
5694 5555
                     data[MBIC_PAYLOADSTART + (data[MBIC_PAYLOADSTART + MBIC_TableIndex_Length] ) + 6] = (( crcret  & 0x00FF));  
5695 5556
                     data[MBIC_PAYLOADSTART + (data[MBIC_PAYLOADSTART + MBIC_TableIndex_Length] ) + 7] = 0x03; 
5696 5557
 
5697
-                    Uart1_Data_Send(data, (data[MBIC_PAYLOADSTART + 4]) + 5 + 22 + 3);
5558
+                    Uart1_Data_Send(data, (data[MBIC_PAYLOADSTART + MBIC_TableIndex_Length]) + 5 + 22 + 3);
5698 5559
 
5699 5560
                 }else{
5700 5561
                     MBIC_HeaderMergeFunction(data,(data[MBIC_PAYLOADSTART + 4] * 2) + 5);
@@ -5705,19 +5566,11 @@ bool MBIC_Operate(uint8_t* data){
5705 5566
                     data[MBIC_PAYLOADSTART + (data[MBIC_PAYLOADSTART + MBIC_TableIndex_Length] * 2) + 6] = (( crcret  & 0x00FF));  
5706 5567
                     data[MBIC_PAYLOADSTART + (data[MBIC_PAYLOADSTART + MBIC_TableIndex_Length] * 2) + 7] = 0x03;
5707 5568
                     printf("==data[MBIC_PAYLOADSTART + MBIC_TableIndex_Length] : %d \r\n",data[MBIC_PAYLOADSTART + MBIC_TableIndex_Length]);
5708
-                    Uart1_Data_Send(data, (data[MBIC_PAYLOADSTART + MBIC_TableIndex_Length] * 2)    + 5 + 22 + 3);
5569
+                    Uart1_Data_Send(data, ((data[MBIC_PAYLOADSTART + MBIC_TableIndex_Length] + 1) * 2)    + 5 + 22 + 3);
5709 5570
                 }
5710 5571
                 
5711 5572
             break;
5712 5573
        }
5713
-       
5714
-//        if(/*data[MBIC_PAYLOADSTART + data[MBIC_PAYLOADSTART + 4] + 2 ] == 0xE0 && */occurlen > 0){
5715
-//            occurlen -= data[MBIC_PAYLOADSTART + 2] + 5;
5716
-//            for(int k = 0; k < occurlen; k++){
5717
-//                data[MBIC_PAYLOADSTART + k] = data[MBIC_PAYLOADSTART + data[MBIC_PAYLOADSTART + 2] + 5 + k];
5718
-//            }
5719
-//            goto protocolTableLoadReplay;
5720
-//        }        
5721 5574
     }
5722 5575
     else if(cmd == MBIC_Table_Set){
5723 5576
            // protocolTableSaveReplay:
@@ -5773,16 +5626,8 @@ bool MBIC_Operate(uint8_t* data){
5773 5626
                     data[MBIC_PAYLOADSTART + 3] = 0x03; 
5774 5627
 
5775 5628
                     Uart1_Data_Send(data,   22 + 3 + 1);
5776
-//                    Uart1_Data_Send(data, (data[MBIC_PAYLOADSTART + 4] * 2) + 5 + 22 + 3);
5777 5629
                 }                
5778 5630
             }
5779
-//            if(/*data[MBIC_PAYLOADSTART + data[MBIC_PAYLOADSTART + 4] + 2 ] == 0xE0 && */occurlen > 0){
5780
-//                occurlen -= data[MBIC_PAYLOADSTART + 2] + 5;
5781
-//                for(int k = 0; k < occurlen; k++){
5782
-//                    data[MBIC_PAYLOADSTART + k] = data[MBIC_PAYLOADSTART + data[MBIC_PAYLOADSTART + 2] + 5 + k];
5783
-//                }
5784
-//                goto protocolTableSaveReplay;
5785
-//            }
5786 5631
 
5787 5632
     }
5788 5633
     else{
@@ -5874,23 +5719,12 @@ void DET_LevelAlarmCheck(){
5874 5719
     
5875 5720
 
5876 5721
     LimitData_UL_High = ConvertTo2byte(bluecell_Currdatastatus.ULO_Level_High_Threshold_H,bluecell_Currdatastatus.ULO_Level_High_Threshold_L) * 0.1;
5877
-//    printf("bluecell_Currdatastatus.ULO_Level_High_Threshold_H : %x \r\n",bluecell_Currdatastatus.ULO_Level_High_Threshold_H);
5878
-//    printf("bluecell_Currdatastatus.ULO_Level_High_Threshold_L : %x \r\n",bluecell_Currdatastatus.ULO_Level_High_Threshold_L);    
5879
-//    printf("LimitData_UL_High : %d \r\n",LimitData_UL_High);
5880 5722
     LimitData_DL_High = ConvertTo2byte(bluecell_Currdatastatus.DLI_Level_High_Threshold_H,bluecell_Currdatastatus.DLI_Level_High_Threshold_L)* 0.1;
5881 5723
     LimitData_DL_Low = ConvertTo2byte(bluecell_Currdatastatus.DLI_Level_Low_Threshold_H,bluecell_Currdatastatus.DLI_Level_Low_Threshold_L)* 0.1;
5882 5724
 
5883 5725
     LimitData_DL_Shutdown = ConvertTo2byte(bluecell_Currdatastatus.DLI_Shutdown_Threshold_H,bluecell_Currdatastatus.DLI_Shutdown_Threshold_L)* 0.1;
5884 5726
     LimitData_UL_Shutdown = ConvertTo2byte(bluecell_Currdatastatus.ULO_Shutdown_Threshold_H,bluecell_Currdatastatus.ULO_Shutdown_Threshold_L)* 0.1;
5885 5727
     
5886
-    /*DL[DET_Alarm_DL1_Index] = ConvertTo2byte(bluecell_Currdatastatus.DLI_P1_Level1_H,bluecell_Currdatastatus.DLI_P1_Level1_L);
5887
-    DL[DET_Alarm_DL2_Index] = ConvertTo2byte(bluecell_Currdatastatus.DLI_P2_Level2_H,bluecell_Currdatastatus.DLI_P2_Level2_L);
5888
-    DL[DET_Alarm_DL3_Index] = ConvertTo2byte(bluecell_Currdatastatus.DLI_P3_Level3_H,bluecell_Currdatastatus.DLI_P3_Level3_L);
5889
-    DL[DET_Alarm_DL4_Index] = ConvertTo2byte(bluecell_Currdatastatus.DLI_P4_Level4_H,bluecell_Currdatastatus.DLI_P4_Level4_L);
5890
-    UL[DET_Alarm_UL1_Index] = ConvertTo2byte(bluecell_Currdatastatus.ULO_P1_Level1_H,bluecell_Currdatastatus.ULO_P1_Level1_L);
5891
-    UL[DET_Alarm_UL2_Index] = ConvertTo2byte(bluecell_Currdatastatus.ULO_P2_Level2_H,bluecell_Currdatastatus.ULO_P2_Level2_L);
5892
-    UL[DET_Alarm_UL3_Index] = ConvertTo2byte(bluecell_Currdatastatus.ULO_P3_Level3_H,bluecell_Currdatastatus.ULO_P3_Level3_L);
5893
-    UL[DET_Alarm_UL4_Index] = ConvertTo2byte(bluecell_Currdatastatus.ULO_P4_Level4_H,bluecell_Currdatastatus.ULO_P4_Level4_L);*/
5894 5728
 
5895 5729
     ret  = bluecell_Currdatastatus.DLI_P1_Level1_H << 8;
5896 5730
     ret += bluecell_Currdatastatus.DLI_P1_Level1_L;   
@@ -5927,8 +5761,6 @@ void DET_LevelAlarmCheck(){
5927 5761
     Res_UL_dBm[DET_Alarm_UL1_Index] 
5928 5762
         = bluecell_Currdatastatus.ULO_Level1_H << 8 | bluecell_Currdatastatus.ULO_Level1_L; //(int8_t)Bluecell_TestPro(AutoControl_ADC_Compare(ret,&Det_UL1.Table_Det_15_dBm_H,Det_UL1.Table_Length * 2));
5929 5763
 
5930
-//    printf("LimitData_UL_High : %d \r\n",LimitData_UL_High);
5931
-//    printf("DET_High : %d \r\n",Res_UL_dBm[DET_Alarm_UL1_Index] );
5932 5764
 
5933 5765
     ret  = bluecell_Currdatastatus.ULO_P2_Level2_H << 8;
5934 5766
     ret += bluecell_Currdatastatus.ULO_P2_Level2_L;   
@@ -5953,9 +5785,6 @@ void DET_LevelAlarmCheck(){
5953 5785
         = bluecell_Currdatastatus.ULO_Level4_H << 8 | bluecell_Currdatastatus.ULO_Level4_L;//(int8_t)Bluecell_TestPro(AutoControl_ADC_Compare(ret,&Det_UL4.Table_Det_15_dBm_H,Det_UL4.Table_Length * 2));
5954 5786
 
5955 5787
 
5956
-//    printf("LimitData_DL_High : %d \r\n",LimitData_DL_High);    
5957
-//    printf("LimitData_DL_Low : %d \r\n",LimitData_DL_Low);   
5958
-
5959 5788
     /*
5960 5789
         DL Level Alarm Check Part
5961 5790
     */
@@ -5989,28 +5818,6 @@ void DET_LevelAlarmCheck(){
5989 5818
     */
5990 5819
     uint8_t* DL_PathStatus = &bluecell_Currdatastatus.ATT_DL1_PATH ;
5991 5820
     uint8_t* DL_RetryCount = &bluecell_Currdatastatus.DLI_Shutdown_Retry_Count1 ;
5992
-#if 0 // PYJ.2020.06.23_BEGIN -- 
5993
-    for(int i = 0 ; i < DET_Alarm_DL_Shutdown_Index_MAX; i++){
5994
-        if(DL_PathStatus[DET_Alarm_DL1_Shutdown_Index + i] == true){
5995
-            ADC_Alarm_DL_Normal_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] = true;
5996
-            if(DET_DL_Normal_Shutdown_On_AlarmTimerCnt[DET_Alarm_DL1_Shutdown_Index + i] > MBIC_OFF_MAINTAIN_SEC){
5997
-                if(DL_RetryCount[DET_Alarm_DL1_Shutdown_Index + i] > 0){// Nomal Operate
5998
-                    DL_RetryCount[DET_Alarm_DL1_Shutdown_Index + i] = 0;
5999
-                }
6000
-            }
6001
-        }else{
6002
-            ADC_Alarm_DL_Normal_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] = false;
6003
-        }
6004
-        
6005
-        if(LimitData_DL_Shutdown <= Res_DL_dBm[DET_Alarm_DL1_Shutdown_Index + i]){
6006
-            ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] = true;
6007
-        }
6008
-        else{
6009
-             if(LimitData_DL_Shutdown - 2 >= Res_DL_dBm[DET_Alarm_DL1_Shutdown_Index + i])
6010
-                ADC_Alarm_DL_Shutdown_Set[DET_Alarm_DL1_Shutdown_Index + i] = false;
6011
-        }
6012
-    }
6013
-#else
6014 5821
     int16_t DL_Atten[DET_Alarm_DL_Shutdown_Index_MAX] = {0,};
6015 5822
     
6016 5823
     DL_Atten[DET_Alarm_DL1_Index] = bluecell_Currdatastatus.ATT_DL1_H << 8 | bluecell_Currdatastatus.ATT_DL1_L;
@@ -6046,19 +5853,7 @@ void DET_LevelAlarmCheck(){
6046 5853
         }
6047 5854
     }
6048 5855
 
6049
-#endif // PYJ.2020.06.23_END -- 
6050 5856
 //    printf("======================================================\r\n");
6051
-#if 0 // PYJ.2020.06.23_BEGIN -- 
6052
-    for(int i = 0 ; i < DET_Alarm_DL_Index_MAX; i++){
6053
-        if(LimitData_DL_Low >= Res_DL_dBm[DET_Alarm_DL1_Index + i]){
6054
-            ADC_Alarm_DL_Low_Set[DET_Alarm_DL1_Index + i] = true;
6055
-        }
6056
-        else{
6057
-            if(LimitData_DL_Low + 2 <= Res_DL_dBm[DET_Alarm_DL1_Index + i])
6058
-                ADC_Alarm_DL_Low_Set[DET_Alarm_DL1_Index + i] = false;
6059
-
6060
-        }
6061
-#else
6062 5857
         uint8_t* AlarmStatus = &bluecell_Currdatastatus.DLI_Level_Low_Alarm1;
6063 5858
         uint8_t* PathStatus = &bluecell_Currdatastatus.ATT_DL1_PATH;
6064 5859
         for(int i = 0 ; i < DET_Alarm_DL_Index_MAX; i++){
@@ -6085,7 +5880,6 @@ void DET_LevelAlarmCheck(){
6085 5880
             }
6086 5881
 
6087 5882
 
6088
-#endif // PYJ.2020.06.23_END -- 
6089 5883
         
6090 5884
 #if 0 // PYJ.2020.06.22_BEGIN -- 
6091 5885
         printf("=========================================================\r\n");

+ 11 - 10
Bluecell_Src/flash.c

@@ -4,6 +4,7 @@
4 4
  *  Created on: 2019. 7. 15.
5 5
  *      Author: parkyj
6 6
  */
7
+#include <stdio.h>
7 8
 #include "flash.h"
8 9
 #include "MBIC_Bootloader.h"
9 10
 #include "bluecell_operate.h"
@@ -31,7 +32,7 @@ void Jump_App(void){
31 32
 uint8_t CurrFlash_BankCheck(){
32 33
     uint32_t  CurrApiAddress = 0,Bank1Address=0,Bank2Address = 0;
33 34
     uint32_t i = 0;
34
-    uint8_t ret = 0;
35
+    //uint8_t ret = 0;
35 36
     CurrApiAddress = FLASH_MBICUSER_START_ADDR;
36 37
     Bank1Address = FLASH_USER_BANK1_START_ADDR;
37 38
     Bank2Address = FLASH_USER_BANK2_START_ADDR;
@@ -53,7 +54,7 @@ void Flash_InitRead() // ?占쏙옙湲고븿?占쏙옙
53 54
 {
54 55
     uint32_t  CurrApiAddress = 0,Bank1Address=0,Bank2Address = 0;
55 56
     uint32_t i = 0;
56
-    uint8_t ret = 0;
57
+    //uint8_t ret = 0;
57 58
     CurrApiAddress = FLASH_MBICUSER_START_ADDR;
58 59
     Bank1Address = FLASH_USER_BANK1_START_ADDR;
59 60
     Bank2Address = FLASH_USER_BANK2_START_ADDR;
@@ -363,7 +364,7 @@ uint8_t Flash_Data_Write(uint8_t* data){
363 364
             ret = 1;
364 365
             HAL_Delay(1000);
365 366
             if(Errcnt == 0xFF)
366
-                return;
367
+                return false;
367 368
             
368 369
 //            Errcnt++;
369 370
             goto returntoFirst;
@@ -401,7 +402,7 @@ uint8_t API_Flash_Data_Write(uint8_t* data){
401 402
             ret = 1;
402 403
             HAL_Delay(1000);
403 404
             if(Errcnt == 0xFF)
404
-                return;
405
+                return false;
405 406
             
406 407
             Errcnt++;
407 408
             goto returntoFirst;
@@ -421,8 +422,8 @@ uint8_t Bank_Flash_write(uint8_t* data,uint32_t StartBankAddress) // ?占쏙옙
421 422
 {
422 423
 
423 424
     /*Variable used for Erase procedure*/
424
-    static FLASH_EraseInitTypeDef EraseInitStruct;
425
-    static uint32_t PAGEError = 0;
425
+    //static FLASH_EraseInitTypeDef EraseInitStruct;
426
+    //static uint32_t PAGEError = 0;
426 427
     uint8_t ret = 0;
427 428
 
428 429
 
@@ -686,7 +687,7 @@ void MBIC_DataErase_Func(uint8_t bank_num){
686 687
 }
687 688
 uint8_t BuildTimeCheck(){
688 689
     uint32_t  CurrApiAddress = 0,Bank1Address=0,Bank2Address = 0;
689
-    uint32_t i = 0;
690
+    //uint32_t i = 0;
690 691
     uint8_t ret = 0;
691 692
     CurrApiAddress = FLASH_MBICUSER_START_ADDR;
692 693
     Bank1Address = FLASH_USER_BANK1_START_ADDR;
@@ -706,15 +707,15 @@ uint8_t BuildTimeCheck(){
706 707
 }
707 708
 
708 709
 uint8_t MBIC_APIFLASH_Func(uint8_t* data,uint32_t size,uint8_t bank_num){
709
-    static FLASH_EraseInitTypeDef EraseInitStruct;
710
-    static uint32_t PAGEError = 0;
710
+    //static FLASH_EraseInitTypeDef EraseInitStruct;
711
+    //static uint32_t PAGEError = 0;
711 712
     static uint32_t DownloadIndex;
712 713
     static __IO uint32_t data32 = 0 , MemoryProgramStatus = 0;
713 714
     int dataindex = 0;
714 715
     uint32_t writedata = 0;
715 716
     HAL_FLASH_Unlock();
716 717
     uint32_t  CurrApiAddress = 0,Bank1Address=0,Bank2Address = 0;
717
-    uint32_t i = 0;
718
+    //uint32_t i = 0;
718 719
     uint8_t ret = 0;
719 720
     CurrApiAddress = FLASH_MBICUSER_START_ADDR;
720 721
     Bank1Address = FLASH_USER_BANK1_START_ADDR;