aboutsummaryrefslogtreecommitdiff
path: root/src/drivers/stm32
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2013-08-02 22:34:55 -0700
committerpx4dev <px4@purgatory.org>2013-08-02 22:34:55 -0700
commit9d6ec6b3655fcd902be7a7fe4f2a24033c714afb (patch)
tree6093f77bca4fce924d3cce0e4ed065344a063f82 /src/drivers/stm32
parenta9c1882ea01aa0cf00448bc874c97087853bb13c (diff)
downloadpx4-firmware-9d6ec6b3655fcd902be7a7fe4f2a24033c714afb.tar.gz
px4-firmware-9d6ec6b3655fcd902be7a7fe4f2a24033c714afb.tar.bz2
px4-firmware-9d6ec6b3655fcd902be7a7fe4f2a24033c714afb.zip
Restructure things so that the PX4 configs move out of the NuttX tree, and most of the PX4-specific board configuration data moves out of the config and into the board driver.
Rename some directories that got left behind in the great board renaming.
Diffstat (limited to 'src/drivers/stm32')
-rw-r--r--src/drivers/stm32/drv_hrt.c7
-rw-r--r--src/drivers/stm32/tone_alarm/tone_alarm.cpp2
2 files changed, 2 insertions, 7 deletions
diff --git a/src/drivers/stm32/drv_hrt.c b/src/drivers/stm32/drv_hrt.c
index 1cc18afda..58529fb03 100644
--- a/src/drivers/stm32/drv_hrt.c
+++ b/src/drivers/stm32/drv_hrt.c
@@ -59,7 +59,7 @@
#include <errno.h>
#include <string.h>
-#include <arch/board/board.h>
+#include <board_config.h>
#include <drivers/drv_hrt.h>
#include "chip.h"
@@ -70,8 +70,6 @@
#include "stm32_gpio.h"
#include "stm32_tim.h"
-#ifdef HRT_TIMER
-
/* HRT configuration */
#if HRT_TIMER == 1
# define HRT_TIMER_BASE STM32_TIM1_BASE
@@ -905,6 +903,3 @@ hrt_latency_update(void)
/* catch-all at the end */
latency_counters[index]++;
}
-
-
-#endif /* HRT_TIMER */
diff --git a/src/drivers/stm32/tone_alarm/tone_alarm.cpp b/src/drivers/stm32/tone_alarm/tone_alarm.cpp
index 2284be84d..24eec52af 100644
--- a/src/drivers/stm32/tone_alarm/tone_alarm.cpp
+++ b/src/drivers/stm32/tone_alarm/tone_alarm.cpp
@@ -104,7 +104,7 @@
#include <math.h>
#include <ctype.h>
-#include <arch/board/board.h>
+#include <board_config.h>
#include <drivers/drv_hrt.h>
#include <arch/stm32/chip.h>