Changeset 15 in flair-src for trunk/lib/FlairMeta/src/SimuX4.cpp

Timestamp:

Apr 8, 2016, 3:40:57 PM (9 years ago)

Author:

Bayard Gildas

Message:

sources reformatted with flair-format-dir script

File:

• trunk/lib/FlairMeta/src/SimuX4.cpp (modified) (1 diff)

trunk/lib/FlairMeta/src/SimuX4.cpp

@@ -34 +34 @@
 using namespace flair::actuator;
 
-namespace flair { namespace meta {
+namespace flair {
+namespace meta {
 
-SimuX4::SimuX4(FrameworkManager* parent,string uav_name,int simu_id,filter::UavMultiplex *multiplex) : Uav(parent,uav_name,multiplex) {
+SimuX4::SimuX4(FrameworkManager *parent, string uav_name, int simu_id,
+               filter::UavMultiplex *multiplex)
+    : Uav(parent, uav_name, multiplex) {
 
-    if(multiplex==NULL) SetMultiplex(new X4X8Multiplex(parent,"motors",X4X8Multiplex::X4));
+  if (multiplex == NULL)
+    SetMultiplex(new X4X8Multiplex(parent, "motors", X4X8Multiplex::X4));
 
-    SetBldc(new SimuBldc(GetUavMultiplex(),GetUavMultiplex()->GetLayout(),"motors",GetUavMultiplex()->MotorsCount(),simu_id));
-    SetUsRangeFinder(new SimuUs(parent,"us",simu_id,60));
-    SetAhrs(new SimuAhrs(parent,"imu",simu_id,70));
-    Tab* bat_tab=new Tab(parent->GetTabWidget(),"battery");
-    SetBatteryMonitor(new BatteryMonitor(bat_tab->NewRow(),"battery"));
-    GetBatteryMonitor()->SetBatteryValue(12);
-    SetVerticalCamera(new SimuCamera(parent, "simu_cam_v", 320, 240, 3, simu_id, 10));
+  SetBldc(new SimuBldc(GetUavMultiplex(), GetUavMultiplex()->GetLayout(),
+                       "motors", GetUavMultiplex()->MotorsCount(), simu_id));
+  SetUsRangeFinder(new SimuUs(parent, "us", simu_id, 60));
+  SetAhrs(new SimuAhrs(parent, "imu", simu_id, 70));
+  Tab *bat_tab = new Tab(parent->GetTabWidget(), "battery");
+  SetBatteryMonitor(new BatteryMonitor(bat_tab->NewRow(), "battery"));
+  GetBatteryMonitor()->SetBatteryValue(12);
+  SetVerticalCamera(
+      new SimuCamera(parent, "simu_cam_v", 320, 240, 3, simu_id, 10));
 }
 
-SimuX4::~SimuX4() {
+SimuX4::~SimuX4() {}
 
+void SimuX4::StartSensors(void) {
+  ((SimuAhrs *)GetAhrs())->Start();
+  ((SimuUs *)GetUsRangeFinder())->Start();
+  ((SimuCamera *)GetVerticalCamera())->Start();
+  Uav::StartSensors();
 }
 
-void SimuX4::StartSensors(void) {
-    ((SimuAhrs*)GetAhrs())->Start();
-    ((SimuUs*)GetUsRangeFinder())->Start();
-    ((SimuCamera *)GetVerticalCamera())->Start();
-    Uav::StartSensors();
-}
-
-void SimuX4::SetupVRPNAutoIP(string name) {
-    SetupVRPN("127.0.0.1:3883",name);
-}
+void SimuX4::SetupVRPNAutoIP(string name) { SetupVRPN("127.0.0.1:3883", name); }
 
 } // end namespace meta