| 57,6 → 57,21 |
|---|
| #include "mymath.h" |
| #include "isqrt.h" |
| |
| //MartinW; added vars |
| unsigned char loop1, loop2, loop3; |
| unsigned char settingdest = 5; |
| int keynumber=-7; |
| |
| unsigned short CurrentOffset = 0;/// |
| |
| unsigned char pos1, pos2, pos3, pos4=0; |
| unsigned char Motors0,Motors1,Motors2,Motors3,Motors4,Motors5,Motors6,Motors7; |
| unsigned char Motors0max,Motors1max,Motors2max,Motors3max,Motors4max,Motors5max,Motors6max,Motors7max; |
| unsigned short MotorsTmax; |
| unsigned char updatemotors=5; |
| //MartinW; added vars |
| |
| |
| unsigned char h,m,s; |
| unsigned int BaroExpandActive = 0; |
| int MesswertNick,MesswertRoll,MesswertGier,MesswertGierBias, RohMesswertNick,RohMesswertRoll; |
| 187,7 → 202,7 |
|---|
| DebugOut.Analog[15] = Motor[3].SetPoint; |
| DebugOut.Analog[20] = ServoNickValue; |
| DebugOut.Analog[22] = Capacity.ActualCurrent; |
| DebugOut.Analog[23] = Capacity.UsedCapacity; |
| DebugOut.Analog[23] = Capacity.RemainCapacity; |
| // DebugOut.Analog[22] = FromNaviCtrl_Value.GpsZ; |
| // DebugOut.Analog[29] = FromNaviCtrl_Value.SerialDataOkay; |
| DebugOut.Analog[29] = Capacity.MinOfMaxPWM; |
| 368,7 → 383,7 |
|---|
| static signed long tmpl,tmpl2,tmpl3,tmpl4; |
| static signed int oldNick, oldRoll, d2Roll, d2Nick; |
| signed long winkel_nick, winkel_roll; |
| unsigned char i; |
| // unsigned char i; |
| MesswertGier = (signed int) AdNeutralGier - AdWertGier; |
| MesswertNick = (signed int) AdWertNickFilter / 8; |
| MesswertRoll = (signed int) AdWertRollFilter / 8; |