Dmitry Kovalev
/
LGfiltr
forkd
Fork of LGstaandart by
Diff: Global.c
- Revision:
- 200:1df682165694
- Parent:
- 199:2728719cdc64
--- a/Global.c Thu Oct 20 09:32:25 2016 +0000 +++ b/Global.c Thu Oct 20 11:38:22 2016 +0000 @@ -6,7 +6,7 @@ unsigned long Global_Time, Time_UART,Time_Sec,Time_vibro,Time_1kHz; float t1; unsigned char BuffTemp[100]; -unsigned char Time[1000]; +unsigned char Time[400]; unsigned int Event1Hz; unsigned int Event500Hz; unsigned int Event1K ; @@ -76,7 +76,7 @@ ///////////расчета значений буферов ВП/////////////// ///////////////////////////////////////////////////// /////////////инициализация переменных в структ вибро///////////////// - + Gyro.start=30000; Gyro.FlashMod=0; Gyro.FrqHZ=388; Gyro.Frq = Gyro.FrqHZ<<16; @@ -111,13 +111,13 @@ Buff_16PointD[i] = 0x00; GyroP.Array[i] = 0x00; } - for (int i = 0; i < 64; i++ ) { + /* for (int i = 0; i < 64; i++ ) { BuffADC_16Point[CountV64]=0x00; BuffADC_32Point[CountV64]=0x00; BuffADC_32PointD[CountV64]=0x00; BuffADC_64Point[CountV64]=0x00; - } - PulseADC_64Point=0; + }*/ + // PulseADC_64Point=0; //////////////////////////////////////////////////// //////////////////////////////////////////////////// ///////////////////////////////////////////////////// @@ -147,7 +147,7 @@ Buff_ADC_3[i] = 0; Buff_ADC_4[i] = 0; } - for (int i = 0; i < 256; i++ ) { + /* for (int i = 0; i < 256; i++ ) { Buff_ADC_5[i]= 0; } for (int i = 0; i < 256; i++ ) { @@ -155,7 +155,7 @@ } for (int i = 0; i < 256; i++ ) { Buff_AMP[i]= 0; - } + }*/ //////////////////////////////////////////////////// //////////////////////////////////////////////////// @@ -193,7 +193,7 @@ ///////////////////////////////////////////////////// Gyro.Ktermo=1;// K° - Gyro.TermoNKU=44700;//48824*0,0061-273=25 С° + Gyro.Termo=44700;//48824*0,0061-273=25 С° Spi.DAC_A = 41000; Spi.DAC_B = 35220; @@ -202,8 +202,8 @@ Gyro.StrayHZ_flag = 0; Gyro.LogHZ = 0; - Gyro.StrayPLC_Pls = 1000; - Gyro.StrayPLC_Mns = -1000; + //Gyro.StrayPLC_Pls = 1000; + // Gyro.StrayPLC_Mns = -1000; Gyro.StrayPLC_2Mode = 2000; Gyro.StrayPLC_flag = 0; Gyro.LogPLC = 0; @@ -240,7 +240,7 @@ LPC_PINCON->PINMODE3 |= 0x3C300; //P1.20, p1.23 - LPC_QEI->MAXPOS = MAX_QEI_CNT; //LPC_QEI->"регистор максимального положения" = 2147483646 + LPC_QEI->MAXPOS = 2147483646; //LPC_QEI->"регистор максимального положения" = 2147483646 LPC_QEI->FILTER = 2; // фильтр( ?? ) LPC_QEI->CON = 0xF; //сбросить в ноль все счетчики кв.э. (скорость, направление, позицию и тд) LPC_QEI->CONF = (0<<2) |(0<<1); //Quadrature inputs, no inverting,only A pulses are counted