Diff: Global.c

Revision:

222:7de7b3bf3a1d

Parent:

220:04c54405b82d

Child:

225:f8fee6c586cc

--- a/Global.c	Mon Oct 23 05:31:10 2017 +0000
+++ b/Global.c	Mon Nov 20 13:06:31 2017 +0000
@@ -11,7 +11,7 @@
 unsigned int 	Event500Hz;
 unsigned int 	Event1K;
 unsigned int 	Event1250Hz;
-unsigned int 	Event2K;
+unsigned int 	Event5K;
 unsigned int 	Event100K;
 unsigned int 	EventVibro;
 unsigned int 	MODFlag=0;
@@ -21,7 +21,7 @@
 unsigned int 	Time100K;
 unsigned int 	Time1K;
 unsigned int 	Time1250Hz;
-unsigned int 	Time2K;
+unsigned int 	Time5K;
 unsigned int 	Time500Hz;
 unsigned int 	Time250Hz;
 unsigned int 	Time1Hz;
@@ -127,11 +127,13 @@
     if(GyroP.Str.ParamMod)
     {			
     Gyro.ShowMod2=0;
+     			Gyro.TimeToJump			= GyroP.Str.TimeToJump;     											
+     			Gyro.JumpDelta			= GyroP.Str.JumpDelta;   
                 Gyro.ShiftMod			= GyroP.Str.ShiftMod;
     			Gyro.PLC_Start   		= 0x7fff+GyroP.Str.PLC_Start;
       		    Gyro.DownTreshold		= 0x7fff+GyroP.Str.DownTreshold;  																//27
 				Gyro.HighTreshold		= 0x7fff+GyroP.Str.HighTreshold;  	
-				Gyro.PLCDelay			= GyroP.Str.PLCDelay/10;  	
+			//	Gyro.PLCDelay			= GyroP.Str.PLCDelay/10;  	
 				Gyro.ResetLevelCool		= 0x7fff+GyroP.Str.ResetLevelCool; 																//105
                 Gyro.ResetLevelHeat		= 0x7fff+GyroP.Str.ResetLevelHeat;
                 Gyro.HFO_Gain			= GyroP.Str.HFO_Gain;
@@ -287,7 +289,7 @@
 				int Dummy; // инициализация мусорки для очистки буфера приема.
               
 
-    if(Gyro.LG_Type==1)Spi.DAC_A=(unsigned int)(24000);
+    if(Gyro.LG_Type==1)Spi.DAC_A=Gyro.HFO_Max;