Changeset 158 in flair-src for trunk/lib/FlairSensorActuator/src/SimuGps.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/SimuGps.cpp (modified) (4 diffs)

trunk/lib/FlairSensorActuator/src/SimuGps.cpp

@@ -39 +39 @@
 
 SimuGps::SimuGps(string name,
-                 NmeaGps::NMEAFlags_t NMEAFlags, uint32_t deviceId,uint8_t priority)
+                 NmeaGps::NMEAFlags_t NMEAFlags, uint32_t modelId,uint32_t deviceId,uint8_t priority)
     : NmeaGps(name, NMEAFlags),Thread(getFrameworkManager(), name, priority) {
 
@@ -49 +49 @@
   numberOfSatellites = new SpinBox(GetGroupBox()->NewRow(), "number of satellites", 1, 15, 1, 5);
 
-  ostringstream dev_name;
-  dev_name << "simu_gps_" << deviceId;
-  shmem = new SharedMem((Thread *)this, dev_name.str().c_str(),
+  shmem = new SharedMem((Thread *)this, ShMemName(modelId, deviceId),
                         sizeof(gps_states_t));
                         
@@ -58 +56 @@
 
 
-SimuGps::SimuGps(const IODevice *parent, string name, uint32_t deviceId)
+SimuGps::SimuGps(const IODevice *parent, string name, uint32_t modelId,uint32_t deviceId)
     : NmeaGps(parent, name), Thread(parent, name, 0) {
   dataRate = NULL;
 
-  ostringstream dev_name;
-  dev_name << "simu_gps_" << deviceId;
-  shmem = new SharedMem((Thread *)this, dev_name.str().c_str(),
+  shmem = new SharedMem((Thread *)this,ShMemName(modelId, deviceId),
                         sizeof(gps_states_t));
   
@@ -73 +69 @@
   SafeStop();
   Join();
+}
+
+string SimuGps::ShMemName(uint32_t modelId,uint32_t deviceId) {
+  ostringstream dev_name;
+  dev_name << "simu" <<  modelId << "_gps_" << deviceId;
+  return dev_name.str().c_str();
 }