Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

directory structure for architecture-specific code and headers #12821

Merged
merged 12 commits into from
Aug 30, 2019
Merged

directory structure for architecture-specific code and headers #12821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1c0a913
platform: restructure (NuttX) architecture-specific code
bkueng Aug 23, 2019
227c65d
adc: refactor into arch-specific directories
bkueng Aug 26, 2019
e8f6515
NuttX hrt: move into arch-specific directory
bkueng Aug 26, 2019
3baa662
drv_led_pwm: move to arch-specific directory
bkueng Aug 26, 2019
0cd911f
src/drivers/{kinetis,stm32}: move to arch-specific directories
bkueng Aug 28, 2019
6d94557
ToneAlarmInterface: move to drivers/drv_tone_alarm
bkueng Aug 27, 2019
351c8f9
src/platforms/qurt: move to src/drivers
bkueng Aug 27, 2019
35faad7
platforms/posix/src: move to platforms/posix/src/px4/common
bkueng Aug 27, 2019
eaa48a5
src/platforms/posix: move to platforms/posix/src/px4/common and src/d…
bkueng Aug 27, 2019
7ee09f6
src/platforms/common: move to platforms/common
bkueng Aug 27, 2019
b30c1a5
src/platforms: move remaining source files to platforms/common
bkueng Aug 27, 2019
ae2631e
px4_middleware: remove that header and move px4::init to px4_init.h
bkueng Aug 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 13 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,17 @@ else()
px4_find_python_module(jinja2 REQUIRED)
endif()

#=============================================================================
# get chip and chip manufacturer
#
px4_os_determine_build_chip()
if(NOT PX4_CHIP_MANUFACTURER)
message(FATAL_ERROR "px4_os_determine_build_chip() needs to set PX4_CHIP_MANUFACTURER")
endif()
if(NOT PX4_CHIP)
message(FATAL_ERROR "px4_os_determine_build_chip() needs to set PX4_CHIP")
endif()

#=============================================================================
# build flags
#
Expand Down Expand Up @@ -451,7 +462,8 @@ add_library(parameters_interface INTERFACE)
include(px4_add_library)
add_subdirectory(src/lib EXCLUDE_FROM_ALL)

add_subdirectory(src/platforms EXCLUDE_FROM_ALL)
add_subdirectory(platforms/${PX4_PLATFORM}/src/px4)
add_subdirectory(platforms EXCLUDE_FROM_ALL)
add_subdirectory(src/modules/uORB EXCLUDE_FROM_ALL) # TODO: platform layer
add_subdirectory(src/drivers/boards EXCLUDE_FROM_ALL)

Expand Down
4 changes: 1 addition & 3 deletions boards/airmind/mindpx-v2/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ px4_add_board(
TEL2:/dev/ttyS2

DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_trigger
Expand All @@ -40,9 +41,6 @@ px4_add_board(
pwm_out_sim
px4fmu
rc_input
stm32
stm32/adc
stm32/tone_alarm
tap_esc
telemetry # all available telemetry drivers
test_ppm
Expand Down
2 changes: 1 addition & 1 deletion boards/airmind/mindpx-v2/src/timer_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion boards/auav/esc35-v1/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ px4_add_board(

DRIVERS
bootloaders
stm32
uavcanesc

MODULES
Expand Down
4 changes: 1 addition & 3 deletions boards/auav/x21/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ px4_add_board(
TEL2:/dev/ttyS2

DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
Expand Down Expand Up @@ -46,9 +47,6 @@ px4_add_board(
px4fmu
px4io
roboclaw
stm32
stm32/adc
stm32/tone_alarm
tap_esc
telemetry # all available telemetry drivers
test_ppm
Expand Down
2 changes: 1 addition & 1 deletion boards/auav/x21/src/timer_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 1 addition & 3 deletions boards/av/x-v1/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ px4_add_board(
TEL4:/dev/ttyS3

DRIVERS
adc
barometer # all available barometer drivers
batt_smbus
camera_capture
Expand Down Expand Up @@ -47,9 +48,6 @@ px4_add_board(
px4fmu
rc_input
#roboclaw
stm32
stm32/adc
#stm32/tone_alarm
tap_esc
telemetry # all available telemetry drivers
test_ppm
Expand Down
2 changes: 1 addition & 1 deletion boards/av/x-v1/src/timer_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion boards/bitcraze/crazyflie/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ px4_add_board(
imu/mpu9250
optical_flow/pmw3901
px4fmu
stm32

MODULES
attitude_estimator_q
Expand Down
2 changes: 1 addition & 1 deletion boards/bitcraze/crazyflie/src/timer_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions boards/holybro/kakutef7/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ px4_add_board(
# /dev/ttyS5: UART7 (ESC telemetry)

DRIVERS
adc
barometer/bmp280
gps
imu/mpu6000
Expand All @@ -25,9 +26,6 @@ px4_add_board(
pwm_out_sim
px4fmu
rc_input
stm32
stm32/adc
stm32/tone_alarm
telemetry
tone_alarm
osd
Expand Down
2 changes: 1 addition & 1 deletion boards/holybro/kakutef7/src/timer_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion boards/intel/aerofc-v1/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ px4_add_board(
pwm_out_sim
px4fmu
rc_input
stm32
tap_esc
#telemetry # all available telemetry drivers
#uavcan
Expand Down
1 change: 0 additions & 1 deletion boards/intel/aerofc-v1/rtps.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ px4_add_board(
pwm_out_sim
px4fmu
rc_input
stm32
tap_esc
#telemetry # all available telemetry drivers
#uavcan
Expand Down
2 changes: 1 addition & 1 deletion boards/intel/aerofc-v1/src/timer_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 1 addition & 3 deletions boards/mro/ctrl-zero-f7/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ px4_add_board(
#FRSKY:/dev/ttyS5

DRIVERS
adc
#barometer # all available barometer drivers
#barometer/dps310
batt_smbus
Expand Down Expand Up @@ -49,9 +50,6 @@ px4_add_board(
rc_input
roboclaw
safety_button
stm32
stm32/adc
stm32/tone_alarm
tap_esc
telemetry # all available telemetry drivers
test_ppm
Expand Down
2 changes: 1 addition & 1 deletion boards/mro/ctrl-zero-f7/src/timer_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 1 addition & 3 deletions boards/nxp/fmuk66-v3/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ px4_add_board(
TEL2:/dev/ttyS1

DRIVERS
adc
barometer # all available barometer drivers
barometer/mpl3115a2
batt_smbus
Expand All @@ -30,9 +31,6 @@ px4_add_board(
imu/mpu6000
imu/mpu9250
irlock
kinetis
kinetis/adc
kinetis/tone_alarm
lights/blinkm
lights/oreoled
lights/rgbled
Expand Down
2 changes: 1 addition & 1 deletion boards/nxp/fmuk66-v3/src/timer_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 1 addition & 3 deletions boards/omnibus/f4sd/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ px4_add_board(
URT6:/dev/ttyS2

DRIVERS
adc
#barometer # all available barometer drivers
barometer/bmp280
#batt_smbus
Expand All @@ -35,9 +36,6 @@ px4_add_board(
#pwm_out_sim
px4fmu
rc_input
stm32
stm32/adc
#stm32/tone_alarm
#tap_esc
#telemetry # all available telemetry drivers
telemetry/frsky_telemetry
Expand Down
2 changes: 1 addition & 1 deletion boards/omnibus/f4sd/src/timer_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion boards/px4/cannode-v1/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ px4_add_board(

DRIVERS
bootloaders
stm32
uavcannode

MODULES
Expand Down
1 change: 0 additions & 1 deletion boards/px4/esc-v1/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ px4_add_board(

DRIVERS
bootloaders
stm32
uavcanesc

MODULES
Expand Down
4 changes: 1 addition & 3 deletions boards/px4/fmu-v2/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ px4_add_board(
TEL4:/dev/ttyS6

DRIVERS
adc
#barometer # all available barometer drivers
barometer/ms5611
#batt_smbus
Expand Down Expand Up @@ -55,9 +56,6 @@ px4_add_board(
px4fmu
px4io
#roboclaw
stm32
stm32/adc
stm32/tone_alarm
#tap_esc
#telemetry # all available telemetry drivers
#test_ppm
Expand Down
4 changes: 1 addition & 3 deletions boards/px4/fmu-v2/fixedwing.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ px4_add_board(
TEL4:/dev/ttyS6

DRIVERS
adc
#barometer # all available barometer drivers
barometer/ms5611
batt_smbus
Expand All @@ -35,9 +36,6 @@ px4_add_board(
magnetometer/hmc5883
px4fmu
px4io
stm32
stm32/adc
stm32/tone_alarm
#telemetry # all available telemetry drivers
telemetry/iridiumsbd
tone_alarm
Expand Down
4 changes: 1 addition & 3 deletions boards/px4/fmu-v2/lpe.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ px4_add_board(
TEL4:/dev/ttyS6

DRIVERS
adc
#barometer # all available barometer drivers
barometer/ms5611
#batt_smbus
Expand Down Expand Up @@ -51,9 +52,6 @@ px4_add_board(
pwm_out_sim
px4fmu
px4io
stm32
stm32/adc
stm32/tone_alarm
#tap_esc
#telemetry # all available telemetry drivers
#test_ppm
Expand Down
4 changes: 1 addition & 3 deletions boards/px4/fmu-v2/multicopter.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ px4_add_board(
TEL4:/dev/ttyS6

DRIVERS
adc
barometer/ms5611
#batt_smbus
camera_capture
Expand All @@ -35,9 +36,6 @@ px4_add_board(
optical_flow/px4flow
px4fmu
px4io
stm32
stm32/adc
stm32/tone_alarm
tone_alarm

MODULES
Expand Down
4 changes: 1 addition & 3 deletions boards/px4/fmu-v2/rover.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ px4_add_board(
TEL4:/dev/ttyS6

DRIVERS
adc
barometer/ms5611
batt_smbus
camera_capture
Expand All @@ -31,9 +32,6 @@ px4_add_board(
optical_flow/px4flow
px4fmu
px4io
stm32
stm32/adc
stm32/tone_alarm
tone_alarm

MODULES
Expand Down
2 changes: 1 addition & 1 deletion boards/px4/fmu-v2/src/timer_config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 1 addition & 3 deletions boards/px4/fmu-v2/test.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ px4_add_board(
TEL4:/dev/ttyS3

DRIVERS
adc
#barometer # all available barometer drivers
barometer/ms5611
#batt_smbus
Expand Down Expand Up @@ -51,9 +52,6 @@ px4_add_board(
#pwm_out_sim
px4fmu
px4io
stm32
stm32/adc
stm32/tone_alarm
#tap_esc
#telemetry # all available telemetry drivers
#test_ppm
Expand Down
Loading