mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-11-02 09:21:35 +08:00
Julian Oes
3c39095271
* hrt: Fix PPM input on channel 2 The CCMR1_PPM define for PPM input on channel 2 was incorrectly set to 2, which was setting bits for channel 1 instead of channel 2. This prevented PPM input from functioning properly on channel 2. Changed CCMR1_PPM for channel 2 from 2 to (1 << 8), which correctly configures the CC2S bits for input capture mode on TI2. This fixes an issue noted in the existing code comment: "FIXME! There is an interaction in the CCMR registers that prevents using Chan 1 as the timer and chan 2 as the PPM" Tested on STM32H743 with PPM input on PC7 (TIM8_CH2). * rc_input: enable sharing serial and PPM pin By setting RC_SERIAL_PORT_SHARED_PPM_PIN_GPIO_RX it is now possible to use the same pin on the STM32 for PPM input as well as serial input. * boards: Add support for Holybro KakuteH7-Wing
75 lines
2.4 KiB
CMake
75 lines
2.4 KiB
CMake
############################################################################
|
|
#
|
|
# Copyright (c) 2016 PX4 Development Team. All rights reserved.
|
|
#
|
|
# Redistribution and use in source and binary forms, with or without
|
|
# modification, are permitted provided that the following conditions
|
|
# are met:
|
|
#
|
|
# 1. Redistributions of source code must retain the above copyright
|
|
# notice, this list of conditions and the following disclaimer.
|
|
# 2. Redistributions in binary form must reproduce the above copyright
|
|
# notice, this list of conditions and the following disclaimer in
|
|
# the documentation and/or other materials provided with the
|
|
# distribution.
|
|
# 3. Neither the name PX4 nor the names of its contributors may be
|
|
# used to endorse or promote products derived from this software
|
|
# without specific prior written permission.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
|
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
# POSSIBILITY OF SUCH DAMAGE.
|
|
#
|
|
############################################################################
|
|
if("${PX4_BOARD_LABEL}" STREQUAL "bootloader")
|
|
add_compile_definitions(BOOTLOADER)
|
|
add_library(drivers_board
|
|
bootloader_main.c
|
|
init.c
|
|
usb.c
|
|
timer_config.cpp
|
|
)
|
|
target_link_libraries(drivers_board
|
|
PRIVATE
|
|
nuttx_arch # sdio
|
|
nuttx_drivers # sdio
|
|
px4_layer #gpio
|
|
arch_io_pins # iotimer
|
|
bootloader
|
|
)
|
|
target_include_directories(drivers_board PRIVATE ${PX4_SOURCE_DIR}/platforms/nuttx/src/bootloader/common)
|
|
|
|
else()
|
|
add_library(drivers_board
|
|
can.c
|
|
i2c.cpp
|
|
init.c
|
|
led.c
|
|
sdio.c
|
|
spi.cpp
|
|
timer_config.cpp
|
|
usb.c
|
|
)
|
|
add_dependencies(drivers_board arch_board_hw_info)
|
|
|
|
target_link_libraries(drivers_board
|
|
PRIVATE
|
|
arch_io_pins
|
|
arch_spi
|
|
arch_board_hw_info
|
|
drivers__led # drv_led_start
|
|
nuttx_arch # sdio
|
|
nuttx_drivers # sdio
|
|
px4_layer
|
|
)
|
|
endif()
|