diff options
author | px4dev <px4@purgatory.org> | 2012-10-27 11:34:20 -0700 |
---|---|---|
committer | px4dev <px4@purgatory.org> | 2012-10-27 11:34:20 -0700 |
commit | 6cec7f131ea9f68bd750d462333543f451bc4405 (patch) | |
tree | 6c536693550b51176bb948d79a81aa1b1244277b /nuttx | |
parent | 5135e5308b5689794b0497ed6be103d1bc332b7b (diff) | |
download | px4-firmware-6cec7f131ea9f68bd750d462333543f451bc4405.tar.gz px4-firmware-6cec7f131ea9f68bd750d462333543f451bc4405.tar.bz2 px4-firmware-6cec7f131ea9f68bd750d462333543f451bc4405.zip |
Minor board.h changes.
Diffstat (limited to 'nuttx')
-rwxr-xr-x | nuttx/configs/px4fmu/include/board.h | 44 |
1 files changed, 4 insertions, 40 deletions
diff --git a/nuttx/configs/px4fmu/include/board.h b/nuttx/configs/px4fmu/include/board.h index a7dae6552..3f0f26ba1 100755 --- a/nuttx/configs/px4fmu/include/board.h +++ b/nuttx/configs/px4fmu/include/board.h @@ -45,9 +45,6 @@ #ifndef __ASSEMBLY__ # include <stdint.h> #endif -//#include "stm32_rcc.h" -//#include "stm32_sdio.h" -//#include "stm32_internal.h" /************************************************************************************ * Definitions @@ -298,7 +295,7 @@ * Note that these are unshifted addresses. */ #define PX4_I2C_OBDEV_HMC5883 0x1e -#define PX4_I2C_OBDEV_MS5611 NOTDEFINED +#define PX4_I2C_OBDEV_MS5611 0x76 #define PX4_I2C_OBDEV_EEPROM NOTDEFINED #define PX4_I2C_OBDEV_PX4IO_BL 0x18 @@ -327,11 +324,9 @@ /* * Tone alarm output */ -#ifdef CONFIG_TONE_ALARM -# define TONE_ALARM_TIMER 3 /* timer 3 */ -# define TONE_ALARM_CHANNEL 3 /* channel 3 */ -# define GPIO_TONE_ALARM (GPIO_ALT|GPIO_AF2|GPIO_SPEED_2MHz|GPIO_FLOAT|GPIO_PUSHPULL|GPIO_PORTC|GPIO_PIN8) -#endif +#define TONE_ALARM_TIMER 3 /* timer 3 */ +#define TONE_ALARM_CHANNEL 3 /* channel 3 */ +#define GPIO_TONE_ALARM (GPIO_ALT|GPIO_AF2|GPIO_SPEED_2MHz|GPIO_FLOAT|GPIO_PUSHPULL|GPIO_PORTC|GPIO_PIN8) /************************************************************************************ * Public Data @@ -362,37 +357,6 @@ extern "C" { EXTERN void stm32_boardinitialize(void); -/************************************************************************************ - * Button support. - * - * Description: - * up_buttoninit() must be called to initialize button resources. After - * that, up_buttons() may be called to collect the current state of all - * buttons or up_irqbutton() may be called to register button interrupt - * handlers. - * - * After up_buttoninit() has been called, up_buttons() may be called to - * collect the state of all buttons. up_buttons() returns an 8-bit bit set - * with each bit associated with a button. See the BUTTON_*_BIT - * definitions in board.h for the meaning of each bit. - * - * up_irqbutton() may be called to register an interrupt handler that will - * be called when a button is depressed or released. The ID value is a - * button enumeration value that uniquely identifies a button resource. See the - * BUTTON_* definitions in board.h for the meaning of enumeration - * value. The previous interrupt handler address is returned (so that it may - * restored, if so desired). - * - ************************************************************************************/ - -#ifdef CONFIG_ARCH_BUTTONS -EXTERN void up_buttoninit(void); -EXTERN uint8_t up_buttons(void); -#ifdef CONFIG_ARCH_IRQBUTTONS -EXTERN xcpt_t up_irqbutton(int id, xcpt_t irqhandler); -#endif -#endif - #undef EXTERN #if defined(__cplusplus) } |