Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 204 → Rev 205

/trunk/spi_slave.c
306,6 → 306,8
ToFlightCtrl.Param.Byte[0] = GPSData.Flags;
ToFlightCtrl.Param.Byte[1] = GPSData.NumOfSats;
ToFlightCtrl.Param.Byte[2] = GPSData.SatFix;
ToFlightCtrl.Param.Int[2] = NaviData.HomePositionDeviation.Distance; // dm
ToFlightCtrl.Param.sInt[3] = NaviData.HomePositionDeviation.Bearing; // deg
break;
 
default:
377,9 → 379,9
fifo_put(&CompassCalcStateFiFo, CompassCalState);
}
Parameter.NaviPH_LoginTime = FromFlightCtrl.Param.Byte[1];
NaviData.Variometer = (NaviData.Variometer + 2 * ((s16) FromFlightCtrl.Param.Int[1] - NaviData.Altimeter)) / 2; // provisorisch
NaviData.Altimeter = (s16) FromFlightCtrl.Param.Int[1]; // is located at byte 2 and 3
NaviData.SetpointAltitude = (s16) FromFlightCtrl.Param.Int[2]; // is located at byte 4 and 5
NaviData.Variometer = (NaviData.Variometer + 2 * (FromFlightCtrl.Param.sInt[1] - NaviData.Altimeter)) / 2; // provisorisch
NaviData.Altimeter = FromFlightCtrl.Param.sInt[1]; // is located at byte 2 and 3
NaviData.SetpointAltitude = FromFlightCtrl.Param.sInt[2]; // is located at byte 4 and 5
CHK_POTI_MM(Parameter.NaviGpsPLimit,FromFlightCtrl.Param.Byte[6],0,255);
CHK_POTI_MM(Parameter.NaviGpsILimit,FromFlightCtrl.Param.Byte[7],0,255);
CHK_POTI_MM(Parameter.NaviGpsDLimit,FromFlightCtrl.Param.Byte[8],0,255);
/trunk/spi_slave.h
31,10 → 31,12
s16 GyroYaw;
union
{
u8 Byte[12];
s8 sByte[12];
u8 Byte[12];
s16 Int[6];
s32 Long[3];
u16 Int[6];
s16 sInt[6];
u32 Long[3];
s32 sLong[3];
float Float[3];
} Param;
u8 Chksum;
58,10 → 60,12
u16 BeepTime;
union
{
u8 Byte[12];
s8 sByte[12];
u8 Byte[12];
s16 Int[6];
s32 Long[3];
u16 Int[6];
s16 sInt[6];
u32 Long[3];
s32 sLong[3];
float Float[3];
}Param;
u8 Chksum;