Index: trunk/demos/MixedReality/real/simulator/CMakeLists.txt
===================================================================
--- trunk/demos/MixedReality/real/simulator/CMakeLists.txt (revision 299)
+++ trunk/demos/MixedReality/real/simulator/CMakeLists.txt (revision 301)
@@ -5,4 +5,5 @@
SET(FLAIR_USE_SIMULATOR TRUE)
SET(FLAIR_USE_SIMULATOR_GL TRUE)
+SET(COPY_RESOURCE_FILES true)
include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
@@ -35,10 +36,10 @@
INSTALL(
TARGETS ${PROJECT_NAME}_rt
- RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/real
+ RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
)
INSTALL(
TARGETS ${PROJECT_NAME}_nrt
- RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/real
+ RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
)
Index: trunk/demos/MixedReality/real/simulator/resources/core2-64/simulator_x4.sh
===================================================================
--- trunk/demos/MixedReality/real/simulator/resources/core2-64/simulator_x4.sh (revision 301)
+++ trunk/demos/MixedReality/real/simulator/resources/core2-64/simulator_x4.sh (revision 301)
@@ -0,0 +1,10 @@
+#! /bin/bash
+if [ -f /proc/xenomai/version ];then
+ EXEC=./MixedReality_simulator_real_rt
+else
+ EXEC=./MixedReality_simulator_real_nrt
+fi
+
+. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+
+$EXEC -p 9000 -a 127.0.0.1 -x simulator_x4.xml -o 10 -m $FLAIR_ROOT/flair-bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml
Index: trunk/demos/MixedReality/real/simulator/resources/core2-64/simulator_x4.xml
===================================================================
--- trunk/demos/MixedReality/real/simulator/resources/core2-64/simulator_x4.xml (revision 301)
+++ trunk/demos/MixedReality/real/simulator/resources/core2-64/simulator_x4.xml (revision 301)
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/demos/MixedReality/real/uav/CMakeLists.txt
===================================================================
--- trunk/demos/MixedReality/real/uav/CMakeLists.txt (revision 299)
+++ trunk/demos/MixedReality/real/uav/CMakeLists.txt (revision 301)
@@ -8,4 +8,5 @@
SET(FLAIR_USE_META TRUE)
SET(FLAIR_USE_VRPN TRUE)
+SET(COPY_RESOURCE_FILES true)
include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
@@ -37,9 +38,9 @@
INSTALL(
TARGETS ${PROJECT_NAME}_rt
- RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/real
+ RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
)
INSTALL(
TARGETS ${PROJECT_NAME}_nrt
- RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/MixedReality/real
+ RUNTIME DESTINATION $ENV{FLAIR_ROOT}/flair-bin/demos/${ARCH_DIR}/${PROJECT_NAME}
)
Index: trunk/demos/MixedReality/real/uav/resources/armv7a-neon/MixedReality_ardrone2.sh
===================================================================
--- trunk/demos/MixedReality/real/uav/resources/armv7a-neon/MixedReality_ardrone2.sh (revision 301)
+++ trunk/demos/MixedReality/real/uav/resources/armv7a-neon/MixedReality_ardrone2.sh (revision 301)
@@ -0,0 +1,1 @@
+./MixedReality_uav_real_nrt -a 192.168.147.193 -p 9000 -l /tmp -x MixedReality_ardrone2.xml -n Drone_0 -t ardrone2
Index: trunk/demos/MixedReality/real/uav/resources/armv7a-neon/MixedReality_ardrone2.xml
===================================================================
--- trunk/demos/MixedReality/real/uav/resources/armv7a-neon/MixedReality_ardrone2.xml (revision 301)
+++ trunk/demos/MixedReality/real/uav/resources/armv7a-neon/MixedReality_ardrone2.xml (revision 301)
@@ -0,0 +1,357 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/demos/MixedReality/real/uav/resources/armv7a-neon/MixedReality_bebop.sh
===================================================================
--- trunk/demos/MixedReality/real/uav/resources/armv7a-neon/MixedReality_bebop.sh (revision 301)
+++ trunk/demos/MixedReality/real/uav/resources/armv7a-neon/MixedReality_bebop.sh (revision 301)
@@ -0,0 +1,1 @@
+./MixedReality_uav_real_nrt -a 192.168.42.24 -p 9000 -l /tmp -x MixedReality_bebop.xml -n Drone_0 -t bebop
Index: trunk/demos/MixedReality/real/uav/resources/armv7a-neon/MixedReality_bebop.xml
===================================================================
--- trunk/demos/MixedReality/real/uav/resources/armv7a-neon/MixedReality_bebop.xml (revision 301)
+++ trunk/demos/MixedReality/real/uav/resources/armv7a-neon/MixedReality_bebop.xml (revision 301)
@@ -0,0 +1,268 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/demos/MixedReality/real/uav/resources/armv7a-neon/MixedReality_hdsx8.sh
===================================================================
--- trunk/demos/MixedReality/real/uav/resources/armv7a-neon/MixedReality_hdsx8.sh (revision 301)
+++ trunk/demos/MixedReality/real/uav/resources/armv7a-neon/MixedReality_hdsx8.sh (revision 301)
@@ -0,0 +1,1 @@
+./MixedReality_uav_real_rt -a 192.168.147.217 -p 9000 -l /tmp -x MixedReality_hdsx8.xml -n x8_0 -t hds_x8
Index: trunk/demos/MixedReality/real/uav/resources/armv7a-neon/MixedReality_hdsx8.xml
===================================================================
--- trunk/demos/MixedReality/real/uav/resources/armv7a-neon/MixedReality_hdsx8.xml (revision 301)
+++ trunk/demos/MixedReality/real/uav/resources/armv7a-neon/MixedReality_hdsx8.xml (revision 301)
@@ -0,0 +1,478 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/demos/MixedReality/real/uav/resources/core2-64/setup_x4.xml
===================================================================
--- trunk/demos/MixedReality/real/uav/resources/core2-64/setup_x4.xml (revision 301)
+++ trunk/demos/MixedReality/real/uav/resources/core2-64/setup_x4.xml (revision 301)
@@ -0,0 +1,361 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: trunk/demos/MixedReality/real/uav/resources/core2-64/x4.sh
===================================================================
--- trunk/demos/MixedReality/real/uav/resources/core2-64/x4.sh (revision 301)
+++ trunk/demos/MixedReality/real/uav/resources/core2-64/x4.sh (revision 301)
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+if [ -f /proc/xenomai/version ];then
+ EXEC=./MixedReality_uav_real_rt
+else
+ EXEC=./MixedReality_uav_real_nrt
+fi
+
+. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+
+$EXEC -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu0 -v 127.0.0.1:3884