| /trunk/analog.c |
|---|
| 213,7 → 213,7 |
| case 12: |
| if(PlatinenVersion == 10) AdWertGier = (ADC + gier1 + 1) / 2; |
| else |
| if(PlatinenVersion == 20) AdWertGier = 2047 - (ADC + gier1); |
| if(PlatinenVersion >= 20) AdWertGier = 2047 - (ADC + gier1); |
| else AdWertGier = (ADC + gier1); |
| kanal = AD_ACC_Y; |
| break; |
| 438,7 → 438,7 |
| case 28: |
| if(PlatinenVersion == 10) AdWertGier = (ADC + gier1 + 2) / 4; |
| else |
| if(PlatinenVersion == 20) AdWertGier = 2047 - (ADC + gier1 + 1) / 2; |
| if(PlatinenVersion >= 20) AdWertGier = 2047 - (ADC + gier1 + 1) / 2; |
| else AdWertGier = (ADC + gier1 + 1) / 2; |
| kanal = AD_NICK; |
| break; |
| /trunk/fc.c |
|---|
| 173,7 → 173,7 |
| DebugOut.Analog[1] = IntegralRoll / (EE_Parameter.GyroAccFaktor * 4); |
| DebugOut.Analog[2] = Mittelwert_AccNick / 4; |
| DebugOut.Analog[3] = Mittelwert_AccRoll / 4; |
| DebugOut.Analog[4] = MesswertGier; |
| DebugOut.Analog[4] = (signed int) AdNeutralGier - AdWertGier; |
| DebugOut.Analog[5] = HoehenWert/5; |
| DebugOut.Analog[6] = (Mess_Integral_Hoch / 512);//AdWertAccHoch;// Aktuell_az;//(Mess_Integral_Hoch / 512);//Aktuell_az; |
| DebugOut.Analog[8] = KompassValue; |
| 329,7 → 329,6 |
| VarioMeter = 0; |
| Mess_Integral_Hoch = 0; |
| KompassStartwert = KompassValue; |
| ControlHeading = KompassValue / 15; |
| GPS_Neutral(); |
| beeptime = 50; |
| Umschlag180Nick = ((long) EE_Parameter.WinkelUmschlagNick * 2500L) + 15000L; |
| 772,6 → 771,7 |
| SummeNick = 0; |
| SummeRoll = 0; |
| FCFlags |= FCFLAG_START; |
| ControlHeading = KompassValue / 15; |
| } |
| else |
| { |
| 1205,10 → 1205,8 |
| if(v > w) w = v; // grösste Neigung ermitteln |
| korrektur = w / 8 + 2; |
| fehler = ((540 + KompassValue - (ErsatzKompass/GIER_GRAD_FAKTOR)) % 360) - 180; |
| if(abs(MesswertGier) > 128) |
| { |
| // korrektur = korrektur = w / 16 + 2; // schnell konvergieren |
| } |
| fehler += MesswertGier / 12; |
| if(!KompassSignalSchlecht && w < 25) |
| { |
| GierGyroFehler += fehler; |
| /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 |
|---|
| 115,7 → 115,10 |
| DDRB = 0x00; |
| PORTB = 0x00; |
| for(timer = 0; timer < 1000; timer++); // verzögern |
| if(PINB & 0x01) |
| #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
| PlatinenVersion = 21; |
| #else |
| if(PINB & 0x01) |
| { |
| if(PINB & 0x02) PlatinenVersion = 13; |
| else PlatinenVersion = 11; |
| 125,7 → 128,7 |
| if(PINB & 0x02) PlatinenVersion = 20; |
| else PlatinenVersion = 10; |
| } |
| #endif |
| DDRC = 0x81; // SCL |
| DDRC |=0x40; // HEF4017 Reset |
| PORTC = 0xff; // Pullup SDA |
| 139,8 → 142,8 |
| WDTCSR = 0; |
| beeptime = 2500; |
| StickGier = 0; PPM_in[K_GAS] = 0;StickRoll = 0; StickNick = 0; |
| if(PlatinenVersion >= 20) GIER_GRAD_FAKTOR = 1000; else GIER_GRAD_FAKTOR = 1291; // unterschiedlich für ME und ENC |
| StickGier = 0; PPM_in[K_GAS] = 0; StickRoll = 0; StickNick = 0; |
| if(PlatinenVersion >= 20) GIER_GRAD_FAKTOR = 1220; else GIER_GRAD_FAKTOR = 1291; // unterschiedlich für ME und ENC |
| ROT_OFF; |
| Timer_Init(); |
| /trunk/menu.c |
|---|
| 95,7 → 95,7 |
| LCD_printfxy(0,3,"Gier%4i (%3i)",AdNeutralGier - AdWertGier, AdNeutralGier); |
| } |
| else |
| if((PlatinenVersion == 11) || (PlatinenVersion == 20)) |
| if((PlatinenVersion == 11) || (PlatinenVersion >= 20)) |
| { |
| LCD_printfxy(0,1,"Nick %4i (%3i.%x)",AdWertNick - AdNeutralNick/8, AdNeutralNick/16, (AdNeutralNick%16)/2); |
| LCD_printfxy(0,2,"Roll %4i (%3i.%x)",AdWertRoll - AdNeutralRoll/8, AdNeutralRoll/16, (AdNeutralRoll%16)/2); |