Skip to content

Commit

Permalink
rename drivers/px4fmu -> drivers/pwm_out
Browse files Browse the repository at this point in the history 
 - split out header
  • Loading branch information
@dagar
dagar committed Mar 31, 2020
1 parent 3bcd8c6 commit ca81175
Show file tree
Hide file tree
Showing 51 changed files with 338 additions and 332 deletions.
24 changes: 12 additions & 12 deletions ROMFS/px4fmu_common/init.d/rc.interface
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 ]
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
5 changes: 3 additions & 2 deletions ROMFS/px4fmu_common/init.d/rc.sensors
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 0 additions & 5 deletions ROMFS/px4fmu_test/init.d/rc.sensors
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/airmind/mindpx-v2/default.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
rc_input
roboclaw
tap_esc
Expand Down
2 changes: 1 addition & 1 deletion boards/av/x-v1/default.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ px4_add_board(
#protocol_splitter
#pwm_input
pwm_out_sim
px4fmu
pwm_out
rc_input
roboclaw
tap_esc
Expand Down
2 changes: 1 addition & 1 deletion boards/bitcraze/crazyflie/default.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ px4_add_board(
gps
imu/mpu9250
optical_flow/pmw3901
px4fmu
pwm_out
MODULES
attitude_estimator_q
#camera_feedback
Expand Down
2 changes: 1 addition & 1 deletion boards/holybro/durandal-v1/default.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/holybro/durandal-v1/stackcheck.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/holybro/kakutef7/default.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ px4_add_board(
optical_flow/px4flow
osd
pwm_out_sim
px4fmu
pwm_out
rc_input
telemetry
tone_alarm
Expand Down
2 changes: 1 addition & 1 deletion boards/intel/aerofc-v1/default.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/intel/aerofc-v1/rtps.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/modalai/fc-v1/default.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ px4_add_board(
#protocol_splitter
#pwm_input
pwm_out_sim
px4fmu
pwm_out
rc_input
roboclaw
safety_button
Expand Down
2 changes: 1 addition & 1 deletion boards/mro/ctrl-zero-f7/default.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ px4_add_board(
#protocol_splitter
#pwm_input
pwm_out_sim
px4fmu
pwm_out
rc_input
roboclaw
safety_button
Expand Down
2 changes: 1 addition & 1 deletion boards/mro/x21-777/default.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
roboclaw
tap_esc
Expand Down
2 changes: 1 addition & 1 deletion boards/mro/x21/default.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
roboclaw
tap_esc
Expand Down
2 changes: 1 addition & 1 deletion boards/nxp/fmuk66-v3/default.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ px4_add_board(
power_monitor/ina226
#protocol_splitter
pwm_out_sim
px4fmu
pwm_out
rc_input
roboclaw
safety_button
Expand Down
2 changes: 1 addition & 1 deletion boards/nxp/fmurt1062-v1/default.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/nxp/rddrone-uavcan146/default.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/omnibus/f4sd/default.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/px4/fmu-v2/default.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ px4_add_board(
#protocol_splitter
#pwm_input
#pwm_out_sim
px4fmu
pwm_out
px4io
#roboclaw
#tap_esc
Expand Down
2 changes: 1 addition & 1 deletion boards/px4/fmu-v2/fixedwing.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/px4/fmu-v2/lpe.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/px4/fmu-v2/multicopter.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ px4_add_board(
lights/rgbled
magnetometer/hmc5883
#optical_flow/px4flow
px4fmu
pwm_out
px4io
tone_alarm
MODULES
Expand Down
2 changes: 1 addition & 1 deletion boards/px4/fmu-v2/rover.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ px4_add_board(
lights/rgbled
magnetometer/hmc5883
optical_flow/px4flow
px4fmu
pwm_out
px4io
tone_alarm

Expand Down
2 changes: 1 addition & 1 deletion boards/px4/fmu-v2/test.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ px4_add_board(
#protocol_splitter
#pwm_input
#pwm_out_sim
px4fmu
pwm_out
px4io
#roboclaw
#tap_esc
Expand Down
2 changes: 1 addition & 1 deletion boards/px4/fmu-v3/default.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
roboclaw
tap_esc
Expand Down
2 changes: 1 addition & 1 deletion boards/px4/fmu-v3/rtps.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ px4_add_board(
protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
roboclaw
tap_esc
Expand Down
2 changes: 1 addition & 1 deletion boards/px4/fmu-v3/stackcheck.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ px4_add_board(
protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
roboclaw
tap_esc
Expand Down
2 changes: 1 addition & 1 deletion boards/px4/fmu-v4/cannode.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/px4/fmu-v4/default.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
rc_input
roboclaw
safety_button
Expand Down
2 changes: 1 addition & 1 deletion boards/px4/fmu-v4/optimized.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion boards/px4/fmu-v4/rtps.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ px4_add_board(
protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
rc_input
roboclaw
safety_button
Expand Down
2 changes: 1 addition & 1 deletion boards/px4/fmu-v4/stackcheck.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
rc_input
#roboclaw
safety_button
Expand Down
2 changes: 1 addition & 1 deletion boards/px4/fmu-v4pro/default.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ px4_add_board(
#protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
roboclaw
tap_esc
Expand Down
2 changes: 1 addition & 1 deletion boards/px4/fmu-v4pro/rtps.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ px4_add_board(
protocol_splitter
pwm_input
pwm_out_sim
px4fmu
pwm_out
px4io
roboclaw
tap_esc
Expand Down
Loading

0 comments on commit ca81175

Please sign in to comment.