| /trunk/analog.c |
|---|
| 273,7 → 273,8 |
| SummenHoehe -= SummenHoehe/SM_FILTER; |
| SummenHoehe += HoehenWert; |
| tmp = (HoehenWert - SummenHoehe/SM_FILTER); |
| if(abs(tmp) > 128) VarioMeter = (7 * VarioMeter + 8 * tmp)/8; |
| if(tmp > 1024) tmp = 1024; else if(tmp < -1024) tmp = -1024; |
| if(abs(VarioMeter) > 700) VarioMeter = (15 * VarioMeter + 8 * tmp)/16; |
| else VarioMeter = (31 * VarioMeter + 8 * tmp)/32; |
| tmpLuftdruck /= 2; |
| messanzahl_Druck = 18/2; |
| /trunk/fc.c |
|---|
| 1038,6 → 1038,10 |
| { |
| tmp_long = (long)(IntegralNick / EE_Parameter.GyroAccFaktor - (long)(Mittelwert_AccNick - FromNaviCtrl.AccErrorN)); |
| tmp_long2 = (long)(IntegralRoll / EE_Parameter.GyroAccFaktor - (long)(Mittelwert_AccRoll - FromNaviCtrl.AccErrorR)); |
| DebugOut.Analog[16] = (Mittelwert_AccRoll - FromNaviCtrl.AccErrorR)/4; |
| DebugOut.Analog[17] = (Mittelwert_AccNick - FromNaviCtrl.AccErrorN)/4; |
| tmp_long = (tmp_long * FromNaviCtrl_Value.Kalman_K) / (32 * 16); |
| tmp_long2 = (tmp_long2 * FromNaviCtrl_Value.Kalman_K) / (32 * 16); |
| if((MaxStickNick > 64) || (MaxStickRoll > 64)) |
| /trunk/hottmenu.c |
|---|
| 247,7 → 247,7 |
| //--------------------------------------------------------------- |
| void HoTT_Menu(void) |
| { |
| static unsigned char line, page = 0,show_current = 0,show_mag = 0; |
| static unsigned char line, page = 0,show_current = 0,show_mag = 0, show_poti = 0; |
| unsigned char tmp; |
| HoTTVarioMeter = (HoTTVarioMeter * 7 + VarioMeter) / 8; |
| 530,8 → 530,17 |
| if(EE_Parameter.ComingHomeAltitude) HoTT_printf("%um",EE_Parameter.ComingHomeAltitude) else HoTT_printf("HOLD "); |
| break; |
| case 6: |
| HoTT_printfxy(0,6,"Ni:%4i Ro:%4i C:%3i",PPM_in[EE_Parameter.Kanalbelegung[K_NICK]],PPM_in[EE_Parameter.Kanalbelegung[K_ROLL]], Parameter_ServoNickControl); |
| HoTT_printfxy(0,7,"Gs:%4i Ya:%4i ",PPM_in[EE_Parameter.Kanalbelegung[K_GAS]]+127,PPM_in[EE_Parameter.Kanalbelegung[K_GIER]]); |
| if(!show_poti) |
| { |
| HoTT_printfxy(0,6,"Ni:%4i Ro:%4i C:%3i",PPM_in[EE_Parameter.Kanalbelegung[K_NICK]],PPM_in[EE_Parameter.Kanalbelegung[K_ROLL]], Parameter_ServoNickControl); |
| HoTT_printfxy(0,7,"Gs:%4i Ya:%4i ",PPM_in[EE_Parameter.Kanalbelegung[K_GAS]]+127,PPM_in[EE_Parameter.Kanalbelegung[K_GIER]]); |
| } |
| else |
| { |
| HoTT_printfxy(0,6,"P1:%4i P2:%4i 3:%3i",Poti1,Poti2, Poti3); |
| HoTT_printfxy(0,7,"P4:%4i P5:%4i 6:%3i",Poti4,Poti5, Poti6); |
| } |
| break; |
| case 7: //HoTT_printfxy(0,6,"WARNINGS:"); |
| if(HoTTBlink) |
| 553,6 → 562,8 |
| case 14: |
| case 15: |
| case 16: |
| if(HottKeyboard == HOTT_KEY_SET) { if(show_poti) show_poti = 0; else show_poti = 1; Hott_ClearLine(6); Hott_ClearLine(7);} |
| else |
| if(HottKeyboard == HOTT_KEY_RIGHT) { LIBFC_HoTT_Clear(); page = 1; line = 0;}; |
| HottKeyboard = 0; |
| break; |
| /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,7 → 6,7 |
| #------------------------------------------------------------------- |
| VERSION_MAJOR = 0 |
| VERSION_MINOR = 86 |
| VERSION_PATCH = 2 |
| VERSION_PATCH = 3 |
| VERSION_SERIAL_MAJOR = 11 # Serial Protocol |
| VERSION_SERIAL_MINOR = 0 # Serial Protocol |
| NC_SPI_COMPATIBLE = 27 # Navi-Kompatibilität |
| /trunk/uart.c |
|---|
| 96,8 → 96,8 |
| "Motor 2 ", |
| "Motor 3 ", |
| "Motor 4 ", //15 |
| "16 ", |
| "17 ", |
| "16 R ", |
| "17 N ", |
| "18 ", |
| "19 ", |
| "Servo ", //20 |
| /trunk/version.txt |
|---|
| 520,5 → 520,10 |
| - Kompass-Fusions-Dämpfung bei Neigung leicht verringert |
| - '.' im Vario-Höhenregler |
| 0.86d H.Buss 26.09.2011 |
| - Analog.c: Vario Überlauf anders verhinden |
| - Poti1-6 auch im HoTT-Display |