Changeset 66 in pacpussensors

Timestamp:

Sep 25, 2014, 4:35:35 PM (10 years ago)

Author:

DHERBOMEZ Gérald

Message:

Modifications:

• migration of alasca component to pacpus framework 0.1.X
• new component for Velodyne HDL64E sensor
• addition of xml example files for alasca, gps, cangateway and velodyne

Location:

trunk

Files:

• Alasca/AlascaComponent.cpp (modified) (5 diffs)
• Alasca/alasca.xml (added)
• CanGateway/cangateway.xml (added)
• Gps/gps_nmea.xml (added)
• VelodyneComponent (added)
• VelodyneComponent/CMakeLists.txt (added)
• VelodyneComponent/VelodyneComponent.cpp (added)
• VelodyneComponent/VelodyneComponent.h (added)
• VelodyneComponent/structure_velodyne.h (added)
• VelodyneComponent/velodyne.xml (added)

trunk/Alasca/AlascaComponent.cpp

@@ -53 +53 @@
     pendingBytes.time = 0;
     pendingBytes.previousData = false;
-    recording = false;
+        setRecording(false);
     // default values
     host_ = "172.17.130.205";
@@ -74 +74 @@
     //generator = new AlascaDataGenerator(this);
     A_socket->connectToServer(host_, port_);
-    if (recording) {
+        if (isRecording()) {
         try {
             dbtFile_.open(kAlaskaDbtFileName, WriteMode, ALASCA_XT, sizeof(AlascaXT));
@@ -106 +106 @@
 {
     A_socket->closeSocket();
-    if (recording) {
+    if (isRecording()) {
         dbtFile_.close();
         dataFile_.close();
@@ -119 +119 @@
 ComponentBase::COMPONENT_CONFIGURATION AlascaComponent::configureComponent(XmlComponentConfig config)
 {
-    if (param.getProperty("recording") != QString::null)
-        recording = param.getProperty("recording").toInt();
-    if (param.getProperty("alascaIP") != QString::null)
-        host_ = param.getProperty("alascaIP");
-    if (param.getProperty("alascaPort") != QString::null)
-        port_ = param.getProperty("alascaPort").toInt();
+    if (config.getProperty("recording") != QString::null)
+        setRecording ( config.getProperty("recording").toInt() );
+    if (config.getProperty("alascaIP") != QString::null)
+        host_ = config.getProperty("alascaIP");
+    if (config.getProperty("alascaPort") != QString::null)
+        port_ = config.getProperty("alascaPort").toInt();
 
     return ComponentBase::CONFIGURED_OK;
@@ -489 +489 @@
             setState(ComponentBase::MONITOR_OK);
             // write data on the disk
-            if (recording) writeData();
+            if (isRecording()) writeData();
             // push data in shared memory
             shmem_->write(&alascaData, sizeof(alascaData));