Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-26 08:22:43 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

[conf] some joystick cleanup

Browse Source 
- RC_4CH message does not have a joystick_id field
- there is no rc_dl_active_joystick anymore
- aurora_skate_controller is out-of-date/non-functional
This commit is contained in:
Felix Ruess
2014-02-16 23:29:07 +01:00
parent cbe2e5f347
commit 69fa744f65
2 changed files with 75 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/joystick/aurora_skate_controller.xml
-144
View File
@@ -1,144 +0,0 @@
<!-- Custom Aurora Skate Controller
Joystick has four axes:
axis 0: X on right stick
axis 1: Y on right stick
axis 2: Y on left stick
axis 3: X on left stick
It has 9 buttons.
b0 - right side/left bumper
b1 - right side/right bumper
b2 - right side/down bumper
b3 - right side/up bumper
b7 - yellow
b8 - red
b9 - green
b10 - left side/left bumper
b11 - left side/right bumper
-->
<joystick>
<input>
<axis index="0" name="rx" limit="1.00" exponent="0.7" trim="0"/>
<axis index="1" name="ry" limit="1.00" exponent="0.7" trim="0"/>
<axis index="2" name="ly" limit="1.00" exponent="0.0" trim="0"/>
<axis index="3" name="lx" limit="1.00" exponent="0.7" trim="0"/>
<button index="0" name="b0"/>
<button index="1" name="b1"/>
<button index="2" name="b2"/>
<button index="3" name="b3"/>
<button index="4" name="b4"/>
<button index="5" name="b5"/>
<button index="6" name="b6"/>
<button index="7" name="b7"/>
<button index="8" name="b8"/>
<button index="9" name="b9"/>
<button index="10" name="b10"/>
<button index="11" name="b11"/>
</input>
<messages period="0.0333333333">
<message class="datalink" name="RC_4CH" send_always="true">
<field name="joystick_id" value="JoystickID()"/>
<field name="throttle" value="Scale(ly,-10,127)"/>
<field name="roll" value="rx"/>
<field name="yaw" value="lx"/>
<field name="pitch" value="0-ry"/>
</message>
<!-- trim commands -->
<message class="ground" name="DL_SETTING_MOD" on_event="b1">
<field name="index" value="IndexOfSetting('rc_roll_trim')"/>
<field name="mod" value="10"/>
</message>
<message class="ground" name="DL_SETTING_MOD" on_event="b0">
<field name="index" value="IndexOfSetting('rc_roll_trim')"/>
<field name="mod" value="0-10"/>
</message>
<message class="ground" name="DL_SETTING_MOD" on_event="b3">
<field name="index" value="IndexOfSetting('rc_pitch_trim')"/>
<field name="mod" value="10"/>
</message>
<message class="ground" name="DL_SETTING_MOD" on_event="b2">
<field name="index" value="IndexOfSetting('rc_pitch_trim')"/>
<field name="mod" value="0-10"/>
</message>
<message class="ground" name="DL_SETTING_MOD" on_event="b11">
<field name="index" value="IndexOfSetting('rc_yaw_trim')"/>
<field name="mod" value="10"/>
</message>
<message class="ground" name="DL_SETTING_MOD" on_event="b10">
<field name="index" value="IndexOfSetting('rc_yaw_trim')"/>
<field name="mod" value="0-10"/>
</message>
<message class="ground" name="DL_SETTING" on_event="b10 && b11">
<field name="index" value="IndexOfSetting('rc_roll_trim')"/>
<field name="value" value="0"/>
</message>
<message class="ground" name="DL_SETTING" on_event="b10 && b11">
<field name="index" value="IndexOfSetting('rc_pitch_trim')"/>
<field name="value" value="0"/>
</message>
<message class="ground" name="DL_SETTING" on_event="b10 && b11">
<field name="index" value="IndexOfSetting('rc_yaw_trim')"/>
<field name="value" value="0-10"/>
</message>
<!--
<message class="ground" name="lx" on_event="b8"/>
<message class="trim_plus" name="ly" on_event="b10"/>
<message class="trim_minus" name="ly" on_event="b11"/>
<message class="trim_plus" name="rx" on_event="b2"/>
<message class="trim_minus" name="rx" on_event="b0"/>
<message class="trim_minus" name="ry" on_event="b3"/>
<message class="trim_plus" name="ry" on_event="b1"/>
<message class="trim_save" name="" on_event="b5"/>
-->
<!-- Camera switch. Currently uses same buttons as yaw trim -->
<message class="ground" name="DL_SETTING" on_event="b1">
<field name="index" value="IndexOfSetting('cam_switch')"/>
<field name="value" value="1"/>
</message>
<message class="ground" name="DL_SETTING" on_event="b0">
<field name="index" value="IndexOfSetting('cam_switch')"/>
<field name="value" value="0"/>
</message>
<!-- Red Button --> <!-- AUTO2 mode -->
<message class="ground" name="DL_SETTING" on_event="b8">
<field name="index" value="IndexOfSetting('pprz_mode')"/>
<field name="value" value="2"/>
</message>
<!-- Yellow Button --> <!-- AUTO1 mode -->
<message class="ground" name="DL_SETTING" on_event="b7">
<field name="index" value="IndexOfSetting('pprz_mode')"/>
<field name="value" value="1"/>
</message>
<!-- Green Button --> <!-- MANUAL mode -->
<message class="ground" name="DL_SETTING" on_event="b9">
<field name="index" value="IndexOfSetting('pprz_mode')"/>
<field name="value" value="0"/>
</message>
<message class="ground" name="DL_SETTING" on_event="b7 || b8 || b9">
<field name="index" value="IndexOfSetting('rc_dl_active_joystick')"/>
<field name="value" value="JoystickID()"/>
</message>
</messages>
</joystick>
conf/joystick/logitech_f710.xml
+75 -115
View File
@@ -25,129 +25,89 @@ It has 8 buttons.
-->
<joystick>
<input>
<axis index="0" name="lx" limit="1.00" exponent="0.7" trim="0"/>
<axis index="1" name="ly" limit="1.00" exponent="0.0" trim="0"/>
<axis index="2" name="lt" limit="1.00" exponent="0.0" trim="0"/>
<axis index="3" name="rx" limit="1.00" exponent="0.7" trim="0"/>
<axis index="4" name="ry" limit="1.00" exponent="0.7" trim="0"/>
<axis index="5" name="rt" limit="1.00" exponent="0.0" trim="0"/>
<axis index="6" name="dx" limit="1.00" exponent="0.0" trim="0"/>
<axis index="7" name="dy" limit="1.00" exponent="0.0" trim="0"/>
<button index="0" name="b_green"/>
<button index="1" name="b_red"/>
<button index="2" name="b_blue"/>
<button index="3" name="b_yellow"/>
<button index="4" name="b_ltb"/>
<button index="5" name="b_rtb"/>
<button index="6" name="b_start"/>
<button index="7" name="b7"/>
<button index="8" name="b8"/>
<button index="9" name="b9"/>
<button index="10" name="b_back"/>
</input>
<input>
<axis index="0" name="lx" limit="1.00" exponent="0.7" trim="0"/>
<axis index="1" name="ly" limit="1.00" exponent="0.0" trim="0"/>
<axis index="2" name="lt" limit="1.00" exponent="0.0" trim="0"/>
<axis index="3" name="rx" limit="1.00" exponent="0.7" trim="0"/>
<axis index="4" name="ry" limit="1.00" exponent="0.7" trim="0"/>
<axis index="5" name="rt" limit="1.00" exponent="0.0" trim="0"/>
<axis index="6" name="dx" limit="1.00" exponent="0.0" trim="0"/>
<axis index="7" name="dy" limit="1.00" exponent="0.0" trim="0"/>
<button index="0" name="b_green"/>
<button index="1" name="b_red"/>
<button index="2" name="b_blue"/>
<button index="3" name="b_yellow"/>
<button index="4" name="b_ltb"/>
<button index="5" name="b_rtb"/>
<button index="6" name="b_start"/>
<button index="7" name="b7"/>
<button index="8" name="b8"/>
<button index="9" name="b9"/>
<button index="10" name="b_back"/>
</input>
<messages period="0.0333333333">
<variables>
<!-- manual by default and when pressing b_green, AUTO1 on b_yellow, AUTO2 on b_red -->
<var name="mode" default="0"/>
<set var="mode" value="0" on_event="b_green"/>
<set var="mode" value="1" on_event="b_yellow"/>
<set var="mode" value="2" on_event="b_red"/>
</variables>
<messages period="0.0333333333">
<message class="datalink" name="RC_4CH" send_always="true">
<field name="mode" value="mode"/>
<field name="throttle" value="Bound(0-ly,0,127)"/>
<field name="roll" value="rx"/>
<field name="yaw" value="lx"/>
<field name="pitch" value="ry"/>
</message>
<message class="datalink" name="RC_4CH" send_always="true">
<field name="joystick_id" value="JoystickID()"/>
<field name="throttle" value="Bound(0-ly,0,127)"/>
<field name="roll" value="rx"/>
<field name="yaw" value="lx"/>
<field name="pitch" value="ry"/>
</message>
<!-- trim commands -->
<!-- uncomment if you have rc_x_trim
<message class="ground" name="DL_SETTING" on_event="b_ltb && b_rtb">
<field name="index" value="IndexOfSetting('rc_roll_trim')"/>
<field name="value" value="0"/>
</message>
<message class="ground" name="DL_SETTING" on_event="b_ltb && b_rtb">
<field name="index" value="IndexOfSetting('rc_pitch_trim')"/>
<field name="value" value="0"/>
</message>
<!-- trim commands -->
<message class="ground" name="DL_SETTING_MOD" on_event="dx > 100">
<field name="index" value="IndexOfSetting('rc_roll_trim')"/>
<field name="mod" value="10"/>
</message>
<message class="ground" name="DL_SETTING_MOD" on_event="0-dx > 100" >
<field name="index" value="IndexOfSetting('rc_roll_trim')"/>
<field name="mod" value="0-10"/>
</message>
<message class="ground" name="DL_SETTING" on_event="b_ltb && b_rtb">
<field name="index" value="IndexOfSetting('rc_yaw_trim')"/>
<field name="value" value="0-10"/>
</message>
<message class="ground" name="DL_SETTING_MOD" on_event="dy > 100">
<field name="index" value="IndexOfSetting('rc_pitch_trim')"/>
<field name="mod" value="10"/>
</message>
<message class="ground" name="DL_SETTING_MOD" on_event="0-dy > 100">
<field name="index" value="IndexOfSetting('rc_pitch_trim')"/>
<field name="mod" value="0-10"/>
</message>
-->
<!--
<message class="ground" name="lx" on_event="b8"/>
<message class="trim_plus" name="ly" on_event="b10"/>
<message class="trim_minus" name="ly" on_event="b11"/>
<message class="trim_plus" name="rx" on_event="b2"/>
<message class="trim_minus" name="rx" on_event="b0"/>
<message class="trim_minus" name="ry" on_event="b3"/>
<message class="trim_plus" name="ry" on_event="b1"/>
<message class="trim_save" name="" on_event="b5"/>
-->
<message class="ground" name="DL_SETTING_MOD" on_event="b_rtb">
<field name="index" value="IndexOfSetting('rc_yaw_trim')"/>
<field name="mod" value="10"/>
</message>
<message class="ground" name="DL_SETTING_MOD" on_event="b_ltb">
<field name="index" value="IndexOfSetting('rc_yaw_trim')"/>
<field name="mod" value="0-10"/>
</message>
<!-- Camera switch. only uncomment if you have cam_switch -->
<!--
<message class="ground" name="DL_SETTING" on_event="b_start">
<field name="index" value="IndexOfSetting('cam_switch')"/>
<field name="value" value="1"/>
</message>
<message class="ground" name="DL_SETTING" on_event="b_ltb && b_rtb">
<field name="index" value="IndexOfSetting('rc_roll_trim')"/>
<field name="value" value="0"/>
</message>
<message class="ground" name="DL_SETTING" on_event="b_back">
<field name="index" value="IndexOfSetting('cam_switch')"/>
<field name="value" value="0"/>
</message>
-->
<message class="ground" name="DL_SETTING" on_event="b_ltb && b_rtb">
<field name="index" value="IndexOfSetting('rc_pitch_trim')"/>
<field name="value" value="0"/>
</message>
<message class="ground" name="DL_SETTING" on_event="b_ltb && b_rtb">
<field name="index" value="IndexOfSetting('rc_yaw_trim')"/>
<field name="value" value="0-10"/>
</message>
<!--
<message class="ground" name="lx" on_event="b8"/>
<message class="trim_plus" name="ly" on_event="b10"/>
<message class="trim_minus" name="ly" on_event="b11"/>
<message class="trim_plus" name="rx" on_event="b2"/>
<message class="trim_minus" name="rx" on_event="b0"/>
<message class="trim_minus" name="ry" on_event="b3"/>
<message class="trim_plus" name="ry" on_event="b1"/>
<message class="trim_save" name="" on_event="b5"/>
-->
<!-- Camera switch. Currently uses same buttons as yaw trim -->
<message class="ground" name="DL_SETTING" on_event="b_start">
<field name="index" value="IndexOfSetting('cam_switch')"/>
<field name="value" value="1"/>
</message>
<message class="ground" name="DL_SETTING" on_event="b_back">
<field name="index" value="IndexOfSetting('cam_switch')"/>
<field name="value" value="0"/>
</message>
<!-- Red Button --> <!-- AUTO2 mode -->
<message class="ground" name="DL_SETTING" on_event="b_red">
<field name="index" value="IndexOfSetting('pprz_mode')"/>
<field name="value" value="2"/>
</message>
<!-- Yellow Button --> <!-- AUTO1 mode -->
<message class="ground" name="DL_SETTING" on_event="b_yellow">
<field name="index" value="IndexOfSetting('pprz_mode')"/>
<field name="value" value="1"/>
</message>
<!-- Green Button --> <!-- MANUAL mode -->
<message class="ground" name="DL_SETTING" on_event="b_green">
<field name="index" value="IndexOfSetting('pprz_mode')"/>
<field name="value" value="0"/>
</message>
<message class="ground" name="DL_SETTING" on_event="b_green || b_yellow || b_red">
<field name="index" value="IndexOfSetting('rc_dl_active_joystick')"/>
<field name="value" value="JoystickID()"/>
</message>
</messages>
</messages>
</joystick>