rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Small fix to be able to build CC for Revo branch and to include revo in

Browse Source 
package.
This commit is contained in:
James Cotton 2012-05-07 01:54:04 -05:00
parent 6c0dc80978
commit a40a0b0e31
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flight/Modules/GPS/GPS.c
View File

@ -150,7 +150,6 @@ int32_t GPSInitialize(void)
#else #else
if (gpsPort && gpsEnabled) { if (gpsPort && gpsEnabled) {
GPSPositionInitialize(); GPSPositionInitialize();
GPSVelocityInitialize();
#if !defined(PIOS_GPS_MINIMAL) #if !defined(PIOS_GPS_MINIMAL)
GPSTimeInitialize(); GPSTimeInitialize();
GPSSatellitesInitialize(); GPSSatellitesInitialize();

2
flight/Modules/GPS/UBX.c
View File

@ -70,6 +70,7 @@ bool checksum_ubx_message (UBXPacket *ubx)
void parse_ubx_nav_velned (UBXPayload payload) void parse_ubx_nav_velned (UBXPayload payload)
{ {
#if defined(REVOLUTION)
GPSVelocityData GpsVelocity; GPSVelocityData GpsVelocity;
GPSVelocityGet(&GpsVelocity); GPSVelocityGet(&GpsVelocity);
@ -78,6 +79,7 @@ void parse_ubx_nav_velned (UBXPayload payload)
GpsVelocity.Down = (float)payload.nav_velned.velD/100.0f; GpsVelocity.Down = (float)payload.nav_velned.velD/100.0f;
GPSVelocitySet(&GpsVelocity); GPSVelocitySet(&GpsVelocity);
#endif
} }
void parse_ubx_message (UBXPacket *ubx) void parse_ubx_message (UBXPacket *ubx)

5
flight/Modules/ManualControl/manualcontrol.c
View File

@ -679,6 +679,11 @@ static void altitudeHoldDesired(ManualControlCommandData * cmd)
AltitudeHoldDesiredSet(&altitudeHoldDesired); AltitudeHoldDesiredSet(&altitudeHoldDesired);
} }
#else #else
static void positionDesired(ManualControlCommandData * cmd)
{
AlarmsSet(SYSTEMALARMS_ALARM_MANUALCONTROL, SYSTEMALARMS_ALARM_ERROR);
}
static void altitudeHoldDesired(ManualControlCommandData * cmd) static void altitudeHoldDesired(ManualControlCommandData * cmd)
{ {
AlarmsSet(SYSTEMALARMS_ALARM_MANUALCONTROL, SYSTEMALARMS_ALARM_ERROR); AlarmsSet(SYSTEMALARMS_ALARM_MANUALCONTROL, SYSTEMALARMS_ALARM_ERROR);

2
package/Makefile
View File

@ -30,7 +30,7 @@ CLEAN_FLIGHT := YES
endif endif
# Set up targets # Set up targets
FW_TARGETS := $(addprefix fw_, coptercontrol) FW_TARGETS := $(addprefix fw_, coptercontrol) $(addprefix fw_, revolution)
FW_TARGETS_TOOLS := $(addprefix fw_, coptercontrol) FW_TARGETS_TOOLS := $(addprefix fw_, coptercontrol)
BL_TARGETS := $(addprefix bl_, coptercontrol) BL_TARGETS := $(addprefix bl_, coptercontrol)
BU_TARGETS := $(addprefix bu_, coptercontrol) BU_TARGETS := $(addprefix bu_, coptercontrol)