Rev 473 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 473 | Rev 475 | ||
|---|---|---|---|
| Line 359... | Line 359... | ||
| 359 | LCD_printfxy(0,1,"GyroRoll: %4i", FromFlightCtrl.GyroRoll); |
359 | LCD_printfxy(0,1,"GyroRoll: %4i", FromFlightCtrl.GyroRoll); |
| 360 | LCD_printfxy(0,2,"GyroYaw: %4i", FromFlightCtrl.GyroYaw); |
360 | LCD_printfxy(0,2,"GyroYaw: %4i", FromFlightCtrl.GyroYaw); |
| 361 | if(FC_is_Calibrated) LCD_printfxy(0,3,"Calibrated ") else LCD_printfxy(0,3,"not calibrated"); |
361 | if(FC_is_Calibrated) LCD_printfxy(0,3,"Calibrated ") else LCD_printfxy(0,3,"not calibrated"); |
| 362 | break; |
362 | break; |
| 363 | case 15: |
363 | case 15: |
| 364 | LCD_printfxy(0,0,"Ubat: %2i.%1i V", FC.BAT_Voltage/10, FC.BAT_Voltage%10); |
364 | // LCD_printfxy(0,0,"Ubat: %2i.%1i V", FC.BAT_Voltage/10, FC.BAT_Voltage%10); |
| 365 | LCD_printfxy(0,1,"Compass: %3i", Compass_Heading); |
365 | LCD_printfxy(0,0,"Compass: %3i", FromFlightCtrl.GyroHeading / 10); |
| - | 366 | LCD_printfxy(0,1,"Man.-Offset:%3i", FC.FromFC_CompassOffset / 10); |
|
| - | 367 | if(FC.FromFC_DisableDeclination) |
|
| - | 368 | { |
|
| - | 369 | LCD_printfxy(0,2,"Mag.Declinat.:disabl"); |
|
| - | 370 | } |
|
| - | 371 | else |
|
| - | 372 | { |
|
| 366 | if(GeoMagDec < 0) sign = '-'; |
373 | if(GeoMagDec < 0) sign = '-'; |
| 367 | else sign = '+'; |
374 | else sign = '+'; |
| 368 | LCD_printfxy(0,2,"Mag.Declinat.:%c%i.%1i", sign, abs(GeoMagDec)/10,abs(GeoMagDec)%10); |
375 | LCD_printfxy(0,2,"Mag.Declinat.:%c%i.%1i", sign, abs(GeoMagDec)/10,abs(GeoMagDec)%10); |
| - | 376 | } |
|
| 369 | LCD_printfxy(0,3,"True Compass: %3i", GyroCompassCorrected/10); |
377 | LCD_printfxy(0,3,"True Compass: %3i", GyroCompassCorrected/10); |
| 370 | break; |
378 | break; |
| 371 | case 16: // User Parameter |
379 | case 16: // User Parameter |
| 372 | LCD_printfxy(0,0,"UP1:%3i UP2:%3i",Parameter.User1,Parameter.User2); |
380 | LCD_printfxy(0,0,"UP1:%3i UP2:%3i",Parameter.User1,Parameter.User2); |
| 373 | LCD_printfxy(0,1,"UP3:%3i UP4:%3i",Parameter.User3,Parameter.User4); |
381 | LCD_printfxy(0,1,"UP3:%3i UP4:%3i",Parameter.User3,Parameter.User4); |
| Line 462... | Line 470... | ||
| 462 | case 23: |
470 | case 23: |
| 463 | LCD_printfxy(0,0,"Ext. Compass" ); |
471 | LCD_printfxy(0,0,"Ext. Compass" ); |
| 464 | if(I2C_CompassPort == I2C_EXTERN_0) |
472 | if(I2C_CompassPort == I2C_EXTERN_0) |
| 465 | { |
473 | { |
| 466 | u8 tmp; |
474 | u8 tmp; |
| 467 | LCD_printfxy(0,1,"ACC X Y Z"); |
475 | LCD_printfxy(0,1,"ACC X Y Z"); |
| 468 | LCD_printfxy(0,2," %5d %5d %5d",AccRawVector.X,AccRawVector.Y,AccRawVector.Z); |
476 | LCD_printfxy(0,2," %5d %5d %5d",AccRawVector.X/40,AccRawVector.Y/40,AccRawVector.Z/40); |
| 469 | tmp = GetExtCompassOrientation(); |
477 | tmp = GetExtCompassOrientation(); |
| 470 | LCD_printfxy(0,3,"Orientat.: "); |
478 | LCD_printfxy(0,3,"Orientat.: "); |
| 471 | if(!tmp) LCD_printfxy(11,3,"??") else LCD_printfxy(11,3,"%2d",tmp); |
479 | if(!tmp) LCD_printfxy(11,3,"??") else LCD_printfxy(11,3,"%2d",tmp); |
| - | 480 | LCD_printfxy(15,3,"(%d)",ExtCompassOrientation); |
|
| 472 | } |
481 | } |
| 473 | else |
482 | else |
| 474 | { |
483 | { |
| 475 | LCD_printfxy(0,1,"Not connected"); |
484 | LCD_printfxy(0,1,"Not connected"); |
| 476 | } |
485 | } |