Changeset 378 in flair-src for trunk

Timestamp:

12/16/20 16:50:34 (3 years ago)

Author:

Sanahuja Guillaume

Message:

up ugv

Location:

trunk

Files:

• cmake-modules/FlairUseFile.cmake (modified) (1 diff)
• demos/TwoWheelRobotCircleFollower/simulator/resources/core2-64/simulator.xml (added)
• demos/TwoWheelRobotCircleFollower/ugv/resources/core2-64/setup_simu.xml (added)
• demos/TwoWheelRobotCircleFollower/ugv/resources/core2-64/setup_sumo.xml (added)
• demos/TwoWheelRobotCircleFollower/ugv/resources/core2-64/ugv.sh (deleted)
• demos/TwoWheelRobotCircleFollower/ugv/resources/core2-64/ugv_simu.sh (added)
• demos/TwoWheelRobotCircleFollower/ugv/resources/core2-64/ugv_sumo.sh (added)
• lib/FlairMeta/src/SimuUgv.h (modified) (1 diff)
• lib/FlairMeta/src/SumoUgv.cpp (added)
• lib/FlairMeta/src/SumoUgv.h (added)
• lib/FlairMeta/src/UgvFactory.cpp (modified) (2 diffs)
• lib/FlairSensorActuator/CMakeLists.txt (modified) (1 diff)
• lib/FlairSensorActuator/src/SimulatedUgvControls.h (modified) (1 diff)
• lib/FlairSensorActuator/src/SumoUgvControls.cpp (added)
• lib/FlairSensorActuator/src/SumoUgvControls.h (added)

trunk/cmake-modules/FlairUseFile.cmake

@@ -75 +75 @@
             SET(FLAIR_LIBRARIES ${FLAIR_LIBRARY_DIR}/libHdsSensorActuator.a ${FLAIR_LIBRARIES})
     endif()
+    if("${CMAKE_SYSTEM_PROCESSOR_DEFAULTTUNE}" MATCHES "core2-64")      
+        SET(FLAIR_LIBRARIES ${FLAIR_LIBRARIES} sumo)
+    endif()
 ENDIF (FLAIR_USE_SENSOR_ACTUATOR)
 

trunk/lib/FlairMeta/src/SimuUgv.h

@@ -5 +5 @@
 /*!
  * \file SimuUgv.h
- * \brief Class defining a simulation x4 uav
+ * \brief Class defining a simulation ugv
  * \author Guillaume Sanahuja, Copyright Heudiasyc UMR UTC/CNRS 7253
  * \date 2020/12/16

trunk/lib/FlairMeta/src/UgvFactory.cpp

@@ -19 +19 @@
 #include "FrameworkManager.h"
 #include "SimuUgv.h"
+#include "SumoUgv.h"
 
 
@@ -52 +53 @@
     }
     return new SimuUgv(name, simu_id);
-  }/* else if (type.compare(0, 7, "x8_simu") == 0) {
-    int simu_id = 0;
-    if (type.size() > 7) {
-      simu_id = atoi(type.substr(7, type.size() - 7).c_str());
-    }
-    return new SimuX8(name, simu_id,options, multiplex);
-  }*/ else {
+  } else if (type.compare(0, 4, "sumo") == 0) {
+    return new SumoUgv(name);
+  } else {
     getFrameworkManager()->Err("UGV type %s unknown\n", type.c_str());
     return NULL;

trunk/lib/FlairSensorActuator/CMakeLists.txt

@@ -9 +9 @@
         ${CMAKE_CURRENT_SOURCE_DIR}/../FlairVisionFilter/src
         ${CMAKE_SYSROOT}/usr/include/vrpn
+    ${CMAKE_SYSROOT}/usr/include/sumo
 )
 

trunk/lib/FlairSensorActuator/src/SimulatedUgvControls.h

@@ -15 +15 @@
 
 #include <UgvControls.h>
-#include <Thread.h>
 
 namespace flair {