Changeset 86 in pacpussensors

Timestamp:

Jun 3, 2015, 3:42:58 PM (9 years ago)

Author:

phudelai

Message:

Socket:

• Despecialisation de PacpusUDPSocket (anciennement spécialisée Airplug)
• Ajout d'une classe UDPSocket

CanDriver:

• Préparation au code du driver CAN Softing
• Ajout des libs pour la compilation

Location:

trunk

Files:

• CanGateway/driver/CanDriver.h (modified) (2 diffs)
• CanGateway/driver/CanL2.h (added)
• CanGateway/driver/Can_def.h (added)
• CanGateway/driver/SoftingCanDriver.cpp (added)
• CanGateway/driver/SoftingCanDriver.h (added)
• CanGateway/driver/libs/canL2.lib (added)
• CanGateway/driver/libs/canV4generic.lib (added)
• PacpusSocket/PacpusUDPSocket.cpp (modified) (5 diffs)
• PacpusSocket/PacpusUDPSocket.h (modified) (1 diff)

trunk/CanGateway/driver/CanDriver.h

@@ -15 +15 @@
 
 
-
 #ifndef _CANDRIVER_H_
 #define _CANDRIVER_H_
 
 
-#define VECTOR_CAN_DRIVER     1
-#define NI_CAN_DRIVER         2
-#define VECTOR_CANXL_DRIVER         3
-#define  PEAK_CAN_DRIVER 4
-#define  IGEP_CAN_DRIVER 5      
-#define  PEAK_CAN_DRIVER 6
+#define VECTOR_CAN_DRIVER       1
+#define NI_CAN_DRIVER           2
+#define VECTOR_CANXL_DRIVER     3
+#define PEAK_CAN_DRIVER         4
+#define IGEP_CAN_DRIVER         5       
+#define PEAK_CAN_DRIVER_WIN     6
+#define SOFTING_CAN_DRIVER      7
+
 
 #if CAN_DRIVER_TYPE == VECTOR_CAN_DRIVER
@@ -33 +34 @@
 #include "NiCanDriver.h"
 #define CanDriverType NiCanDriver
+#elif CAN_DRIVER_TYPE == VECTOR_CANXL_DRIVER
+#include "XLVectorCanDriver.h"
+#define CanDriverType XLVectorCanDriver
 #elif CAN_DRIVER_TYPE == PEAK_CAN_DRIVER
 #include "PeakCanDriver.h"
 #define CanDriverType PeakCanDriver
+#elif CAN_DRIVER_TYPE == IGEP_CAN_DRIVER
+#include "igepCanDriver.h"
+#define CanDriverType igepCanDriver
 #elif CAN_DRIVER_TYPE == PEAK_CAN_DRIVER_WIN
 #include "PeakCanDriverWin.h"
 #define CanDriverType PeakCanDriverWin
-#elif CAN_DRIVER_TYPE == IGEP_CAN_DRIVER
-#include "igepCanDriver.h"
-#define CanDriverType igepCanDriver
-#elif CAN_DRIVER_TYPE == VECTOR_CANXL_DRIVER
-#include "XLVectorCanDriver.h"
-#define CanDriverType XLVectorCanDriver
+#elif CAN_DRIVER_TYPE == SOFTING_CAN_DRIVER
+#include "SoftingCanDriver.h"
+#define CanDriverType SoftingCanDriver
 #else
 #define CanDriverType CanDriverUnknown

trunk/PacpusSocket/PacpusUDPSocket.cpp

@@ -47 +47 @@
 
 
+////////////////////////////////////////////////////////////////////////////////
+// AddOutputs
+////////////////////////////////////////////////////////////////////////////////
+void PacpusUDPSocket::addOutputs()
+{
+        addOutput<QString, PacpusUDPSocket>("udpSocketOutput");
+}
+
+
 //////////////////////////////////////////////////////////////////////////
 // Called by the ComponentManager to pass the XML parameters to the 
@@ -96 +105 @@
             
         connect(udpSocket_, SIGNAL(readyRead()), this, SLOT(readPendingDatagrams()));
-}
-
-
+        
+        updSocketOutput_ = getTypedOutput<QString, PacpusUDPSocket>("udpSocketOutput");
+}
+
+
+//////////////////////////////////////////////////////////////////////////
+// Send datagram QString
+//////////////////////////////////////////////////////////////////////////
 void PacpusUDPSocket::sendDatagrams(QString frame) 
 { 
@@ -119 +133 @@
 
 
+//////////////////////////////////////////////////////////////////////////
+// Send datagram QByteArray
+//////////////////////////////////////////////////////////////////////////
 void PacpusUDPSocket::sendDatagrams(QByteArray frame) 
 { 
@@ -139 +156 @@
 
 
+//////////////////////////////////////////////////////////////////////////
+// Called when the socket receive a new datagram 
+//////////////////////////////////////////////////////////////////////////
 void PacpusUDPSocket::readPendingDatagrams()
 {
@@ -164 +184 @@
                         }
                         
-                        // Output
+                        if (updSocketOutput_ && updSocketOutput_->hasConnection())
+                                updSocketOutput_->send(QString(datagram.data()));
                 }
                 else

trunk/PacpusSocket/PacpusUDPSocket.h

@@ -83 +83 @@
     virtual void stopActivity();
     virtual COMPONENT_CONFIGURATION configureComponent(XmlComponentConfig config);
+        
+        OutputInterface<QString, PacpusUDPSocket>* udpSocketOutput_;
 
     QUdpSocket * udpSocket_;