| /trunk/eeprom.c |
|---|
| 186,8 → 186,8 |
| EE_Parameter.J17Bitmask = 243; |
| EE_Parameter.WARN_J16_Bitmask = 0xAA; |
| EE_Parameter.WARN_J17_Bitmask = 0xAA; |
| EE_Parameter.J16Timing = 20; |
| EE_Parameter.J17Timing = 20; |
| EE_Parameter.J16Timing = 40; |
| EE_Parameter.J17Timing = 40; |
| EE_Parameter.LoopGasLimit = 50; |
| EE_Parameter.LoopThreshold = 90; // Wert: 0-247 Schwelle für Stickausschlag |
| /trunk/fc.c |
|---|
| 590,12 → 590,12 |
| CHK_POTI_MM(Parameter_J16Timing,EE_Parameter.J16Timing,5,255); |
| CHK_POTI_MM(Parameter_J17Timing,EE_Parameter.J17Timing,5,255); |
| if(EE_Parameter.Servo3 == 247) { if(PORTC & (1<<PORTC2)) Parameter_Servo3 = 130; else Parameter_Servo3 = 80;} |
| else if(EE_Parameter.Servo3 == 246) { if(PORTC & (1<<PORTC3)) Parameter_Servo3 = 130; else Parameter_Servo3 = 80;} |
| if(EE_Parameter.Servo3 == 247) { if(PORTC & (1<<PORTC2)) Parameter_Servo3 = 140; else Parameter_Servo3 = 70;} // Out1 (J16) |
| else if(EE_Parameter.Servo3 == 246) { if(PORTC & (1<<PORTC3)) Parameter_Servo3 = 140; else Parameter_Servo3 = 70;} |
| else CHK_POTI(Parameter_Servo3,EE_Parameter.Servo3); |
| if(EE_Parameter.Servo4 == 247) { if(PORTC & (1<<PORTC2)) Parameter_Servo4 = 130; else Parameter_Servo4 = 80;} |
| else if(EE_Parameter.Servo4 == 246) { if(PORTC & (1<<PORTC3)) Parameter_Servo4 = 130; else Parameter_Servo4 = 80;} |
| if(EE_Parameter.Servo4 == 247) { if(PORTC & (1<<PORTC2)) Parameter_Servo4 = 140; else Parameter_Servo4 = 70;} |
| else if(EE_Parameter.Servo4 == 246) { if(PORTC & (1<<PORTC3)) Parameter_Servo4 = 140; else Parameter_Servo4 = 70;} // Out2 (J17) |
| else CHK_POTI(Parameter_Servo4,EE_Parameter.Servo4); |
| CHK_POTI(Parameter_HoehenSchalter,EE_Parameter.MaxHoehe); |
| /trunk/fc.h |
|---|
| 20,10 → 20,12 |
| #define FC_STATUS_VARIO_TRIM_UP 0x40 |
| #define FC_STATUS_VARIO_TRIM_DOWN 0x80 |
| // FC_StatusFlags2 |
| // FC_StatusFlags2 |
| #define FC_STATUS2_CAREFREE 0x01 |
| #define FC_STATUS2_ALTITUDE_CONTROL 0x02 |
| #define FC_STATUS2_RC_FAILSAVE_ACTIVE 0x04 |
| #define FC_STATUS2_OUT1_ACTIVE 0x08 |
| #define FC_STATUS2_OUT2_ACTIVE 0x10 |
| //NC_To_FC_Flags |
| #define NC_TO_FC_FLYING_RANGE 0x01 |
| /trunk/led.c |
|---|
| 93,6 → 93,8 |
| if(J17Mask == 1) J17Mask = 128; else J17Mask /= 2; |
| if(J17Mask & EE_Parameter.WARN_J17_Bitmask) J17_ON; else J17_OFF; |
| } |
| if(PORTC & (1<<PORTC2)) FC_StatusFlags2 |= FC_STATUS2_OUT1_ACTIVE; else FC_StatusFlags2 &= ~FC_STATUS2_OUT1_ACTIVE; // Out1 (J16) |
| if(PORTC & (1<<PORTC3)) FC_StatusFlags2 |= FC_STATUS2_OUT2_ACTIVE; else FC_StatusFlags2 &= ~FC_STATUS2_OUT2_ACTIVE; // Out2 (J17) |
| } |
| } |
| /trunk/libfc1284.a |
|---|
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| /trunk/libfc644.a |
|---|
| Cannot display: file marked as a binary type. |
| svn:mime-type = application/octet-stream |
| /trunk/timer0.c |
|---|
| 215,12 → 215,12 |
| if(EE_Parameter.ServoFilterNick) ServoNickValue = ((ServoNickValue * EE_Parameter.ServoFilterNick) + nick) / (EE_Parameter.ServoFilterNick + 1); |
| else ServoNickValue = nick; |
| // limit servo value to its parameter range definition |
| if(ServoNickValue < ((int16_t)EE_Parameter.ServoNickMin * MULTIPLYER) ) |
| if(ServoNickValue < ((int16_t)EE_Parameter.ServoNickMin * MULTIPLYER)) |
| { |
| ServoNickValue = (int16_t)EE_Parameter.ServoNickMin * MULTIPLYER; |
| } |
| else |
| if(ServoNickValue > ((int16_t)EE_Parameter.ServoNickMax * MULTIPLYER) ) |
| if(ServoNickValue > ((int16_t)EE_Parameter.ServoNickMax * MULTIPLYER)) |
| { |
| ServoNickValue = (int16_t)EE_Parameter.ServoNickMax * MULTIPLYER; |
| } |
| 242,12 → 242,12 |
| if(EE_Parameter.ServoFilterRoll) ServoRollValue = ((ServoRollValue * EE_Parameter.ServoFilterRoll) + roll) / (EE_Parameter.ServoFilterRoll + 1); |
| else ServoRollValue = roll; |
| // limit servo value to its parameter range definition |
| if(ServoRollValue < ((int16_t)EE_Parameter.ServoRollMin * MULTIPLYER) ) |
| if(ServoRollValue < ((int16_t)EE_Parameter.ServoRollMin * MULTIPLYER)) |
| { |
| ServoRollValue = (int16_t)EE_Parameter.ServoRollMin * MULTIPLYER; |
| } |
| else |
| if(ServoRollValue > ((int16_t)EE_Parameter.ServoRollMax * MULTIPLYER) ) |
| if(ServoRollValue > ((int16_t)EE_Parameter.ServoRollMax * MULTIPLYER)) |
| { |
| ServoRollValue = (int16_t)EE_Parameter.ServoRollMax * MULTIPLYER; |
| } |
| /trunk/version.txt |
|---|
| 539,6 → 539,6 |
| - Option: Failsafe-Sinkflug xx% Schwebegas |
| - "Max Altitude" als Parameter auf der SD-Karte im Navi -> Beeinflusst "Parameter_MaximumAltitude" (das niedrigste gilt) und es gibt eine Fehlermeldung "ERR:Max Altitude" |
| - SPI-Protokoll: BL.Status eingefügt und Parameter.GlobalConfig & Parameter.ExtraConfig verschoben |
| - Senden der Out1 & Out2-Zustände an die NC, damit es in der OSD-Darstellung angezeigt werden kann |