Dmitry Kovalev
/
LGstaandart
forkd
Fork of LG2 by
Diff: vibro.h
- Revision:
- 193:a0fe8bfc97e4
- Parent:
- 192:d32c8cf7bcd9
- Child:
- 195:bcc769f5292b
--- a/vibro.h Thu Sep 01 08:23:30 2016 +0000 +++ b/vibro.h Thu Sep 15 11:09:00 2016 +0000 @@ -20,11 +20,12 @@ extern int tempAMP; typedef struct _Gyro { - + int qei; + int QEIznak1,QEIznak2; unsigned int StrayHZ; //помеха unsigned int StrayHZ_flag; unsigned int LogHZ; - + int flag; unsigned int StrayPLC_Pls; //помеха + int StrayPLC_Mns; //помеха - @@ -44,7 +45,7 @@ // unsigned int Rate1_Flag; unsigned int Rate1_Event; // unsigned int Rate2_Flag; - unsigned int Rate2_Event; + unsigned int Reper_Event; #define Rate1 0x01 #define Rate2 0x02 #define PRate1 0x81 @@ -53,12 +54,23 @@ unsigned int DeltaEXT_Event; unsigned int Delta500_Event; - + unsigned int Delta_Bins_Event500; + unsigned int B_Delta_EventEXT; + unsigned int B_Delta_Event500; unsigned int Event_500Hz; #define Delta_500 0x10 #define PDelta_500 0x90 #define Delta_EXT 0x0 #define PDelta_EXT 0x80 + #define Delta_Bins 0x0 + #define PDelta_Bins 0x1 + + + #define PB_Delta_EXT 0x9 + #define B_Delta_EXT 0x1 + #define PB_Delta_INT 0x8 + #define B_Delta_INT 0x0 + unsigned int RgConA; unsigned int RgConB; @@ -124,7 +136,7 @@ //Контур регулеровки накачки (если нужно, например ГВЧ) - + int tempdelta; @@ -132,10 +144,10 @@ unsigned int SOC_Out; unsigned int My_Addres; unsigned int DropDelayGLD;//задержка для мультидропа (дискрета 100кГц) - #define DropDelayGLD_0 45 - #define DropDelayGLD_1 45 - #define DropDelayGLD_2 60 - #define DropDelayGLD_3 75 + #define DropDelayGLD_0 50 + #define DropDelayGLD_1 50 + #define DropDelayGLD_2 65 + #define DropDelayGLD_3 80 unsigned int GLD_Serial; unsigned int CRC; unsigned int Firmware_Version; @@ -146,7 +158,7 @@ int CuruAngle ; -// int OldCuruAngle ; + int OldCuruAngle ; // int Num; int Cnt_Dif;