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

Reenable the CC3D sensors

Browse Source
This commit is contained in:
James Cotton 2012-01-24 11:03:33 -06:00
parent 466992a907
commit e9552065a9
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flight/CopterControl/Makefile
View File

@ -226,8 +226,8 @@ SRC += $(PIOSCOMMON)/pios_crc.c
SRC += $(PIOSCOMMON)/pios_flashfs_objlist.c SRC += $(PIOSCOMMON)/pios_flashfs_objlist.c
SRC += $(PIOSCOMMON)/pios_flash_w25x.c SRC += $(PIOSCOMMON)/pios_flash_w25x.c
SRC += $(PIOSCOMMON)/pios_adxl345.c SRC += $(PIOSCOMMON)/pios_adxl345.c
#SRC += $(PIOSCOMMON)/pios_l3gd20.c SRC += $(PIOSCOMMON)/pios_l3gd20.c
#SRC += $(PIOSCOMMON)/pios_bma180.c SRC += $(PIOSCOMMON)/pios_bma180.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

2
flight/CopterControl/System/inc/pios_config.h
View File

@ -77,10 +77,8 @@
#define PIOS_INCLUDE_ADXL345 #define PIOS_INCLUDE_ADXL345
#define PIOS_INCLUDE_FLASH #define PIOS_INCLUDE_FLASH
/*
#define PIOS_INCLUDE_BMA180 #define PIOS_INCLUDE_BMA180
#define PIOS_INCLUDE_L3GD20 #define PIOS_INCLUDE_L3GD20
*/
/* /*
#define PIOS_INCLUDE_BMP085 #define PIOS_INCLUDE_BMP085
*/ */

2
flight/Modules/Attitude/attitude.c
View File

@ -392,7 +392,7 @@ static int32_t updateSensorsCC3D(AccelsData * accelsData, GyrosData * gyrosData)
struct pios_l3gd20_data gyro; struct pios_l3gd20_data gyro;
bool gyro_error = false; bool gyro_error = false;
while(gyro_read_good = PIOS_L3GD20_ReadFifo(&gyro)) != 0 && !gyro_error) while((gyro_read_good = PIOS_L3GD20_ReadFifo(&gyro) != 0) && !gyro_error)
gyro_error = ((xTaskGetTickCount() - lastSysTime) > 5) ? true : gyro_error; gyro_error = ((xTaskGetTickCount() - lastSysTime) > 5) ? true : gyro_error;
while(gyro_read_good == 0) { while(gyro_read_good == 0) {
gyro_samples++; gyro_samples++;