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

Timestamp:

Mar 5, 2017, 10:50:56 AM (8 years ago)

Author:

Sanahuja Guillaume

Message:

corrected simu/device id for sensors

Location:

trunk/lib/FlairMeta/src

Files:

• SimuX4.cpp (modified) (3 diffs)
• SimuX4.h (modified) (1 diff)
• SimuX8.cpp (modified) (2 diffs)
• SimuX8.h (modified) (1 diff)

trunk/lib/FlairMeta/src/SimuX4.cpp

@@ -38 +38 @@
 namespace meta {
 
-SimuX4::SimuX4(string name, int simu_id,string options,
+SimuX4::SimuX4(string name, uint32_t simu_id,string options,
                filter::UavMultiplex *multiplex)
     : Uav(name, multiplex) {
@@ -46 +46 @@
 
   SetBldc(new SimuBldc(GetUavMultiplex(), GetUavMultiplex()->GetLayout(),
-                       "motors", GetUavMultiplex()->MotorsCount(), simu_id));
-  SetUsRangeFinder(new SimuUs("us", simu_id, 60));
-  SetAhrs(new SimuAhrs("imu", simu_id, 70));
+                       "motors", GetUavMultiplex()->MotorsCount(), simu_id,0));
+  SetUsRangeFinder(new SimuUs("us", simu_id,0, 60));
+  SetAhrs(new SimuAhrs("imu", simu_id, 0,70));
   Tab *bat_tab = new Tab(getFrameworkManager()->GetTabWidget(), "battery");
   SetBatteryMonitor(new BatteryMonitor(bat_tab->NewRow(), "battery"));
@@ -59 +59 @@
         }
   
-  SetVerticalCamera(
-      new SimuCamera("simu_cam_v", camvWidth, camvHeight, 3, simu_id, 10));
+  SetVerticalCamera(new SimuCamera("simu_cam_v", camvWidth, camvHeight, 3, simu_id,0, 10));
+  //SetHorizontalCamera(new SimuCamera("simu_cam_h", 320, 240, 3, simu_id,1, 10));
 }
 

trunk/lib/FlairMeta/src/SimuX4.h

@@ -26 +26 @@
   // simu_id: 0 if simulating only one UAV
   //>0 otherwise
-  SimuX4(std::string name, int simu_id = 0,std::string options="",
+  SimuX4(std::string name, uint32_t simu_id = 0,std::string options="",
          filter::UavMultiplex *multiplex = NULL);
   ~SimuX4();

trunk/lib/FlairMeta/src/SimuX8.cpp

@@ -37 +37 @@
 namespace meta {
 
-SimuX8::SimuX8(string name, int simu_id,string options,
+SimuX8::SimuX8(string name, uint32_t simu_id,string options,
                filter::UavMultiplex *multiplex)
     : Uav(name, multiplex) {
@@ -45 +45 @@
 
   SetBldc(new SimuBldc(GetUavMultiplex(), GetUavMultiplex()->GetLayout(),
-                       "motors", GetUavMultiplex()->MotorsCount(), simu_id));
-  SetUsRangeFinder(new SimuUs("us", simu_id, 60));
-  SetAhrs(new SimuAhrs("imu", simu_id, 70));
+                       "motors", GetUavMultiplex()->MotorsCount(), simu_id,0));
+  SetUsRangeFinder(new SimuUs("us", simu_id,0, 60));
+  SetAhrs(new SimuAhrs("imu", simu_id, 0,70));
   Tab *bat_tab = new Tab(getFrameworkManager()->GetTabWidget(), "battery");
   SetBatteryMonitor(new BatteryMonitor(bat_tab->NewRow(), "battery"));
   GetBatteryMonitor()->SetBatteryValue(12);
-  SetVerticalCamera(
-      new SimuCamera("simu_cam_v", 320, 240, 3, simu_id, 10));
+  SetVerticalCamera(new SimuCamera("simu_cam_v", 320, 240, 3, simu_id,0, 10));
+  //SetHorizontalCamera(new SimuCamera("simu_cam_h", 320, 240, 3, simu_id,1, 10));
 }
 

trunk/lib/FlairMeta/src/SimuX8.h

@@ -26 +26 @@
   // simu_id: 0 if simulating only one UAV
   //>0 otherwise
-  SimuX8(std::string name, int simu_id = 0,std::string options="",
+  SimuX8(std::string name, uint32_t simu_id = 0,std::string options="",
          filter::UavMultiplex *multiplex = NULL);
   ~SimuX8();