Changeset 86 in pacpussensors for trunk/PacpusSocket

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/PacpusSocket

Files:

• PacpusUDPSocket.cpp (modified) (5 diffs)
• PacpusUDPSocket.h (modified) (1 diff)

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_;