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

Ported Christophe's i2c driver reimplementation to libopencm3 using test_baro for testing.

Browse Source
This commit is contained in:
Piotr Esden-Tempski
2012-02-24 18:08:12 -08:00
parent 7b77b52d01
commit 13cd9362e7
5 changed files with 233 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/autopilot/lisa_test_progs.makefile
+1 -1
View File
@@ -182,7 +182,7 @@ test_baro.CFLAGS += -I$(SRC_LISA) -I$(SRC_BOARD)
test_baro.srcs += $(SRC_BOARD)/test_baro.c
test_baro.srcs += $(SRC_BOARD)/baro_board.c
test_baro.CFLAGS += -DUSE_I2C2
test_baro.srcs += mcu_periph/i2c.c $(SRC_ARCH)/mcu_periph/i2c_arch.c
test_baro.srcs += mcu_periph/i2c.c $(SRC_ARCH)/mcu_periph/i2c_arch.rewritten.c
#
sw/airborne/arch/stm32/mcu_periph/i2c_arch.h
+1 -2
View File
@@ -29,8 +29,7 @@
#define I2C_HW_H
#include "mcu_periph/i2c.h"
#include <stm32/i2c.h>
#include <libopencm3/stm32/i2c.h>
#ifdef USE_I2C1
sw/airborne/arch/stm32/mcu_periph/i2c_arch.rewritten.c
+217 -201
View File
File diff suppressed because it is too large Load Diff
sw/airborne/boards/lisa_m/baro_board.c
+5 -7
View File
@@ -1,6 +1,6 @@
#include "subsystems/sensors/baro.h"
#include <stm32/gpio.h>
#include <libopencm3/stm32/f1/gpio.h>
struct Baro baro;
struct BaroBoard baro_board;
@@ -75,16 +75,14 @@ void baro_init(void) {
bmp085_baro_read_calibration();
/* STM32 specific (maybe this is a LISA/M specific driver anyway?) */
GPIO_InitTypeDef GPIO_InitStructure;
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_0;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_Init(GPIOB, &GPIO_InitStructure);
gpio_clear(GPIOB, GPIO0);
gpio_set_mode(GPIOB, GPIO_MODE_INPUT,
GPIO_CNF_INPUT_PULL_UPDOWN, GPIO0);
}
static inline int baro_eoc(void)
{
return GPIO_ReadInputDataBit(GPIOB,GPIO_Pin_0);
return gpio_get(GPIOB, GPIO0);
}
static inline void bmp085_request_pressure(void)
sw/airborne/boards/lisa_m/test_baro.c
+9 -9
View File
@@ -80,15 +80,15 @@ static inline void main_periodic_task( void ) {
RunOnceEvery(256,
{
DOWNLINK_SEND_I2C_ERRORS(DefaultChannel, DefaultDevice,
&i2c2_errors.ack_fail_cnt,
&i2c2_errors.miss_start_stop_cnt,
&i2c2_errors.arb_lost_cnt,
&i2c2_errors.over_under_cnt,
&i2c2_errors.pec_recep_cnt,
&i2c2_errors.timeout_tlow_cnt,
&i2c2_errors.smbus_alert_cnt,
&i2c2_errors.unexpected_event_cnt,
&i2c2_errors.last_unexpected_event);
&i2c2.errors->ack_fail_cnt,
&i2c2.errors->miss_start_stop_cnt,
&i2c2.errors->arb_lost_cnt,
&i2c2.errors->over_under_cnt,
&i2c2.errors->pec_recep_cnt,
&i2c2.errors->timeout_tlow_cnt,
&i2c2.errors->smbus_alert_cnt,
&i2c2.errors->unexpected_event_cnt,
&i2c2.errors->last_unexpected_event);
});
}