Changeset 378 in flair-src for trunk/lib


Ignore:
Timestamp:
Dec 16, 2020, 4:50:34 PM (12 months ago)
Author:
Sanahuja Guillaume
Message:

up ugv

Location:
trunk/lib
Files:
4 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/FlairMeta/src/SimuUgv.h

    r377 r378  
    55/*!
    66 * \file SimuUgv.h
    7  * \brief Class defining a simulation x4 uav
     7 * \brief Class defining a simulation ugv
    88 * \author Guillaume Sanahuja, Copyright Heudiasyc UMR UTC/CNRS 7253
    99 * \date 2020/12/16
  • trunk/lib/FlairMeta/src/UgvFactory.cpp

    r377 r378  
    1919#include "FrameworkManager.h"
    2020#include "SimuUgv.h"
     21#include "SumoUgv.h"
    2122
    2223
     
    5253    }
    5354    return new SimuUgv(name, simu_id);
    54   }/* else if (type.compare(0, 7, "x8_simu") == 0) {
    55     int simu_id = 0;
    56     if (type.size() > 7) {
    57       simu_id = atoi(type.substr(7, type.size() - 7).c_str());
    58     }
    59     return new SimuX8(name, simu_id,options, multiplex);
    60   }*/ else {
     55  } else if (type.compare(0, 4, "sumo") == 0) {
     56    return new SumoUgv(name);
     57  } else {
    6158    getFrameworkManager()->Err("UGV type %s unknown\n", type.c_str());
    6259    return NULL;
  • trunk/lib/FlairSensorActuator/CMakeLists.txt

    r338 r378  
    99        ${CMAKE_CURRENT_SOURCE_DIR}/../FlairVisionFilter/src
    1010        ${CMAKE_SYSROOT}/usr/include/vrpn
     11    ${CMAKE_SYSROOT}/usr/include/sumo
    1112)
    1213
  • trunk/lib/FlairSensorActuator/src/SimulatedUgvControls.h

    r377 r378  
    1515
    1616#include <UgvControls.h>
    17 #include <Thread.h>
    1817
    1918namespace flair {
Note: See TracChangeset for help on using the changeset viewer.