Index: /trunk/demos/CircleFollower/uav/build_armv5te/bin/CircleFollower_minidrones.sh
===================================================================
--- /trunk/demos/CircleFollower/uav/build_armv5te/bin/CircleFollower_minidrones.sh (revision 236)
+++ /trunk/demos/CircleFollower/uav/build_armv5te/bin/CircleFollower_minidrones.sh (revision 236)
@@ -0,0 +1,1 @@
+./CircleFollower_nrt -a 192.168.2.2 -p 9000 -l /tmp -x CircleFollower_minidrones.xml -n Drone_0 -t mamboedu
Index: /trunk/demos/CircleFollower/uav/build_armv5te/bin/CircleFollower_minidrones.xml
===================================================================
--- /trunk/demos/CircleFollower/uav/build_armv5te/bin/CircleFollower_minidrones.xml (revision 236)
+++ /trunk/demos/CircleFollower/uav/build_armv5te/bin/CircleFollower_minidrones.xml (revision 236)
@@ -0,0 +1,357 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/CircleFollower/uav/build_armv7a_neon/bin/CircleFollower_ardrone2.sh
===================================================================
--- /trunk/demos/CircleFollower/uav/build_armv7a_neon/bin/CircleFollower_ardrone2.sh (revision 236)
+++ /trunk/demos/CircleFollower/uav/build_armv7a_neon/bin/CircleFollower_ardrone2.sh (revision 236)
@@ -0,0 +1,1 @@
+./CircleFollower_nrt -a 192.168.147.193 -p 9000 -l /tmp -x CircleFollower_ardrone2.xml -n Drone_0 -t ardrone2
Index: /trunk/demos/CircleFollower/uav/build_armv7a_neon/bin/CircleFollower_ardrone2.xml
===================================================================
--- /trunk/demos/CircleFollower/uav/build_armv7a_neon/bin/CircleFollower_ardrone2.xml (revision 236)
+++ /trunk/demos/CircleFollower/uav/build_armv7a_neon/bin/CircleFollower_ardrone2.xml (revision 236)
@@ -0,0 +1,357 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/CircleFollower/uav/build_armv7a_neon/bin/CircleFollower_bebop.sh
===================================================================
--- /trunk/demos/CircleFollower/uav/build_armv7a_neon/bin/CircleFollower_bebop.sh (revision 236)
+++ /trunk/demos/CircleFollower/uav/build_armv7a_neon/bin/CircleFollower_bebop.sh (revision 236)
@@ -0,0 +1,1 @@
+./CircleFollower_nrt -a 192.168.42.24 -p 9000 -l /tmp -x CircleFollower_bebop.xml -n Drone_0 -t bebop
Index: /trunk/demos/CircleFollower/uav/build_armv7a_neon/bin/CircleFollower_bebop.xml
===================================================================
--- /trunk/demos/CircleFollower/uav/build_armv7a_neon/bin/CircleFollower_bebop.xml (revision 236)
+++ /trunk/demos/CircleFollower/uav/build_armv7a_neon/bin/CircleFollower_bebop.xml (revision 236)
@@ -0,0 +1,268 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/CircleFollower/uav/build_armv7a_neon/bin/CircleFollower_hdsx8.sh
===================================================================
--- /trunk/demos/CircleFollower/uav/build_armv7a_neon/bin/CircleFollower_hdsx8.sh (revision 236)
+++ /trunk/demos/CircleFollower/uav/build_armv7a_neon/bin/CircleFollower_hdsx8.sh (revision 236)
@@ -0,0 +1,1 @@
+./CircleFollower_rt -a 192.168.147.217 -p 9000 -l /tmp -x CircleFollower_hdsx8.xml -n x8_0 -t hds_x8
Index: /trunk/demos/CircleFollower/uav/build_armv7a_neon/bin/CircleFollower_hdsx8.xml
===================================================================
--- /trunk/demos/CircleFollower/uav/build_armv7a_neon/bin/CircleFollower_hdsx8.xml (revision 236)
+++ /trunk/demos/CircleFollower/uav/build_armv7a_neon/bin/CircleFollower_hdsx8.xml (revision 236)
@@ -0,0 +1,478 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/CircleFollower/uav/build_core2_64/bin/setup_x4.xml
===================================================================
--- /trunk/demos/CircleFollower/uav/build_core2_64/bin/setup_x4.xml (revision 236)
+++ /trunk/demos/CircleFollower/uav/build_core2_64/bin/setup_x4.xml (revision 236)
@@ -0,0 +1,361 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/CircleFollower/uav/build_core2_64/bin/setup_x8.xml
===================================================================
--- /trunk/demos/CircleFollower/uav/build_core2_64/bin/setup_x8.xml (revision 236)
+++ /trunk/demos/CircleFollower/uav/build_core2_64/bin/setup_x8.xml (revision 236)
@@ -0,0 +1,342 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/CircleFollower/uav/build_core2_64/bin/x4.sh
===================================================================
--- /trunk/demos/CircleFollower/uav/build_core2_64/bin/x4.sh (revision 236)
+++ /trunk/demos/CircleFollower/uav/build_core2_64/bin/x4.sh (revision 236)
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+if [ -f /proc/xenomai/version ];then
+ EXEC=./CircleFollower_rt
+else
+ EXEC=./CircleFollower_nrt
+fi
+
+. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+
+$EXEC -n x4_0 -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu
Index: /trunk/demos/CircleFollower/uav/build_core2_64/bin/x8.sh
===================================================================
--- /trunk/demos/CircleFollower/uav/build_core2_64/bin/x8.sh (revision 236)
+++ /trunk/demos/CircleFollower/uav/build_core2_64/bin/x8.sh (revision 236)
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+if [ -f /proc/xenomai/version ];then
+ EXEC=./CircleFollower_rt
+else
+ EXEC=./CircleFollower_nrt
+fi
+
+. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+
+$EXEC -n x8_0 -a 127.0.0.1 -p 9000 -l ./ -x setup_x8.xml -t x8_simu
Index: /trunk/demos/Gps/simulator/build_core2_64/bin/setup_x4.xml
===================================================================
--- /trunk/demos/Gps/simulator/build_core2_64/bin/setup_x4.xml (revision 236)
+++ /trunk/demos/Gps/simulator/build_core2_64/bin/setup_x4.xml (revision 236)
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/Gps/simulator/build_core2_64/bin/setup_x8.xml
===================================================================
--- /trunk/demos/Gps/simulator/build_core2_64/bin/setup_x8.xml (revision 236)
+++ /trunk/demos/Gps/simulator/build_core2_64/bin/setup_x8.xml (revision 236)
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/Gps/simulator/build_core2_64/bin/simulator_x4.sh
===================================================================
--- /trunk/demos/Gps/simulator/build_core2_64/bin/simulator_x4.sh (revision 236)
+++ /trunk/demos/Gps/simulator/build_core2_64/bin/simulator_x4.sh (revision 236)
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+if [ -f /proc/xenomai/version ];then
+ EXEC=./Gps_simulator_rt
+else
+ EXEC=./Gps_simulator_nrt
+fi
+
+. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+
+$EXEC -n x4_0 -t x4 -p 9000 -a 127.0.0.1 -x setup_x4.xml -o 10 -m $FLAIR_ROOT/flair-bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml
Index: /trunk/demos/Gps/simulator/build_core2_64/bin/simulator_x8.sh
===================================================================
--- /trunk/demos/Gps/simulator/build_core2_64/bin/simulator_x8.sh (revision 236)
+++ /trunk/demos/Gps/simulator/build_core2_64/bin/simulator_x8.sh (revision 236)
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+if [ -f /proc/xenomai/version ];then
+ EXEC=./CircleFollower_simulator_rt
+else
+ EXEC=./CircleFollower_simulator_nrt
+fi
+
+. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+
+$EXEC -n x8_0 -t x8 -p 9000 -a 127.0.0.1 -x setup_x8.xml -o 10 -m $FLAIR_ROOT/flair-bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml
Index: /trunk/demos/Gps/uav/build_core2_64/bin/setup_x4.xml
===================================================================
--- /trunk/demos/Gps/uav/build_core2_64/bin/setup_x4.xml (revision 236)
+++ /trunk/demos/Gps/uav/build_core2_64/bin/setup_x4.xml (revision 236)
@@ -0,0 +1,361 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/Gps/uav/build_core2_64/bin/setup_x8.xml
===================================================================
--- /trunk/demos/Gps/uav/build_core2_64/bin/setup_x8.xml (revision 236)
+++ /trunk/demos/Gps/uav/build_core2_64/bin/setup_x8.xml (revision 236)
@@ -0,0 +1,342 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/Gps/uav/build_core2_64/bin/x4.sh
===================================================================
--- /trunk/demos/Gps/uav/build_core2_64/bin/x4.sh (revision 236)
+++ /trunk/demos/Gps/uav/build_core2_64/bin/x4.sh (revision 236)
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+if [ -f /proc/xenomai/version ];then
+ EXEC=./DemoGps_rt
+else
+ EXEC=./DemoGps_nrt
+fi
+
+. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+
+$EXEC -n x4_0 -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu
Index: /trunk/demos/Gps/uav/build_core2_64/bin/x8.sh
===================================================================
--- /trunk/demos/Gps/uav/build_core2_64/bin/x8.sh (revision 236)
+++ /trunk/demos/Gps/uav/build_core2_64/bin/x8.sh (revision 236)
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+if [ -f /proc/xenomai/version ];then
+ EXEC=./DemoGps_rt
+else
+ EXEC=./DemoGps_nrt
+fi
+
+. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+
+$EXEC -n x8_0 -a 127.0.0.1 -p 9000 -l ./ -x setup_x8.xml -t x8_simu
Index: /trunk/demos/OpticalFlow/simulator/build_core2_64/bin/setup_x4.xml
===================================================================
--- /trunk/demos/OpticalFlow/simulator/build_core2_64/bin/setup_x4.xml (revision 236)
+++ /trunk/demos/OpticalFlow/simulator/build_core2_64/bin/setup_x4.xml (revision 236)
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/OpticalFlow/simulator/build_core2_64/bin/setup_x8.xml
===================================================================
--- /trunk/demos/OpticalFlow/simulator/build_core2_64/bin/setup_x8.xml (revision 236)
+++ /trunk/demos/OpticalFlow/simulator/build_core2_64/bin/setup_x8.xml (revision 236)
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/OpticalFlow/simulator/build_core2_64/bin/simulator_x4.sh
===================================================================
--- /trunk/demos/OpticalFlow/simulator/build_core2_64/bin/simulator_x4.sh (revision 236)
+++ /trunk/demos/OpticalFlow/simulator/build_core2_64/bin/simulator_x4.sh (revision 236)
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+if [ -f /proc/xenomai/version ];then
+ EXEC=./OpticalFlow_simulator_rt
+else
+ EXEC=./OpticalFlow_simulator_nrt
+fi
+
+. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+
+$EXEC -n x4_0 -t x4 -a 127.0.0.1 -p 9000 -x setup_x4.xml -o 10 -m $FLAIR_ROOT/flair-bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml
Index: /trunk/demos/OpticalFlow/simulator/build_core2_64/bin/simulator_x8.sh
===================================================================
--- /trunk/demos/OpticalFlow/simulator/build_core2_64/bin/simulator_x8.sh (revision 236)
+++ /trunk/demos/OpticalFlow/simulator/build_core2_64/bin/simulator_x8.sh (revision 236)
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+if [ -f /proc/xenomai/version ];then
+ EXEC=./OpticalFlow_simulator_rt
+else
+ EXEC=./OpticalFlow_simulator_nrt
+fi
+
+. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+
+$EXEC -n x8_0 -t x8 -a 127.0.0.1 -p 9000 -x setup_x8.xml -o 10 -m $FLAIR_ROOT/flair-bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml
Index: /trunk/demos/OpticalFlow/uav/build_armv7a_neon/bin/OpticalFlow_ardrone2.sh
===================================================================
--- /trunk/demos/OpticalFlow/uav/build_armv7a_neon/bin/OpticalFlow_ardrone2.sh (revision 236)
+++ /trunk/demos/OpticalFlow/uav/build_armv7a_neon/bin/OpticalFlow_ardrone2.sh (revision 236)
@@ -0,0 +1,1 @@
+./OpticalFlow_nrt -a 192.168.147.217 -p 9000 -l /tmp -x OpticalFlow_ardrone2.xml -n Drone_0 -t ardrone2 -v ./dspcv_dsp.out
Index: /trunk/demos/OpticalFlow/uav/build_armv7a_neon/bin/OpticalFlow_ardrone2.xml
===================================================================
--- /trunk/demos/OpticalFlow/uav/build_armv7a_neon/bin/OpticalFlow_ardrone2.xml (revision 236)
+++ /trunk/demos/OpticalFlow/uav/build_armv7a_neon/bin/OpticalFlow_ardrone2.xml (revision 236)
@@ -0,0 +1,267 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/OpticalFlow/uav/build_core2_64/bin/setup_x4.xml
===================================================================
--- /trunk/demos/OpticalFlow/uav/build_core2_64/bin/setup_x4.xml (revision 236)
+++ /trunk/demos/OpticalFlow/uav/build_core2_64/bin/setup_x4.xml (revision 236)
@@ -0,0 +1,287 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/OpticalFlow/uav/build_core2_64/bin/setup_x8.xml
===================================================================
--- /trunk/demos/OpticalFlow/uav/build_core2_64/bin/setup_x8.xml (revision 236)
+++ /trunk/demos/OpticalFlow/uav/build_core2_64/bin/setup_x8.xml (revision 236)
@@ -0,0 +1,287 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/OpticalFlow/uav/build_core2_64/bin/x4.sh
===================================================================
--- /trunk/demos/OpticalFlow/uav/build_core2_64/bin/x4.sh (revision 236)
+++ /trunk/demos/OpticalFlow/uav/build_core2_64/bin/x4.sh (revision 236)
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+if [ -f /proc/xenomai/version ];then
+ EXEC=./OpticalFlow_rt
+else
+ EXEC=./OpticalFlow_nrt
+fi
+
+. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+
+$EXEC -n x4_0 -a 127.0.0.1 -p 9000 -l /tmp -x setup_x4.xml -t x4_simu -v dsp_stub
Index: /trunk/demos/OpticalFlow/uav/build_core2_64/bin/x8.sh
===================================================================
--- /trunk/demos/OpticalFlow/uav/build_core2_64/bin/x8.sh (revision 236)
+++ /trunk/demos/OpticalFlow/uav/build_core2_64/bin/x8.sh (revision 236)
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+if [ -f /proc/xenomai/version ];then
+ EXEC=./OpticalFlow_rt
+else
+ EXEC=./OpticalFlow_nrt
+fi
+
+. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+
+$EXEC -n x8_0 -a 127.0.0.1 -p 9000 -l /tmp -x setup_x8.xml -t x8_simu -v dsp_stub
Index: /trunk/demos/PidStandalone/simulator/build_core2_64/bin/setup_x4.xml
===================================================================
--- /trunk/demos/PidStandalone/simulator/build_core2_64/bin/setup_x4.xml (revision 236)
+++ /trunk/demos/PidStandalone/simulator/build_core2_64/bin/setup_x4.xml (revision 236)
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/PidStandalone/simulator/build_core2_64/bin/setup_x8.xml
===================================================================
--- /trunk/demos/PidStandalone/simulator/build_core2_64/bin/setup_x8.xml (revision 236)
+++ /trunk/demos/PidStandalone/simulator/build_core2_64/bin/setup_x8.xml (revision 236)
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/PidStandalone/simulator/build_core2_64/bin/simulator_x4.sh
===================================================================
--- /trunk/demos/PidStandalone/simulator/build_core2_64/bin/simulator_x4.sh (revision 236)
+++ /trunk/demos/PidStandalone/simulator/build_core2_64/bin/simulator_x4.sh (revision 236)
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+if [ -f /proc/xenomai/version ];then
+ EXEC=./simulator_pid_rt
+else
+ EXEC=./simulator_pid_nrt
+fi
+
+. $IGEP_ROOT/uav_dev/bin/noarch/distribution_specific_hack.sh
+
+$EXEC -n x4_0 -t x4 -a 127.0.0.1 -p 9000 -x setup_x4.xml -o 10 -m $IGEP_ROOT/uav_dev/media -s $IGEP_ROOT/uav_dev/media/optitrack_b122.xml
Index: /trunk/demos/PidStandalone/simulator/build_core2_64/bin/simulator_x8.sh
===================================================================
--- /trunk/demos/PidStandalone/simulator/build_core2_64/bin/simulator_x8.sh (revision 236)
+++ /trunk/demos/PidStandalone/simulator/build_core2_64/bin/simulator_x8.sh (revision 236)
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+if [ -f /proc/xenomai/version ];then
+ EXEC=./simulator_pid_rt
+else
+ EXEC=./simulator_pid_nrt
+fi
+
+. $IGEP_ROOT/uav_dev/bin/noarch/distribution_specific_hack.sh
+
+$EXEC -n x8_0 -t x8 -a 127.0.0.1 -p 9000 -x setup_x8.xml -o 10 -m $IGEP_ROOT/uav_dev/media -s $IGEP_ROOT/uav_dev/media/optitrack_b122.xml
Index: /trunk/demos/PidStandalone/simulator/src/main.cpp
===================================================================
--- /trunk/demos/PidStandalone/simulator/src/main.cpp (revision 235)
+++ /trunk/demos/PidStandalone/simulator/src/main.cpp (revision 236)
@@ -18,5 +18,4 @@
#include
#ifdef GL
-#include
#include
#include
@@ -97,6 +96,4 @@
#ifdef GL
SimuUsGL* us_gl;
-
- SimuCameraGL *cam_bas;
Parser *gui;
#endif
@@ -108,20 +105,19 @@
#ifdef GL
- gui=new Parser(simu,960,480,640,480,media_path,scene_file);
+ gui=new Parser(1024, 768, 1024, 768,media_path,scene_file);
#endif
if(type=="x4")
{
- drone=new X4(simu,name,0);
+ drone=new X4(name,0);
}
else
{
- drone=new X8(simu,name,0);
+ drone=new X8(name,0);
}
- imu=new SimuImu(drone,"imu",0);
+ imu=new SimuImu(drone,"imu",0,0);
#ifdef GL
- us_gl=new SimuUsGL(drone,"us",0);
- cam_bas=new SimuCameraGL(drone,"bottom camera",320,240,640,0,0);
+ us_gl=new SimuUsGL(drone,"us",0,0);
#endif
Index: /trunk/demos/PidStandalone/uav/CMakeLists.txt
===================================================================
--- /trunk/demos/PidStandalone/uav/CMakeLists.txt (revision 235)
+++ /trunk/demos/PidStandalone/uav/CMakeLists.txt (revision 236)
@@ -5,6 +5,6 @@
SET(FLAIR_USE_FILTER TRUE)
SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
+SET(FLAIR_USE_VISION_FILTER TRUE)
SET(FLAIR_USE_META TRUE)
-SET(FLAIR_USE_VRPN TRUE)
include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)
Index: /trunk/demos/PidStandalone/uav/build_armv7a_neon/bin/demo_pid_ardrone2.sh
===================================================================
--- /trunk/demos/PidStandalone/uav/build_armv7a_neon/bin/demo_pid_ardrone2.sh (revision 236)
+++ /trunk/demos/PidStandalone/uav/build_armv7a_neon/bin/demo_pid_ardrone2.sh (revision 236)
@@ -0,0 +1,1 @@
+./demo_pid_nrt -a 192.168.147.192 -p 9000 -l /tmp -x reglages_ardrone2.xml -n Drone_0 -t ardrone2
Index: /trunk/demos/PidStandalone/uav/build_armv7a_neon/bin/reglages_ardrone2.xml
===================================================================
--- /trunk/demos/PidStandalone/uav/build_armv7a_neon/bin/reglages_ardrone2.xml (revision 236)
+++ /trunk/demos/PidStandalone/uav/build_armv7a_neon/bin/reglages_ardrone2.xml (revision 236)
@@ -0,0 +1,267 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/PidStandalone/uav/build_core2_64/bin/setup_x4.xml
===================================================================
--- /trunk/demos/PidStandalone/uav/build_core2_64/bin/setup_x4.xml (revision 236)
+++ /trunk/demos/PidStandalone/uav/build_core2_64/bin/setup_x4.xml (revision 236)
@@ -0,0 +1,287 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/PidStandalone/uav/build_core2_64/bin/setup_x8.xml
===================================================================
--- /trunk/demos/PidStandalone/uav/build_core2_64/bin/setup_x8.xml (revision 236)
+++ /trunk/demos/PidStandalone/uav/build_core2_64/bin/setup_x8.xml (revision 236)
@@ -0,0 +1,287 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/PidStandalone/uav/build_core2_64/bin/x4.sh
===================================================================
--- /trunk/demos/PidStandalone/uav/build_core2_64/bin/x4.sh (revision 236)
+++ /trunk/demos/PidStandalone/uav/build_core2_64/bin/x4.sh (revision 236)
@@ -0,0 +1,10 @@
+#! /bin/bash
+if [ -f /proc/xenomai/version ];then
+ EXEC=./demo_pid_rt
+else
+ EXEC=./demo_pid_nrt
+fi
+
+. $IGEP_ROOT/uav_dev/bin/noarch/distribution_specific_hack.sh
+
+$EXEC -n x4_0 -a 127.0.0.1 -p 9000 -l ./ -x setup_x4.xml -t x4_simu $*
Index: /trunk/demos/PidStandalone/uav/build_core2_64/bin/x8.sh
===================================================================
--- /trunk/demos/PidStandalone/uav/build_core2_64/bin/x8.sh (revision 236)
+++ /trunk/demos/PidStandalone/uav/build_core2_64/bin/x8.sh (revision 236)
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+if [ -f /proc/xenomai/version ];then
+ EXEC=./demo_pid_rt
+else
+ EXEC=./demo_pid_nrt
+fi
+
+. $IGEP_ROOT/uav_dev/bin/noarch/distribution_specific_hack.sh
+
+$EXEC -n x8_0 -a 127.0.0.1 -p 9000 -l ./ -x setup_x8.xml -t x8_simu
Index: /trunk/demos/PidStandalone/uav/src/PidUav.cpp
===================================================================
--- /trunk/demos/PidStandalone/uav/src/PidUav.cpp (revision 235)
+++ /trunk/demos/PidStandalone/uav/src/PidUav.cpp (revision 236)
@@ -43,5 +43,5 @@
PidUav::PidUav(Uav *uav, TargetController *controller)
: behaviourMode(BehaviourMode_t::Default),
- UavStateMachine(uav, controller) {
+ UavStateMachine(controller) {
my_uRoll = new Pid(setupLawTab->At(1, 1), "custom uRoll");
my_uRoll->UseDefaultPlot(graphLawTab->LastRowLastCol());
@@ -107,5 +107,5 @@
const AhrsData *refOrientation = GetDefaultReferenceOrientation();
Quaternion refQuaternion;
- Vector3D refAngularRates;
+ Vector3Df refAngularRates;
refOrientation->GetQuaternionAndAngularRates(refQuaternion, refAngularRates);
Euler refAngles = refQuaternion.ToEuler();
@@ -113,5 +113,5 @@
const AhrsData *currentOrientation = GetDefaultOrientation();
Quaternion currentQuaternion;
- Vector3D currentAngularRates;
+ Vector3Df currentAngularRates;
currentOrientation->GetQuaternionAndAngularRates(currentQuaternion,
currentAngularRates);
Index: /trunk/demos/PidStandalone/uav/src/main.cpp
===================================================================
--- /trunk/demos/PidStandalone/uav/src/main.cpp (revision 235)
+++ /trunk/demos/PidStandalone/uav/src/main.cpp (revision 236)
@@ -48,7 +48,7 @@
manager->SetupLogger(log_path);
- Uav *drone = CreateUav(manager, name, uav_type);
+ Uav *drone = CreateUav(name, uav_type);
TargetEthController *controller =
- new TargetEthController(manager, "Dualshock3", 20000);
+ new TargetEthController("Dualshock3", 20000);
// EmulatedController *controller=new EmulatedController(manager,"Emulated
// Controller");
Index: /trunk/demos/SimpleFleet/simulator/build_core2_64/bin/setup_x8.xml
===================================================================
--- /trunk/demos/SimpleFleet/simulator/build_core2_64/bin/setup_x8.xml (revision 236)
+++ /trunk/demos/SimpleFleet/simulator/build_core2_64/bin/setup_x8.xml (revision 236)
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/SimpleFleet/simulator/build_core2_64/bin/simulator_x8.sh
===================================================================
--- /trunk/demos/SimpleFleet/simulator/build_core2_64/bin/simulator_x8.sh (revision 236)
+++ /trunk/demos/SimpleFleet/simulator/build_core2_64/bin/simulator_x8.sh (revision 236)
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+if [ -f /proc/xenomai/version ];then
+ EXEC=./SimpleFleet_simulator_rt
+else
+ EXEC=./SimpleFleet_simulator_nrt
+fi
+
+. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+
+$EXEC -n x8 -a 127.0.0.1 -p 9000 -x setup_x8.xml -o 10 -m $FLAIR_ROOT/flair-bin/models -s $FLAIR_ROOT/flair-bin/models/indoor_flight_arena.xml
Index: /trunk/demos/SimpleFleet/uav/build_armv7a_neon/bin/SimpleFleet.sh
===================================================================
--- /trunk/demos/SimpleFleet/uav/build_armv7a_neon/bin/SimpleFleet.sh (revision 236)
+++ /trunk/demos/SimpleFleet/uav/build_armv7a_neon/bin/SimpleFleet.sh (revision 236)
@@ -0,0 +1,1 @@
+./SimpleFleet_nrt -a 192.168.147.193 -p 9000 -l /tmp -x SimpleFleet_ardrone2.xml -n Drone_0 -t ardrone2 -b 192.168.147.255
Index: /trunk/demos/SimpleFleet/uav/build_armv7a_neon/bin/SimpleFleet_ardrone2.xml
===================================================================
--- /trunk/demos/SimpleFleet/uav/build_armv7a_neon/bin/SimpleFleet_ardrone2.xml (revision 236)
+++ /trunk/demos/SimpleFleet/uav/build_armv7a_neon/bin/SimpleFleet_ardrone2.xml (revision 236)
@@ -0,0 +1,357 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/SimpleFleet/uav/build_core2_64/bin/setup_x8.xml
===================================================================
--- /trunk/demos/SimpleFleet/uav/build_core2_64/bin/setup_x8.xml (revision 236)
+++ /trunk/demos/SimpleFleet/uav/build_core2_64/bin/setup_x8.xml (revision 236)
@@ -0,0 +1,342 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/SimpleFleet/uav/build_core2_64/bin/x8_0.sh
===================================================================
--- /trunk/demos/SimpleFleet/uav/build_core2_64/bin/x8_0.sh (revision 236)
+++ /trunk/demos/SimpleFleet/uav/build_core2_64/bin/x8_0.sh (revision 236)
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+if [ -f /proc/xenomai/version ];then
+ EXEC=./SimpleFleet_rt
+else
+ EXEC=./SimpleFleet_nrt
+fi
+
+. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+
+$EXEC -n x8_0 -a 127.0.0.1 -p 9000 -l ./ -x setup_x8.xml -t x8_simu0 -b 127.255.255.255:20010
Index: /trunk/demos/SimpleFleet/uav/build_core2_64/bin/x8_1.sh
===================================================================
--- /trunk/demos/SimpleFleet/uav/build_core2_64/bin/x8_1.sh (revision 236)
+++ /trunk/demos/SimpleFleet/uav/build_core2_64/bin/x8_1.sh (revision 236)
@@ -0,0 +1,11 @@
+#! /bin/bash
+
+if [ -f /proc/xenomai/version ];then
+ EXEC=./SimpleFleet_rt
+else
+ EXEC=./SimpleFleet_nrt
+fi
+
+. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+
+$EXEC -n x8_1 -a 127.0.0.1 -p 9000 -l ./ -x setup_x8.xml -t x8_simu1 -b 127.255.255.255:20010 -d 21000
Index: /trunk/demos/Sinus/build_armv5te/bin/Sinus.sh
===================================================================
--- /trunk/demos/Sinus/build_armv5te/bin/Sinus.sh (revision 236)
+++ /trunk/demos/Sinus/build_armv5te/bin/Sinus.sh (revision 236)
@@ -0,0 +1,10 @@
+#! /bin/bash
+
+if [ -f /proc/xenomai/version ];then
+ EXEC=./Sinus_rt
+else
+ EXEC=./Sinus_nrt
+fi
+
+$EXEC -a ${1}
+
Index: /trunk/demos/Sinus/build_armv5te/bin/Sinus.xml
===================================================================
--- /trunk/demos/Sinus/build_armv5te/bin/Sinus.xml (revision 236)
+++ /trunk/demos/Sinus/build_armv5te/bin/Sinus.xml (revision 236)
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/Sinus/build_armv7a_neon/bin/Sinus.sh
===================================================================
--- /trunk/demos/Sinus/build_armv7a_neon/bin/Sinus.sh (revision 236)
+++ /trunk/demos/Sinus/build_armv7a_neon/bin/Sinus.sh (revision 236)
@@ -0,0 +1,10 @@
+#! /bin/bash
+
+if [ -f /proc/xenomai/version ];then
+ EXEC=./Sinus_rt
+else
+ EXEC=./Sinus_nrt
+fi
+
+$EXEC -a ${1}
+
Index: /trunk/demos/Sinus/build_armv7a_neon/bin/Sinus.xml
===================================================================
--- /trunk/demos/Sinus/build_armv7a_neon/bin/Sinus.xml (revision 236)
+++ /trunk/demos/Sinus/build_armv7a_neon/bin/Sinus.xml (revision 236)
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/demos/Sinus/build_core2_64/bin/Sinus.sh
===================================================================
--- /trunk/demos/Sinus/build_core2_64/bin/Sinus.sh (revision 236)
+++ /trunk/demos/Sinus/build_core2_64/bin/Sinus.sh (revision 236)
@@ -0,0 +1,11 @@
+#! /bin/bash
+if [ -f /proc/xenomai/version ];then
+ EXEC=./Sinus_rt
+else
+ EXEC=./Sinus_nrt
+fi
+
+. $FLAIR_ROOT/flair-dev/scripts/distribution_specific_hack.sh
+
+$EXEC
+
Index: /trunk/demos/Sinus/build_core2_64/bin/Sinus.xml
===================================================================
--- /trunk/demos/Sinus/build_core2_64/bin/Sinus.xml (revision 236)
+++ /trunk/demos/Sinus/build_core2_64/bin/Sinus.xml (revision 236)
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+