| /trunk/fc.c |
|---|
| 1293,7 → 1293,6 |
| } |
| // Kompass fusionieren |
| if(!KompassSignalSchlecht) ErsatzKompass += (fehler * KompassFusion) / korrektur; |
| DebugOut.Analog[16] = KompassFusion; |
| // MK Gieren |
| if(!NeueKompassRichtungMerken) |
| { |
| /trunk/hottmenu.c |
|---|
| 53,7 → 53,9 |
| "Mixer Error \0", // 19 |
| "Carefree Error \0", // 20 |
| "GPS Fix lost \0", // 21 |
| "Magnet Error \0" // 22 |
| "Magnet Error \0", // 22 |
| "Motor restart \0", // 23 |
| "BL Limitation \0" // 24 |
| }; |
| unsigned char MaxBlTempertaure = 0; |
| /trunk/hottmenu.h |
|---|
| 3,7 → 3,7 |
| #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
| #define MAX_ERR_NUMBER 23 |
| #define MAX_ERR_NUMBER (24+1) |
| extern const char PROGMEM NC_ERROR_TEXT[MAX_ERR_NUMBER][17]; |
| extern unsigned char HottKeyboard,HoTT_RequestedSensor; |
| /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/makefile |
|---|
| 6,10 → 6,10 |
| #------------------------------------------------------------------- |
| VERSION_MAJOR = 0 |
| VERSION_MINOR = 85 |
| VERSION_PATCH = 20 |
| VERSION_PATCH = 21 |
| VERSION_SERIAL_MAJOR = 11 # Serial Protocol |
| VERSION_SERIAL_MINOR = 0 # Serial Protocol |
| NC_SPI_COMPATIBLE = 25 # Navi-Kompatibilität |
| NC_SPI_COMPATIBLE = 26 # Navi-Kompatibilität |
| #------------------------------------------------------------------- |
| # get SVN revision |
| /trunk/spi.c |
|---|
| 162,6 → 162,7 |
| void UpdateSPI_Buffer(void) |
| { |
| signed int tmp; |
| static unsigned char motorindex; |
| ToNaviCtrl.IntegralNick = (int) (IntegralNick / (long)(EE_Parameter.GyroAccFaktor * 4)); |
| ToNaviCtrl.IntegralRoll = (int) (IntegralRoll / (long)(EE_Parameter.GyroAccFaktor * 4)); |
| ToNaviCtrl.GyroCompass = (10 * ErsatzKompass) / GIER_GRAD_FAKTOR; |
| 197,8 → 198,11 |
| ToNaviCtrl.Param.Byte[6] = VarioCharacter; |
| ToNaviCtrl.Param.Byte[7] = Parameter_GlobalConfig; |
| ToNaviCtrl.Param.Byte[8] = Parameter_ExtraConfig; |
| ToNaviCtrl.Param.Byte[9] = motorindex; |
| ToNaviCtrl.Param.Byte[10] = Motor[motorindex].Temperature; |
| ToNaviCtrl.Param.Byte[11] = Motor[motorindex++].Current; |
| motorindex %= 12; |
| break; |
| case SPI_FCCMD_PARAMETER1: |
| ToNaviCtrl.Param.Byte[0] = EE_Parameter.NaviGpsModeControl; // Parameters for the Naviboard |
| ToNaviCtrl.Param.Byte[1] = EE_Parameter.NaviGpsGain; |
| 277,6 → 281,8 |
| ToNaviCtrl.Param.Byte[7] = EE_Parameter.ServoRollComp; |
| ToNaviCtrl.Param.Byte[8] = EE_Parameter.ServoRollMin; |
| ToNaviCtrl.Param.Byte[9] = EE_Parameter.ServoRollMax; |
| ToNaviCtrl.Param.Byte[10] = Capacity.MinOfMaxPWM; |
| ToNaviCtrl.Param.Byte[11] = DebugOut.Analog[28]; // I2C-Error counter |
| break; |
| } |
| /trunk/twimaster.h |
|---|
| 39,7 → 39,7 |
| uint8_t ReadMode; // select data to read |
| // the following bytes must be exactly in that order! |
| uint8_t Current; // in 0.1 A steps, read back from BL |
| uint8_t MaxPWM; // read back from BL is less than 255 if BL is in current limit |
| uint8_t MaxPWM; // read back from BL -> is less than 255 if BL is in current limit, not running (250) or starting (40) |
| int8_t Temperature; // old BL-Ctrl will return a 255 here, the new version the temp. in °C |
| } __attribute__((packed)) MotorData_t; |
| /trunk/version.txt |
|---|
| 503,5 → 503,5 |
| - 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 |
| - BL-Temoeraturen, I2C-Fehler und BL-MaxPWM zum Loggen an NC |