Changeset 122 in flair-src for trunk/demos/Skeletons/CustomReferenceAngles

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

modifs uav vrpn i686

Location:

trunk/demos/Skeletons/CustomReferenceAngles

Files:

• CMakeLists.txt (modified) (1 diff)
• src/MyApp.cpp (modified) (1 diff)
• src/MyApp.h (modified) (1 diff)
• src/main.cpp (modified) (1 diff)

trunk/demos/Skeletons/CustomReferenceAngles/CMakeLists.txt

@@ -6 +6 @@
 SET(FLAIR_USE_SENSOR_ACTUATOR TRUE)
 SET(FLAIR_USE_META TRUE)
-SET(FLAIR_USE_VRPN TRUE)
 
 include($ENV{FLAIR_ROOT}/flair-dev/cmake-modules/GlobalCmakeFlair.cmake)

trunk/demos/Skeletons/CustomReferenceAngles/src/MyApp.cpp

@@ -29 +29 @@
 using namespace flair::sensor;
 
-MyApp::MyApp(Uav* uav,TargetController *controller): UavStateMachine(uav,controller), behaviourMode(BehaviourMode_t::Default) {
+MyApp::MyApp(TargetController *controller): UavStateMachine(controller), behaviourMode(BehaviourMode_t::Default) {
     start_CustomAngles=new PushButton(GetButtonsLayout()->NewRow(),"start CustomReferenceAngles");
     stop_CustomAngles=new PushButton(GetButtonsLayout()->NewRow(),"stop CustomReferenceAngles");
 
     customReferenceOrientation= new AhrsData(this,"reference");
-    uav->GetAhrs()->AddPlot(customReferenceOrientation,DataPlot::Yellow);
+    GetUav()->GetAhrs()->AddPlot(customReferenceOrientation,DataPlot::Yellow);
     AddDataToControlLawLog(customReferenceOrientation);
 }

trunk/demos/Skeletons/CustomReferenceAngles/src/MyApp.h

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

trunk/demos/Skeletons/CustomReferenceAngles/src/main.cpp

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