yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1875 from mstuettgen/master

Browse Source 
Latest rover changes
This commit is contained in:
Lorenz Meier
2015-03-20 17:17:13 +01:00
parent 6b494ee0f0 9130976d9e
commit 4f0f2b0329
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ROMFS/px4fmu_common/init.d/50001_rover → ROMFS/px4fmu_common/init.d/50001_axialracing_ax10
View File

@@ -1,10 +1,10 @@
#!nsh #!nsh
# #
# Generic rover # loading default values for the axialracing ax10
# #
#load some defaults e.g. PWM values #load some defaults e.g. PWM values
sh /etc/init.d/rc.rover_defaults sh /etc/init.d/rc.axialracing_ax10_defaults
#choose a mixer, for rover control we need a plain passthrough to the servos #choose a mixer, for rover control we need a plain passthrough to the servos
set MIXER IO_pass set MIXER IO_pass

4
ROMFS/px4fmu_common/init.d/rc.autostart
View File

@@ -287,10 +287,10 @@ fi
# #
# Ground Rover # Ground Rover AxialRacing AX10
# #
if param compare SYS_AUTOSTART 50001 if param compare SYS_AUTOSTART 50001
then then
sh /etc/init.d/50001_rover sh /etc/init.d/50001_axialracing_ax10
fi fi

3
ROMFS/px4fmu_common/init.d/rc.rover_apps → ROMFS/px4fmu_common/init.d/rc.axialracing_ax10_apps
View File

@@ -6,4 +6,5 @@
ekf_att_pos_estimator start ekf_att_pos_estimator start
rover_steering_control start # disabled the start of steering control app due to use of offboard mode only
# rover_steering_control start

4
ROMFS/px4fmu_common/init.d/rc.rover_defaults → ROMFS/px4fmu_common/init.d/rc.axialracing_ax10_defaults
View File

@@ -19,8 +19,8 @@ set PWM_RATE 50
set PWM_DISARMED 1500 set PWM_DISARMED 1500
# PWM range # PWM range
set PWM_MIN 1200 set PWM_MIN 1100
set PWM_MAX 1800 set PWM_MAX 1900
# Enable servo output on pins 3 and 4 (steering and thrust) # Enable servo output on pins 3 and 4 (steering and thrust)
# but also include 1+2 as they form together one output group # but also include 1+2 as they form together one output group

2
ROMFS/px4fmu_common/init.d/rcS
View File

@@ -631,7 +631,7 @@ then
# Start standard rover apps # Start standard rover apps
if [ $LOAD_DAPPS == yes ] if [ $LOAD_DAPPS == yes ]
then then
sh /etc/init.d/rc.rover_apps sh /etc/init.d/rc.axialracing_ax10_apps
fi fi
fi fi

1
src/examples/rover_steering_control/main.cpp
View File

@@ -155,7 +155,6 @@ int parameters_update(const struct param_handles *h, struct params *p)
void control_attitude(const struct vehicle_attitude_setpoint_s *att_sp, const struct vehicle_attitude_s *att, void control_attitude(const struct vehicle_attitude_setpoint_s *att_sp, const struct vehicle_attitude_s *att,
struct actuator_controls_s *actuators) struct actuator_controls_s *actuators)
{ {
/* /*
* The PX4 architecture provides a mixer outside of the controller. * The PX4 architecture provides a mixer outside of the controller.
* The mixer is fed with a default vector of actuator controls, representing * The mixer is fed with a default vector of actuator controls, representing