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


Ignore:
Timestamp:
Mar 5, 2017, 10:50:56 AM (5 years ago)
Author:
Sanahuja Guillaume
Message:

corrected simu/device id for sensors

Location:
trunk/lib/FlairMeta/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/FlairMeta/src/SimuX4.cpp

    r157 r158  
    3838namespace meta {
    3939
    40 SimuX4::SimuX4(string name, int simu_id,string options,
     40SimuX4::SimuX4(string name, uint32_t simu_id,string options,
    4141               filter::UavMultiplex *multiplex)
    4242    : Uav(name, multiplex) {
     
    4646
    4747  SetBldc(new SimuBldc(GetUavMultiplex(), GetUavMultiplex()->GetLayout(),
    48                        "motors", GetUavMultiplex()->MotorsCount(), simu_id));
    49   SetUsRangeFinder(new SimuUs("us", simu_id, 60));
    50   SetAhrs(new SimuAhrs("imu", simu_id, 70));
     48                       "motors", GetUavMultiplex()->MotorsCount(), simu_id,0));
     49  SetUsRangeFinder(new SimuUs("us", simu_id,0, 60));
     50  SetAhrs(new SimuAhrs("imu", simu_id, 0,70));
    5151  Tab *bat_tab = new Tab(getFrameworkManager()->GetTabWidget(), "battery");
    5252  SetBatteryMonitor(new BatteryMonitor(bat_tab->NewRow(), "battery"));
     
    5959        }
    6060 
    61   SetVerticalCamera(
    62       new SimuCamera("simu_cam_v", camvWidth, camvHeight, 3, simu_id, 10));
     61  SetVerticalCamera(new SimuCamera("simu_cam_v", camvWidth, camvHeight, 3, simu_id,0, 10));
     62  //SetHorizontalCamera(new SimuCamera("simu_cam_h", 320, 240, 3, simu_id,1, 10));
    6363}
    6464
  • trunk/lib/FlairMeta/src/SimuX4.h

    r157 r158  
    2626  // simu_id: 0 if simulating only one UAV
    2727  //>0 otherwise
    28   SimuX4(std::string name, int simu_id = 0,std::string options="",
     28  SimuX4(std::string name, uint32_t simu_id = 0,std::string options="",
    2929         filter::UavMultiplex *multiplex = NULL);
    3030  ~SimuX4();
  • trunk/lib/FlairMeta/src/SimuX8.cpp

    r157 r158  
    3737namespace meta {
    3838
    39 SimuX8::SimuX8(string name, int simu_id,string options,
     39SimuX8::SimuX8(string name, uint32_t simu_id,string options,
    4040               filter::UavMultiplex *multiplex)
    4141    : Uav(name, multiplex) {
     
    4545
    4646  SetBldc(new SimuBldc(GetUavMultiplex(), GetUavMultiplex()->GetLayout(),
    47                        "motors", GetUavMultiplex()->MotorsCount(), simu_id));
    48   SetUsRangeFinder(new SimuUs("us", simu_id, 60));
    49   SetAhrs(new SimuAhrs("imu", simu_id, 70));
     47                       "motors", GetUavMultiplex()->MotorsCount(), simu_id,0));
     48  SetUsRangeFinder(new SimuUs("us", simu_id,0, 60));
     49  SetAhrs(new SimuAhrs("imu", simu_id, 0,70));
    5050  Tab *bat_tab = new Tab(getFrameworkManager()->GetTabWidget(), "battery");
    5151  SetBatteryMonitor(new BatteryMonitor(bat_tab->NewRow(), "battery"));
    5252  GetBatteryMonitor()->SetBatteryValue(12);
    53   SetVerticalCamera(
    54       new SimuCamera("simu_cam_v", 320, 240, 3, simu_id, 10));
     53  SetVerticalCamera(new SimuCamera("simu_cam_v", 320, 240, 3, simu_id,0, 10));
     54  //SetHorizontalCamera(new SimuCamera("simu_cam_h", 320, 240, 3, simu_id,1, 10));
    5555}
    5656
  • trunk/lib/FlairMeta/src/SimuX8.h

    r157 r158  
    2626  // simu_id: 0 if simulating only one UAV
    2727  //>0 otherwise
    28   SimuX8(std::string name, int simu_id = 0,std::string options="",
     28  SimuX8(std::string name, uint32_t simu_id = 0,std::string options="",
    2929         filter::UavMultiplex *multiplex = NULL);
    3030  ~SimuX8();
Note: See TracChangeset for help on using the changeset viewer.