Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2728 → Rev 2729

/trunk/spi.c
312,8 → 312,8
break;
case 3:
ToNaviCtrl.Command = SPI_FCCMD_SLOW3;
ToNaviCtrl.Param.Byte[0] = Parameter_ServoNickControl;
ToNaviCtrl.Param.Byte[1] = Parameter_ServoRollControl;
// ToNaviCtrl.Param.Byte[0] = Parameter_ServoNickControl;
// ToNaviCtrl.Param.Byte[1] = Parameter_ServoRollControl;
ToNaviCtrl.Param.Byte[2] = EE_Parameter.NaviDescendRange; // in 10m
ToNaviCtrl.Param.Byte[3] = Parameter_MaximumAltitude;
ToNaviCtrl.Param.Byte[4] = EE_Parameter.ServoCompInvert;
556,7 → 556,10
SetParamByte(EE_BAUDRATE_CRC,FromNcBaudrateIndex+1);
UART_Init();
}
NaviData_WaypointIndex = FromNaviCtrl.Param.Byte[18];
NaviData_WaypointNumber = FromNaviCtrl.Param.Byte[19];
break;
 
case SPI_NCCMD_GPSINFO:
GPSInfo.Flags = FromNaviCtrl.Param.Byte[0];
GPSInfo.NumOfSats = FromNaviCtrl.Param.Byte[1];
574,11 → 577,10
EarthMagneticField = FromNaviCtrl.Param.Byte[0];
EarthMagneticInclination = FromNaviCtrl.Param.Byte[1];
EarthMagneticInclinationTheoretic = FromNaviCtrl.Param.Byte[2];
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))
//FromNaviCtrl.Param.Byte[3];
//FromNaviCtrl.Param.Byte[4];
//FromNaviCtrl.Param.Byte[5];
NaviData_TargetDistance = FromNaviCtrl.Param.Int[3];
#endif
NaviData_WaypointIndex = FromNaviCtrl.Param.Byte[4];
NaviData_WaypointNumber = FromNaviCtrl.Param.Byte[5];
NaviData_TargetHoldTime = FromNaviCtrl.Param.Byte[8];
NaviData_MaxWpListIndex = FromNaviCtrl.Param.Byte[9];
CompassCorrected = FromNaviCtrl.Param.sInt[5]; // Bytes 10 & 11
/trunk/spi.h
86,6 → 86,7
#define KM_BIT_OFF 0x08 // Fast switch off
#define KM_BIT_EXTCNTRL 0x10
 
 
/*
struct str_ToNaviCtrl
{
253,6 → 254,7
extern unsigned char FlyzonePointCnt;
extern unsigned int TrigLogging_CountExternal;
extern unsigned char FromNcBaudrateIndex;
extern unsigned char GPS_TimeHours, GPS_TimeMinutes, GPS_TimeSeconds;
#else