Changeset 116 in flair-src for branches

Timestamp:

Nov 16, 2016, 9:21:42 AM (8 years ago)

Author:

Thomas Fuhrmann

Message:

Problem when copied the trunk

Location:

branches/semaphore

Files:

• . (copied) (copied from trunk )
• tools/Controller/DualShock3/cmake_codeblocks.sh (modified) (1 diff)
• tools/Controller/Mavlink/src/GuiFlair.cpp (modified) (1 diff)

branches/semaphore/tools/Controller/DualShock3/cmake_codeblocks.sh

@@ -1 +1 @@
 DIR=build_$(uname -m)
 
-### IMPORTANT: We don't use standard cmake_codeblocks script since we don't compile in release mode due to optimization problem (-03) ###
+function replace_cxx_flags () {
+        cmake_version=$(cmake --version)
+        cmake_version_number=$(expr match "$cmake_version" '.*\([0-9]\.[0-9]*\.[0-9]*\)')
+        first_digit=$(expr match "$cmake_version_number" '\([0-9]*\)')
+        second_digit=$(expr match "$cmake_version_number" '.*\.\([0-9]*\)\..*')
+        if [ "$first_digit" -ge "3" ] || [ "$second_digit" -ge "4" ]; then
+                find . -name build.make -type f -exec sed -i 's/CXX_FLAGS/CXX_FLAGS) $(CXX_INCLUDES/g' {} \;
+        fi
+}
 
 #verifie l'existence du lien symbolique build

branches/semaphore/tools/Controller/Mavlink/src/GuiFlair.cpp

@@ -62 +62 @@
                 if (received > 0) {
                    cout << "MavPlanner GuiFlair MissionStart data received : " << receiveFrameBuffer << endl;
-                   outputSocket->SendMessage(receiveFrameBuffer, received);
+                   // outputSocket->SendMessage(receiveFrameBuffer, received);
+                   inputSocket->SendMessage(receiveFrameBuffer, received);
                 }
         } while (received != 0);