diff options
| author | Donovan Baarda <abo@minkirri.apana.org.au> | 2014-06-12 14:53:43 +1000 |
|---|---|---|
| committer | Donovan Baarda <abo@minkirri.apana.org.au> | 2014-06-12 14:53:43 +1000 |
| commit | 0669a40347ffa233bc6042b0f65d244509a61394 (patch) | |
| tree | 36a4577bdaa1ed28ca1ad222a54777012dd2dda8 /facetracknoir/clientfiles/FlightGear/Protocol | |
| parent | 72540e0a96a3120a5d02271e714aba29e136ab78 (diff) | |
| parent | 7454496476ba17ea622781d280606161581c9544 (diff) | |
Merge branch 'master' of https://github.com/opentrack/opentrack into dev/ewma2
Resolved conflicts manually in files:
ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
ftnoir_filter_ewma2/ftnoir_filter_ewma2.h
Diffstat (limited to 'facetracknoir/clientfiles/FlightGear/Protocol')
| -rw-r--r-- | facetracknoir/clientfiles/FlightGear/Protocol/headtracker.xml | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/facetracknoir/clientfiles/FlightGear/Protocol/headtracker.xml b/facetracknoir/clientfiles/FlightGear/Protocol/headtracker.xml index cd1d0dad..8c14119a 100644 --- a/facetracknoir/clientfiles/FlightGear/Protocol/headtracker.xml +++ b/facetracknoir/clientfiles/FlightGear/Protocol/headtracker.xml @@ -11,57 +11,44 @@ <chunk> <name>x</name> <type>double</type> - <node>/sim/headtracker/x-m</node> + <node>/sim/current-view/x-offset-m</node> </chunk> <chunk> <name>y</name> <type>double</type> - <node>/sim/headtracker/y-m</node> + <node>/sim/current-view/y-offset-m</node> </chunk> <chunk> <name>z</name> <type>double</type> - <node>/sim/headtracker/z-m</node> + <node>/sim/current-view/z-offset-m</node> </chunk> <chunk> <name>heading</name> <type>double</type> - <node>/sim/headtracker/heading-deg</node> + <node>/sim/current-view/heading-offset-deg</node> </chunk> <chunk> <name>pitch</name> <type>double</type> - <node>/sim/headtracker/pitch-deg</node> + <node>/sim/current-view/pitch-offset-deg</node> </chunk> <chunk> <name>roll</name> <type>double</type> - <node>/sim/headtracker/roll-deg</node> + <node>/sim/current-view/roll-offset-deg</node> </chunk> <chunk> <name>status</name> <type>int</type> - <node>/sim/headtracker/status</node> + <node>/sim/current-view/headtracker-debug-status</node> </chunk> </input> - - <output> - <binary_mode>true</binary_mode> - <binary_footer>none</binary_footer> - <byte_order>host</byte_order> - <record_length>4</record_length> - - <chunk> - <name>control</name> - <type>int</type> - <node>/sim/headtracker/control</node> - </chunk> - </output> </generic> </PropertyList> |