diff options
| author | Lorenz Meier <lorenz@px4.io> | 2015-03-20 17:17:13 +0100 |
|---|---|---|
| committer | Lorenz Meier <lorenz@px4.io> | 2015-03-20 17:17:13 +0100 |
| commit | 4f0f2b032940e9b98b334c623f483137d3d97b5d (patch) | |
| tree | f013dde827e094e9a7b198b594280d13ffd8dfec /ROMFS | |
| parent | 6b494ee0f034e0e61deaee2dc7b8a84185cd4533 (diff) | |
| parent | 9130976d9e0e8d5fa27a78967eddfce2e0113b8a (diff) | |
| download | px4-firmware-4f0f2b032940e9b98b334c623f483137d3d97b5d.tar.gz px4-firmware-4f0f2b032940e9b98b334c623f483137d3d97b5d.tar.bz2 px4-firmware-4f0f2b032940e9b98b334c623f483137d3d97b5d.zip | |
Merge pull request #1875 from mstuettgen/master
Latest rover changes
Diffstat (limited to 'ROMFS')
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/50001_axialracing_ax10 (renamed from ROMFS/px4fmu_common/init.d/50001_rover) | 4 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.autostart | 4 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.axialracing_ax10_apps (renamed from ROMFS/px4fmu_common/init.d/rc.rover_apps) | 3 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rc.axialracing_ax10_defaults (renamed from ROMFS/px4fmu_common/init.d/rc.rover_defaults) | 4 | ||||
| -rw-r--r-- | ROMFS/px4fmu_common/init.d/rcS | 2 |
5 files changed, 9 insertions, 8 deletions
diff --git a/ROMFS/px4fmu_common/init.d/50001_rover b/ROMFS/px4fmu_common/init.d/50001_axialracing_ax10 index c2f94705c..a36bac5cc 100644 --- a/ROMFS/px4fmu_common/init.d/50001_rover +++ b/ROMFS/px4fmu_common/init.d/50001_axialracing_ax10 @@ -1,10 +1,10 @@ #!nsh # -# Generic rover +# loading default values for the axialracing ax10 # #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 set MIXER IO_pass diff --git a/ROMFS/px4fmu_common/init.d/rc.autostart b/ROMFS/px4fmu_common/init.d/rc.autostart index 434e7870b..de81795b4 100644 --- a/ROMFS/px4fmu_common/init.d/rc.autostart +++ b/ROMFS/px4fmu_common/init.d/rc.autostart @@ -287,10 +287,10 @@ fi # -# Ground Rover +# Ground Rover AxialRacing AX10 # if param compare SYS_AUTOSTART 50001 then - sh /etc/init.d/50001_rover + sh /etc/init.d/50001_axialracing_ax10 fi diff --git a/ROMFS/px4fmu_common/init.d/rc.rover_apps b/ROMFS/px4fmu_common/init.d/rc.axialracing_ax10_apps index 1d15b9835..625febd7a 100644 --- a/ROMFS/px4fmu_common/init.d/rc.rover_apps +++ b/ROMFS/px4fmu_common/init.d/rc.axialracing_ax10_apps @@ -6,4 +6,5 @@ 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 diff --git a/ROMFS/px4fmu_common/init.d/rc.rover_defaults b/ROMFS/px4fmu_common/init.d/rc.axialracing_ax10_defaults index 23bf47df1..e5d400abe 100644 --- a/ROMFS/px4fmu_common/init.d/rc.rover_defaults +++ b/ROMFS/px4fmu_common/init.d/rc.axialracing_ax10_defaults @@ -19,8 +19,8 @@ set PWM_RATE 50 set PWM_DISARMED 1500 # PWM range -set PWM_MIN 1200 -set PWM_MAX 1800 +set PWM_MIN 1100 +set PWM_MAX 1900 # Enable servo output on pins 3 and 4 (steering and thrust) # but also include 1+2 as they form together one output group diff --git a/ROMFS/px4fmu_common/init.d/rcS b/ROMFS/px4fmu_common/init.d/rcS index 59abdc8e3..111965bd5 100644 --- a/ROMFS/px4fmu_common/init.d/rcS +++ b/ROMFS/px4fmu_common/init.d/rcS @@ -631,7 +631,7 @@ then # Start standard rover apps if [ $LOAD_DAPPS == yes ] then - sh /etc/init.d/rc.rover_apps + sh /etc/init.d/rc.axialracing_ax10_apps fi fi |