Changeset 158 in flair-src for trunk/lib/FlairSensorActuator/src/SimuImu.cpp

Timestamp:

03/05/17 10:50:56 (6 years ago)

Author:

Sanahuja Guillaume

Message:

corrected simu/device id for sensors

File:

• trunk/lib/FlairSensorActuator/src/SimuImu.cpp (modified) (3 diffs)

trunk/lib/FlairSensorActuator/src/SimuImu.cpp

@@ -34 +34 @@
 namespace sensor {
 
-SimuImu::SimuImu(string name, uint32_t dev_id,
+SimuImu::SimuImu(string name, uint32_t modelId,uint32_t deviceId,
                  uint8_t priority)
     : Imu(name), Thread(getFrameworkManager(), name, priority) {
@@ -40 +40 @@
       new SpinBox(GetGroupBox()->NewRow(), "data rate", " Hz", 1, 500, 1, 200);
   ahrsData = new AhrsData((Imu *)this);
-
-  ostringstream dev_name;
-  dev_name << "simu_imu_" << dev_id;
-  shmem = new SharedMem((Thread *)this, dev_name.str().c_str(),
+  
+  shmem = new SharedMem((Thread *)this, ShMemName(modelId, deviceId),
                         sizeof(imu_states_t));
   SetIsReady(true);
 }
 
-SimuImu::SimuImu(const IODevice *parent, string name, uint32_t dev_id)
+SimuImu::SimuImu(const IODevice *parent, string name, uint32_t modelId,uint32_t deviceId)
     : Imu(parent,name), Thread(parent, name, 0) {
   dataRate = NULL;
 
-  ostringstream dev_name;
-  dev_name << "simu_imu_" << dev_id;
-  shmem = new SharedMem((Thread *)this, dev_name.str().c_str(),
+  shmem = new SharedMem((Thread *)this, ShMemName(modelId, deviceId),
                         sizeof(imu_states_t));
   SetIsReady(true);
@@ -62 +58 @@
   SafeStop();
   Join();
+}
+
+string SimuImu::ShMemName(uint32_t modelId,uint32_t deviceId) {
+  ostringstream dev_name;
+  dev_name << "simu" <<  modelId << "_imu_" << deviceId;
+  return dev_name.str().c_str();
 }