| /trunk/Spektrum.c |
|---|
| 313,15 → 313,18 |
| if (index == 2) index = 4; // Analog channel reassigment (2 <-> 4) for logical numbering (1,2,3,4) |
| else if (index == 4) index = 2; |
| #endif |
| if(abs(signal - PPM_in[index]) < 6) |
| { |
| if(SenderOkay < 200) SenderOkay += 10; |
| else |
| { |
| if(abs(signal - PPM_in[index]) < 6) |
| { |
| if(EE_Parameter.FailsafeChannel == 0 || PPM_in[EE_Parameter.FailsafeChannel] < 100) // forces Failsafe if the receiver doesn't have 'signal loss' on Failsafe |
| { |
| if(SenderOkay < 200) SenderOkay += 10; |
| else |
| { |
| SenderOkay = 200; |
| TIMSK1 &= ~_BV(ICIE1); // disable PPM-Input |
| } |
| } |
| } |
| } |
| } |
| tmp = (3 * (PPM_in[index]) + signal) / 4; |
| if(tmp > signal+1) tmp--; else |
| if(tmp < signal-1) tmp++; |
| /trunk/eeprom.h |
|---|
| 93,6 → 93,8 |
| #define RECEIVER_JETI 4 |
| #define RECEIVER_ACT_DSL 5 |
| #define RECEIVER_HOTT 6 |
| #define RECEIVER_SBUS 7 |
| #define RECEIVER_UNKNOWN 0xFF |
| // defines for lookup ParamSet.ChannelAssignment |
| /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/main.c |
|---|
| 250,7 → 250,6 |
| DebugOut.Status[0] = 0x01 | 0x02; |
| JetiBeep = 0; |
| if(EE_Parameter.ExtraConfig & CFG_NO_RCOFF_BEEPING) DisableRcOffBeeping = 1; |
| while (1) |
| { |
| if(ReceiverUpdateModeActive) while (1) PORTC &= ~(1<<7); // Beeper off |
| /trunk/makefile |
|---|
| 5,11 → 5,11 |
| F_CPU = 20000000 |
| #------------------------------------------------------------------- |
| VERSION_MAJOR = 0 |
| VERSION_MINOR = 86 |
| VERSION_PATCH = 3 |
| VERSION_MINOR = 87 |
| VERSION_PATCH = 2 |
| VERSION_SERIAL_MAJOR = 11 # Serial Protocol |
| VERSION_SERIAL_MINOR = 0 # Serial Protocol |
| NC_SPI_COMPATIBLE = 27 # Navi-Kompatibilität |
| NC_SPI_COMPATIBLE = 29 # Navi-Kompatibilität |
| #------------------------------------------------------------------- |
| # get SVN revision |
| 131,7 → 131,7 |
| SRC = main.c uart.c timer0.c analog.c menu.c eeprom.c |
| SRC += twimaster.c rc.c fc.c GPS.c spi.c led.c Spektrum.c |
| SRC += mymath.c jetimenu.c capacity.c debug.c |
| SRC += hottmenu.c |
| SRC += hottmenu.c sbus.c |
| ########################################################################################################## |
| /trunk/timer0.c |
|---|
| 214,8 → 214,6 |
| } |
| if(Parameter_UserParam1) ServoNickValue = ((ServoNickValue * Parameter_UserParam1) + nick) / (Parameter_UserParam1 + 1); |
| else ServoNickValue = nick; |
| DebugOut.Analog[16] = nick; |
| DebugOut.Analog[17] = ServoNickValue; |
| // limit servo value to its parameter range definition |
| if(ServoNickValue < ((int16_t)EE_Parameter.ServoNickMin * MULTIPLYER) ) |
| { |
| 243,8 → 241,6 |
| } |
| if(Parameter_UserParam2) ServoRollValue = ((ServoRollValue * Parameter_UserParam2) + roll) / (Parameter_UserParam2 + 1); |
| else ServoRollValue = roll; |
| DebugOut.Analog[18] = roll; |
| DebugOut.Analog[19] = ServoRollValue; |
| // limit servo value to its parameter range definition |
| if(ServoRollValue < ((int16_t)EE_Parameter.ServoRollMin * MULTIPLYER) ) |
| { |
| /trunk/version.txt |
|---|
| 533,4 → 533,5 |
| - Höhenwert auf cm kalibriert (zeigte ca. 10% zu viel an) |
| - Neue Error-Codes: "No SD-Card", "Flying range!" und "Error SD-Logging" |
| - Wenn die Motoren aus sind, den Luftduckwert langsam nachführen |
| - das einfache sbus-protokoll implementiert (nur FC2.1) |