forked from Archive/PX4-Autopilot
src/drivers/{kinetis,stm32}: move to arch-specific directories
This commit is contained in:
parent
3003e7d0fc
commit
f3fccf53f6
|
@ -41,7 +41,6 @@ px4_add_board(
|
|||
pwm_out_sim
|
||||
px4fmu
|
||||
rc_input
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#include <stm32_tim.h>
|
||||
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
#include <drivers/stm32/drv_io_timer.h>
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include "board_config.h"
|
||||
|
||||
|
|
|
@ -45,7 +45,6 @@ px4_add_board(
|
|||
|
||||
DRIVERS
|
||||
bootloaders
|
||||
stm32
|
||||
uavcanesc
|
||||
|
||||
MODULES
|
||||
|
|
|
@ -47,7 +47,6 @@ px4_add_board(
|
|||
px4fmu
|
||||
px4io
|
||||
roboclaw
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#include <stm32_tim.h>
|
||||
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
#include <drivers/stm32/drv_io_timer.h>
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include "board_config.h"
|
||||
|
||||
|
|
|
@ -48,7 +48,6 @@ px4_add_board(
|
|||
px4fmu
|
||||
rc_input
|
||||
#roboclaw
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#include <stm32_tim.h>
|
||||
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
#include <drivers/stm32/drv_io_timer.h>
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include "board_config.h"
|
||||
|
||||
|
|
|
@ -14,7 +14,6 @@ px4_add_board(
|
|||
imu/mpu9250
|
||||
optical_flow/pmw3901
|
||||
px4fmu
|
||||
stm32
|
||||
|
||||
MODULES
|
||||
attitude_estimator_q
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
#include "board_config.h"
|
||||
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
#include <drivers/stm32/drv_io_timer.h>
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
|
||||
/* IO Timers normally free-run at 1MHz
|
||||
|
|
|
@ -26,7 +26,6 @@ px4_add_board(
|
|||
pwm_out_sim
|
||||
px4fmu
|
||||
rc_input
|
||||
stm32
|
||||
telemetry
|
||||
tone_alarm
|
||||
osd
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#include <stm32_tim.h>
|
||||
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
#include <drivers/stm32/drv_io_timer.h>
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include "board_config.h"
|
||||
|
||||
|
|
|
@ -27,7 +27,6 @@ px4_add_board(
|
|||
pwm_out_sim
|
||||
px4fmu
|
||||
rc_input
|
||||
stm32
|
||||
tap_esc
|
||||
#telemetry # all available telemetry drivers
|
||||
#uavcan
|
||||
|
|
|
@ -30,7 +30,6 @@ px4_add_board(
|
|||
pwm_out_sim
|
||||
px4fmu
|
||||
rc_input
|
||||
stm32
|
||||
tap_esc
|
||||
#telemetry # all available telemetry drivers
|
||||
#uavcan
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
#include <stm32_tim.h>
|
||||
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
#include <drivers/stm32/drv_io_timer.h>
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include "board_config.h"
|
||||
|
||||
|
|
|
@ -50,7 +50,6 @@ px4_add_board(
|
|||
rc_input
|
||||
roboclaw
|
||||
safety_button
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#include <stm32_tim.h>
|
||||
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
#include <drivers/stm32/drv_io_timer.h>
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include "board_config.h"
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ px4_add_board(
|
|||
imu/mpu6000
|
||||
imu/mpu9250
|
||||
irlock
|
||||
kinetis
|
||||
lights/blinkm
|
||||
lights/oreoled
|
||||
lights/rgbled
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
#include "chip/kinetis_ftm.h"
|
||||
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
#include <drivers/kinetis/drv_io_timer.h>
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include "board_config.h"
|
||||
|
||||
|
|
|
@ -36,7 +36,6 @@ px4_add_board(
|
|||
#pwm_out_sim
|
||||
px4fmu
|
||||
rc_input
|
||||
stm32
|
||||
#tap_esc
|
||||
#telemetry # all available telemetry drivers
|
||||
telemetry/frsky_telemetry
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#include <stm32_tim.h>
|
||||
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
#include <drivers/stm32/drv_io_timer.h>
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include "board_config.h"
|
||||
|
||||
|
|
|
@ -43,7 +43,6 @@ px4_add_board(
|
|||
|
||||
DRIVERS
|
||||
bootloaders
|
||||
stm32
|
||||
uavcannode
|
||||
|
||||
MODULES
|
||||
|
|
|
@ -45,7 +45,6 @@ px4_add_board(
|
|||
|
||||
DRIVERS
|
||||
bootloaders
|
||||
stm32
|
||||
uavcanesc
|
||||
|
||||
MODULES
|
||||
|
|
|
@ -56,7 +56,6 @@ px4_add_board(
|
|||
px4fmu
|
||||
px4io
|
||||
#roboclaw
|
||||
stm32
|
||||
#tap_esc
|
||||
#telemetry # all available telemetry drivers
|
||||
#test_ppm
|
||||
|
|
|
@ -36,7 +36,6 @@ px4_add_board(
|
|||
magnetometer/hmc5883
|
||||
px4fmu
|
||||
px4io
|
||||
stm32
|
||||
#telemetry # all available telemetry drivers
|
||||
telemetry/iridiumsbd
|
||||
tone_alarm
|
||||
|
|
|
@ -52,7 +52,6 @@ px4_add_board(
|
|||
pwm_out_sim
|
||||
px4fmu
|
||||
px4io
|
||||
stm32
|
||||
#tap_esc
|
||||
#telemetry # all available telemetry drivers
|
||||
#test_ppm
|
||||
|
|
|
@ -36,7 +36,6 @@ px4_add_board(
|
|||
optical_flow/px4flow
|
||||
px4fmu
|
||||
px4io
|
||||
stm32
|
||||
tone_alarm
|
||||
|
||||
MODULES
|
||||
|
|
|
@ -32,7 +32,6 @@ px4_add_board(
|
|||
optical_flow/px4flow
|
||||
px4fmu
|
||||
px4io
|
||||
stm32
|
||||
tone_alarm
|
||||
|
||||
MODULES
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#include <stm32_tim.h>
|
||||
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
#include <drivers/stm32/drv_io_timer.h>
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include "board_config.h"
|
||||
|
||||
|
|
|
@ -52,7 +52,6 @@ px4_add_board(
|
|||
#pwm_out_sim
|
||||
px4fmu
|
||||
px4io
|
||||
stm32
|
||||
#tap_esc
|
||||
#telemetry # all available telemetry drivers
|
||||
#test_ppm
|
||||
|
|
|
@ -55,7 +55,6 @@ px4_add_board(
|
|||
px4fmu
|
||||
px4io
|
||||
roboclaw
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -54,7 +54,6 @@ px4_add_board(
|
|||
px4fmu
|
||||
px4io
|
||||
roboclaw
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#include <stm32_tim.h>
|
||||
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
#include <drivers/stm32/drv_io_timer.h>
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include "board_config.h"
|
||||
|
||||
|
|
|
@ -54,7 +54,6 @@ px4_add_board(
|
|||
px4fmu
|
||||
px4io
|
||||
roboclaw
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -40,7 +40,6 @@ px4_add_board(
|
|||
px4fmu
|
||||
rc_input
|
||||
safety_button
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -42,7 +42,6 @@ px4_add_board(
|
|||
px4fmu
|
||||
rc_input
|
||||
safety_button
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#include <stm32_tim.h>
|
||||
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
#include <drivers/stm32/drv_io_timer.h>
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include "board_config.h"
|
||||
|
||||
|
|
|
@ -40,7 +40,6 @@ px4_add_board(
|
|||
px4fmu
|
||||
rc_input
|
||||
safety_button
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -53,7 +53,6 @@ px4_add_board(
|
|||
px4fmu
|
||||
px4io
|
||||
roboclaw
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -52,7 +52,6 @@ px4_add_board(
|
|||
px4fmu
|
||||
px4io
|
||||
roboclaw
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#include <stm32_tim.h>
|
||||
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
#include <drivers/stm32/drv_io_timer.h>
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include "board_config.h"
|
||||
|
||||
|
|
|
@ -54,7 +54,6 @@ px4_add_board(
|
|||
rc_input
|
||||
roboclaw
|
||||
safety_button
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -54,7 +54,6 @@ px4_add_board(
|
|||
rc_input
|
||||
roboclaw
|
||||
safety_button
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -38,7 +38,6 @@ px4_add_board(
|
|||
px4io
|
||||
rc_input
|
||||
safety_button
|
||||
stm32
|
||||
telemetry # all available telemetry drivers
|
||||
tone_alarm
|
||||
uavcan
|
||||
|
|
|
@ -54,7 +54,6 @@ px4_add_board(
|
|||
rc_input
|
||||
roboclaw
|
||||
safety_button
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -42,7 +42,6 @@ px4_add_board(
|
|||
rc_input
|
||||
roboclaw
|
||||
safety_button
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
tone_alarm
|
||||
|
|
|
@ -42,7 +42,6 @@ px4_add_board(
|
|||
rc_input
|
||||
roboclaw
|
||||
safety_button
|
||||
stm32
|
||||
telemetry # all available telemetry drivers
|
||||
tone_alarm
|
||||
uavcan
|
||||
|
|
|
@ -52,7 +52,6 @@ px4_add_board(
|
|||
rc_input
|
||||
roboclaw
|
||||
safety_button
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#include <stm32_tim.h>
|
||||
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
#include <drivers/stm32/drv_io_timer.h>
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include "board_config.h"
|
||||
|
||||
|
|
|
@ -52,7 +52,6 @@ px4_add_board(
|
|||
rc_input
|
||||
roboclaw
|
||||
safety_button
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -54,7 +54,6 @@ px4_add_board(
|
|||
rc_input
|
||||
roboclaw
|
||||
safety_button
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -48,7 +48,6 @@ px4_add_board(
|
|||
px4io
|
||||
rc_input
|
||||
safety_button
|
||||
stm32
|
||||
telemetry # all available telemetry drivers
|
||||
tone_alarm
|
||||
uavcan
|
||||
|
|
|
@ -49,7 +49,6 @@ px4_add_board(
|
|||
rc_input
|
||||
roboclaw
|
||||
safety_button
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
tone_alarm
|
||||
|
|
|
@ -52,7 +52,6 @@ px4_add_board(
|
|||
rc_input
|
||||
roboclaw
|
||||
safety_button
|
||||
stm32
|
||||
telemetry # all available telemetry drivers
|
||||
tone_alarm
|
||||
uavcan
|
||||
|
|
|
@ -54,7 +54,6 @@ px4_add_board(
|
|||
rc_input
|
||||
roboclaw
|
||||
safety_button
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#include <stm32_tim.h>
|
||||
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
#include <drivers/stm32/drv_io_timer.h>
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include "board_config.h"
|
||||
|
||||
|
|
|
@ -54,7 +54,6 @@ px4_add_board(
|
|||
rc_input
|
||||
roboclaw
|
||||
safety_button
|
||||
stm32
|
||||
tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
test_ppm
|
||||
|
|
|
@ -6,7 +6,6 @@ px4_add_board(
|
|||
TOOLCHAIN arm-none-eabi
|
||||
ARCHITECTURE cortex-m3
|
||||
DRIVERS
|
||||
stm32
|
||||
MODULES
|
||||
px4iofirmware
|
||||
)
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
#include <stdint.h>
|
||||
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
#include <drivers/stm32/drv_io_timer.h>
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include <arch/board/board.h>
|
||||
|
||||
|
|
|
@ -36,7 +36,6 @@ px4_add_board(
|
|||
|
||||
DRIVERS
|
||||
bootloaders
|
||||
stm32
|
||||
#uavcannode
|
||||
|
||||
MODULES
|
||||
|
|
|
@ -41,6 +41,6 @@ add_library(drivers_board
|
|||
)
|
||||
|
||||
target_link_libraries(drivers_board
|
||||
PRIVATE
|
||||
drivers_arch
|
||||
PRIVATE
|
||||
px4_layer
|
||||
)
|
||||
|
|
|
@ -46,7 +46,6 @@ px4_add_board(
|
|||
pwm_out_sim
|
||||
px4fmu
|
||||
rc_input
|
||||
stm32
|
||||
#tap_esc
|
||||
telemetry # all available telemetry drivers
|
||||
#test_ppm
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
#include <stm32_tim.h>
|
||||
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
#include <drivers/stm32/drv_io_timer.h>
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include "board_config.h"
|
||||
|
||||
|
|
|
@ -174,7 +174,9 @@ function(px4_add_common_flags)
|
|||
${PX4_BINARY_DIR}/src/lib
|
||||
${PX4_BINARY_DIR}/src/modules
|
||||
|
||||
${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/src/px4/${PX4_CHIP_MANUFACTURER}/${PX4_CHIP}
|
||||
${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/src/px4/${PX4_CHIP_MANUFACTURER}/${PX4_CHIP}/include
|
||||
${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/src/px4/common/include
|
||||
${PX4_SOURCE_DIR}/platforms/common/include
|
||||
${PX4_SOURCE_DIR}/src
|
||||
${PX4_SOURCE_DIR}/src/include
|
||||
${PX4_SOURCE_DIR}/src/lib
|
||||
|
|
|
@ -78,7 +78,6 @@ endif()
|
|||
target_link_libraries(nuttx_arch
|
||||
INTERFACE
|
||||
drivers_board
|
||||
drivers_arch
|
||||
drivers_boards_common
|
||||
drivers_boards_common_arch
|
||||
arch_hrt
|
||||
|
|
|
@ -100,6 +100,9 @@ function(px4_os_determine_build_chip)
|
|||
if (CONFIG_STM32_STM32F10XX)
|
||||
set(CHIP_MANUFACTURER "stm")
|
||||
set(CHIP "stm32f1")
|
||||
elseif(CONFIG_STM32_STM32F30XX)
|
||||
set(CHIP_MANUFACTURER "stm")
|
||||
set(CHIP "stm32f3")
|
||||
elseif(CONFIG_STM32_STM32F4XXX)
|
||||
set(CHIP_MANUFACTURER "stm")
|
||||
set(CHIP "stm32f4")
|
||||
|
|
|
@ -32,10 +32,11 @@
|
|||
############################################################################
|
||||
|
||||
|
||||
add_subdirectory(../common/adc adc)
|
||||
add_subdirectory(../common/led_pwm led_pwm)
|
||||
add_subdirectory(../common/hrt hrt)
|
||||
add_subdirectory(../common/tone_alarm tone_alarm)
|
||||
add_subdirectory(../kinetis/adc adc)
|
||||
add_subdirectory(../kinetis/led_pwm led_pwm)
|
||||
add_subdirectory(../kinetis/hrt hrt)
|
||||
add_subdirectory(../kinetis/io_pins io_pins)
|
||||
add_subdirectory(../kinetis/tone_alarm tone_alarm)
|
||||
|
||||
|
||||
|
|
@ -32,5 +32,5 @@
|
|||
****************************************************************************/
|
||||
#pragma once
|
||||
|
||||
#include "../stm32_common/px4_arch_adc.h"
|
||||
#include "../../../kinetis/include/px4_arch/adc.h"
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
/****************************************************************************
|
||||
*
|
||||
* Copyright (c) 2019 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.
|
||||
*
|
||||
****************************************************************************/
|
||||
#pragma once
|
||||
|
||||
|
||||
#include "../../../kinetis/include/px4_arch/io_timer.h"
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
#pragma once
|
||||
|
||||
|
||||
#include "../../common/px4_platform_micro_hal.h"
|
||||
#include <px4_platform/micro_hal.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
|
@ -34,6 +34,7 @@
|
|||
#include <board_config.h>
|
||||
#include <drivers/drv_adc.h>
|
||||
#include <drivers/drv_hrt.h>
|
||||
#include <px4_arch/adc.h>
|
||||
|
||||
#include <nuttx/analog/adc.h>
|
||||
#include <kinetis.h>
|
|
@ -36,6 +36,6 @@
|
|||
|
||||
#define SYSTEM_ADC_BASE 0 // not used on kinetis
|
||||
|
||||
#include "../../common/px4_platform_adc.h"
|
||||
#include <px4_platform/adc.h>
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
############################################################################
|
||||
#
|
||||
# Copyright (c) 2016-2017 PX4 Development Team. All rights reserved.
|
||||
# Copyright (c) 2015-2019 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
|
||||
|
@ -31,12 +31,9 @@
|
|||
#
|
||||
############################################################################
|
||||
|
||||
add_library(drivers_arch
|
||||
drv_io_timer.c
|
||||
drv_pwm_servo.c
|
||||
drv_pwm_trigger.c
|
||||
drv_input_capture.c
|
||||
px4_add_library(arch_io_pins
|
||||
io_timer.c
|
||||
pwm_servo.c
|
||||
pwm_trigger.c
|
||||
input_capture.c
|
||||
)
|
||||
add_dependencies(drivers_arch prebuild_targets)
|
||||
target_link_libraries(drivers_arch PRIVATE drivers_board)
|
||||
target_compile_options(drivers_arch PRIVATE -Wno-cast-align) # TODO: fix and enable
|
|
@ -72,9 +72,7 @@
|
|||
|
||||
#include <arch/board/board.h>
|
||||
#include <drivers/drv_input_capture.h>
|
||||
#include "drv_io_timer.h"
|
||||
|
||||
#include "drv_input_capture.h"
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include <kinetis.h>
|
||||
#include "chip/kinetis_sim.h"
|
|
@ -56,7 +56,7 @@
|
|||
#include <arch/board/board.h>
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
|
||||
#include "drv_io_timer.h"
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include <kinetis.h>
|
||||
#include "chip/kinetis_sim.h"
|
|
@ -58,8 +58,7 @@
|
|||
#include <arch/board/board.h>
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
|
||||
#include "drv_io_timer.h"
|
||||
#include "drv_pwm_servo.h"
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include <kinetis.h>
|
||||
|
|
@ -54,8 +54,7 @@
|
|||
#include <arch/board/board.h>
|
||||
#include <drivers/drv_pwm_trigger.h>
|
||||
|
||||
#include "drv_io_timer.h"
|
||||
#include "drv_pwm_trigger.h"
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
int up_pwm_trigger_set(unsigned channel, uint16_t value)
|
||||
{
|
|
@ -56,7 +56,7 @@
|
|||
#include <arch/board/board.h>
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
|
||||
#include <drivers/kinetis/drv_io_timer.h>
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include <kinetis.h>
|
||||
#include "chip/kinetis_sim.h"
|
|
@ -34,6 +34,7 @@
|
|||
#include <board_config.h>
|
||||
#include <drivers/drv_adc.h>
|
||||
#include <drivers/drv_hrt.h>
|
||||
#include <px4_arch/adc.h>
|
||||
|
||||
#include <stm32_adc.h>
|
||||
#include <stm32_gpio.h>
|
||||
|
|
|
@ -53,5 +53,5 @@
|
|||
# define SYSTEM_ADC_BASE STM32_ADC1_BASE
|
||||
#endif
|
||||
|
||||
#include "../../common/px4_platform_adc.h"
|
||||
#include <px4_platform/adc.h>
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
****************************************************************************/
|
||||
#pragma once
|
||||
|
||||
#include "../../common/px4_platform_micro_hal.h"
|
||||
#include <px4_platform/micro_hal.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
****************************************************************************/
|
||||
|
||||
/**
|
||||
* @file arch_px4io_serial.h
|
||||
* @file px4io_serial.h
|
||||
*
|
||||
* Serial Interface definition for PX4IO
|
||||
*/
|
|
@ -1,6 +1,6 @@
|
|||
############################################################################
|
||||
#
|
||||
# Copyright (c) 2015 PX4 Development Team. All rights reserved.
|
||||
# Copyright (c) 2015-2019 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
|
||||
|
@ -31,12 +31,9 @@
|
|||
#
|
||||
############################################################################
|
||||
|
||||
add_library(drivers_arch
|
||||
drv_io_timer.c
|
||||
drv_pwm_servo.c
|
||||
drv_pwm_trigger.c
|
||||
drv_input_capture.c
|
||||
px4_add_library(arch_io_pins
|
||||
io_timer.c
|
||||
pwm_servo.c
|
||||
pwm_trigger.c
|
||||
input_capture.c
|
||||
)
|
||||
add_dependencies(drivers_arch prebuild_targets)
|
||||
target_link_libraries(drivers_arch PRIVATE drivers_board)
|
||||
target_compile_options(drivers_arch PRIVATE -Wno-cast-align) # TODO: fix and enable
|
|
@ -72,9 +72,7 @@
|
|||
|
||||
#include <arch/board/board.h>
|
||||
#include <drivers/drv_input_capture.h>
|
||||
#include "drv_io_timer.h"
|
||||
|
||||
#include "drv_input_capture.h"
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include <stm32_gpio.h>
|
||||
#include <stm32_tim.h>
|
|
@ -58,7 +58,7 @@
|
|||
#include <arch/board/board.h>
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
|
||||
#include "drv_io_timer.h"
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include <stm32_gpio.h>
|
||||
#include <stm32_tim.h>
|
|
@ -58,8 +58,7 @@
|
|||
#include <arch/board/board.h>
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
|
||||
#include "drv_io_timer.h"
|
||||
#include "drv_pwm_servo.h"
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include <stm32_tim.h>
|
||||
|
|
@ -54,8 +54,7 @@
|
|||
#include <arch/board/board.h>
|
||||
#include <drivers/drv_pwm_trigger.h>
|
||||
|
||||
#include "drv_io_timer.h"
|
||||
#include "drv_pwm_trigger.h"
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
#include <stm32_tim.h>
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
#include <systemlib/px4_macros.h>
|
||||
|
||||
#include <drivers/drv_pwm_output.h>
|
||||
#include <drivers/stm32/drv_io_timer.h>
|
||||
#include <px4_arch/io_timer.h>
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -0,0 +1,37 @@
|
|||
/****************************************************************************
|
||||
*
|
||||
* Copyright (c) 2019 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.
|
||||
*
|
||||
****************************************************************************/
|
||||
#pragma once
|
||||
|
||||
|
||||
#include "../../../stm32_common/include/px4_arch/io_timer.h"
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
#pragma once
|
||||
|
||||
|
||||
#include "../stm32_common/px4_arch_micro_hal.h"
|
||||
#include "../../../stm32_common/include/px4_arch/micro_hal.h"
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
|
@ -32,5 +32,6 @@
|
|||
############################################################################
|
||||
|
||||
|
||||
add_subdirectory(${PX4_CHIP})
|
||||
add_subdirectory(../stm32_common/hrt hrt)
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue