Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-04 22:17:01 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

[fix] fix warning, missing include, and more configuration

Browse Source
This commit is contained in:
Gautier Hattenberger
2013-07-24 22:54:22 +02:00
parent 0195cecb91
commit d5ea3a92a2
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/arch/lpc21/mcu_periph/uart_arch.c
+1 -1
View File
@@ -68,7 +68,7 @@ void uart_periph_set_baudrate(struct uart_periph* p, uint32_t baud) {
uart_enable_interrupts(p); uart_enable_interrupts(p);
} }
void uart_periph_set_bits_stop_parity(struct uart_periph* p, uint8_t __attribute__((unused)) bits, uint8_t __attribute__((unused)) stop, uint8_t __attribute__((unused)) parity) { void uart_periph_set_bits_stop_parity(struct uart_periph* __attribute__((unused)) p, uint8_t __attribute__((unused)) bits, uint8_t __attribute__((unused)) stop, uint8_t __attribute__((unused)) parity) {
// TBD // TBD
} }
sw/airborne/boards/umarim/imu_umarim.c
+7 -1
View File
@@ -32,7 +32,7 @@
#include <math.h> #include <math.h>
#include "imu_umarim.h" #include "imu_umarim.h"
#include "mcu_periph/i2c.h" #include "mcu_periph/i2c.h"
#include "led.h" #include "generated/airframe.h"
// Downlink // Downlink
#include "mcu_periph/uart.h" #include "mcu_periph/uart.h"
@@ -43,6 +43,11 @@
#define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE #define DOWNLINK_DEVICE DOWNLINK_AP_DEVICE
#endif #endif
#ifndef UMARIM_ACCEL_RANGE
#define UMARIM_ACCEL_RANGE ADXL345_RANGE_16G
#endif
PRINT_CONFIG_VAR(UMARIM_ACCEL_RANGE)
#ifndef UMARIM_ACCEL_RATE #ifndef UMARIM_ACCEL_RATE
#define UMARIM_ACCEL_RATE ADXL345_RATE_50HZ #define UMARIM_ACCEL_RATE ADXL345_RATE_50HZ
#endif #endif
@@ -74,6 +79,7 @@ void imu_impl_init(void)
adxl345_i2c_init(&imu_umarim.adxl, &(IMU_UMARIM_I2C_DEV), ADXL345_ADDR_ALT); adxl345_i2c_init(&imu_umarim.adxl, &(IMU_UMARIM_I2C_DEV), ADXL345_ADDR_ALT);
// change the default data rate // change the default data rate
imu_umarim.adxl.config.rate = UMARIM_ACCEL_RATE; imu_umarim.adxl.config.rate = UMARIM_ACCEL_RATE;
imu_umarim.adxl.config.range = UMARIM_ACCEL_RANGE;
imu_umarim.gyr_valid = FALSE; imu_umarim.gyr_valid = FALSE;
imu_umarim.acc_valid = FALSE; imu_umarim.acc_valid = FALSE;
sw/airborne/firmwares/fixedwing/datalink.c
+3
View File
@@ -74,6 +74,9 @@ uint8_t joystick_block;
} }
#endif #endif
#if defined RADIO_CONTROL && defined RADIO_CONTROL_TYPE_DATALINK
#include "subsystems/radio_control/rc_datalink.h"
#endif
#define MOfCm(_x) (((float)(_x))/100.) #define MOfCm(_x) (((float)(_x))/100.)