Diff: Command.c

Revision:

165:b2bd0c810a4f

Parent:

163:affb5706d191

Child:

168:f4a6abb18358

--- a/Command.c	Tue May 17 14:04:34 2016 +0000
+++ b/Command.c	Fri May 20 14:03:58 2016 +0000
@@ -114,8 +114,10 @@
     WriteConN (BuffTemp,8);
    
 }
+
 void CMD_Delta_500Hz(void)
 {   
+
     Gyro.Delta500_Event=0;
     unsigned int Temp;
 	BuffTemp[ 0] = Gyro.SOC_Out;
@@ -184,7 +186,7 @@
      
      //Напряжение на регуляторе периметра
      case 8:
-          Temp = Spi.DAC_B - 0x7fff;
+          Temp = Spi.DAC_B /*- 0x7fff*/;
           BuffTemp[5] =  (Temp >> 8) & 0xff;
   
      break;  
@@ -272,8 +274,9 @@
     Check(BuffTemp, CRC_N);
     WriteConN (BuffTemp,CRC_N);  
    
-    CountParam++;
-    if(CountParam>21)CountParam=0;//зацикливания буфера от 0 до 21
+    
+    if(CountParam>20)CountParam=0;//зацикливания буфера от 0 до 21
+    else CountParam++;
     
 }
 void CMD_Delta_Ext(void)
@@ -351,7 +354,7 @@
      
      //Напряжение на регуляторе периметра
      case 8:
-          Temp = Spi.DAC_B - 0x7fff;
+          Temp = Spi.DAC_B /*- 0x7fff*/;
           BuffTemp[5] =  (Temp >> 8) & 0xff;
   
      break;  
@@ -860,10 +863,10 @@
                
                 case 0xA0:
                   TempParam=(BuffTemp[3]) & 0x90; 
-                  if      (TempParam==Delta_500)        CMD_Delta_500Hz();
-                  else if (TempParam==Delta_EXT)        CMD_Delta_Ext();
-                  else if (TempParam==PDelta_500)      { Gyro.ModeOut=3; Gyro.Delta500_Event=0; /*WriteCon("Delta500");*/ }
-                  else if (TempParam==PDelta_EXT)      { Gyro.ModeOut=4; Gyro.DeltaEXT_Event=0;/* WriteCon("deltaEXT"); */}
+                  if      (TempParam==Delta_500)       {CMD_Delta_500Hz();}
+                  else if (TempParam==Delta_EXT)       {CMD_Delta_Ext();  }
+                  else if (TempParam==PDelta_500)      { UART_InitSet (1, 115200, 0x03); Gyro.ModeOut=3; Gyro.Delta500_Event=0; /*WriteCon("Delta500");*/ }
+                  else if (TempParam==PDelta_EXT)      { UART_InitSet (1, 115200, 0x03); Gyro.ModeOut=4; Gyro.DeltaEXT_Event=0;/* WriteCon("deltaEXT"); */}
                 break;
                
                 case 0xD8:
@@ -889,7 +892,7 @@
                 case 0xDD:
 	                TempParam=(BuffTemp[3]) & 0x9f; 
 	                if      (TempParam == Rate1)        { CMD_Rate(); 		     	                    WriteCon("Rate11");}
-	                else if (TempParam == Rate2)        { CMD_Rate2(); 		                        WriteCon("Rate21");}
+	                else if (TempParam == Rate2)        { CMD_Rate2(); 		                            WriteCon("Rate21");}
 	                else if (TempParam == PRate1)       { Gyro.ModeOut=1; Gyro.Rate1_Event=0;	        WriteCon("Rate12");}
 	                else if (TempParam == PRate2)       { Gyro.ModeOut=2; Gyro.Rate2_Event=0;		    WriteCon("Rate22");}
                 break;