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

Jump to bottom

pwm_out_sim cleanup #9007

Merged
merged 2 commits into from
Mar 4, 2018
Merged

pwm_out_sim cleanup #9007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9fe0e1
pwm_out_sim cleanup
dagar Mar 4, 2018
4e77633
pwm_out_sim reduce stack 1310 -> 1000
dagar Mar 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ROMFS/px4fmu_common/init.d/rcS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ then

if [ $OUTPUT_MODE == hil ]
then
if pwm_out_sim mode_pwm16
if pwm_out_sim start
then
else
tune_control play -m ${TUNE_ERR}
Expand Down
2 changes: 1 addition & 1 deletion platforms/qurt/src/px4_layer/commands_hil.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const char *get_commands()
"mc_pos_control start\n"
"mc_att_control start\n"
"sleep 1\n"
"pwm_out_sim mode_pwm\n"
"pwm_out_sim start\n"
"param set RC1_MAX 2015\n"
"param set RC1_MIN 996\n"
"param set RC1_TRIM 1502\n"
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/ekf2/hippocampus
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dataman start

simulator start -s

pwm_out_sim mode_pwm
pwm_out_sim start
mixer load /dev/pwm_output0 ROMFS/px4fmu_test/mixers/uuv_quad_x.mix

gyrosim start
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/ekf2/iris
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ accelsim start
barosim start
adcsim start
gpssim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
land_detector start multicopter
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/ekf2/iris_1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ accelsim start
barosim start
adcsim start
gpssim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
land_detector start multicopter
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/ekf2/iris_2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ accelsim start
barosim start
adcsim start
gpssim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
land_detector start multicopter
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/ekf2/iris_irlock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ accelsim start
barosim start
adcsim start
gpssim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
land_detector start multicopter
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/ekf2/iris_opt_flow
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ accelsim start
barosim start
adcsim start
gpssim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
land_detector start multicopter
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/ekf2/iris_rplidar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ accelsim start
barosim start
adcsim start
gpssim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
land_detector start multicopter
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/ekf2/multiple_iris
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ accelsim start
barosim start
adcsim start
gpssim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
land_detector start multicopter
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/ekf2/plane
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ barosim start
adcsim start
gpssim start
measairspeedsim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
navigator start
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/ekf2/rover
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ barosim start
adcsim start
gpssim start
measairspeedsim start
pwm_out_sim mode_pwm
pwm_out_sim start
sleep 1
sensors start
commander start
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/ekf2/solo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ accelsim start
barosim start
adcsim start
gpssim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
land_detector start multicopter
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/ekf2/standard_vtol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ barosim start
adcsim start
gpssim start
measairspeedsim start
pwm_out_sim mode_pwm
pwm_out_sim start start
sensors start
commander start
land_detector start vtol
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/ekf2/tailsitter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ barosim start
adcsim start
gpssim start
measairspeedsim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
land_detector start vtol
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/ekf2/tiltrotor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ barosim start
adcsim start
gpssim start
measairspeedsim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
land_detector start vtol
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/ekf2/typhoon_h480
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ accelsim start
barosim start
adcsim start
gpssim start
pwm_out_sim mode_pwm16
pwm_out_sim start
sensors start
commander start
land_detector start multicopter
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/inav/iris
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ accelsim start
barosim start
adcsim start
gpssim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
land_detector start multicopter
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/inav/iris_opt_flow
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ accelsim start
barosim start
adcsim start
gpssim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
land_detector start multicopter
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/lpe/hippocampus
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dataman start

simulator start -s

pwm_out_sim mode_pwm
pwm_out_sim start
mixer load /dev/pwm_output0 ROMFS/px4fmu_test/mixers/uuv_quad_x.mix

gyrosim start
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/lpe/iris
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ accelsim start
barosim start
adcsim start
gpssim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
land_detector start multicopter
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/lpe/iris_1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ accelsim start
barosim start
adcsim start
gpssim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
land_detector start multicopter
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/lpe/iris_2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ accelsim start
barosim start
adcsim start
gpssim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
land_detector start multicopter
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/lpe/iris_irlock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ accelsim start
barosim start
adcsim start
gpssim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
land_detector start multicopter
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/lpe/iris_opt_flow
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ accelsim start
barosim start
adcsim start
gpssim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
land_detector start multicopter
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/lpe/iris_rplidar
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ accelsim start
barosim start
adcsim start
gpssim start
pwm_out_sim mode_pwm
pwm_out_sim start
sleep 1
sensors start
commander start
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/lpe/plane
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ barosim start
adcsim start
gpssim start
measairspeedsim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
navigator start
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/lpe/rover
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ barosim start
adcsim start
gpssim start
measairspeedsim start
pwm_out_sim mode_pwm
pwm_out_sim start
sleep 1
sensors start
commander start
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/lpe/solo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ accelsim start
barosim start
adcsim start
gpssim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
land_detector start multicopter
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/lpe/standard_vtol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ barosim start
adcsim start
gpssim start
measairspeedsim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
land_detector start vtol
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/lpe/typhoon_h480
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ accelsim start
barosim start
adcsim start
gpssim start
pwm_out_sim mode_pwm16
pwm_out_sim start
sensors start
commander start
land_detector start multicopter
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/rcS_gazebo_delta_wing
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ barosim start
adcsim start
gpssim start
measairspeedsim start
pwm_out_sim mode_pwm
pwm_out_sim start
sensors start
commander start
navigator start
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/test/cmd_template.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ barosim start
adcsim start
gpssim start
measairspeedsim start
pwm_out_sim mode_pwm
pwm_out_sim start

ver all

Expand Down
2 changes: 1 addition & 1 deletion posix-configs/SITL/init/test/tests_template.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ barosim start
adcsim start
gpssim start
measairspeedsim start
pwm_out_sim mode_pwm
pwm_out_sim start

ver all

Expand Down
2 changes: 1 addition & 1 deletion posix-configs/eagle/hil/px4.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ mc_pos_control start
mc_att_control start
land_detector start multicopter
sleep 1
pwm_out_sim mode_pwm
pwm_out_sim start
mixer load /dev/pwm_output0 /startup/quad_x.main.mix
list_devices
list_files
Expand Down
2 changes: 1 addition & 1 deletion posix-configs/rpi/px4_hil.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ mc_pos_control start
mc_att_control start
mavlink start -x -u 14577 -r 1000000
navio_sysfs_rc_in start
pwm_out_sim mode_pwm16
pwm_out_sim start
mixer load /dev/pwm_output0 ROMFS/px4fmu_common/mixers/quad_x.main.mix
logger start -t -b 200
mavlink boot_complete
Expand Down
8 changes: 1 addition & 7 deletions src/drivers/pwm_out_sim/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,6 @@
px4_add_module(
MODULE drivers__pwm_out_sim
MAIN pwm_out_sim
STACK_MAIN 1200
STACK_MAX 1200
COMPILE_FLAGS
SRCS
pwm_out_sim.cpp
DEPENDS
platforms__common
PWMSim.cpp
)
# vim: set noet ft=cmake fenc=utf-8 ff=unix :
Loading