Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 317 → Rev 318

/trunk/main.c
166,7 → 166,11
else if(FC_Version.Compatible != FC_SPI_COMPATIBLE)
{
LED_RED_ON;
#ifndef FOLLOW_ME
sprintf(ErrorMSG,"FC not compatible ");
#else
sprintf(ErrorMSG,"! FollowMe only ! ");
#endif
ErrorCode = 1;
StopNavigation = 1;
UART_VersionInfo.HardwareError[0] |= NC_ERROR0_FC_INCOMPATIBLE;
/trunk/main.h
2,7 → 2,7
#define _MAIN_H
 
 
#define FOLLOW_ME
//#define FOLLOW_ME
 
#ifdef FOLLOW_ME
extern u8 TransmitAlsoToFC;
13,8 → 13,8
//-----------------------
 
#define VERSION_MAJOR 0
#define VERSION_MINOR 24
#define VERSION_PATCH 5
#define VERSION_MINOR 25
#define VERSION_PATCH 0
// 0 = A
// 1 = B
// 2 = C
/trunk/menu.c
274,22 → 274,49
LCD_printfxy(0,3,"Alt:%c%04ld.%03ld m",sign, i1, i2);
}
break;
case 8: // RC stick controls from FC
case 8:
LCD_printfxy(0,0,"Target Position");
if(NaviData.TargetPosition.Status == INVALID)
{
LCD_printfxy(0,1," ");
LCD_printfxy(0,2," Is not set. ");
LCD_printfxy(0,3," ");
}
else
{
if(NaviData.TargetPosition.Longitude < 0) sign = '-';
else sign = '+';
i1 = abs(NaviData.TargetPosition.Longitude)/10000000L;
i2 = abs(NaviData.TargetPosition.Longitude)%10000000L;
LCD_printfxy(0,1,"Lon:%c%03ld.%07ld deg",sign, i1, i2);
if(NaviData.TargetPosition.Latitude < 0) sign = '-';
else sign = '+';
i1 = abs(NaviData.TargetPosition.Latitude)/10000000L;
i2 = abs(NaviData.TargetPosition.Latitude)%10000000L;
LCD_printfxy(0,2,"Lat:%c%03ld.%07ld deg",sign, i1, i2);
if(NaviData.HomePosition.Altitude < 0) sign = '-';
else sign = '+';
i1 = abs(NaviData.TargetPosition.Altitude)/1000L;
i2 = abs(NaviData.TargetPosition.Altitude)%1000L;
LCD_printfxy(0,3,"Alt:%c%04ld.%03ld m",sign, i1, i2);
}
break;
case 9: // RC stick controls from FC
LCD_printfxy(0,0,"RC-Sticks" );
LCD_printfxy(0,1,"Ni:%4i Ro:%4i ",FC.StickNick, FC.StickRoll);
LCD_printfxy(0,2,"Gs:%4i Ya:%4i ",FC.StickGas, FC.StickYaw);
break;
case 9: // RC poti controls from FC
case 10: // RC poti controls from FC
LCD_printfxy(0,0,"RC-Potis 1" );
LCD_printfxy(0,1,"Po1:%3i Po2:%3i ",FC.Poti[0], FC.Poti[1]);
LCD_printfxy(0,2,"Po3:%3i Po4:%3i ",FC.Poti[2], FC.Poti[3]);
break;
case 10: // RC poti controls from FC
case 11: // RC poti controls from FC
LCD_printfxy(0,0,"RC-Potis 2" );
LCD_printfxy(0,1,"Po5:%3i Po6:%3i ",FC.Poti[4], FC.Poti[5]);
LCD_printfxy(0,2,"Po7:%3i Po8:%3i ",FC.Poti[6], FC.Poti[7]);
break;
case 11: // attitude from FC
case 12: // attitude from FC
if(FromFlightCtrl.AngleNick < 0) sign = '-';
else sign = '+';
i1 = abs(FromFlightCtrl.AngleNick)/10;
311,12 → 338,12
i2 = abs(FromFlightCtrl.AccRoll)%10;
LCD_printfxy(0,3," AccRoll:%c%03ld.%01ld", sign, i1, i2);
break;
case 12: // gyros from FC
case 13: // gyros from FC
LCD_printfxy(0,0,"GyroNick: %4i", FromFlightCtrl.GyroNick);
LCD_printfxy(0,1,"GyroRoll: %4i", FromFlightCtrl.GyroRoll);
LCD_printfxy(0,2,"GyroYaw: %4i", FromFlightCtrl.GyroYaw);
break;
case 13: // Remote Control Level from FC
case 14: // Remote Control Level from FC
LCD_printfxy(0,0,"RC-Level: %3i", FC.RC_Quality);
LCD_printfxy(0,1,"Ubat: %2i.%1i V", FC.BAT_Voltage/10, FC.BAT_Voltage%10);
LCD_printfxy(0,2,"CompHeading: %3i", Compass_Heading);
324,13 → 351,13
else sign = '+';
LCD_printfxy(0,3,"GeoMagDec: %c%i.%1i", sign, abs(GeoMagDec)/10,abs(GeoMagDec)%10);
break;
case 14: // User Parameter
case 15: // User Parameter
LCD_printfxy(0,0,"UP1:%3i UP2:%3i",Parameter.User1,Parameter.User2);
LCD_printfxy(0,1,"UP3:%3i UP4:%3i",Parameter.User3,Parameter.User4);
LCD_printfxy(0,2,"UP5:%3i UP6:%3i",Parameter.User5,Parameter.User6);
LCD_printfxy(0,3,"UP7:%3i UP8:%3i",Parameter.User7,Parameter.User8);
break;
case 15: // magnetic field
case 16: // magnetic field
if(Compass_CalState)
{
LCD_printfxy(0,0,"Calibration:");