Changeset 38 in flair-src for trunk/demos/SimpleFleet/uav/src

Timestamp:

06/23/16 10:15:30 (8 years ago)

Author:

Bayard Gildas

Message:

Modif. pour ajour manette émulée (EmulatedController)

Location:

trunk/demos/SimpleFleet/uav/src

Files:

• SimpleFleet.cpp (modified) (2 diffs)
• SimpleFleet.h (modified) (1 diff)
• main.cpp (modified) (3 diffs)

trunk/demos/SimpleFleet/uav/src/SimpleFleet.cpp

@@ -13 +13 @@
 
 #include "SimpleFleet.h"
+#include <TargetController.h>
 #include <Uav.h>
 #include <GridLayout.h>
@@ -49 +50 @@
 
 
-SimpleFleet::SimpleFleet(flair::meta::Uav* uav,string broadcast,uint16_t ds3port): UavStateMachine(uav,ds3port), behaviourMode(BehaviourMode_t::Default), vrpnLost(false) {
+SimpleFleet::SimpleFleet(flair::meta::Uav* uav,string broadcast,TargetController *controller): UavStateMachine(uav,controller), behaviourMode(BehaviourMode_t::Default), vrpnLost(false) {
     uav->SetupVRPNAutoIP(uav->ObjectName());
 

trunk/demos/SimpleFleet/uav/src/SimpleFleet.h

@@ -34 +34 @@
 class SimpleFleet : public flair::meta::UavStateMachine {
     public:
-        SimpleFleet(flair::meta::Uav* uav,std::string broadcast,uint16_t ds3port);
+        SimpleFleet(flair::meta::Uav* uav,std::string broadcast,flair::sensor::TargetController *controller);
         ~SimpleFleet();
 

trunk/demos/SimpleFleet/uav/src/main.cpp

@@ -17 +17 @@
 #include <stdio.h>
 #include <tclap/CmdLine.h>
+#include <TargetEthController.h>
 
 using namespace TCLAP;
@@ -22 +23 @@
 using namespace flair::core;
 using namespace flair::meta;
+using namespace flair::sensor;
 
 string uav_type;
@@ -45 +47 @@
 
     Uav* drone=CreateUav(manager,name,uav_type);
-    SimpleFleet* demo=new SimpleFleet(drone,broadcast,ds3port);
+    TargetEthController *controller=new TargetEthController(manager,"Dualshock3",ds3port);
+    SimpleFleet* demo=new SimpleFleet(drone,broadcast,controller);
 
     demo->Start();