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

Timestamp:

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

Author:

Sanahuja Guillaume

Message:

corrected simu/device id for sensors

File:

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

trunk/lib/FlairSensorActuator/src/SimuUs.cpp

@@ -32 +32 @@
 namespace sensor {
 
-SimuUs::SimuUs(string name, uint32_t dev_id,
+SimuUs::SimuUs(string name, uint32_t modelId,uint32_t deviceId,
                uint8_t priority)
     : Thread(getFrameworkManager(), name, priority), UsRangeFinder( name) {
@@ -38 +38 @@
       new SpinBox(GetGroupBox()->NewRow(), "data rate", " Hz", 1, 500, 1, 50);
 
-  ostringstream dev_name;
-  dev_name << "simu_us_" << dev_id;
-  shmem = new SharedMem((Thread *)this, dev_name.str().c_str(), sizeof(float));
+  shmem = new SharedMem((Thread *)this, ShMemName(modelId, deviceId), sizeof(float));
 
   SetIsReady(true);
 }
 
-SimuUs::SimuUs(const IODevice *parent, string name, uint32_t dev_id)
+SimuUs::SimuUs(const IODevice *parent, string name,uint32_t modelId,uint32_t deviceId)
     : Thread(parent, name, 0), UsRangeFinder(parent,name) {
   data_rate = NULL;
 
-  ostringstream dev_name;
-  dev_name << "simu_us_" << dev_id;
-  shmem = new SharedMem((Thread *)this, dev_name.str().c_str(), sizeof(float));
+  shmem = new SharedMem((Thread *)this, ShMemName(modelId, deviceId), sizeof(float));
   
   SetIsReady(true);
@@ -59 +55 @@
   SafeStop();
   Join();
+}
+
+string SimuUs::ShMemName(uint32_t modelId,uint32_t deviceId) {
+  ostringstream dev_name;
+  dev_name << "simu" <<  modelId << "_us_" << deviceId;
+  return dev_name.str().c_str();
 }