| /trunk/hottmenu.c |
|---|
| 21,6 → 21,31 |
| #define HoTT_OBEN 125 |
| #define HoTT_UNTEN 126 |
| const char PROGMEM NC_ERROR_TEXT[MAX_ERR_NUMBER][17] = |
| { |
| //0123456789123456 |
| "No Error \0", // 0 |
| "Not compatible \0", // 1 |
| "MK3Mag not compa\0", // 2 |
| "No FC communicat\0", // 3 |
| "MK3Mag communica\0", // 4 |
| "GPS communicatio\0", // 5 |
| "compass value \0", // 6 |
| "RC Signal lost \0", // 7 |
| "FC spi rx error \0", // 8 |
| "No NC communicat\0", // 9 |
| "FC Nick Gyro \0", // 10 |
| "FC Roll Gyro \0", // 11 |
| "FC Yaw Gyro \0", // 12 |
| "FC Nick ACC \0", // 13 |
| "FC Roll ACC \0", // 14 |
| "FC Z-ACC \0", // 15 |
| "Pressure sensor \0", // 16 |
| "FC I2C \0", // 17 |
| "Bl Missing \0", // 18 |
| "Mixer Error \0", // 19 |
| "Carefree Error \0" // 20 |
| }; |
| //--------------------------------------------------------------- |
| void Hott_ClearLine(unsigned char line) |
| 32,7 → 57,7 |
| unsigned char HoTT_Waring(void) |
| { |
| if(FC_StatusFlags & FC_STATUS_LOWBAT) return(VOICE_MINIMALE_EINGANSSPANNUNG); |
| if(MotorenEin && NC_ErrorCode) return(VOICE_BEEP); |
| if(/*MotorenEin &&*/ NC_ErrorCode) return(VOICE_BEEP); |
| return(0); |
| } |
| 133,7 → 158,7 |
| } |
| else |
| { //012345678901234567890 |
| HoTT_printfxy(0,4,"No NaviCtrl! "); |
| HoTT_printfxy(0,4," No NaviCtrl "); |
| } |
| break; |
| case 5: |
| 148,7 → 173,17 |
| if(RequiredMotors > 6) HoTT_printfxy(0,6,"%3i %3i %3i %3i%cC", Motor[4].Temperature, Motor[5].Temperature, Motor[6].Temperature, Motor[7].Temperature,HoTT_GRAD); |
| //HoTT_printfxy(15,6,"%KEY:%02x",HottKeyboard); |
| break; |
| case 7: if(NC_ErrorCode) {Hott_ClearLine(7); HoTT_printfxy_BLINK(3,7,"ERROR: %2d ",NC_ErrorCode);} |
| case 7: if(NC_ErrorCode) |
| { |
| if(HoTTBlink && NC_ErrorCode < MAX_ERR_NUMBER) |
| { |
| Hott_ClearLine(7); |
| HoTT_printfxy_INV(0,7,"ERR: %2d !",NC_ErrorCode); |
| } |
| else |
| { |
| HoTT_printfxy(0,7,"ERR: "); _printf_P(&LIBFC_HoTT_Putchar, NC_ERROR_TEXT[NC_ErrorCode] , 0);}; |
| } |
| else HoTT_printfxy(0,7," www.MikroKopter.de "); |
| break; |
| case 8: ASCIIPacket.WarnBeep = HoTT_Waring(); |
| /trunk/hottmenu.h |
|---|
| 3,6 → 3,9 |
| #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
| #define MAX_ERR_NUMBER 21 |
| extern const char PROGMEM NC_ERROR_TEXT[MAX_ERR_NUMBER][17]; |
| extern unsigned char HottKeyboard,HoTT_RequestedSensor; |
| extern unsigned char HottUpdate(unsigned char key); |
| /trunk/jetimenu.c |
|---|
| 4,6 → 4,7 |
| #include "main.h" |
| #include "spi.h" |
| #include "capacity.h" |
| #include "hottmenu.h" |
| #define JETIBOX_KEY_RIGHT 0x1F |
| #define JETIBOX_KEY_UP 0x2F |
| 29,7 → 30,28 |
| { |
| JetiBox_printfxy(6,0,"Status"); |
| } |
| if(NC_ErrorCode) JetiBox_printfxy(6,0,"ERROR: %2d ",NC_ErrorCode); |
| #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
| if(NC_ErrorCode) |
| { |
| static unsigned int timer; |
| static char toggle = 1; |
| if(CheckDelay(timer)) { if(toggle) toggle = 0; else toggle = 1; timer = SetDelay(1500);}; |
| if(toggle) |
| { |
| LIBFC_JetiBox_SetPos(0); |
| _printf_P(&LIBFC_JetiBox_Putchar, NC_ERROR_TEXT[NC_ErrorCode] , 0); |
| } |
| else |
| { |
| JetiBox_printfxy(6,0,"ERROR: %2d ",NC_ErrorCode); |
| JetiBeep = 'O'; |
| } |
| } |
| #else |
| if(NC_ErrorCode) { JetiBox_printfxy(6,0,"ERROR: %2d ",NC_ErrorCode); JetiBeep = 'O';}; |
| #endif |
| JetiBox_printfxy(0,1,"%4i %2i:%02i",Capacity.UsedCapacity,FlugSekunden/60,FlugSekunden%60); |
| if(Parameter_GlobalConfig & CFG_HOEHENREGELUNG) |
| { |
| /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 |
|---|
| 256,10 → 256,10 |
| { |
| if (JetiUpdateModeActive) while (1); |
| GRN_ON; |
| //GRN_ON; |
| if(UpdateMotor && AdReady) // ReglerIntervall |
| { |
| GRN_OFF; |
| //GRN_OFF; |
| UpdateMotor=0; |
| if(WinkelOut.CalcState) CalMk3Mag(); |
| else MotorRegler(); |
| 354,7 → 354,8 |
| { |
| if(NC_Version.Compatible) |
| { |
| VersionInfo.HardwareError[1] |= FC_ERROR1_SPI_RX; |
| VersionInfo.HardwareError[1] |= FC_ERROR1_SPI_RX; |
| NC_ErrorCode = 9; // "ERR: no NC communication" |
| if(BeepMuster == 0xffff && MotorenEin) |
| { |
| beeptime = 15000; |
| /trunk/main.h |
|---|
| 35,6 → 35,12 |
| void LipoDetection(unsigned char print); |
| extern unsigned int FlugMinuten,FlugMinutenGesamt,FlugSekunden; |
| #include <avr/pgmspace.h> |
| #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
| #endif |
| #include <stdlib.h> |
| #include <string.h> |
| #include <avr/io.h> |
| 44,7 → 50,6 |
| #include <avr/boot.h> |
| #include <avr/wdt.h> |
| #include "old_macros.h" |
| #include "printf_P.h" |
| 66,7 → 71,6 |
| #include "debug.h" |
| #endif //_MAIN_H |
| /trunk/makefile |
|---|
| 6,7 → 6,7 |
| #------------------------------------------------------------------- |
| VERSION_MAJOR = 0 |
| VERSION_MINOR = 85 |
| VERSION_PATCH = 2 |
| VERSION_PATCH = 3 |
| VERSION_SERIAL_MAJOR = 11 # Serial Protocol |
| VERSION_SERIAL_MINOR = 0 # Serial Protocol |
| NC_SPI_COMPATIBLE = 21 # Navi-Kompatibilität |
| /trunk/version.txt |
|---|
| 469,6 → 469,9 |
| - Coming Home mit Höhenvorgabe |
| - Coming Home als Failsafe |
| - Einführung des GPS-Characters (- / W H D P) |
| - neue Fehlermeldung: NC_ErrorCode = 9 "ERR: no NC communication" |
| - Klartext bei den Jeti-Fehlermeldungen |
| - Jeti-Beep "3*kurz" bei NC-Errors |
| - Jeti-LCD-Aufruf nur noch alle 300ms, weil die Werte zu unruhig waren |