| /trunk/hottmenu.c |
|---|
| 315,12 → 315,6 |
| return(status); |
| } |
| /* |
| unsigned char HoTTErrorCode(void) |
| { |
| return(NC_ErrorCode); |
| } |
| */ |
| //--------------------------------------------------------------- |
| void NC_Fills_HoTT_Telemety(void) |
| { |
| /trunk/hottmenu.h |
|---|
| 39,7 → 39,7 |
| #define SPEAK_MK_OFF 38 |
| #define SPEAK_ALTITUDE_ON 39 |
| #define SPEAK_ALTITUDE_OFF 40 |
| #define SPEAK_100M 41 // ? |
| #define SPEAK_100M 41 |
| #define SPEAK_CF_ON 46 |
| #define SPEAK_SINKING 47 // ? |
| #define SPEAK_RISING 48 |
| 47,6 → 47,7 |
| #define SPEAK_GPS_ON 50 |
| #define SPEAK_FOLLWING 51 // ? |
| #define SPEAK_STARTING 52 |
| // Achtung: wenn > 53 -> JETI_CODE[53] anpassen |
| //fehlt: |
| //"Error" |
| /trunk/jetimenu.c |
|---|
| 217,7 → 217,7 |
| if(ChannelNick || ChannelRoll) |
| JetiBox_printfxy(0,1,"Stick! (%i/%i)",ChannelNick,ChannelRoll) |
| else //0123456789ABCDEF |
| if(changed) JetiBox_printfxy(0,1,"land to safe ") |
| if(changed) JetiBox_printfxy(0,1,"land to save ") |
| else JetiBox_printfxy(0,1,"use keys now ") |
| if(key== JETIBOX_KEY_UP ) {NeutralAccX++;JetiBeep=130; changed = 1;} |
| 235,7 → 235,7 |
| else |
| if(changed == 1) |
| { |
| JetiBox_printfxy(0,1," safe -->") |
| JetiBox_printfxy(0,1," save -->") |
| if(key== JETIBOX_KEY_RIGHT) |
| { |
| StoreNeutralToEeprom(); |
| /trunk/led.c |
|---|
| 28,7 → 28,8 |
| static unsigned char J16Warn = 0, J17Warn = 0; |
| static unsigned char from_nc = 0; // Copy for the timing |
| if(FromNC_WP_EventChannel_New) from_nc = FromNC_WP_EventChannel_New; |
| if(!NC_Wait_for_LED) from_nc = (unsigned char) PPM_in[WP_EVENT_PPM_IN] + 127; |
| if(!delay--) // 20ms Intervall |
| { |
| J16Bitmask = EE_Parameter.J16Bitmask; |
| 74,7 → 75,6 |
| if(J16Mask == 0) |
| { |
| from_nc = FromNC_WP_EventChannel_New; |
| FromNC_WP_EventChannel_New = 0; |
| J16Mask = 64; |
| if(J16Bitmask & 128) J16_ON; else J16_OFF; // Ausschalten |
| } |
| 82,6 → 82,7 |
| { |
| if(J16Mask & J16Bitmask) J16_ON; else J16_OFF; |
| J16Mask /= 2; |
| if(J16Mask == 0x01) FromNC_WP_EventChannel_New = 0; // Last Bit -> Refresh the value by NC now |
| } |
| } |
| } |
| /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 = 2 |
| VERSION_MINOR = 9 |
| VERSION_PATCH = 3 |
| VERSION_PATCH = 8 |
| VERSION_SERIAL_MAJOR = 11 # Serial Protocol to KopterTool -> do not change! |
| VERSION_SERIAL_MINOR = 0 # Serial Protocol |
| NC_SPI_COMPATIBLE = 73 # Navi-Kompatibilität |
| NC_SPI_COMPATIBLE = 75 # Navi-Kompatibilität |
| LIB_FC_COMPATIBLE = 7 # Library |
| #------------------------------------------------------------------- |
| # ATMEGA644: 63487 is maximum |
| /trunk/menu.c |
|---|
| 187,7 → 187,7 |
| if(RemoteKeys & KEY3) { NeutralAccX--; changed = 1;} |
| if(RemoteKeys & KEY4) { NeutralAccX++; changed = 1;} |
| LCD_printfxy(13,0,"on "); |
| if(changed) LCD_printfxy(0,3,"land to safe ") |
| if(changed) LCD_printfxy(0,3,"land to save ") |
| else LCD_printfxy(0,3,"use keys to trim ACC") |
| } |
| else |
| 196,7 → 196,7 |
| DisableMenu = 0; |
| if(!(FC_StatusFlags & FC_STATUS_MOTOR_RUN) && changed) |
| { |
| LCD_printfxy(0,3,"Safe? (yes)(no)"); |
| LCD_printfxy(0,3,"Save? (yes)(no)"); |
| if(RemoteKeys & KEY3) { StoreNeutralToEeprom(); AccMenu = 0;} |
| if(RemoteKeys & KEY4) { changed = 0;} |
| } |
| /trunk/spi.c |
|---|
| 402,10 → 402,7 |
| GPSInfo.Speed = FromNaviCtrl.Param.Byte[3]; |
| GPSInfo.HomeDistance = FromNaviCtrl.Param.Int[2]; |
| GPSInfo.HomeBearing = FromNaviCtrl.Param.sInt[3]; |
| if((signed char) PPM_in[WP_EVENT_PPM_IN] == -127) // zuletzt war der WP-Event auf Null |
| { |
| if(!FromNC_WP_EventChannel_New) FromNC_WP_EventChannel_New = (unsigned char) FromNaviCtrl.Param.Byte[8] + 127; // zwischenspeichern, damit keiner verpasst wird |
| } |
| if(!FromNC_WP_EventChannel_New) FromNC_WP_EventChannel_New = (unsigned char) FromNaviCtrl.Param.Byte[8] + 127; // zwischenspeichern, damit keiner verpasst wird |
| PPM_in[WP_EVENT_PPM_IN] = (signed char) FromNaviCtrl.Param.Byte[8]; // WP_EVENT-Channel-Value (FromNC_WP_EventChannel) |
| FromNC_AltitudeSpeed = FromNaviCtrl.Param.Byte[9]; |
| FromNC_AltitudeSetpoint = (long) FromNaviCtrl.Param.sInt[5] * 10; // in cm |
| /trunk/version.txt |
|---|
| 785,6 → 785,10 |
| 2.09g (22.03.2015) |
| - ACC-Calibration by stick: 5 seconds delay |
| 2.09i (24.03.2015) |
| - Bugfix: LED pattern was not used more often if the Hold time was longer than the pattern time |
| toDo: |
| - CalAthmospheare nachführen |