Changeset 435 in flair-src for trunk/lib

Timestamp:

Jul 15, 2021, 2:44:03 PM (3 years ago)

Author:

Sanahuja Guillaume

Message:

add logs to ugv

Location:

trunk/lib

Files:

• FlairMeta/src/SimuUgv.cpp (modified) (2 diffs)
• FlairMeta/src/SumoUgv.cpp (modified) (2 diffs)
• FlairSensorActuator/src/SimulatedUgvControls.cpp (modified) (1 diff)
• FlairSensorActuator/src/SumoUgvControls.cpp (modified) (2 diffs)
• FlairSensorActuator/src/UgvControls.h (modified) (1 diff)

trunk/lib/FlairMeta/src/SimuUgv.cpp

@@ -19 +19 @@
 #include "SimuUgv.h"
 #include <SimulatedUgvControls.h>
+#include <FrameworkManager.h>
 
 using std::string;
@@ -32 +33 @@
 
   SetUgvControls(new SimulatedUgvControls("controls", simu_id,0));
-  
+  getFrameworkManager()->AddDeviceToLog(GetUgvControls());
   
 }

trunk/lib/FlairMeta/src/SumoUgv.cpp

@@ -19 +19 @@
 #include "SumoUgv.h"
 #include <SumoUgvControls.h>
+#include <FrameworkManager.h>
 
 
@@ -32 +33 @@
 
   SetUgvControls(new SumoUgvControls("controls"));
-  
+  getFrameworkManager()->AddDeviceToLog(GetUgvControls());
   
 }

trunk/lib/FlairSensorActuator/src/SimulatedUgvControls.cpp

@@ -70 +70 @@
   }
   output->ReleaseMutex();
+  
+  output->SetDataTime(GetTime());
+  ProcessUpdate(output);
 }
 

trunk/lib/FlairSensorActuator/src/SumoUgvControls.cpp

@@ -51 +51 @@
 }
 
-
 void SumoUgvControls::SetControls(float speed,float turn) {
   sumoControl->move(speed*127, turn*127);
@@ -60 +59 @@
   output->SetValueNoMutex(1, 0, turn);
   output->ReleaseMutex();
+  
+  output->SetDataTime(core::GetTime());
+  ProcessUpdate(output);
 }
 

trunk/lib/FlairSensorActuator/src/UgvControls.h

@@ -85 +85 @@
   */
   void UpdateFrom(const core::io_data *data){};
-  
+
   gui::Tab *mainTab;
 };