Diff: Command.c

Revision:

113:8be429494918

Parent:

112:4a96133a1311

Child:

115:e5a230e5af52

--- a/Command.c	Mon Apr 04 11:09:56 2016 +0000
+++ b/Command.c	Mon Apr 04 14:48:14 2016 +0000
@@ -113,12 +113,10 @@
     BuffTemp[ 4] =(Gyro.CaunMin >> 8) & 0xff;//старший байт счетчика -.
     BuffTemp[ 5] =(Gyro.CaunMin >> 0) & 0xff;//младший байт счетчика -.
  
- 
- 
+  
 Temp = Gyro.CuruAngle;
 Gyro.CuruAngle = 0;
- 
- 
+
     BuffTemp[ 6] =(Temp >> 8) & 0xff;//старший байт разности счетчиков
     BuffTemp[ 7] =(Temp >> 0) & 0xff;//младший байт разности счетчиков
 
@@ -155,24 +153,30 @@
 
     BuffTemp[24] = 0x00;
     BuffTemp[25] = 0x00;// ХЗ
-
-    BuffTemp[26] =  ADC1H;
-    BuffTemp[27] =  ADC1L;
-
-    BuffTemp[28] = ADC2H;
-    BuffTemp[29] = ADC2L;
-
-    BuffTemp[30] = ADC2H;//in1
-    BuffTemp[31] = ADC2L;
-
-    BuffTemp[32] = ADC3H;
-    BuffTemp[33] = ADC3L;//in2
-
-    BuffTemp[34] = ADC5H;
-    BuffTemp[35] = ADC5L;
-
-    BuffTemp[36] =0x00;//ADC6
-    BuffTemp[37] =0x00;//ADC6
+    
+    Temp = Gyro.AD_Fast >> 16;
+    BuffTemp[26] =  (Temp >> 8) & 0xff;
+    BuffTemp[27] =  (Temp >> 0) & 0xff;
+    
+    Temp = Gyro.AD_Slow >> 16;
+    BuffTemp[28] = (Temp >> 8) & 0xff;
+    BuffTemp[29] = (Temp >> 0) & 0xff;
+	
+	Temp = Gyro.In1;
+    BuffTemp[30] = (Temp >> 8) & 0xff;//in1//2
+    BuffTemp[31] = (Temp >> 0) & 0xff;
+    
+ 	Temp = Gyro.In2;
+    BuffTemp[32] = (Temp >> 8) & 0xff;
+    BuffTemp[33] = (Temp >> 0) & 0xff;//in2//3
+	
+	Temp = Gyro.DeltaT;
+    BuffTemp[34] = (Temp >> 8) & 0xff;//дельта
+    BuffTemp[35] = (Temp >> 0) & 0xff;
+	
+	Temp = Gyro.Termo;
+    BuffTemp[36] =(Temp >> 8) & 0xff;//температура
+    BuffTemp[37] =(Temp >> 0) & 0xff;//ADC6
 
     BuffTemp[38] =0x00;
     BuffTemp[39] =0x00;