Changeset 137 in flair-src for trunk/demos

Timestamp:

Feb 14, 2017, 3:06:20 PM (8 years ago)

Author:

Sanahuja Guillaume

Message:

singleton manager

Location:

trunk/demos

Files:

• CircleFollower/uav/src/main.cpp (modified) (1 diff)
• Gps/uav/src/DemoGps.cpp (modified) (1 diff)
• Gps/uav/src/main.cpp (modified) (1 diff)
• OpticalFlow/uav/src/main.cpp (modified) (1 diff)
• SimpleFleet/uav/src/main.cpp (modified) (1 diff)
• Skeletons/CustomReferenceAngles/src/main.cpp (modified) (1 diff)
• Skeletons/CustomTorques/src/main.cpp (modified) (1 diff)

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

@@ -46 +46 @@
 
     Uav* drone=CreateUav(name,uav_type);
-    TargetEthController *controller=new TargetEthController(manager,"Dualshock3",ds3port);
+    TargetEthController *controller=new TargetEthController("Dualshock3",ds3port);
     CircleFollower* demo=new CircleFollower(controller);
 

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

@@ -45 +45 @@
 
     //RTDM_SerialPort *serialport=new RTDM_SerialPort(getFrameworkManager(),"gps_serial","rtser2");
-    //gps=new Mb800(getFrameworkManager(),"gps",serialport,(NmeaGps::NMEAFlags_t)(NmeaGps::GGA|NmeaGps::VTG),40);
-    gps=new SimuGps(getFrameworkManager(),"gps",(NmeaGps::NMEAFlags_t)(NmeaGps::GGA|NmeaGps::VTG),0,40);
+    //gps=new Mb800("gps",serialport,(NmeaGps::NMEAFlags_t)(NmeaGps::GGA|NmeaGps::VTG),40);
+    gps=new SimuGps("gps",(NmeaGps::NMEAFlags_t)(NmeaGps::GGA|NmeaGps::VTG),0,40);
     gps->UseDefaultPlot();
     getFrameworkManager()->AddDeviceToLog(gps);

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

@@ -46 +46 @@
 
     Uav* drone=CreateUav(name,uav_type);
-    TargetEthController *controller=new TargetEthController(manager,"Dualshock3",ds3port);
+    TargetEthController *controller=new TargetEthController("Dualshock3",ds3port);
     DemoGps* demo=new DemoGps(controller);
 

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

@@ -52 +52 @@
 
     Uav* drone=CreateUav(name,uav_type);
-    TargetEthController *controller=new TargetEthController(manager,"Dualshock3",ds3port);
+    TargetEthController *controller=new TargetEthController("Dualshock3",ds3port);
     DemoOpticalFlow* demo=new DemoOpticalFlow(controller);
 

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

@@ -47 +47 @@
 
     Uav* drone=CreateUav(name,uav_type);
-    TargetEthController *controller=new TargetEthController(manager,"Dualshock3",ds3port);
+    TargetEthController *controller=new TargetEthController("Dualshock3",ds3port);
     SimpleFleet* demo=new SimpleFleet(broadcast,controller);
 

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

@@ -45 +45 @@
 
     Uav* drone=CreateUav(name,uav_type);
-    TargetEthController *controller=new TargetEthController(manager,"Dualshock3",ds3port);
+    TargetEthController *controller=new TargetEthController("Dualshock3",ds3port);
     MyApp* app=new MyApp(controller);
 

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

@@ -46 +46 @@
 
     Uav* drone=CreateUav(name,uav_type);
-    TargetEthController *controller=new TargetEthController(manager,"Dualshock3",ds3port);
+    TargetEthController *controller=new TargetEthController("Dualshock3",ds3port);
     MyApp* app=new MyApp(controller);