Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-23 14:47:44 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

rename drivers/px4fmu -> drivers/pwm_out

Browse Source 
- split out header
This commit is contained in:
Daniel Agar
2020-03-27 15:31:04 -04:00
parent 3bcd8c63f8
commit ca81175b07
51 changed files with 338 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ROMFS/px4fmu_common/init.d/rc.interface
+12 -12
View File
@@ -9,7 +9,7 @@
# Otherwise, the variable name goes to the end of the argument.
#
set FMU_CMD fmu
set OUTPUT_CMD pwm_out
set MIXER_AUX_FILE none
set OUTPUT_AUX_DEV /dev/pwm_output1
set OUTPUT_DEV none
@@ -45,16 +45,16 @@ then
set OUTPUT_MODE io
if param greater DSHOT_CONFIG 0
then
set FMU_CMD dshot
set OUTPUT_CMD dshot
fi
fi
else
if param greater DSHOT_CONFIG 0
then
set OUTPUT_MODE dshot
set FMU_CMD dshot
set OUTPUT_CMD dshot
else
set OUTPUT_MODE fmu
set OUTPUT_MODE pwm_out
fi
fi
fi
@@ -91,11 +91,11 @@ then
fi
fi
if [ $OUTPUT_MODE = $FMU_CMD ]
if [ $OUTPUT_MODE = $OUTPUT_CMD ]
then
if ! $FMU_CMD mode_$FMU_MODE
if ! $OUTPUT_CMD mode_$FMU_MODE
then
echo "$FMU_CMD start failed" >> $LOG_FILE
echo "$OUTPUT_CMD start failed" >> $LOG_FILE
# Error tune.
tune_control play -t 2
fi
@@ -206,7 +206,7 @@ then
if [ $MIXER_AUX_FILE != none ]
then
if $FMU_CMD mode_${AUX_MODE}
if $OUTPUT_CMD mode_${AUX_MODE}
then
# Append aux mixer to main device.
if param greater SYS_HITL 0
@@ -233,14 +233,14 @@ then
set FAILSAFE_AUX none
fi
else
echo "ERROR: Could not start: fmu mode_pwm" >> $LOG_FILE
echo "ERROR: Could not start: pwm_out mode_pwm" >> $LOG_FILE
tune_control play -t 20
set PWM_AUX_OUT none
set FAILSAFE_AUX none
fi
# for DShot do not configure pwm values
if [ $FMU_CMD != dshot ]
if [ $OUTPUT_CMD != dshot ]
then
# Set min / max for aux out and rates.
if [ $PWM_AUX_OUT != none ]
@@ -322,7 +322,7 @@ then
fi
fi
if [ $OUTPUT_MODE = fmu -o $OUTPUT_MODE = io ]
if [ $OUTPUT_MODE = pwm_out -o $OUTPUT_MODE = io ]
then
if [ $PWM_OUT != none ]
then
@@ -401,7 +401,7 @@ then
pwm failsafe -c 8 -p p:PWM_MAIN_FAIL8
fi
unset FMU_CMD
unset OUTPUT_CMD
unset MIXER_AUX_FILE
unset OUTPUT_AUX_DEV
unset OUTPUT_DEV
ROMFS/px4fmu_common/init.d/rc.sensors
+3 -2
View File
@@ -11,8 +11,9 @@ then
then
# Configure all I2C buses to 100 KHz as they
# are all external or slow
fmu i2c 1 100000
fmu i2c 2 100000
# TODO: move this
pwm_out i2c 1 100000
pwm_out i2c 2 100000
fi
fi
ROMFS/px4fmu_test/init.d/rc.sensors
-5
View File
@@ -3,11 +3,6 @@
# Standard startup script for onboard sensor drivers.
#
# Configure all I2C buses to 100 KHz as they
# are all external or slow
fmu i2c 1 100000
fmu i2c 2 100000
if ms5611 -s start
then
fi
boards/airmind/mindpx-v2/default.cmake
+1 -1
View File
@@ -43,7 +43,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
rc_input
roboclaw
tap_esc
boards/av/x-v1/default.cmake
+1 -1
View File
@@ -43,7 +43,7 @@ px4_add_board(
#protocol_splitter
#pwm_input
pwm_out_sim
px4fmu
pwm_out
rc_input
roboclaw
tap_esc
boards/bitcraze/crazyflie/default.cmake
+1 -1
View File
@@ -12,7 +12,7 @@ px4_add_board(
gps
imu/mpu9250
optical_flow/pmw3901
px4fmu
pwm_out
MODULES
attitude_estimator_q
#camera_feedback
boards/holybro/durandal-v1/default.cmake
+1 -1
View File
@@ -48,7 +48,7 @@ px4_add_board(
# pwm_input - Need to create arch/stm32 arch/stm32h7 arch/kinetis and reloacate
# all arch dependant code there
pwm_out_sim
px4fmu
pwm_out
px4io
roboclaw
tap_esc
boards/holybro/durandal-v1/stackcheck.cmake
+1 -1
View File
@@ -49,7 +49,7 @@ px4_add_board(
# pwm_input - Need to create arch/stm32 arch/stm32h7 arch/kinetis and reloacate
# all arch dependant code there
pwm_out_sim
px4fmu
pwm_out
px4io
#roboclaw
#tap_esc
boards/holybro/kakutef7/default.cmake
+1 -1
View File
@@ -24,7 +24,7 @@ px4_add_board(
optical_flow/px4flow
osd
pwm_out_sim
px4fmu
pwm_out
rc_input
telemetry
tone_alarm
boards/intel/aerofc-v1/default.cmake
+1 -1
View File
@@ -25,7 +25,7 @@ px4_add_board(
#optical_flow/px4flow
#protocol_splitter
pwm_out_sim
px4fmu
pwm_out
rc_input
tap_esc
#telemetry # all available telemetry drivers
boards/intel/aerofc-v1/rtps.cmake
+1 -1
View File
@@ -25,7 +25,7 @@ px4_add_board(
#optical_flow/px4flow
protocol_splitter
pwm_out_sim
px4fmu
pwm_out
rc_input
tap_esc
#telemetry # all available telemetry drivers
boards/modalai/fc-v1/default.cmake
+1 -1
View File
@@ -42,7 +42,7 @@ px4_add_board(
#protocol_splitter
#pwm_input
pwm_out_sim
px4fmu
pwm_out
rc_input
roboclaw
safety_button
boards/mro/ctrl-zero-f7/default.cmake
+1 -1
View File
@@ -45,7 +45,7 @@ px4_add_board(
#protocol_splitter
#pwm_input
pwm_out_sim
px4fmu
pwm_out
rc_input
roboclaw
safety_button
boards/mro/x21-777/default.cmake
+1 -1
View File
@@ -40,7 +40,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
roboclaw
tap_esc
boards/mro/x21/default.cmake
+1 -1
View File
@@ -43,7 +43,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
roboclaw
tap_esc
boards/nxp/fmuk66-v3/default.cmake
+1 -1
View File
@@ -44,7 +44,7 @@ px4_add_board(
power_monitor/ina226
#protocol_splitter
pwm_out_sim
px4fmu
pwm_out
rc_input
roboclaw
safety_button
boards/nxp/fmurt1062-v1/default.cmake
+1 -1
View File
@@ -40,7 +40,7 @@ px4_add_board(
optical_flow # all available optical flow drivers
# pwm_input - not ptorable
pwm_out_sim
px4fmu
pwm_out
rc_input
roboclaw
safety_button
boards/nxp/rddrone-uavcan146/default.cmake
+1 -1
View File
@@ -39,7 +39,7 @@ px4_add_board(
#lights
#magnetometer # all available magnetometer drivers
#optical_flow # all available optical flow drivers
#px4fmu
#pwm_out
#safety_button
#tone_alarm
#uavcannode # TODO: CAN driver needed
boards/omnibus/f4sd/default.cmake
+1 -1
View File
@@ -36,7 +36,7 @@ px4_add_board(
#pca9685
#pwm_input
#pwm_out_sim
px4fmu
pwm_out
rc_input
#tap_esc
#telemetry # all available telemetry drivers
boards/px4/fmu-v2/default.cmake
+1 -1
View File
@@ -55,7 +55,7 @@ px4_add_board(
#protocol_splitter
#pwm_input
#pwm_out_sim
px4fmu
pwm_out
px4io
#roboclaw
#tap_esc
boards/px4/fmu-v2/fixedwing.cmake
+1 -1
View File
@@ -33,7 +33,7 @@ px4_add_board(
lights/rgbled
#magnetometer # all available magnetometer drivers
magnetometer/hmc5883
px4fmu
pwm_out
px4io
#telemetry # all available telemetry drivers
telemetry/iridiumsbd
boards/px4/fmu-v2/lpe.cmake
+1 -1
View File
@@ -50,7 +50,7 @@ px4_add_board(
#protocol_splitter
#pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
#tap_esc
#telemetry # all available telemetry drivers
boards/px4/fmu-v2/multicopter.cmake
+1 -1
View File
@@ -31,7 +31,7 @@ px4_add_board(
lights/rgbled
magnetometer/hmc5883
#optical_flow/px4flow
px4fmu
pwm_out
px4io
tone_alarm
MODULES
boards/px4/fmu-v2/rover.cmake
+1 -1
View File
@@ -31,7 +31,7 @@ px4_add_board(
lights/rgbled
magnetometer/hmc5883
optical_flow/px4flow
px4fmu
pwm_out
px4io
tone_alarm
boards/px4/fmu-v2/test.cmake
+1 -1
View File
@@ -53,7 +53,7 @@ px4_add_board(
#protocol_splitter
#pwm_input
#pwm_out_sim
px4fmu
pwm_out
px4io
#roboclaw
#tap_esc
boards/px4/fmu-v3/default.cmake
+1 -1
View File
@@ -52,7 +52,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
roboclaw
tap_esc
boards/px4/fmu-v3/rtps.cmake
+1 -1
View File
@@ -52,7 +52,7 @@ px4_add_board(
protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
roboclaw
tap_esc
boards/px4/fmu-v3/stackcheck.cmake
+1 -1
View File
@@ -48,7 +48,7 @@ px4_add_board(
protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
roboclaw
tap_esc
boards/px4/fmu-v4/cannode.cmake
+1 -1
View File
@@ -52,7 +52,7 @@ px4_add_board(
#lights/rgbled_ncp5623c
#magnetometer # all available magnetometer drivers
#optical_flow # all available optical flow drivers
#px4fmu
#pwm_out
#safety_button
#tone_alarm
uavcannode
boards/px4/fmu-v4/default.cmake
+1 -1
View File
@@ -46,7 +46,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
rc_input
roboclaw
safety_button
boards/px4/fmu-v4/optimized.cmake
+1 -1
View File
@@ -46,7 +46,7 @@ px4_add_board(
optical_flow # all available optical flow drivers
#pwm_input
pwm_out_sim
px4fmu
pwm_out
rc_input
#roboclaw
safety_button
boards/px4/fmu-v4/rtps.cmake
+1 -1
View File
@@ -45,7 +45,7 @@ px4_add_board(
protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
rc_input
roboclaw
safety_button
boards/px4/fmu-v4/stackcheck.cmake
+1 -1
View File
@@ -45,7 +45,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
rc_input
#roboclaw
safety_button
boards/px4/fmu-v4pro/default.cmake
+1 -1
View File
@@ -48,7 +48,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
roboclaw
tap_esc
boards/px4/fmu-v4pro/rtps.cmake
+1 -1
View File
@@ -48,7 +48,7 @@ px4_add_board(
protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
roboclaw
tap_esc
boards/px4/fmu-v5/critmonitor.cmake
+1 -1
View File
@@ -46,7 +46,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
rc_input
roboclaw
boards/px4/fmu-v5/default.cmake
+1 -1
View File
@@ -48,7 +48,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
rc_input
roboclaw
boards/px4/fmu-v5/fixedwing.cmake
+1 -1
View File
@@ -35,7 +35,7 @@ px4_add_board(
magnetometer # all available magnetometer drivers
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
rc_input
safety_button
boards/px4/fmu-v5/irqmonitor.cmake
+1 -1
View File
@@ -46,7 +46,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
rc_input
roboclaw
boards/px4/fmu-v5/multicopter.cmake
+1 -1
View File
@@ -39,7 +39,7 @@ px4_add_board(
optical_flow # all available optical flow drivers
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
rc_input
roboclaw
boards/px4/fmu-v5/optimized.cmake
+1 -1
View File
@@ -43,7 +43,7 @@ px4_add_board(
optical_flow # all available optical flow drivers
#pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
rc_input
#roboclaw
boards/px4/fmu-v5/rover.cmake
+1 -1
View File
@@ -36,7 +36,7 @@ px4_add_board(
pca9685
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
rc_input
roboclaw
boards/px4/fmu-v5/rtps.cmake
+1 -1
View File
@@ -46,7 +46,7 @@ px4_add_board(
protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
rc_input
roboclaw
boards/px4/fmu-v5/stackcheck.cmake
+1 -1
View File
@@ -47,7 +47,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
rc_input
#roboclaw
boards/px4/fmu-v5x/default.cmake
+1 -1
View File
@@ -47,7 +47,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
rc_input
roboclaw
boards/px4/fmu-v5x/p2_base_phy_LAN8742Ai.cmake
+1 -1
View File
@@ -47,7 +47,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
rc_input
roboclaw
boards/uvify/core/default.cmake
+1 -1
View File
@@ -33,7 +33,7 @@ px4_add_board(
pca9685
pwm_input
pwm_out_sim
px4fmu
pwm_out
rc_input
tone_alarm
uavcan
cmake/px4_add_board.cmake
+1 -1
View File
@@ -102,7 +102,7 @@
# imu/bmi055
# imu/mpu6000
# magnetometer/ist8310
# px4fmu
# pwm_out
# px4io
# rgbled
# MODULES
src/drivers/px4fmu/CMakeLists.txt → src/drivers/pwm_out/CMakeLists.txt
+5 -4
View File
@@ -1,6 +1,6 @@
############################################################################
#
# Copyright (c) 2015 PX4 Development Team. All rights reserved.
# Copyright (c) 2015-2020 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,11 +31,12 @@
#
############################################################################
px4_add_module(
MODULE drivers__px4fmu
MAIN fmu
MODULE drivers__pwm_out
MAIN pwm_out
COMPILE_FLAGS
SRCS
fmu.cpp
PWMOut.cpp
PWMOut.hpp
DEPENDS
arch_io_pins
mixer
src/drivers/px4fmu/fmu.cpp → src/drivers/pwm_out/PWMOut.cpp
+68 -264
View File
File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More