Changeset 137 in flair-src for trunk/lib/FlairMeta

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

singleton manager

Location:

trunk/lib/FlairMeta/src

Files:

• HdsX8.cpp (modified) (1 diff)
• MetaDualShock3.cpp (modified) (1 diff)
• MetaDualShock3.h (modified) (1 diff)
• SimuX4.cpp (modified) (1 diff)
• SimuX8.cpp (modified) (1 diff)
• UavStateMachine.cpp (modified) (1 diff)
• XAir.cpp (modified) (1 diff)

trunk/lib/FlairMeta/src/HdsX8.cpp

@@ -42 +42 @@
 
   if (multiplex == NULL)
-    SetMultiplex(new X4X8Multiplex(getFrameworkManager(), "motors", X4X8Multiplex::X8));
+    SetMultiplex(new X4X8Multiplex( "motors", X4X8Multiplex::X8));
 
   SetBldc(new BlCtrlV2(GetUavMultiplex(), GetUavMultiplex()->GetLayout(),
                        "motors", GetUavMultiplex()->MotorsCount(), i2cport));
-  SetUsRangeFinder(new Srf08(getFrameworkManager(), "SRF08", i2cport, 0x70, 60));
-  SetAhrs(new Gx3_25_ahrs(getFrameworkManager(), "imu", imu_port,
+  SetUsRangeFinder(new Srf08("SRF08", i2cport, 0x70, 60));
+  SetAhrs(new Gx3_25_ahrs("imu", imu_port,
                           Gx3_25_imu::AccelerationAngularRateAndOrientationMatrix, 70));
   SetBatteryMonitor(((BlCtrlV2 *)GetBldc())->GetBatteryMonitor());
-  SetVerticalCamera(new Ps3Eye(getFrameworkManager(), "camv", 0, 50));
+  SetVerticalCamera(new Ps3Eye("camv", 0, 50));
 }
 

trunk/lib/FlairMeta/src/MetaDualShock3.cpp

@@ -36 +36 @@
 namespace meta {
 
-MetaDualShock3::MetaDualShock3(FrameworkManager *parent, string name,
+MetaDualShock3::MetaDualShock3(string name,
                                TargetController *controller)
     : controller(controller),IODevice((IODevice*)controller, name) {
   pimpl_ = new MetaDualShock3_impl(this, name);
-  parent->AddDeviceToLog(pimpl_->joy_ref);
+  getFrameworkManager()->AddDeviceToLog(pimpl_->joy_ref);
   controller->Start();
 }

trunk/lib/FlairMeta/src/MetaDualShock3.h

@@ -40 +40 @@
 
 public:
-  MetaDualShock3(core::FrameworkManager *parent, std::string name,
+  MetaDualShock3(std::string name,
                  sensor::TargetController *controller);
   ~MetaDualShock3();

trunk/lib/FlairMeta/src/SimuX4.cpp

@@ -42 +42 @@
 
   if (multiplex == NULL)
-    SetMultiplex(new X4X8Multiplex(getFrameworkManager(), "motors", X4X8Multiplex::X4));
+    SetMultiplex(new X4X8Multiplex("motors", X4X8Multiplex::X4));
 
   SetBldc(new SimuBldc(GetUavMultiplex(), GetUavMultiplex()->GetLayout(),
                        "motors", GetUavMultiplex()->MotorsCount(), simu_id));
-  SetUsRangeFinder(new SimuUs(getFrameworkManager(), "us", simu_id, 60));
-  SetAhrs(new SimuAhrs(getFrameworkManager(), "imu", simu_id, 70));
+  SetUsRangeFinder(new SimuUs("us", simu_id, 60));
+  SetAhrs(new SimuAhrs("imu", simu_id, 70));
   Tab *bat_tab = new Tab(getFrameworkManager()->GetTabWidget(), "battery");
   SetBatteryMonitor(new BatteryMonitor(bat_tab->NewRow(), "battery"));
   GetBatteryMonitor()->SetBatteryValue(12);
   SetVerticalCamera(
-      new SimuCamera(getFrameworkManager(), "simu_cam_v", 320, 240, 3, simu_id, 10));
+      new SimuCamera("simu_cam_v", 320, 240, 3, simu_id, 10));
 }
 

trunk/lib/FlairMeta/src/SimuX8.cpp

@@ -42 +42 @@
 
   if (multiplex == NULL)
-    SetMultiplex(new X4X8Multiplex(getFrameworkManager(), "motors", X4X8Multiplex::X8));
+    SetMultiplex(new X4X8Multiplex("motors", X4X8Multiplex::X8));
 
   SetBldc(new SimuBldc(GetUavMultiplex(), GetUavMultiplex()->GetLayout(),
                        "motors", GetUavMultiplex()->MotorsCount(), simu_id));
-  SetUsRangeFinder(new SimuUs(getFrameworkManager(), "us", simu_id, 60));
-  SetAhrs(new SimuAhrs(getFrameworkManager(), "imu", simu_id, 70));
+  SetUsRangeFinder(new SimuUs("us", simu_id, 60));
+  SetAhrs(new SimuAhrs("imu", simu_id, 70));
   Tab *bat_tab = new Tab(getFrameworkManager()->GetTabWidget(), "battery");
   SetBatteryMonitor(new BatteryMonitor(bat_tab->NewRow(), "battery"));
   GetBatteryMonitor()->SetBatteryValue(12);
   SetVerticalCamera(
-      new SimuCamera(getFrameworkManager(), "simu_cam_v", 320, 240, 3, simu_id, 10));
+      new SimuCamera("simu_cam_v", 320, 240, 3, simu_id, 10));
 }
 

trunk/lib/FlairMeta/src/UavStateMachine.cpp

@@ -90 +90 @@
   uZ->AddDeviceToLog(uYaw);
 
-    joy=new MetaDualShock3(getFrameworkManager(),"uav high level controller",controller);
+    joy=new MetaDualShock3("uav high level controller",controller);
     uav->GetAhrs()->AddPlot(joy->GetReferenceOrientation(),DataPlot::Blue);
 

trunk/lib/FlairMeta/src/XAir.cpp

@@ -45 +45 @@
 
   if (multiplex == NULL)
-    SetMultiplex(new X4X8Multiplex(getFrameworkManager(), "motors", X4X8Multiplex::X8));
+    SetMultiplex(new X4X8Multiplex("motors", X4X8Multiplex::X8));
 
   SetBldc(new AfroBldc(GetUavMultiplex(), GetUavMultiplex()->GetLayout(),
                        "motors", GetUavMultiplex()->MotorsCount(), i2cport));
-  SetUsRangeFinder(new Srf08(getFrameworkManager(), "SRF08", i2cport, 0x70, 60));
-  SetAhrs(new Gx3_25_ahrs(getFrameworkManager(), "imu", imu_port,
+  SetUsRangeFinder(new Srf08("SRF08", i2cport, 0x70, 60));
+  SetAhrs(new Gx3_25_ahrs("imu", imu_port,
                           Gx3_25_imu::AccelerationAngularRateAndOrientationMatrix, 70));
   Tab *bat_tab = new Tab(getFrameworkManager()->GetTabWidget(), "battery");
   SetBatteryMonitor(new BatteryMonitor(bat_tab->NewRow(), "battery"));
   GetBatteryMonitor()->SetBatteryValue(12);
-  SetVerticalCamera(new Ps3Eye(getFrameworkManager(), "camv", 0, 50));
+  SetVerticalCamera(new Ps3Eye("camv", 0, 50));
 }