Changeset 121 in pacpusframework for branches/2.0-beta1/src

Timestamp:

Jul 19, 2013, 12:42:35 PM (11 years ago)

Author:

morasjul

Message:

add cmake macro
and improve serial component

Location:

branches/2.0-beta1/src

Files:

• PacpusLib/CMakeLists.txt (modified) (2 diffs)
• PacpusTools/src/PacpusSerialPort.cpp (modified) (3 diffs)

branches/2.0-beta1/src/PacpusLib/CMakeLists.txt

@@ -65 +65 @@
     ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/inputOutputInterface.h
     ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/PacpusEvent.h
-    #${PACPUS_INCLUDE_DIR}/Pacpus/kernel/pacpusStruct.h
+    ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/pacpusStruct.h
 
     ./ComponentBase.cpp
@@ -75 +75 @@
     ./XmlConfigFile.cpp
     ./inputOutputBase.cpp
-    #./pacpusStruct.cpp
+    ./pacpusStruct.cpp
 )
 

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

@@ -42 +42 @@
     sepChar = "\n";
 
+    startChar = "$";
+    stopChar = "\n";
+
     // Or threaded
     connect(serialPort,SIGNAL(readyRead()),this,SLOT(readData()));
@@ -101 +104 @@
     sepChar =  param.getProperty("sepChar");
 
+    if(param.hasProperty("startChar"))
+    startChar =  param.getProperty("startChar");
+
+    if(param.hasProperty("stopChar"))
+    stopChar =  param.getProperty("stopChar");
+
     serialPort->setPortName(portName);
 
     if(!serialPort->setBaudRate(baudRate,direction))
-        LOG_ERROR("n° "<< serialPort->error());
+        LOG_ERROR(getName() << "\t error n° "<< serialPort->error());
     if(!serialPort->setDataBits(dataBits))
-        LOG_ERROR("n° "<< serialPort->error());
+        LOG_ERROR(getName() << "\t error n° "<< serialPort->error());
     if(!serialPort->setParity(parity))
-        LOG_ERROR("n° "<< serialPort->error());
+        LOG_ERROR(getName() << "\t error n° "<< serialPort->error());
     if(!serialPort->setStopBits(stopBits))
-        LOG_ERROR("n° "<< serialPort->error());
+        LOG_ERROR(getName() << "\t error n° "<< serialPort->error());
     if(!serialPort->setFlowControl(flowControl))
-        LOG_ERROR("n° "<< serialPort->error());
+        LOG_ERROR(getName() << "\t error n° "<< serialPort->error());
     if(!serialPort->setDataErrorPolicy(errorPolicy))
-        LOG_ERROR("n° "<< serialPort->error());
+        LOG_ERROR(getName() << "\t error n° "<< serialPort->error());
 
     // For futher developpements
@@ -160 +169 @@
     {
         setState(MONITOR_OK);
-        LOG_DEBUG("Serial write performed")
+        LOG_DEBUG(getName() << " Serial write performed")
     }
     else
      {
         setState(MONITOR_NOK);
-        LOG_WARN("Serial write error")
+        LOG_WARN(getName() << " Serial write error")
     }
 }