Merge branch 'master' of http://bluecell.synology.me:3000/june9152/STM32F103ZET_JDASMBIC

Bluecell_Src/Bluecell_operate.c

@@ -3488,6 +3488,7 @@ uint32_t MBIC_DataSend(uint8_t* data){
     uint16_t Crcret = 0;
     int16_t tmpdata = 0;
      uint32_t HeaderLength = 75;
+	 
 
     
     /*ALARM BIT LIST*/
@@ -4785,6 +4786,7 @@ bool MBIC_Operate(uint8_t* data){
     uint8_t cmd = data[MBIC_PROT_CMD_INDEX];
     int16_t Tmpdata = 0;
     int16_t Tmpdata2 = 0;    
+	int16_t tempdata = 0;
     //uint16_t Temp_ADC = 0;
     //uint16_t i = 0;
     //double temp = 0;
@@ -4916,7 +4918,8 @@ bool MBIC_Operate(uint8_t* data){
                 bluecell_Currdatastatus.Temp_High_Threshold = data[MBIC_PAYLOADSTART + 3]; 
                 break;
             case  Temp_High_Threshold_Default             :
-                bluecell_Currdatastatus.Temp_High_Threshold_Default = data[MBIC_PAYLOADSTART + 3]; 
+				bluecell_Currdatastatus.Temp_High_Threshold = Temp_THREADHOLD_DEFAULT;
+//                bluecell_Currdatastatus.Temp_High_Threshold_Default = data[MBIC_PAYLOADSTART + 3]; 
                 break;
             case  LED_TEST                                :
                 bluecell_Currdatastatus.LED_TEST = data[MBIC_PAYLOADSTART + 3]; 
@@ -5097,7 +5100,14 @@ bool MBIC_Operate(uint8_t* data){
 
                 break;
             case  DLI_Level_High_Low_Threshold_default    :
-                bluecell_Currdatastatus.DLI_Level_High_Low_Threshold_default = data[MBIC_PAYLOADSTART + 3]; 
+			    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;
+			    bluecell_Currdatastatus.DLI_Level_Low_Threshold_H = ((tempdata & 0xFF00) >> 8);
+			    bluecell_Currdatastatus.DLI_Level_Low_Threshold_L = ((tempdata & 0x00FF));				
+              //  bluecell_Currdatastatus.DLI_Level_High_Low_Threshold_default = data[MBIC_PAYLOADSTART + 3]; 
 
                 break;
             case DLI_FRBT_D_Day: 
@@ -5153,7 +5163,10 @@ bool MBIC_Operate(uint8_t* data){
 
                 break;
             case  DLI_AGC_Threshold_Default               :
-                bluecell_Currdatastatus.DLI_AGC_Threshold_default = data[MBIC_PAYLOADSTART + 3]; 
+			    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_AGC_Threshold_default = data[MBIC_PAYLOADSTART + 3]; 
                 break;
             case  DLI_Shutdown_ON_OFF                     :
                 bluecell_Currdatastatus.DLI_Shutdown_ON_OFF = data[MBIC_PAYLOADSTART + 3]; 
@@ -5173,7 +5186,10 @@ bool MBIC_Operate(uint8_t* data){
 
                 break;
             case  DLI_Shutdown_Threshold_Default          :
-                bluecell_Currdatastatus.DLI_Shutdown_Threshold_Default = data[MBIC_PAYLOADSTART + 3]; 
+			    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_Threshold_Default = data[MBIC_PAYLOADSTART + 3]; 
 
                 break;
             case  ULO_RF_Path1_ON_OFF            :
@@ -5382,7 +5398,10 @@ bool MBIC_Operate(uint8_t* data){
                 printf("bluecell_Currdatastatus.ULO_Level_High_Threshold_L : %x \r\n",bluecell_Currdatastatus.ULO_Level_High_Threshold_L);    
                 break;
             case  ULO_Level_High_Threshold_default        :
-                bluecell_Currdatastatus.ULO_Level_High_Threshold_default = data[MBIC_PAYLOADSTART + 3]; 
+			    tempdata  = ULO_LEVEL_HIGH_THREADHOLD_DEFAULT;
+			    bluecell_Currdatastatus.ULO_Level_High_Threshold_H = ((tempdata & 0xFF00) >> 8);
+			    bluecell_Currdatastatus.ULO_Level_High_Threshold_L = ((tempdata & 0x00FF));    				
+//                bluecell_Currdatastatus.ULO_Level_High_Threshold_default = data[MBIC_PAYLOADSTART + 3]; 
                 break;
             case  ULO_ALC_ON_OFF                   :
                 bluecell_Currdatastatus.ULO_ALC_ON_OFF = data[MBIC_PAYLOADSTART + 3]; 
@@ -5396,7 +5415,10 @@ bool MBIC_Operate(uint8_t* data){
 
                 break;
             case  ULO_ALC_Threshold_Default               :
-                bluecell_Currdatastatus.ULO_ALC_Threshold_Default = data[MBIC_PAYLOADSTART + 3]; 
+			    tempdata = ULO_ALC_THREADHOLD_DEFAULT;
+			    bluecell_Currdatastatus.ULO_ALC_Threshold_H = ((tempdata & 0xFF00) >> 8);    
+			    bluecell_Currdatastatus.ULO_ALC_Threshold_L = ((tempdata & 0x00FF));  				
+//                bluecell_Currdatastatus.ULO_ALC_Threshold_Default = data[MBIC_PAYLOADSTART + 3]; 
 
                 break;
             case  ULO_Shutdown_ON_OFF                     :
@@ -5409,7 +5431,11 @@ bool MBIC_Operate(uint8_t* data){
 
                 break;
             case  ULO_Shutdown_Threshold_Default          :
-                bluecell_Currdatastatus.ULO_Shutdown_Threshold_Default = data[MBIC_PAYLOADSTART + 3]; 
+			    tempdata  = ULO_SHUTDOWN_THREADHOLD_DEFAULT;
+			    bluecell_Currdatastatus.ULO_Shutdown_Threshold_H = ((tempdata & 0xFF00) >> 8);        
+			    bluecell_Currdatastatus.ULO_Shutdown_Threshold_L = ((tempdata & 0x00FF));    
+ 								
+                //bluecell_Currdatastatus.ULO_Shutdown_Threshold_Default = data[MBIC_PAYLOADSTART + 3]; 
 
             
                 break;