Rev 2367 | Rev 2373 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 2367 | Rev 2369 | ||
---|---|---|---|
Line 219... | Line 219... | ||
219 | DebugOut.Analog[30] = GPS_Nick; |
219 | DebugOut.Analog[30] = GPS_Nick; |
220 | DebugOut.Analog[31] = GPS_Roll; |
220 | DebugOut.Analog[31] = GPS_Roll; |
221 | if(VersionInfo.HardwareError[0] || VersionInfo.HardwareError[1]) DebugOut.Status[1] |= 1; else DebugOut.Status[1] &= 0xfe; |
221 | if(VersionInfo.HardwareError[0] || VersionInfo.HardwareError[1]) DebugOut.Status[1] |= 1; else DebugOut.Status[1] &= 0xfe; |
222 | //DebugOut.Analog[16] = Variance; |
222 | //DebugOut.Analog[16] = Variance; |
223 | //DebugOut.Analog[17] = VarioMeter; |
223 | //DebugOut.Analog[17] = VarioMeter; |
- | 224 | //DebugOut.Analog[16] = GasIsZeroCnt; |
|
224 | //DebugOut.Analog[18] = HoehenWertF; |
225 | //DebugOut.Analog[18] = HoehenWertF; |
225 | //DebugOut.Analog[25] = Parameter_Hoehe_P; |
226 | //DebugOut.Analog[25] = Parameter_Hoehe_P; |
226 | //DebugOut.Analog[26] = Parameter_Luftdruck_D; |
227 | //DebugOut.Analog[26] = Parameter_Luftdruck_D; |
227 | } |
228 | } |
Line 872... | Line 873... | ||
872 | #endif |
873 | #endif |
873 | if(HoehenWertF > 150 || HoehenWert < -350 || !(Parameter_GlobalConfig & CFG_HOEHENREGELUNG)) |
874 | if(HoehenWertF > 150 || HoehenWert < -350 || !(Parameter_GlobalConfig & CFG_HOEHENREGELUNG)) |
874 | { |
875 | { |
875 | #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
876 | #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
876 | trigger = 1000; |
877 | trigger = 1000; |
877 | if(FC_StatusFlags2 & FC_STATUS2_AUTO_STARTING) { FromNC_AltitudeSpeed = 0; SollHoehe = 300;/*HoehenWertF + 100;*/} |
878 | if(FC_StatusFlags2 & FC_STATUS2_AUTO_STARTING) { FromNC_AltitudeSpeed = 0; SollHoehe = 300;/*HoehenWertF + 100;*/} |
878 | else SpeakHoTT = SPEAK_RISING; |
879 | else SpeakHoTT = SPEAK_RISING; |
879 | #endif |
880 | #endif |
880 | FC_StatusFlags2 &= ~(FC_STATUS2_WAIT_FOR_TAKEOFF | FC_STATUS2_AUTO_STARTING | FC_STATUS2_AUTO_LANDING); |
881 | FC_StatusFlags2 &= ~(FC_STATUS2_WAIT_FOR_TAKEOFF | FC_STATUS2_AUTO_STARTING | FC_STATUS2_AUTO_LANDING); |
881 | } |
882 | } |
882 | SummeNick = 0; |
883 | SummeNick = 0; |
883 | SummeRoll = 0; |
884 | SummeRoll = 0; |
Line 1079... | Line 1080... | ||
1079 | else |
1080 | else |
1080 | if(delay_ausschalten == 100) beeptime = 3500; |
1081 | if(delay_ausschalten == 100) beeptime = 3500; |
1081 | } |
1082 | } |
1082 | else delay_ausschalten = 0; |
1083 | else delay_ausschalten = 0; |
1083 | } |
1084 | } |
1084 | if(GasIsZeroCnt < 1000) GasIsZeroCnt++; |
1085 | if(GasIsZeroCnt < 1000) |
- | 1086 | { |
|
- | 1087 | if(VarioMeter > -150) GasIsZeroCnt++; |
|
- | 1088 | else if(GasIsZeroCnt) GasIsZeroCnt--; |
|
- | 1089 | } |
|
1085 | } |
1090 | } |
1086 | else // gas not at minimum |
1091 | else // gas not at minimum |
1087 | { |
1092 | { |
1088 | move_safety_switch = 0; |
1093 | move_safety_switch = 0; |
1089 | GasIsZeroCnt = 0; |
1094 | GasIsZeroCnt = 0; |
Line 1136... | Line 1141... | ||
1136 | 1141 | ||
1137 | StickGier = -PPM_in[EE_Parameter.Kanalbelegung[K_GIER]]; |
1142 | StickGier = -PPM_in[EE_Parameter.Kanalbelegung[K_GIER]]; |
1138 | if(StickGier > 4) StickGier -= 4; else |
1143 | if(StickGier > 4) StickGier -= 4; else |
Line -... | Line 1144... | ||
- | 1144 | if(StickGier < -4) StickGier += 4; else StickGier = 0; |
|
- | 1145 | ||
- | 1146 | if(GasIsZeroCnt > 512) // About to switch - off |
|
- | 1147 | { |
|
- | 1148 | StickNick = StickNick/8; |
|
- | 1149 | StickRoll = StickRoll/8; |
|
- | 1150 | SummeNick = 0; |
|
- | 1151 | SummeRoll = 0; |
|
1139 | if(StickGier < -4) StickGier += 4; else StickGier = 0; |
1152 | } |
1140 | 1153 | else |
|
1141 | if(GPS_Aid_StickMultiplikator) // in that case the GPS controls stronger |
1154 | if(GPS_Aid_StickMultiplikator) // in that case the GPS controls stronger |
1142 | { |
1155 | { |
1143 | StickNick = (GPS_Aid_StickMultiplikator * (StickNick / 8)) / 16; |
1156 | StickNick = (GPS_Aid_StickMultiplikator * (StickNick / 8)) / 16; |
1144 | StickRoll = (GPS_Aid_StickMultiplikator * (StickRoll / 8)) / 16; |
- | |
1145 | } |
1157 | StickRoll = (GPS_Aid_StickMultiplikator * (StickRoll / 8)) / 16; |
1146 | 1158 | } |
|
1147 | StickNick -= GPS_Nick; |
1159 | StickNick -= GPS_Nick; |
Line 1148... | Line 1160... | ||
1148 | StickRoll -= GPS_Roll; |
1160 | StickRoll -= GPS_Roll; |