From d864b481a1c492f89d4a044c2c0c5e79c11b0645 Mon Sep 17 00:00:00 2001
From: James Cotton <peabody124@gmail.com>
Date: Mon, 23 Jan 2012 04:47:35 -0600
Subject: [PATCH] Fix a few more merge conflicts

---
 flight/CopterControl/Makefile      |  2 --
 flight/Modules/Altitude/altitude.c | 23 -----------------------
 2 files changed, 25 deletions(-)

diff --git a/flight/CopterControl/Makefile b/flight/CopterControl/Makefile
index b657ddfcd..dd78d91a2 100644
--- a/flight/CopterControl/Makefile
+++ b/flight/CopterControl/Makefile
@@ -227,8 +227,6 @@ SRC += $(PIOSCOMMON)/pios_adxl345.c
 SRC += $(PIOSCOMMON)/pios_com.c
 SRC += $(PIOSCOMMON)/pios_i2c_esc.c
 SRC += $(PIOSCOMMON)/pios_bmp085.c
-SRC += $(PIOSCOMMON)/pios_iap.c
-SRC += $(PIOSCOMMON)/pios_bl_helper.c
 SRC += $(PIOSCOMMON)/pios_rcvr.c
 SRC += $(PIOSCOMMON)/pios_gcsrcvr.c
 SRC += $(PIOSCOMMON)/printf-stdarg.c
diff --git a/flight/Modules/Altitude/altitude.c b/flight/Modules/Altitude/altitude.c
index a39f4b445..4898829b0 100644
--- a/flight/Modules/Altitude/altitude.c
+++ b/flight/Modules/Altitude/altitude.c
@@ -109,11 +109,7 @@ int32_t AltitudeInitialize()
 	alt_ds_temp = 0;
 	alt_ds_pres = 0;
 	alt_ds_count = 0;
-<<<<<<< HEAD
-	
-=======
 
->>>>>>> next
 	return 0;
 }
 MODULE_INITCALL(AltitudeInitialize, AltitudeStart)
@@ -185,24 +181,6 @@ static void altitudeTask(void *parameters)
 		if (++alt_ds_count >= alt_ds_size)
 		{
 			alt_ds_count = 0;
-<<<<<<< HEAD
-			
-			// Convert from 1/10ths of degC to degC
-			data.Temperature = alt_ds_temp / (10.0 * alt_ds_size);
-			alt_ds_temp = 0;
-			
-			// Convert from Pa to kPa
-			data.Pressure = alt_ds_pres / (1000.0f * alt_ds_size);
-			alt_ds_pres = 0;
-			
-			// Compute the current altitude (all pressures in kPa)
-			data.Altitude = 44330.0 * (1.0 - powf((data.Pressure / (BMP085_P0 / 1000.0)), (1.0 / 5.255)));
-			
-			// Update the AltitudeActual UAVObject
-			BaroAltitudeSet(&data);
-		}
-		
-=======
 
 			// Convert from 1/10ths of degC to degC
 			data.Temperature = alt_ds_temp / (10.0 * alt_ds_size);
@@ -219,7 +197,6 @@ static void altitudeTask(void *parameters)
 			BaroAltitudeSet(&data);
 		}
 
->>>>>>> next
 		// Delay until it is time to read the next sample
 		vTaskDelayUntil(&lastSysTime, UPDATE_PERIOD / portTICK_RATE_MS);
 	}