Changeset 122 in pacpusframework

Timestamp:

07/22/13 23:45:45 (11 years ago)

Author:

morasjul

Message:

add function to PacpusSerialPort

Location:

branches/2.0-beta1

Files:

• include/Pacpus/PacpusTools/PacpusSerialPort.h (modified) (1 diff)
• include/Pacpus/kernel/inputOutputInterface.h (modified) (5 diffs)
• src/PacpusTools/src/PacpusSerialPort.cpp (modified) (6 diffs)

branches/2.0-beta1/include/Pacpus/PacpusTools/PacpusSerialPort.h

@@ -65 +65 @@
     QString stopChar;
 
+    int minPacketSize;
+
+    bool log;
+
 
 };

branches/2.0-beta1/include/Pacpus/kernel/inputOutputInterface.h

@@ -43 +43 @@
             PacpusTypedEvent<T> * typedEvent = dynamic_cast<PacpusTypedEvent<T> *> (event);
 
-            qDebug() << "Revever " << getSignature() << " thread " << QThread::currentThread() << " Data & " << & typedEvent->data_;
+            //qDebug() << "Reciever " << getSignature() << " thread " << QThread::currentThread() << " Data & " << & typedEvent->data_;
 
             //if(_component) get state
@@ -54 +54 @@
             switch (readingMode_){
             case TimeBounded:
-                qDebug() << "Input " << this->getSignature().leftJustified(20) << QString("Time bournded").leftJustified(15) << road_time()- typedEvent->t_ << "\t" << typedEvent->tr_;
+                //qDebug() << "Input " << this->getSignature().leftJustified(20) << QString("Time bournded").leftJustified(15) << road_time()- typedEvent->t_ << "\t" << typedEvent->tr_;
 
                 if(road_time() - typedEvent->t_> typedEvent->tr_)
@@ -63 +63 @@
 
             case GetLast:
-                qDebug() << "Input " << this->getSignature().leftJustified(20) << QString("GetLast").leftJustified(15) << road_time() - typedEvent->t_ << "\t" << typedEvent->tr_;
+                //qDebug() << "Input " << this->getSignature().leftJustified(20) << QString("GetLast").leftJustified(15) << road_time() - typedEvent->t_ << "\t" << typedEvent->tr_;
 
                 (dynamic_cast<C*>(_component)->*method)(typedEvent->data_);
@@ -70 +70 @@
 
             case NeverSkip:
-                qDebug() << "Input " << this->getSignature().leftJustified(20) << QString("NeverSkip").leftJustified(15) << road_time() - typedEvent->t_ << "\t" << typedEvent->tr_;
+                //qDebug() << "Input " << this->getSignature().leftJustified(20) << QString("NeverSkip").leftJustified(15) << road_time() - typedEvent->t_ << "\t" << typedEvent->tr_;
 
             default:
@@ -138 +138 @@
         for(QList<ConnectionBase>::iterator it = _connection.begin(); it!=_connection.end(); ++it){
             QApplication::postEvent(it->getInterface(),new PacpusTypedEvent<T>(TYPED_EVENT,data,t,tr),it->getPriority()); // Event is delete by the event loop handler
-            qDebug() << "sender " << it->getInterface()->getSignature() <<  " thread " << QThread::currentThread() << " Data & " << &data << " ";
-            // TODO DAta SHAred
+            //qDebug() << "sender " << it->getInterface()->getSignature() <<  " thread " << QThread::currentThread() << " Data & " << &data << " ";
+            // TODO Data Shared
         }
     }

branches/2.0-beta1/src/PacpusTools/src/PacpusSerialPort.cpp

@@ -40 +40 @@
 
     dataMode = ASCII;
-    sepChar = "\n";
-
-    startChar = "$";
+    sepChar = "\n";     // TODO remove
+
+    startChar = "";
     stopChar = "\n";
+    minPacketSize=0;
+
+    log = false; // TODO remove when component ok
 
     // Or threaded
@@ -109 +112 @@
     if(param.hasProperty("stopChar"))
     stopChar =  param.getProperty("stopChar");
+
+    if(param.hasProperty("minPacketSize"))
+    minPacketSize = (DataMode) param.getProperty("minPacketSize").toInt();
 
     serialPort->setPortName(portName);
@@ -135 +141 @@
 {
 
+    buffer.clear();
+
     if(!serialPort->open((QSerialPort::OpenModeFlag)direction))
     { LOG_FATAL("device "<< serialPort->portName().toStdString() <<" failed to open: " << serialPort->errorString()); }
@@ -182 +190 @@
     int n;
 
-    buffer.append(serialPort->readAll());
+    if(dataMode == BINARY & minPacketSize >0)
+        if(serialPort->bytesAvailable() < minPacketSize)
+            return;
+
+    buffer += serialPort->readAll();
 
     while(true) // loop until no data to send
@@ -189 +201 @@
         {
             case ASCII : // Split the first line to send
-
-                n = buffer.indexOf(sepChar,1) + 1;
-                if(n<=0)
-                    return; // end line char not found
+            {
+                if(startChar.size()>0)
+                {
+                    int indexStart = buffer.indexOf(startChar,0);
+                    if(indexStart < 0)
+                        return;
+                    else
+                        buffer.remove(0,indexStart);
+                }
+
+                int indexStop = buffer.indexOf(stopChar,1);
+                if(indexStop < 1)
+                    return;
+
+                n=indexStop;
                 break;
 
+            // This work but replace by previous code that need to be test
+//                n = buffer.indexOf(sepChar,1) + 1;
+//                if(n<=0)
+//                    return; // end line char not found
+//                break;
+            }
             case BINARY : // Get all data
-
                 n = buffer.size();//serialPort->bytesAvailable();
                 if(n<=0)
@@ -218 +246 @@
         GET_OUTPUT("pinOutSignal",PacpusSerialPort,quint16)->send(pinout);
         setState(MONITOR_OK);
-        LOG_INFO("Signal Read " << n << " bytes, PinOut : " << pinout);
-        LOG_INFO(QString(data).toStdString());
-    }
-    //LOG_INFO("Buffer " << buffer.data());
+        LOG_DEBUG("Signal Read " << n << " bytes, PinOut : " << pinout);
+        LOG_DEBUG(data.data());
+
+        if(log)
+        {
+            switch(dataMode)
+            {
+                case ASCII :
+                    LOG_INFO("Buffer " << buffer.data());
+
+                case BINARY :
+                {
+                        QByteArray str;
+                        for(int i =0;i<22 ;i++)
+                            str+= QByteArray::number((uchar)buffer.data()[i],16).toUpper() + " ";
+                        LOG_INFO("Value " << str.data());
+                }
+            }
+        }
+    }
 }