Dmitry Kovalev
/
LGstaandart
forkd
Fork of LG2 by
Diff: Command.c
- Revision:
- 224:598aec95415f
- Parent:
- 222:7de7b3bf3a1d
- Child:
- 225:f8fee6c586cc
diff -r 7de7b3bf3a1d -r 598aec95415f Command.c --- a/Command.c Mon Nov 20 13:06:31 2017 +0000 +++ b/Command.c Tue Nov 21 07:31:05 2017 +0000 @@ -721,10 +721,8 @@ case 1: Temp1 =(int)(((float)(Spi.DAC_A)/0.6667)- 0xefff); break; case 0: // Temp2 = (Spi.DAC_A*1.538) - 0xd80f; - Temp1 =(0xffff-Spi.DAC_A); break;//Temp1 =(int)(((float)(Spi.DAC_A)/0.64)- 56000); break; + Temp1 =(int)(((float)(Spi.DAC_A)/0.64)- 56000); break; } - sprintf((Time),"%d %d \r\n",Spi.DAC_A,Temp1); - WriteCon(Time); //Temp1=Gyro.DacIn/*-0x7fff*/; BuffTemp[10] = (Temp1 >> 8) & 0xff;//выход регулятора гвч; 11 --выход регулятора ГВЧ BuffTemp[11] = (Temp1 >> 0) & 0xff; //12 --выход регулятора ГВЧ @@ -732,7 +730,7 @@ if(Gyro.LG_Type) Temp =(int)(tempDeltaRegul); - else Temp =(unsigned int)(0xffff-Spi.ADC5) ; //Temp =(unsigned int)((0x7fff-Spi.ADC5)*0.79)<<1; + else Temp =(unsigned int)((0x7fff-Spi.ADC5)*0.79)<<1; BuffTemp[12]=(Temp >> 8) & 0xff;//// HFO 13 --сигнал ошибки регулятора ГВЧ BuffTemp[13]=(Temp >> 0) & 0xff;//// 14 --сигнал ошибки регулятора ГВЧ @@ -756,7 +754,7 @@ BuffTemp[20] = (Temp >> 8) & 0xff;//регулятор датчика угла поворота //21 старший байт регулятора датчика угла поворота BuffTemp[21] = (Temp >> 0) & 0xff; //22 - Temp1 =(Spi.DAC_B-0x7fff); + Temp1 =(int)(3300+(0x7fff+(Spi.DAC_B*1.083))); BuffTemp[22] = (Temp1 >> 8) & 0xff; //23 Выход регулятора рабочего периметра BuffTemp[23] = (Temp1 >> 0) & 0xff; //24