| /trunk/fc.c |
|---|
| 635,7 → 635,7 |
| carefree_old = CareFree; |
| } else carefree_old--; |
| } |
| if(FromNaviCtrl.CompassValue < 0 && CareFree) VersionInfo.HardwareError[0] |= FC_ERROR0_CAREFREE; else VersionInfo.HardwareError[0] &= ~FC_ERROR0_CAREFREE; |
| if(FromNaviCtrl.CompassValue < 0 && CareFree) VersionInfo.HardwareError[0] |= FC_ERROR0_CAREFREE; //else VersionInfo.HardwareError[0] &= ~FC_ERROR0_CAREFREE; |
| } |
| else |
| { |
| /trunk/hottmenu.c |
|---|
| 44,7 → 44,8 |
| "I2C FC->BL-Ctrl \0", // 17 |
| "Bl Missing \0", // 18 |
| "Mixer Error \0", // 19 |
| "Carefree Error \0" // 20 |
| "Carefree Error \0", // 20 |
| "GPS Fix lost \0" // 21 |
| }; |
| //--------------------------------------------------------------- |
| 183,7 → 184,7 |
| { |
| HoTT_printfxy(0,7,"ERR: "); _printf_P(&LIBFC_HoTT_Putchar, NC_ERROR_TEXT[NC_ErrorCode] , 0);}; |
| } |
| else HoTT_printfxy(0,7," www.MikroKopter.de "); |
| else HoTT_printfxy(0,7," www.MikroKopter.de "); |
| break; |
| case 8: ASCIIPacket.WarnBeep = HoTT_Waring(); |
| // ASCIIPacket.WarnBeep = Parameter_UserParam1; |
| /trunk/hottmenu.h |
|---|
| 3,7 → 3,7 |
| #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
| #define MAX_ERR_NUMBER 21 |
| #define MAX_ERR_NUMBER 22 |
| extern const char PROGMEM NC_ERROR_TEXT[MAX_ERR_NUMBER][17]; |
| extern unsigned char HottKeyboard,HoTT_RequestedSensor; |
| 101,12 → 101,13 |
| typedef struct |
| { |
| unsigned char StartByte; // 0x7B |
| unsigned char Packet_ID; // 0x00 |
| unsigned char Packet_ID; // |
| unsigned char WarnBeep; // Anzahl der Töne 0..36 |
| char Text[8*21]; |
| unsigned char EndByte; // 0x7D |
| } ASCIIPacket_t; |
| extern GPSPacket_t GPSPacket; |
| extern VarioPacket_t VarioPacket; |
| extern ASCIIPacket_t ASCIIPacket; |
| /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 |
|---|
| 265,7 → 265,7 |
| else MotorRegler(); |
| SendMotorData(); |
| ROT_OFF; |
| if(SenderOkay) { SenderOkay--; VersionInfo.HardwareError[1] &= ~FC_ERROR1_PPM; } |
| if(SenderOkay) { SenderOkay--; /*VersionInfo.HardwareError[1] &= ~FC_ERROR1_PPM;*/ } |
| else |
| { |
| TIMSK1 |= _BV(ICIE1); // enable PPM-Input |
| 295,11 → 295,11 |
| else |
| { |
| ROT_OFF; |
| if(!beeptime) |
| /* if(!beeptime) |
| { |
| VersionInfo.HardwareError[1] &= ~FC_ERROR1_I2C; |
| } |
| } |
| */ } |
| LIBFC_Polling(); |
| if(!UpdateMotor) |
| 323,11 → 323,11 |
| { |
| if(!beeptime) |
| { |
| VersionInfo.HardwareError[1] &= ~FC_ERROR1_BL_MISSING; |
| // VersionInfo.HardwareError[1] &= ~FC_ERROR1_BL_MISSING; |
| if(I2CTimeout > 6) DebugOut.Status[1] &= ~0x02; // BL-Error-Status |
| } |
| } |
| if(I2CTimeout > 6) if(!beeptime) VersionInfo.HardwareError[1] &= ~FC_ERROR1_I2C; |
| // if(I2CTimeout > 6) if(!beeptime) VersionInfo.HardwareError[1] &= ~FC_ERROR1_I2C; |
| if(SenderOkay && DisableRcOffBeeping) { DisableRcOffBeeping = 0; beeptime = 5000;}; |
| if(PcZugriff) PcZugriff--; |
| else |
| /trunk/makefile |
|---|
| 6,7 → 6,7 |
| #------------------------------------------------------------------- |
| VERSION_MAJOR = 0 |
| VERSION_MINOR = 85 |
| VERSION_PATCH = 11 |
| VERSION_PATCH = 12 |
| VERSION_SERIAL_MAJOR = 11 # Serial Protocol |
| VERSION_SERIAL_MINOR = 0 # Serial Protocol |
| NC_SPI_COMPATIBLE = 22 # Navi-Kompatibilität |
| /trunk/spi.c |
|---|
| 259,6 → 259,8 |
| ToNaviCtrl.Param.Byte[4] = PlatinenVersion; |
| ToNaviCtrl.Param.Byte[5] = VersionInfo.HardwareError[0]; |
| ToNaviCtrl.Param.Byte[6] = VersionInfo.HardwareError[1]; |
| VersionInfo.HardwareError[0] = 0; |
| VersionInfo.HardwareError[1] &= 0xff - FC_ERROR1_MIXER; |
| ToNaviCtrl.Param.Byte[7] = VersionInfo.HardwareError[2]; |
| ToNaviCtrl.Param.Byte[8] = VersionInfo.HardwareError[3]; |
| ToNaviCtrl.Param.Byte[9] = VersionInfo.HardwareError[4]; |
| /trunk/version.txt |
|---|
| 484,8 → 484,9 |
| - virtuelles LCD-Menü: |
| - "ExternControl" aus Platzgründen aus dem virtuellen LCD-Menü entfernt. |
| - keine BL-Temperaturen und I2C-Fehler anzeigen, wenn die BL-Regler nicht verwendet werden |
| - nach dem Gieren nicht den Erstatzkompass auf den Kompasswert stellen, die Umschaltung war zu hart |
| - 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 |
| - Fehlermeldungen stehen jetzt mind. so lange an, bis sie an die Nc gesendet wurden |
| - neue Fehlermeldung: "GPS Fix lost" |