# HG changeset patch
# User Jeandet Alexis
# Date 2014-03-24 15:31:13
# Node ID dbff9217c66fd6b9aad43083cc889e9500338ec9
# Parent  a9eb4604e26ae5e7f1e94e25a4c66834fde81944

Integrated lppserial lib to lppmoncommon as a sub-repository.

diff --git a/.hgsub b/.hgsub
--- a/.hgsub
+++ b/.hgsub
@@ -1,1 +1,2 @@
 src/SocExplorerEngine/PeripheralWidget = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/PeripheralWidget
+src/common/lppserial = https://hephaistos.lpp.polytechnique.fr/rhodecode/HG_REPOSITORIES/LPP/INSTRUMENTATION/lppserial
diff --git a/.hgsubstate b/.hgsubstate
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -1,1 +1,2 @@
 2c82d72694590cbc2aebb946667f11f60ea89afe src/SocExplorerEngine/PeripheralWidget
+def3deb8bd342ad5cba9f7984f02f49f8d1df63e src/common/lppserial
diff --git a/src/common/common.pro b/src/common/common.pro
--- a/src/common/common.pro
+++ b/src/common/common.pro
@@ -11,6 +11,7 @@ win32:CONFIG -= static
 win32:INCLUDEPATH += $${PWD}/elf/libelfWin32/include
 win32:INCLUDEPATH += $${PWD}/elf/libelfWin32/include/libelf
 win32:DEFINES+=_ELF_WINDOWS_
+DEFINES+=RS232_debug
 
 win32:LIBS += $${PWD}/elf/libelfWin32/bin/libelf.a
 unix:LIBS += -lelf
@@ -37,8 +38,8 @@ header.files = \
     elf/elfinfowdgt.h \
     elf/elfparser.h \
     elf/elffile.h \
-    qipdialogbox.h
-
+    qipdialogbox.h \
+    lppserial/src/RS232.h
 
 win32{
     elfheader.path = $$[QT_INSTALL_HEADERS]/SocExplorer/common/libelf
@@ -82,7 +83,8 @@ HEADERS += \
     elf/elffile.h \
     qipdialogbox.h \
     PySocExplorer.h \
-    SocExplorerPlot.h
+    SocExplorerPlot.h \
+    lppserial/src/RS232.h
 
 
 SOURCES += \
@@ -102,5 +104,8 @@ SOURCES += \
     qipdialogbox.cpp \
     SocExplorerPlot.cpp
 
+unix:SOURCES += lppserial/src/RS232_unix.c
+win32:SOURCES += lppserial/src/RS232_win.c
 
 
+