Changeset 122 in flair-src for trunk/demos/Gps/uav

Timestamp:

Jan 6, 2017, 1:56:26 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

modifs uav vrpn i686

Location:

trunk/demos/Gps/uav

Files:

• CMakeLists.txt (modified) (1 diff)
• build_i686 (deleted)
• src/DemoGps.cpp (modified) (1 diff)
• src/DemoGps.h (modified) (1 diff)
• src/main.cpp (modified) (1 diff)

trunk/demos/Gps/uav/CMakeLists.txt

@@ -6 +6 @@
 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
 SET(FLAIR_USE_META TRUE)
-SET(FLAIR_USE_VRPN TRUE)
 SET(FLAIR_USE_GPS TRUE)
 

trunk/demos/Gps/uav/src/DemoGps.cpp

@@ -39 +39 @@
 using namespace flair::meta;
 
-DemoGps::DemoGps(Uav* uav,TargetController *controller): UavStateMachine(uav,controller), behaviourMode(BehaviourMode_t::Default) {
-
+DemoGps::DemoGps(TargetController *controller): UavStateMachine(controller), behaviourMode(BehaviourMode_t::Default) {
+                Uav* uav=GetUav();
     startCircle=new PushButton(GetButtonsLayout()->NewRow(),"start_circle");
     stopCircle=new PushButton(GetButtonsLayout()->LastRowLastCol(),"stop_circle");

trunk/demos/Gps/uav/src/DemoGps.h

@@ -33 +33 @@
 class DemoGps : public flair::meta::UavStateMachine {
     public:
-        DemoGps(flair::meta::Uav* uav,flair::sensor::TargetController *controller);
+        DemoGps(flair::sensor::TargetController *controller);
         ~DemoGps();
 

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

@@ -45 +45 @@
     manager->SetupLogger(log_path);
 
-    Uav* drone=CreateUav(manager,name,uav_type);
+    Uav* drone=CreateUav(name,uav_type);
     TargetEthController *controller=new TargetEthController(manager,"Dualshock3",ds3port);
-    DemoGps* demo=new DemoGps(drone,controller);
+    DemoGps* demo=new DemoGps(controller);
 
     demo->Start();