Rev 1118 | Rev 1124 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1118 | Rev 1122 | ||
---|---|---|---|
Line 53... | Line 53... | ||
53 | // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
53 | // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
Line 54... | Line 54... | ||
54 | 54 | ||
55 | #include "main.h" |
55 | #include "main.h" |
56 | #include "parameter.h" |
56 | #include "parameter.h" |
- | 57 | #include "pitch.h" |
|
57 | #include "pitch.h" |
58 | #include "altcon.h" |
Line 58... | Line 59... | ||
58 | #include "eeprom.c" |
59 | #include "eeprom.c" |
59 | 60 | ||
60 | unsigned char h,m,s; |
61 | unsigned char h,m,s; |
Line 728... | Line 729... | ||
728 | StickRoll = stick_roll - GPS_Roll; |
729 | StickRoll = stick_roll - GPS_Roll; |
Line 729... | Line 730... | ||
729 | 730 | ||
Line 730... | Line 731... | ||
730 | StickGier = -PPM_in[EE_Parameter.Kanalbelegung[K_GIER]]; |
731 | StickGier = -PPM_in[EE_Parameter.Kanalbelegung[K_GIER]]; |
731 | - | ||
732 | // Gaswert übernehmen |
732 | |
733 | if( pitchNeutral() ) { |
- | |
734 | StickGas = pitch(); |
- | |
735 | } else { |
- | |
Line 736... | Line 733... | ||
736 | StickGas = PPM_in[EE_Parameter.Kanalbelegung[K_GAS]] + 120; |
733 | // Gaswert übernehmen |
737 | } |
734 | StickGas = pitch_value(); |
Line 738... | Line 735... | ||
738 | 735 | ||
Line 1230... | Line 1227... | ||
1230 | 1227 | ||
1231 | // Zur besseren Auflösung hochskalieren |
1228 | // Zur besseren Auflösung hochskalieren |
Line 1232... | Line 1229... | ||
1232 | GasMischanteil *= STICK_GAIN; |
1229 | GasMischanteil *= STICK_GAIN; |
1233 | 1230 | ||
Line 1234... | Line 1231... | ||
1234 | // Fehlerwert der Höhenregelung einmischen |
1231 | // Fehlerwert der Höhenregelung einmischen |
1235 | GasMischanteil -= altitudeController(); |
1232 | GasMischanteil -= altcon_error(); |
1236 | 1233 |