forked from Archive/PX4-Autopilot
Merge branch 'master' into export-build
This commit is contained in:
commit
ce0e4a3afd
|
@ -92,6 +92,7 @@
|
||||||
|
|
||||||
#include <nuttx/config.h>
|
#include <nuttx/config.h>
|
||||||
|
|
||||||
|
#include <arch/board/board.h>
|
||||||
#include <drivers/device/i2c.h>
|
#include <drivers/device/i2c.h>
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
@ -841,7 +842,7 @@ int
|
||||||
blinkm_main(int argc, char *argv[])
|
blinkm_main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
|
|
||||||
int i2cdevice = 3;
|
int i2cdevice = PX4_I2C_BUS_EXPANSION;
|
||||||
int blinkmadr = 9;
|
int blinkmadr = 9;
|
||||||
|
|
||||||
int x;
|
int x;
|
||||||
|
|
|
@ -125,7 +125,7 @@
|
||||||
# define HRT_TIMER_VECTOR STM32_IRQ_TIM8CC
|
# define HRT_TIMER_VECTOR STM32_IRQ_TIM8CC
|
||||||
# define HRT_TIMER_CLOCK STM32_APB2_TIM8_CLKIN
|
# define HRT_TIMER_CLOCK STM32_APB2_TIM8_CLKIN
|
||||||
# if CONFIG_STM32_TIM8
|
# if CONFIG_STM32_TIM8
|
||||||
# error must not set CONFIG_STM32_TIM8=y and HRT_TIMER=6
|
# error must not set CONFIG_STM32_TIM8=y and HRT_TIMER=8
|
||||||
# endif
|
# endif
|
||||||
#elif HRT_TIMER == 9
|
#elif HRT_TIMER == 9
|
||||||
# define HRT_TIMER_BASE STM32_TIM9_BASE
|
# define HRT_TIMER_BASE STM32_TIM9_BASE
|
||||||
|
|
|
@ -494,7 +494,7 @@ ToneAlarm::init()
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
/* configure the GPIO to the idle state */
|
/* configure the GPIO to the idle state */
|
||||||
stm32_configgpio(GPIO_TONE_ALARM);
|
stm32_configgpio(GPIO_TONE_ALARM_IDLE);
|
||||||
|
|
||||||
/* clock/power on our timer */
|
/* clock/power on our timer */
|
||||||
modifyreg32(STM32_RCC_APB1ENR, 0, TONE_ALARM_CLOCK_ENABLE);
|
modifyreg32(STM32_RCC_APB1ENR, 0, TONE_ALARM_CLOCK_ENABLE);
|
||||||
|
@ -606,6 +606,8 @@ ToneAlarm::start_note(unsigned note)
|
||||||
rEGR = GTIM_EGR_UG; // force a reload of the period
|
rEGR = GTIM_EGR_UG; // force a reload of the period
|
||||||
rCCER |= TONE_CCER; // enable the output
|
rCCER |= TONE_CCER; // enable the output
|
||||||
|
|
||||||
|
// configure the GPIO to enable timer output
|
||||||
|
stm32_configgpio(GPIO_TONE_ALARM);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -616,10 +618,8 @@ ToneAlarm::stop_note()
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Make sure the GPIO is not driving the speaker.
|
* Make sure the GPIO is not driving the speaker.
|
||||||
*
|
|
||||||
* XXX this presumes PX4FMU and the onboard speaker driver FET.
|
|
||||||
*/
|
*/
|
||||||
stm32_gpiowrite(GPIO_TONE_ALARM, 0);
|
stm32_configgpio(GPIO_TONE_ALARM_IDLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -326,6 +326,7 @@
|
||||||
*/
|
*/
|
||||||
#define TONE_ALARM_TIMER 3 /* timer 3 */
|
#define TONE_ALARM_TIMER 3 /* timer 3 */
|
||||||
#define TONE_ALARM_CHANNEL 3 /* channel 3 */
|
#define TONE_ALARM_CHANNEL 3 /* channel 3 */
|
||||||
|
#define GPIO_TONE_ALARM_IDLE (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN8)
|
||||||
#define GPIO_TONE_ALARM (GPIO_ALT|GPIO_AF2|GPIO_SPEED_2MHz|GPIO_FLOAT|GPIO_PUSHPULL|GPIO_PORTC|GPIO_PIN8)
|
#define GPIO_TONE_ALARM (GPIO_ALT|GPIO_AF2|GPIO_SPEED_2MHz|GPIO_FLOAT|GPIO_PUSHPULL|GPIO_PORTC|GPIO_PIN8)
|
||||||
|
|
||||||
/************************************************************************************
|
/************************************************************************************
|
||||||
|
|
Loading…
Reference in New Issue