| /trunk/GPS.c |
|---|
| 8,7 → 8,7 |
| signed int GPS_Nick = 0; |
| signed int GPS_Roll = 0; |
| unsigned char GPS_AidMode = 0; |
| unsigned char GPS_Aid_StickMultiplikator = 0; // 64 = 100% |
| /trunk/eeprom.h |
|---|
| 4,10 → 4,9 |
| #include <inttypes.h> |
| #include "twimaster.h" |
| #define EEPARAM_REVISION 87 // is count up, if paramater stucture has changed (compatibility) |
| #define EEPARAM_REVISION 88 // is count up, if paramater stucture has changed (compatibility) |
| #define EEMIXER_REVISION 1 // is count up, if mixer stucture has changed (compatibility) |
| #define EEPROM_ADR_PARAM_BEGIN 0 |
| #define PID_EE_REVISION 1 // byte |
| #define PID_ACTIVE_SET 2 // byte |
| 62,13 → 61,14 |
| #define CFG_MOTOR_BLINK2 0x80 |
| // ExtraConfig |
| #define CFG2_HEIGHT_LIMIT 0x01 |
| #define CFG2_VARIO_BEEP 0x02 |
| #define CFG_SENSITIVE_RC 0x04 |
| #define CFG_3_3V_REFERENCE 0x08 |
| #define CFG_NO_RCOFF_BEEPING 0x10 |
| #define CFG_GPS_AID 0x20 |
| #define CFG_LEARNABLE_CAREFREE 0x40 |
| #define CFG2_HEIGHT_LIMIT 0x01 |
| #define CFG2_VARIO_BEEP 0x02 |
| #define CFG_SENSITIVE_RC 0x04 |
| #define CFG_3_3V_REFERENCE 0x08 |
| #define CFG_NO_RCOFF_BEEPING 0x10 |
| #define CFG_GPS_AID 0x20 |
| #define CFG_LEARNABLE_CAREFREE 0x40 |
| #define CFG_IGNORE_MAG_ERR_AT_STARTUP 0x80 |
| // bit mask for ParamSet.Config0 |
| #define CFG0_AIRPRESS_SENSOR 0x01 |
| 87,7 → 87,7 |
| #define RECEIVER_SPEKTRUM_LOW_RES 3 |
| #define RECEIVER_JETI 4 |
| #define RECEIVER_ACT_DSL 5 |
| #define RECEIVER_HOTT 6 |
| #define RECEIVER_HOTT 6 |
| #define RECEIVER_UNKNOWN 0xFF |
| // defines for lookup ParamSet.ChannelAssignment |
| /trunk/fc.c |
|---|
| 856,7 → 856,6 |
| unsigned char stick_p; |
| ParameterZuordnung(); |
| stick_p = EE_Parameter.Stick_P; |
| stick_nick = (stick_nick * 3 + PPM_in[EE_Parameter.Kanalbelegung[K_NICK]] * stick_p) / 4; |
| stick_nick += PPM_diff[EE_Parameter.Kanalbelegung[K_NICK]] * EE_Parameter.Stick_D; |
| stick_roll = (stick_roll * 3 + PPM_in[EE_Parameter.Kanalbelegung[K_ROLL]] * stick_p) / 4; |
| 885,7 → 884,11 |
| if(StickGier > 4) StickGier -= 4; else |
| if(StickGier < -4) StickGier += 4; else StickGier = 0; |
| if(GPS_AidMode) { StickNick /= 2; StickRoll /= 2; };// in that case the GPS controls stronger |
| if(GPS_Aid_StickMultiplikator) // in that case the GPS controls stronger |
| { |
| StickNick = (GPS_Aid_StickMultiplikator * (StickNick / 8)) / 16; |
| StickRoll = (GPS_Aid_StickMultiplikator * (StickRoll / 8)) / 16; |
| } |
| StickNick -= GPS_Nick; |
| StickRoll -= GPS_Roll; |
| /trunk/gps.h |
|---|
| 1,3 → 1,3 |
| extern signed int GPS_Nick; |
| extern signed int GPS_Roll; |
| extern unsigned char GPS_AidMode; |
| extern unsigned char GPS_Aid_StickMultiplikator; |
| /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 |
|---|
| 254,7 → 254,7 |
| while (1) |
| { |
| if (ReceiverUpdateModeActive) while (1); |
| if(ReceiverUpdateModeActive) while (1) PORTC &= ~(1<<7); // Beeper off |
| //GRN_ON; |
| if(UpdateMotor && AdReady) // ReglerIntervall |
| 359,7 → 359,7 |
| } |
| GPS_Nick = 0; |
| GPS_Roll = 0; |
| GPS_AidMode = 0; |
| GPS_Aid_StickMultiplikator = 0; |
| GPSInfo.Flags = 0; |
| FromNaviCtrl.AccErrorN = 0; |
| FromNaviCtrl.AccErrorR = 0; |
| /trunk/makefile |
|---|
| 6,10 → 6,10 |
| #------------------------------------------------------------------- |
| VERSION_MAJOR = 0 |
| VERSION_MINOR = 85 |
| VERSION_PATCH = 19 |
| VERSION_PATCH = 20 |
| VERSION_SERIAL_MAJOR = 11 # Serial Protocol |
| VERSION_SERIAL_MINOR = 0 # Serial Protocol |
| NC_SPI_COMPATIBLE = 24 # Navi-Kompatibilität |
| NC_SPI_COMPATIBLE = 25 # Navi-Kompatibilität |
| #------------------------------------------------------------------- |
| # get SVN revision |
| /trunk/spi.c |
|---|
| 299,7 → 299,6 |
| // KompassRichtung = ((540 + KompassValue - KompassSollWert) % 360) - 180; |
| if(FromNaviCtrl.BeepTime > beeptime /*&& !WinkelOut.CalcState*/) beeptime = FromNaviCtrl.BeepTime; |
| #define FLAG_GPS_AID 0x01 |
| switch (FromNaviCtrl.Command) |
| { |
| case SPI_NCCMD_KALMAN: |
| 310,7 → 309,7 |
| FromNaviCtrl_Value.GpsZ = FromNaviCtrl.Param.Byte[4]; |
| FromNC_Rotate_C = FromNaviCtrl.Param.Byte[5]; |
| FromNC_Rotate_S = FromNaviCtrl.Param.Byte[6]; |
| if(FromNaviCtrl.Param.Byte[7] & FLAG_GPS_AID) GPS_AidMode = 1; else GPS_AidMode = 0; |
| GPS_Aid_StickMultiplikator = FromNaviCtrl.Param.Byte[7]; |
| if(CareFree && FromNaviCtrl.Param.sInt[4] >= 0) |
| { |
| KompassSollWert = FromNaviCtrl.Param.sInt[4]; // bei Carefree kann NC den Kompass-Sollwinkel vorgeben |
| /trunk/version.txt |
|---|
| 486,7 → 486,7 |
| - keine BL-Temperaturen und I2C-Fehler anzeigen, wenn die BL-Regler nicht verwendet werden |
| - nach dem Gieren nicht den Ersatzkompass auf den Kompasswert stellen, die Umschaltung war zu hart |
| - ACC Correction eingeführt |
| - I2C Fehler kamen nicht bei der NC an, weil die zu kurz waren |
| - I2C Fehler kamen nicht bei der NC an, weil die zu kurz waren - jetzt meldet die NC die Fehler mind. 5 Sekunden |
| - Fehlermeldungen stehen jetzt mind. so lange an, bis sie an die Nc gesendet wurden |
| - neue Fehlermeldung: "GPS Fix lost" |
| - LED: Schaltfläche "nur bei Motor start" bei beiden getrennt |
| 502,5 → 502,6 |
| - KompassFusion wird jetzt getrennt von der NC berechnet |
| - neuer Fehler: 22 -> Magnet error |
| - Sport-Setting entfernt und ein "Easy-Setting" eingeführt (leicht reduzierte Sticks); "Beginner" ist jetzt "Normal" |
| - MagnetError kann man in der Startphase ignorieren |