Changeset 224 in flair-src for trunk/lib/FlairSensorActuator/src/SimuGps.cpp

Timestamp:

03/06/18 12:12:58 (6 years ago)

Author:

Sanahuja Guillaume

Message:

maj for armv5te

File:

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

trunk/lib/FlairSensorActuator/src/SimuGps.cpp

@@ -18 +18 @@
 #include "SimuGps.h"
 #include <FrameworkManager.h>
-#include <GeoCoordinate.h>
 #include <GpsData.h>
 #include <SharedMem.h>
@@ -57 +56 @@
 
 
-SimuGps::SimuGps(const IODevice *parent, string name, uint32_t modelId,uint32_t deviceId)
-    : NmeaGps(parent, name), Thread(parent, name, 0) {
-  dataRate = NULL;
-
-  shmem = new SharedMem((Thread *)this,ShMemName(modelId, deviceId),
-                        sizeof(gps_states_t));
-  
-  SetIsReady(true);
-}
-
 SimuGps::~SimuGps() {
   SafeStop();
@@ -76 +65 @@
   dev_name << "simu" <<  modelId << "_gps_" << deviceId;
   return dev_name.str().c_str();
-}
-
-void SimuGps::UpdateFrom(const io_data *data) {
-  if (data != NULL) {
-    Matrix *input = (Matrix *)data;
-    gps_states_t state;
-
-    input->GetMutex();
-    //simulator is ned, convert it to enu
-    //TODO: put simulator in enu?
-    state.e = input->ValueNoMutex(5, 0);//y simulator
-    state.n = input->ValueNoMutex(4, 0);//x simulator
-    state.u = -input->ValueNoMutex(6, 0);//z simulator
-    state.ve = input->ValueNoMutex(11, 0);//vy simulator
-    state.vn = input->ValueNoMutex(10, 0);//vx simulator
-    input->ReleaseMutex();
-
-    shmem->Write((char *)&state, sizeof(gps_states_t));
-  }
 }