Diff: main.c

Revision:

231:079835d508ef

Parent:

228:a8195e1b1123

Child:

232:130a2b5003e6

--- a/main.c	Tue Jan 09 13:25:45 2018 +0000
+++ b/main.c	Thu Jan 25 13:59:43 2018 +0000
@@ -13,6 +13,7 @@
 ** Descriptions:
 **--------------------------------------------------------------------------------------------------------
 *********************************************************************************************************/
+#include "startup_LPC17xx.s"
 #include "Global.h"
 
 /******************************************************************************
@@ -33,46 +34,34 @@
  // unsigned int timer;
 int main (void)
 {
+   //int ppp;
+
+ 
     SystemInit1();  // Инициализация контроллера: установка тактовых частот
     SystemCoreClockUpdate1(); // расчет тактовой частоты процессора перед инициализацией UART - 103MHz
     InitMCPWM();
     Param_init();
     GLD_Init();
     
-  /*if(Gyro.LG_Type==1)   Gyro.RgConA = 0xff;
- 	else Gyro.RgConA = 0xfd;
-    Gyro.RgConB = 0x4;*/
     
     BackLightOFF
     LightUpOFF
 
     UART_InitSet (0, 921600, 0x03);
     UART_InitSet (1, 921600, 0x03);
-   /*
-    UART_InitSet (0, 115200, 0x03);
-    UART_InitSet (1, 115200, 0x03); */
+
 Out_G_photo(Gyro.Gain_Sin, Gyro.Gain_Cos);  
-		       for(int q=0; q<300; q++)
-               {
-               BuffADC_1Point[CountV255] =0;
-               }
-            //   time(timer);
+
+
+    Gyro.Firmware_Version	= 17543;
+
+    Gyro.Firmware_Version=convertStrToTime(__DATE__);
 
     while ( 1 ) { 
-    if(Time1Hz<5)
-    {
-      ADC_64Point=0;
-      ADC_32PointD=0;
-      for(int q=0; q<64; q++)
-            	{
-            	BuffADC_znak	[q] = 0;		
-				BuffADC_64Point		[q] = 0;	
-				Buff_Restored_Mod 	[q] = 0;    
-            	}
-    }
+
         Event_1250Hz();
      	Event_100KHz();
-     	Event_5KHz();
+     	Event_10KHz();
         Event_1KHz();
         Event_500Hz();
         Event_250Hz();
@@ -93,17 +82,6 @@
         ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
         M_RateA();
         AllRegul();
- 
- 
- 
-
-        /* if (count10v>=64*198)
- 		  {
- 		  	sprintf((Time),"%d %d\r\n", AMPSUMM,AMPSUMP);
-    	 	WriteCon(Time);
- 		  }*/
- 
- 
         
 /////////////////////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////////Работа с Flash//////////////////////////////////////////////////////////////////