Dmitry Kovalev
/
LGfiltr
forkd
Fork of LGstaandart by
Diff: vibro.c
- Revision:
- 231:079835d508ef
- Parent:
- 227:2774b56bfab0
- Child:
- 232:130a2b5003e6
diff -r 8f7eeb47ca51 -r 079835d508ef vibro.c --- a/vibro.c Tue Jan 09 13:25:45 2018 +0000 +++ b/vibro.c Thu Jan 25 13:59:43 2018 +0000 @@ -1,6 +1,11 @@ #include "Global.h" GyroT Gyro; GyroParam GyroP; + +TermCorS TermoCorrStatic; +TermCorD TermoCorrDynamic; + + volatile unsigned int Cheng_AMP_Flag=0; //int reper=0; int Rate2VibFlag,countA=0,tempDP,vibrot=0,fnoize=0,Znak=0,tempy,ttempo; @@ -190,17 +195,15 @@ if (Gyro.Frq < Gyro.FrqHZmin) Gyro.Frq=Gyro.FrqHZmin;//нижнее ограничение частоты else if(Gyro.Frq > Gyro.FrqHZmax) Gyro.Frq=Gyro.FrqHZmax;//верхнее ограничение частоты*/ LPC_TIM1->MR0 =(unsigned int)(103200000/(Gyro.Frq>>11));//запись в таймер нового значение частоты вибро - // LPC_TIM1->MR0 =(unsigned int) F_vib; } ////////////////////////////////////////////////////////////////////////////// /////////////////////////основного 32 тактного цикла////////////////////////// ////////////////////////////////////////////////////////////////////////////// void cheng(void) -{ static unsigned int counttt=0; - switch(CountV31) { +{ + switch(CountV31) { case 0: - ReVib();///обновление значений вибро Gyro.VibroAMPRegulF=1; Time_vibro=0; @@ -223,17 +226,7 @@ break; case 31: - /* if(counttt>199) - { - - sprintf((Time)," %d %d %d %d \r\n ", SinMns, SinPls, SinMns+SinPls, faza); - WriteCon(Time); - counttt=0; - SinMns=0; - SinPls=0; - } - counttt++; -*/ + break; } } @@ -248,10 +241,7 @@ Gyro.VibroAMPRegulF = 0; VibroAMPRegul(); PLCRegul(); - if(Gyro.LG_Type==1) - { - HFORegul(); - } + HFORegul(); } // Регулеровка Амплитуды виброподвеса if (Gyro.VibroNoiseF == 1) {Gyro.VibroNoiseF = 0; OLDCalcAmpN();} }