From a40a0b0e3181dbbf62d07fd84c8658eb82714c13 Mon Sep 17 00:00:00 2001
From: James Cotton <peabody124@gmail.com>
Date: Mon, 7 May 2012 01:54:04 -0500
Subject: [PATCH] Small fix to be able to build CC for Revo branch and to
 include revo in package.

---
 flight/Modules/GPS/GPS.c                     | 1 -
 flight/Modules/GPS/UBX.c                     | 2 ++
 flight/Modules/ManualControl/manualcontrol.c | 5 +++++
 package/Makefile                             | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/flight/Modules/GPS/GPS.c b/flight/Modules/GPS/GPS.c
index a9cef47dd..9d02c06e4 100644
--- a/flight/Modules/GPS/GPS.c
+++ b/flight/Modules/GPS/GPS.c
@@ -150,7 +150,6 @@ int32_t GPSInitialize(void)
 #else
 	if (gpsPort && gpsEnabled) {
 		GPSPositionInitialize();
-		GPSVelocityInitialize();
 #if !defined(PIOS_GPS_MINIMAL)
 		GPSTimeInitialize();
 		GPSSatellitesInitialize();
diff --git a/flight/Modules/GPS/UBX.c b/flight/Modules/GPS/UBX.c
index 2e52b02e0..180834281 100644
--- a/flight/Modules/GPS/UBX.c
+++ b/flight/Modules/GPS/UBX.c
@@ -70,6 +70,7 @@ bool checksum_ubx_message (UBXPacket *ubx)
 
 void parse_ubx_nav_velned (UBXPayload payload)
 {
+#if defined(REVOLUTION)
 	GPSVelocityData GpsVelocity;
 	GPSVelocityGet(&GpsVelocity);
 
@@ -78,6 +79,7 @@ void parse_ubx_nav_velned (UBXPayload payload)
 	GpsVelocity.Down	= (float)payload.nav_velned.velD/100.0f;
 
 	GPSVelocitySet(&GpsVelocity);
+#endif
 }
 
 void parse_ubx_message (UBXPacket *ubx)
diff --git a/flight/Modules/ManualControl/manualcontrol.c b/flight/Modules/ManualControl/manualcontrol.c
index 708dc0169..a9ece79b9 100644
--- a/flight/Modules/ManualControl/manualcontrol.c
+++ b/flight/Modules/ManualControl/manualcontrol.c
@@ -679,6 +679,11 @@ static void altitudeHoldDesired(ManualControlCommandData * cmd)
 	AltitudeHoldDesiredSet(&altitudeHoldDesired);
 }
 #else
+static void positionDesired(ManualControlCommandData * cmd)
+{
+	AlarmsSet(SYSTEMALARMS_ALARM_MANUALCONTROL, SYSTEMALARMS_ALARM_ERROR);
+}
+
 static void altitudeHoldDesired(ManualControlCommandData * cmd)
 {
 	AlarmsSet(SYSTEMALARMS_ALARM_MANUALCONTROL, SYSTEMALARMS_ALARM_ERROR);
diff --git a/package/Makefile b/package/Makefile
index 5598be8c3..c6efa2ff1 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -30,7 +30,7 @@ CLEAN_FLIGHT := YES
 endif
 
 # Set up targets
-FW_TARGETS        := $(addprefix fw_, coptercontrol)
+FW_TARGETS        := $(addprefix fw_, coptercontrol) $(addprefix fw_, revolution)
 FW_TARGETS_TOOLS  := $(addprefix fw_, coptercontrol)
 BL_TARGETS        := $(addprefix bl_, coptercontrol)
 BU_TARGETS        := $(addprefix bu_, coptercontrol)