rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00
Code Issues Releases Activity

Fix a few more merge conflicts

Browse Source
This commit is contained in:
James Cotton 2012-01-23 04:47:35 -06:00
parent cc0cbf0381
commit d864b481a1
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flight/CopterControl/Makefile
View File

@ -227,8 +227,6 @@ SRC += $(PIOSCOMMON)/pios_adxl345.c
SRC += $(PIOSCOMMON)/pios_com.c SRC += $(PIOSCOMMON)/pios_com.c
SRC += $(PIOSCOMMON)/pios_i2c_esc.c SRC += $(PIOSCOMMON)/pios_i2c_esc.c
SRC += $(PIOSCOMMON)/pios_bmp085.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_rcvr.c
SRC += $(PIOSCOMMON)/pios_gcsrcvr.c SRC += $(PIOSCOMMON)/pios_gcsrcvr.c
SRC += $(PIOSCOMMON)/printf-stdarg.c SRC += $(PIOSCOMMON)/printf-stdarg.c

23
flight/Modules/Altitude/altitude.c
View File

@ -109,11 +109,7 @@ int32_t AltitudeInitialize()
alt_ds_temp = 0; alt_ds_temp = 0;
alt_ds_pres = 0; alt_ds_pres = 0;
alt_ds_count = 0; alt_ds_count = 0;
<<<<<<< HEAD
=======
>>>>>>> next
return 0; return 0;
} }
MODULE_INITCALL(AltitudeInitialize, AltitudeStart) MODULE_INITCALL(AltitudeInitialize, AltitudeStart)
@ -185,24 +181,6 @@ static void altitudeTask(void *parameters)
if (++alt_ds_count >= alt_ds_size) if (++alt_ds_count >= alt_ds_size)
{ {
alt_ds_count = 0; 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 // Convert from 1/10ths of degC to degC
data.Temperature = alt_ds_temp / (10.0 * alt_ds_size); data.Temperature = alt_ds_temp / (10.0 * alt_ds_size);
@ -219,7 +197,6 @@ static void altitudeTask(void *parameters)
BaroAltitudeSet(&data); BaroAltitudeSet(&data);
} }
>>>>>>> next
// Delay until it is time to read the next sample // Delay until it is time to read the next sample
vTaskDelayUntil(&lastSysTime, UPDATE_PERIOD / portTICK_RATE_MS); vTaskDelayUntil(&lastSysTime, UPDATE_PERIOD / portTICK_RATE_MS);
} }