Diff: MTimer.c

Revision:

232:130a2b5003e6

Parent:

231:079835d508ef

--- a/MTimer.c	Thu Jan 25 13:59:43 2018 +0000
+++ b/MTimer.c	Wed Jan 31 13:41:23 2018 +0000
@@ -13,7 +13,7 @@
 unsigned int CountV31=0;
 unsigned int CountV255=0;
 unsigned int CountV511=0;
-unsigned int f,MODCount=0;
+unsigned int f;
 int loop=0;
 int t;
 float aPLC[5];
@@ -31,8 +31,7 @@
 	
 		Gyro.EvenRate7=1;
 
-/*	sprintf((Time),"%d       %d\r\n",  Spi.DAC_B,   PlcWormDeltaout);
-        WriteCon(Time);*/
+
 		Event1250Hz--;
 
 	}
@@ -101,56 +100,30 @@
 	
     if (Event1Hz)	
     {
-   
-   
-   
-     if(Gyro.ParamFlag) {/*Switch(Gyro.NP)*/};
-   
-   
-   
-   
-   
+   TempClac();
    
-     if(Gyro.TemperNewData)
-      	{
-     	 Gyro.TemperNewData = 0;
-     
-    	 if(Gyro.TermoMod>0)Gyro.TermoMod = 1;
-      	 else if(Gyro.TermoMod==0)Gyro.TermoMod = OldTermoMod;
-      	 else Gyro.TermoMod =(-1);
-     	 OldTermoMod = Gyro.TermoMod;
-     	}
-  
-       PlcWormDeltaout=0;
+
+     TermoCopensRecalc(Spi.ADC1, Spi.ADC2, 10000);
+     PlcWormDeltaout=0;
 
         if(Gyro.RgConA&0x4) JumpTimer=0;
-     else
+        else
      	{   
-     
      	 JumpTimer++;
     	 if(JumpTimer>(Gyro.TimeToJump-1))
      		{
-     		Gyro.PLCDelay	= GyroP.Str.PLCDelay; 
+     		//Gyro.PLCDelay = GyroP.Str.PLCDelay; 
      		JumpMod();
      		JumpTimer=0;
     	 	}
-     	}
-     
-     
+    	 	
+     	}     
 
       Discharg();
       BackLight();
       Gyro.Rate1_Event = 1; 
       Event1Hz--;
       Time1Hz++; 
-      
-
-     /*
-     sprintf((Time),"\r\n  %s   %d    %d ",__DATE__, UItempDate, FtempDate);
-     WriteCon(Time);*/
-    /*sprintf(Time,"%s %s.",__DATE__,  __TIME__ );                 //Подготовка даты и времени компиляции
-    WriteCon(Time);*/
-     
     }
 }
 
@@ -198,7 +171,7 @@
       
     // Gyro.CuruAngle=0;
 	  Event250Hz--;
-	  MODCount++;
+
 	  }
 }
 /////////////////////////////////////////////////////