fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-23 07:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

boards: remove DIRECT_INPUT_TIMER_CHANNELS from board_config.h

Browse Source
This commit is contained in:
Beat Küng
2021-09-08 16:10:24 -04:00
committed by Daniel Agar
parent ae8733c2d4
commit c5c80e31b6
33 changed files with 16 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/nuttx/src/px4/stm/stm32_common/io_pins/input_capture.c
+2 -2
View File
@@ -77,7 +77,7 @@
#include <stm32_gpio.h>
#include <stm32_tim.h>
#if defined(BOARD_HAS_CAPTURE)
#if !defined(BOARD_HAS_NO_CAPTURE)
/* Support Input capture */
@@ -497,4 +497,4 @@ int up_input_capture_get_stats(unsigned channel, input_capture_stats_t *stats, b
return rv;
}
#endif // defined(BOARD_HAS_CAPTURE)
#endif // !defined(BOARD_HAS_NO_CAPTURE)
platforms/nuttx/src/px4/stm/stm32_common/io_pins/io_timer.c
+6 -6
View File
@@ -156,7 +156,7 @@ typedef uint8_t io_timer_allocation_t; /* big enough to hold MAX_IO_TIMERS */
io_timer_channel_allocation_t timer_allocations[MAX_IO_TIMERS] = { };
#if defined(BOARD_HAS_CAPTURE)
#if !defined(BOARD_HAS_NO_CAPTURE)
/* Stats and handlers are only useful for Capture */
@@ -171,12 +171,12 @@ static struct channel_handler_entry {
channel_handler_t callback;
void *context;
} channel_handlers[MAX_TIMER_IO_CHANNELS];
#endif // defined(BOARD_HAS_CAPTURE)
#endif // !defined(BOARD_HAS_NO_CAPTURE)
static int io_timer_handler(uint16_t timer_index)
{
#if defined(BOARD_HAS_CAPTURE)
#if !defined(BOARD_HAS_NO_CAPTURE)
/* Read the count at the time of the interrupt */
uint16_t count = rCNT(timer_index);
@@ -231,7 +231,7 @@ static int io_timer_handler(uint16_t timer_index)
/* Clear all the SR bits for interrupt enabled channels only */
rSR(timer_index) = ~(statusr & (enabled | enabled << 8));
#endif // defined(BOARD_HAS_CAPTURE)
#endif // !defined(BOARD_HAS_NO_CAPTURE)
return 0;
}
@@ -773,7 +773,7 @@ int io_timer_channel_init(unsigned channel, io_timer_channel_mode_t mode,
gpio = timer_io_channels[channel].gpio_in;
break;
#if defined(BOARD_HAS_CAPTURE)
#if !defined(BOARD_HAS_NO_CAPTURE)
case IOTimerChanMode_Capture:
setbits = CCMR_C1_CAPTURE_INIT;
@@ -851,7 +851,7 @@ int io_timer_channel_init(unsigned channel, io_timer_channel_mode_t mode,
rvalue |= setbits;
rCCER(timer) = rvalue;
#if !defined(BOARD_HAS_CAPTURE)
#if defined(BOARD_HAS_NO_CAPTURE)
UNUSED(dier_setbits);
#else
channel_handlers[channel].callback = channel_handler;