mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-05 10:40:42 +00:00
Moving Quazip and QExtSerialPort to external libraries for mac and unix
This commit is contained in:
Mark Watkins
parent
1b2b7adef6
commit
edb7bc3690
2
3rdparty/3rdparty.pro
vendored
2
3rdparty/3rdparty.pro
vendored
@ -1,6 +1,6 @@
|
|||||||
TEMPLATE = subdirs
|
TEMPLATE = subdirs
|
||||||
|
|
||||||
SUBDIRS = qextserialport quazip
|
SUBDIRS = quazip qextserialport
|
||||||
|
|
||||||
CONFIG += ordered
|
CONFIG += ordered
|
||||||
|
|
||||||
|
|||||||
47
3rdparty/qextserialport/.gitignore
vendored
47
3rdparty/qextserialport/.gitignore
vendored
@ -1,47 +0,0 @@
|
|||||||
syntax: glob
|
|
||||||
*.pro.user*
|
|
||||||
*.app
|
|
||||||
*.moc
|
|
||||||
*.prl
|
|
||||||
Makefile*
|
|
||||||
doc/html/
|
|
||||||
*.framework/
|
|
||||||
*.xcodeproj/
|
|
||||||
debug/
|
|
||||||
release/
|
|
||||||
qtc-gdbmacros/
|
|
||||||
*.rej
|
|
||||||
*.orig
|
|
||||||
*.obj
|
|
||||||
*.swp
|
|
||||||
*.dll
|
|
||||||
*.exp
|
|
||||||
*.ilk
|
|
||||||
*.pdb
|
|
||||||
*.lib
|
|
||||||
Thumbs.db
|
|
||||||
moc_*.cpp
|
|
||||||
qrc_*.cpp
|
|
||||||
*.o
|
|
||||||
*.so.*
|
|
||||||
*.so
|
|
||||||
*.pdb
|
|
||||||
ui_*.h
|
|
||||||
*~
|
|
||||||
.qmake.cache
|
|
||||||
extserialport.prf
|
|
||||||
lib/*
|
|
||||||
*.orig
|
|
||||||
*.exe
|
|
||||||
*.vcproj
|
|
||||||
*.vcproj.*.user
|
|
||||||
*_resource.rc
|
|
||||||
*.sln
|
|
||||||
*.idb
|
|
||||||
*.ncb
|
|
||||||
*.suo
|
|
||||||
examples/enumerator/enumerator
|
|
||||||
examples/event/event
|
|
||||||
examples/qespta/qespta
|
|
||||||
examples/uartassistant/uartassistant
|
|
||||||
object_script.*
|
|
||||||
24
3rdparty/qextserialport/doc/doc.pri
vendored
24
3rdparty/qextserialport/doc/doc.pri
vendored
@ -1,12 +1,12 @@
|
|||||||
OTHER_FILES += $$PWD/qextserialport.qdocconf
|
OTHER_FILES += $$PWD/qextserialport.qdocconf
|
||||||
|
|
||||||
#name of qdoc3 has been changed to qdoc under Qt5
|
#name of qdoc3 has been changed to qdoc under Qt5
|
||||||
QESP_QDOC = qdoc
|
QESP_QDOC = qdoc
|
||||||
lessThan(QT_MAJOR_VERSION, 5):QESP_QDOC = qdoc3
|
lessThan(QT_MAJOR_VERSION, 5):QESP_QDOC = qdoc3
|
||||||
|
|
||||||
docs_target.target = docs
|
docs_target.target = docs
|
||||||
docs_target.commands = $$QESP_QDOC $$PWD/qextserialport.qdocconf
|
docs_target.commands = $$QESP_QDOC $$PWD/qextserialport.qdocconf
|
||||||
|
|
||||||
QMAKE_EXTRA_TARGETS = docs_target
|
QMAKE_EXTRA_TARGETS = docs_target
|
||||||
QMAKE_CLEAN += "-r $$PWD/html"
|
QMAKE_CLEAN += "-r $$PWD/html"
|
||||||
|
|
||||||
|
|||||||
@ -1,16 +1,16 @@
|
|||||||
/*!
|
/*!
|
||||||
\example examples/enumerator
|
\example examples/enumerator
|
||||||
\title enumerator Demo
|
\title enumerator Demo
|
||||||
|
|
||||||
The example demonstrates how to use QextSerialEnumerator.
|
The example demonstrates how to use QextSerialEnumerator.
|
||||||
|
|
||||||
Include the proper header file
|
Include the proper header file
|
||||||
\snippet examples/enumerator/main.cpp 0
|
\snippet examples/enumerator/main.cpp 0
|
||||||
|
|
||||||
Get available ports in the system.
|
Get available ports in the system.
|
||||||
\snippet examples/enumerator/main.cpp 1
|
\snippet examples/enumerator/main.cpp 1
|
||||||
|
|
||||||
Output
|
Output
|
||||||
\snippet examples/enumerator/main.cpp 2
|
\snippet examples/enumerator/main.cpp 2
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
14
3rdparty/qextserialport/doc/examples/qespta.qdoc
vendored
14
3rdparty/qextserialport/doc/examples/qespta.qdoc
vendored
@ -1,7 +1,7 @@
|
|||||||
/*!
|
/*!
|
||||||
\example examples/qespta
|
\example examples/qespta
|
||||||
\title qespta Demo
|
\title qespta Demo
|
||||||
|
|
||||||
The example demonstrates how to use QextSerialPort.
|
The example demonstrates how to use QextSerialPort.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
@ -1,24 +1,24 @@
|
|||||||
/*!
|
/*!
|
||||||
\example examples/uartassistant
|
\example examples/uartassistant
|
||||||
\title UartAssistant Demo
|
\title UartAssistant Demo
|
||||||
|
|
||||||
The example demonstrates how to use QextSerialPort.
|
The example demonstrates how to use QextSerialPort.
|
||||||
|
|
||||||
Initialze UI element.
|
Initialze UI element.
|
||||||
\snippet examples/uartassistant/dialog.cpp 0
|
\snippet examples/uartassistant/dialog.cpp 0
|
||||||
|
|
||||||
Initialize serial port
|
Initialize serial port
|
||||||
\snippet examples/uartassistant/dialog.cpp 1
|
\snippet examples/uartassistant/dialog.cpp 1
|
||||||
|
|
||||||
port Settings
|
port Settings
|
||||||
\snippet examples/uartassistant/dialog.cpp 2
|
\snippet examples/uartassistant/dialog.cpp 2
|
||||||
|
|
||||||
Open or Close the port.
|
Open or Close the port.
|
||||||
\snippet examples/uartassistant/dialog.cpp 3
|
\snippet examples/uartassistant/dialog.cpp 3
|
||||||
|
|
||||||
Read from or Write to the port
|
Read from or Write to the port
|
||||||
\snippet examples/uartassistant/dialog.cpp 4
|
\snippet examples/uartassistant/dialog.cpp 4
|
||||||
|
|
||||||
\image uartassistant.png
|
\image uartassistant.png
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
106
3rdparty/qextserialport/doc/qextserialport.qdocconf
vendored
106
3rdparty/qextserialport/doc/qextserialport.qdocconf
vendored
@ -1,53 +1,53 @@
|
|||||||
# Run qdoc3 from the directory that contains this file.
|
# Run qdoc3 from the directory that contains this file.
|
||||||
project = qesp
|
project = qesp
|
||||||
description = QextSerialPort Reference Documentation
|
description = QextSerialPort Reference Documentation
|
||||||
url = http://code.google.com/p/qextserialport
|
url = http://code.google.com/p/qextserialport
|
||||||
|
|
||||||
outputencoding = UTF-8
|
outputencoding = UTF-8
|
||||||
language = Cpp
|
language = Cpp
|
||||||
|
|
||||||
#Paths are relative to the location of this file
|
#Paths are relative to the location of this file
|
||||||
headerdirs = . ../src
|
headerdirs = . ../src
|
||||||
sourcedirs = . ../src
|
sourcedirs = . ../src
|
||||||
exampledirs = ../examples ..
|
exampledirs = ../examples ..
|
||||||
imagedirs = ./examples/images images
|
imagedirs = ./examples/images images
|
||||||
|
|
||||||
Cpp.ignoretokens = QEXTSERIALPORT_EXPORT
|
Cpp.ignoretokens = QEXTSERIALPORT_EXPORT
|
||||||
|
|
||||||
indexes = $QTDIR/doc/html/qt.index
|
indexes = $QTDIR/doc/html/qt.index
|
||||||
|
|
||||||
qhp.projects = qesp
|
qhp.projects = qesp
|
||||||
qhp.qesp.file = qesp.qhp
|
qhp.qesp.file = qesp.qhp
|
||||||
qhp.qesp.namespace = com.google.code.qextserialport.120
|
qhp.qesp.namespace = com.google.code.qextserialport.120
|
||||||
qhp.qesp.virtualFolder = qdoc
|
qhp.qesp.virtualFolder = qdoc
|
||||||
qhp.qesp.indexTitle = QextSerialPort Reference Documentation
|
qhp.qesp.indexTitle = QextSerialPort Reference Documentation
|
||||||
qhp.qesp.indexRoot =
|
qhp.qesp.indexRoot =
|
||||||
qhp.qesp.extraFiles = style/style.css
|
qhp.qesp.extraFiles = style/style.css
|
||||||
|
|
||||||
|
|
||||||
#------------------------------------------------------------------
|
#------------------------------------------------------------------
|
||||||
outputdir = html
|
outputdir = html
|
||||||
outputformats = HTML
|
outputformats = HTML
|
||||||
|
|
||||||
headers.fileextensions = "*.h"
|
headers.fileextensions = "*.h"
|
||||||
sources.fileextensions = "*.cpp *.qdoc"
|
sources.fileextensions = "*.cpp *.qdoc"
|
||||||
|
|
||||||
HTML.templatedir = .
|
HTML.templatedir = .
|
||||||
HTML.stylesheets = style/style.css
|
HTML.stylesheets = style/style.css
|
||||||
|
|
||||||
HTML.headerstyles = " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/style.css\" />\n"
|
HTML.headerstyles = " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/style.css\" />\n"
|
||||||
HTML.endheader = "</head>\n"
|
HTML.endheader = "</head>\n"
|
||||||
|
|
||||||
HTML.postheader = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\n" \
|
HTML.postheader = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\">\n" \
|
||||||
"<tr>\n" \
|
"<tr>\n" \
|
||||||
"<td class=\"postheader\" valign=\"center\">" \
|
"<td class=\"postheader\" valign=\"center\">" \
|
||||||
"<a href=\"index.html\">Home</a> ·" \
|
"<a href=\"index.html\">Home</a> ·" \
|
||||||
" <a href=\"classes.html\">All Classes</a> ·" \
|
" <a href=\"classes.html\">All Classes</a> ·" \
|
||||||
"</td></tr></table>"
|
"</td></tr></table>"
|
||||||
|
|
||||||
HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
|
HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \
|
||||||
"<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
|
"<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
|
||||||
"<td width=\"40%\" align=\"left\">Copyright © 2000-2012</td>\n" \
|
"<td width=\"40%\" align=\"left\">Copyright © 2000-2012</td>\n" \
|
||||||
"<td width=\"20%\" align=\"center\"><a href=\"http://code.google.com/p/qextserialport\">QextSerialPort Project</a></td>\n" \
|
"<td width=\"20%\" align=\"center\"><a href=\"http://code.google.com/p/qextserialport\">QextSerialPort Project</a></td>\n" \
|
||||||
"<td width=\"40%\" align=\"right\"><div align=\"right\">QextSerialPort Manual</div></td>\n" \
|
"<td width=\"40%\" align=\"right\"><div align=\"right\">QextSerialPort Manual</div></td>\n" \
|
||||||
"</tr></table></div></address>"
|
"</tr></table></div></address>"
|
||||||
|
|||||||
274
3rdparty/qextserialport/doc/style/style.css
vendored
274
3rdparty/qextserialport/doc/style/style.css
vendored
@ -1,137 +1,137 @@
|
|||||||
a:link, a:visited {
|
a:link, a:visited {
|
||||||
color: #00732F;
|
color: #00732F;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
font: normal 400 14px/1.2 Arial;
|
font: normal 400 14px/1.2 Arial;
|
||||||
margin-top: 85px;
|
margin-top: 85px;
|
||||||
}
|
}
|
||||||
|
|
||||||
h1 {
|
h1 {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
h2 {
|
h2 {
|
||||||
font: 500 20px/1.2 Arial;
|
font: 500 20px/1.2 Arial;
|
||||||
}
|
}
|
||||||
|
|
||||||
h3.fn, span.fn {
|
h3.fn, span.fn {
|
||||||
-moz-border-radius: 7px 7px 7px 7px;
|
-moz-border-radius: 7px 7px 7px 7px;
|
||||||
-webkit-border-radius: 7px 7px 7px 7px;
|
-webkit-border-radius: 7px 7px 7px 7px;
|
||||||
border-radius: 7px 7px 7px 7px;
|
border-radius: 7px 7px 7px 7px;
|
||||||
background-color: #F6F6F6;
|
background-color: #F6F6F6;
|
||||||
border-width: 1px;
|
border-width: 1px;
|
||||||
border-style: solid;
|
border-style: solid;
|
||||||
border-color: #E6E6E6;
|
border-color: #E6E6E6;
|
||||||
word-spacing: 3px;
|
word-spacing: 3px;
|
||||||
padding: 3px 5px;
|
padding: 3px 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
table, pre {
|
table, pre {
|
||||||
-moz-border-radius: 7px 7px 7px 7px;
|
-moz-border-radius: 7px 7px 7px 7px;
|
||||||
-webkit-border-radius: 7px 7px 7px 7px;
|
-webkit-border-radius: 7px 7px 7px 7px;
|
||||||
border-radius: 7px 7px 7px 7px;
|
border-radius: 7px 7px 7px 7px;
|
||||||
background-color: #F6F6F6;
|
background-color: #F6F6F6;
|
||||||
border: 1px solid #E6E6E6;
|
border: 1px solid #E6E6E6;
|
||||||
border-collapse: separate;
|
border-collapse: separate;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
line-height: 1.2;
|
line-height: 1.2;
|
||||||
margin-bottom: 25px;
|
margin-bottom: 25px;
|
||||||
margin-left: 15px;
|
margin-left: 15px;
|
||||||
}
|
}
|
||||||
|
|
||||||
table td {
|
table td {
|
||||||
padding: 3px 15px 3px 20px;
|
padding: 3px 15px 3px 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
table tr.even {
|
table tr.even {
|
||||||
background-color: white;
|
background-color: white;
|
||||||
color: #66666E;
|
color: #66666E;
|
||||||
}
|
}
|
||||||
|
|
||||||
table tr.odd {
|
table tr.odd {
|
||||||
background-color: #F6F6F6;
|
background-color: #F6F6F6;
|
||||||
color: #66666E;
|
color: #66666E;
|
||||||
}
|
}
|
||||||
|
|
||||||
li {
|
li {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
padding-left: 12px;
|
padding-left: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.cpp {
|
.cpp {
|
||||||
display: block;
|
display: block;
|
||||||
margin: 10;
|
margin: 10;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
overflow-y: hidden;
|
overflow-y: hidden;
|
||||||
padding: 20px 0 20px 0;
|
padding: 20px 0 20px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.footer {
|
.footer {
|
||||||
margin-top: 50px;
|
margin-top: 50px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.memItemLeft {
|
.memItemLeft {
|
||||||
padding-right: 3px;
|
padding-right: 3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.memItemRight {
|
.memItemRight {
|
||||||
padding: 3px 15px 3px 0;
|
padding: 3px 15px 3px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.qml {
|
.qml {
|
||||||
display: block;
|
display: block;
|
||||||
margin: 10;
|
margin: 10;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
overflow-y: hidden;
|
overflow-y: hidden;
|
||||||
padding: 20px 0 20px 0;
|
padding: 20px 0 20px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.qmldefault {
|
.qmldefault {
|
||||||
padding-left: 5px;
|
padding-left: 5px;
|
||||||
float: right;
|
float: right;
|
||||||
color: red;
|
color: red;
|
||||||
}
|
}
|
||||||
|
|
||||||
.qmlreadonly {
|
.qmlreadonly {
|
||||||
padding-left: 5px;
|
padding-left: 5px;
|
||||||
float: right;
|
float: right;
|
||||||
color: #254117;
|
color: #254117;
|
||||||
}
|
}
|
||||||
|
|
||||||
.rightAlign {
|
.rightAlign {
|
||||||
padding: 3px 5px 3px 10px;
|
padding: 3px 5px 3px 10px;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
.title {
|
.title {
|
||||||
background-color: white;
|
background-color: white;
|
||||||
color: #44A51C;
|
color: #44A51C;
|
||||||
font-family: Verdana;
|
font-family: Verdana;
|
||||||
font-size: 35px;
|
font-size: 35px;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
left: 0;
|
left: 0;
|
||||||
padding-bottom: 5px;
|
padding-bottom: 5px;
|
||||||
padding-left: 16px;
|
padding-left: 16px;
|
||||||
padding-top: 20px;
|
padding-top: 20px;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0;
|
right: 0;
|
||||||
top: 0;
|
top: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.toc {
|
.toc {
|
||||||
float: right;
|
float: right;
|
||||||
-moz-border-radius: 7px 7px 7px 7px;
|
-moz-border-radius: 7px 7px 7px 7px;
|
||||||
-webkit-border-radius: 7px 7px 7px 7px;
|
-webkit-border-radius: 7px 7px 7px 7px;
|
||||||
border-radius: 7px 7px 7px 7px;
|
border-radius: 7px 7px 7px 7px;
|
||||||
background-color: #F6F6F6;
|
background-color: #F6F6F6;
|
||||||
border: 1px solid #DDD;
|
border: 1px solid #DDD;
|
||||||
margin: 0 20px 10px 10px;
|
margin: 0 20px 10px 10px;
|
||||||
padding: 20px 15px 20px 20px;
|
padding: 20px 15px 20px 20px;
|
||||||
height: auto;
|
height: auto;
|
||||||
width: 200px;
|
width: 200px;
|
||||||
}
|
}
|
||||||
|
|||||||
5
3rdparty/qextserialport/qextserialport.pro
vendored
5
3rdparty/qextserialport/qextserialport.pro
vendored
@ -4,7 +4,7 @@
|
|||||||
# CONFIG += qesp_static
|
# CONFIG += qesp_static
|
||||||
|
|
||||||
# Uncomment following line if you want to build framework for mac
|
# Uncomment following line if you want to build framework for mac
|
||||||
# macx:CONFIG += qesp_mac_framework
|
#macx:CONFIG += qesp_mac_framework
|
||||||
|
|
||||||
# Uncomment following line if you want to enable udev for linux
|
# Uncomment following line if you want to enable udev for linux
|
||||||
# linux*:CONFIG += qesp_linux_udev
|
# linux*:CONFIG += qesp_linux_udev
|
||||||
@ -70,7 +70,6 @@ greaterThan(QT_MAJOR_VERSION, 4) {
|
|||||||
QESP_LIB_BASENAME = qextserialport
|
QESP_LIB_BASENAME = qextserialport
|
||||||
}
|
}
|
||||||
TARGET = $$qextLibraryName($$QESP_LIB_BASENAME)
|
TARGET = $$qextLibraryName($$QESP_LIB_BASENAME)
|
||||||
|
|
||||||
VERSION = 1.2.0
|
VERSION = 1.2.0
|
||||||
|
|
||||||
# generate feature file by qmake based on this *.in file.
|
# generate feature file by qmake based on this *.in file.
|
||||||
@ -78,7 +77,7 @@ QMAKE_SUBSTITUTES += extserialport.prf.in
|
|||||||
OTHER_FILES += extserialport.prf.in
|
OTHER_FILES += extserialport.prf.in
|
||||||
|
|
||||||
# for make docs
|
# for make docs
|
||||||
#include(doc/doc.pri)
|
include(doc/doc.pri)
|
||||||
|
|
||||||
# for make install
|
# for make install
|
||||||
win32:!qesp_static {
|
win32:!qesp_static {
|
||||||
|
|||||||
72
3rdparty/qextserialport/src/qextserialport.pri
vendored
72
3rdparty/qextserialport/src/qextserialport.pri
vendored
@ -1,36 +1,36 @@
|
|||||||
INCLUDEPATH += $$PWD
|
INCLUDEPATH += $$PWD
|
||||||
DEPENDPATH += $$PWD
|
DEPENDPATH += $$PWD
|
||||||
|
|
||||||
PUBLIC_HEADERS += $$PWD/qextserialport.h \
|
PUBLIC_HEADERS += $$PWD/qextserialport.h \
|
||||||
$$PWD/qextserialenumerator.h \
|
$$PWD/qextserialenumerator.h \
|
||||||
$$PWD/qextserialport_global.h
|
$$PWD/qextserialport_global.h
|
||||||
|
|
||||||
HEADERS += $$PUBLIC_HEADERS \
|
HEADERS += $$PUBLIC_HEADERS \
|
||||||
$$PWD/qextserialport_p.h \
|
$$PWD/qextserialport_p.h \
|
||||||
$$PWD/qextserialenumerator_p.h \
|
$$PWD/qextserialenumerator_p.h \
|
||||||
|
|
||||||
SOURCES += $$PWD/qextserialport.cpp \
|
SOURCES += $$PWD/qextserialport.cpp \
|
||||||
$$PWD/qextserialenumerator.cpp
|
$$PWD/qextserialenumerator.cpp
|
||||||
unix {
|
unix {
|
||||||
SOURCES += $$PWD/qextserialport_unix.cpp
|
SOURCES += $$PWD/qextserialport_unix.cpp
|
||||||
linux* {
|
linux* {
|
||||||
SOURCES += $$PWD/qextserialenumerator_linux.cpp
|
SOURCES += $$PWD/qextserialenumerator_linux.cpp
|
||||||
} else:macx {
|
} else:macx {
|
||||||
SOURCES += $$PWD/qextserialenumerator_osx.cpp
|
SOURCES += $$PWD/qextserialenumerator_osx.cpp
|
||||||
} else {
|
} else {
|
||||||
SOURCES += $$PWD/qextserialenumerator_unix.cpp
|
SOURCES += $$PWD/qextserialenumerator_unix.cpp
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
win32:SOURCES += $$PWD/qextserialport_win.cpp \
|
win32:SOURCES += $$PWD/qextserialport_win.cpp \
|
||||||
$$PWD/qextserialenumerator_win.cpp
|
$$PWD/qextserialenumerator_win.cpp
|
||||||
|
|
||||||
linux*{
|
linux*{
|
||||||
!qesp_linux_udev:DEFINES += QESP_NO_UDEV
|
!qesp_linux_udev:DEFINES += QESP_NO_UDEV
|
||||||
qesp_linux_udev: LIBS += -ludev
|
qesp_linux_udev: LIBS += -ludev
|
||||||
}
|
}
|
||||||
|
|
||||||
macx:LIBS += -framework IOKit -framework CoreFoundation
|
macx:LIBS += -framework IOKit -framework CoreFoundation
|
||||||
win32:LIBS += -lsetupapi -ladvapi32 -luser32
|
win32:LIBS += -lsetupapi -ladvapi32 -luser32
|
||||||
|
|
||||||
# moc doesn't detect Q_OS_LINUX correctly, so add this to make it work
|
# moc doesn't detect Q_OS_LINUX correctly, so add this to make it work
|
||||||
linux*:DEFINES += __linux__
|
linux*:DEFINES += __linux__
|
||||||
|
|||||||
144
3rdparty/qextserialport/src/qextserialport_global.h
vendored
144
3rdparty/qextserialport/src/qextserialport_global.h
vendored
@ -1,72 +1,72 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
** Copyright (c) 2000-2003 Wayne Roth
|
** Copyright (c) 2000-2003 Wayne Roth
|
||||||
** Copyright (c) 2004-2007 Stefan Sander
|
** Copyright (c) 2004-2007 Stefan Sander
|
||||||
** Copyright (c) 2007 Michal Policht
|
** Copyright (c) 2007 Michal Policht
|
||||||
** Copyright (c) 2008 Brandon Fosdick
|
** Copyright (c) 2008 Brandon Fosdick
|
||||||
** Copyright (c) 2009-2010 Liam Staskawicz
|
** Copyright (c) 2009-2010 Liam Staskawicz
|
||||||
** Copyright (c) 2011 Debao Zhang
|
** Copyright (c) 2011 Debao Zhang
|
||||||
** All right reserved.
|
** All right reserved.
|
||||||
** Web: http://code.google.com/p/qextserialport/
|
** Web: http://code.google.com/p/qextserialport/
|
||||||
**
|
**
|
||||||
** Permission is hereby granted, free of charge, to any person obtaining
|
** Permission is hereby granted, free of charge, to any person obtaining
|
||||||
** a copy of this software and associated documentation files (the
|
** a copy of this software and associated documentation files (the
|
||||||
** "Software"), to deal in the Software without restriction, including
|
** "Software"), to deal in the Software without restriction, including
|
||||||
** without limitation the rights to use, copy, modify, merge, publish,
|
** without limitation the rights to use, copy, modify, merge, publish,
|
||||||
** distribute, sublicense, and/or sell copies of the Software, and to
|
** distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
** permit persons to whom the Software is furnished to do so, subject to
|
** permit persons to whom the Software is furnished to do so, subject to
|
||||||
** the following conditions:
|
** the following conditions:
|
||||||
**
|
**
|
||||||
** The above copyright notice and this permission notice shall be
|
** The above copyright notice and this permission notice shall be
|
||||||
** included in all copies or substantial portions of the Software.
|
** included in all copies or substantial portions of the Software.
|
||||||
**
|
**
|
||||||
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
** NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
** NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||||
** LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
** LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
** OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
** OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
** WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
** WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#ifndef QEXTSERIALPORT_GLOBAL_H
|
#ifndef QEXTSERIALPORT_GLOBAL_H
|
||||||
#define QEXTSERIALPORT_GLOBAL_H
|
#define QEXTSERIALPORT_GLOBAL_H
|
||||||
|
|
||||||
#include <QtCore/QtGlobal>
|
#include <QtCore/QtGlobal>
|
||||||
|
|
||||||
#ifdef QEXTSERIALPORT_BUILD_SHARED
|
#ifdef QEXTSERIALPORT_BUILD_SHARED
|
||||||
# define QEXTSERIALPORT_EXPORT Q_DECL_EXPORT
|
# define QEXTSERIALPORT_EXPORT Q_DECL_EXPORT
|
||||||
#elif defined(QEXTSERIALPORT_USING_SHARED)
|
#elif defined(QEXTSERIALPORT_USING_SHARED)
|
||||||
# define QEXTSERIALPORT_EXPORT Q_DECL_IMPORT
|
# define QEXTSERIALPORT_EXPORT Q_DECL_IMPORT
|
||||||
#else
|
#else
|
||||||
# define QEXTSERIALPORT_EXPORT
|
# define QEXTSERIALPORT_EXPORT
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// ### for compatible with old version. should be removed in QESP 2.0
|
// ### for compatible with old version. should be removed in QESP 2.0
|
||||||
#ifdef _TTY_NOWARN_
|
#ifdef _TTY_NOWARN_
|
||||||
# define QESP_NO_WARN
|
# define QESP_NO_WARN
|
||||||
#endif
|
#endif
|
||||||
#ifdef _TTY_NOWARN_PORT_
|
#ifdef _TTY_NOWARN_PORT_
|
||||||
# define QESP_NO_PORTABILITY_WARN
|
# define QESP_NO_PORTABILITY_WARN
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*if all warning messages are turned off, flag portability warnings to be turned off as well*/
|
/*if all warning messages are turned off, flag portability warnings to be turned off as well*/
|
||||||
#ifdef QESP_NO_WARN
|
#ifdef QESP_NO_WARN
|
||||||
# define QESP_NO_PORTABILITY_WARN
|
# define QESP_NO_PORTABILITY_WARN
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*macros for warning and debug messages*/
|
/*macros for warning and debug messages*/
|
||||||
#ifdef QESP_NO_PORTABILITY_WARN
|
#ifdef QESP_NO_PORTABILITY_WARN
|
||||||
# define QESP_PORTABILITY_WARNING while (false)qWarning
|
# define QESP_PORTABILITY_WARNING while (false)qWarning
|
||||||
#else
|
#else
|
||||||
# define QESP_PORTABILITY_WARNING qWarning
|
# define QESP_PORTABILITY_WARNING qWarning
|
||||||
#endif /*QESP_NOWARN_PORT*/
|
#endif /*QESP_NOWARN_PORT*/
|
||||||
|
|
||||||
#ifdef QESP_NO_WARN
|
#ifdef QESP_NO_WARN
|
||||||
# define QESP_WARNING while (false)qWarning
|
# define QESP_WARNING while (false)qWarning
|
||||||
#else
|
#else
|
||||||
# define QESP_WARNING qWarning
|
# define QESP_WARNING qWarning
|
||||||
#endif /*QESP_NOWARN*/
|
#endif /*QESP_NOWARN*/
|
||||||
|
|
||||||
#endif // QEXTSERIALPORT_GLOBAL_H
|
#endif // QEXTSERIALPORT_GLOBAL_H
|
||||||
|
|
||||||
|
|||||||
500
3rdparty/qextserialport/src/qextserialport_p.h
vendored
500
3rdparty/qextserialport/src/qextserialport_p.h
vendored
@ -1,250 +1,250 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
** Copyright (c) 2000-2003 Wayne Roth
|
** Copyright (c) 2000-2003 Wayne Roth
|
||||||
** Copyright (c) 2004-2007 Stefan Sander
|
** Copyright (c) 2004-2007 Stefan Sander
|
||||||
** Copyright (c) 2007 Michal Policht
|
** Copyright (c) 2007 Michal Policht
|
||||||
** Copyright (c) 2008 Brandon Fosdick
|
** Copyright (c) 2008 Brandon Fosdick
|
||||||
** Copyright (c) 2009-2010 Liam Staskawicz
|
** Copyright (c) 2009-2010 Liam Staskawicz
|
||||||
** Copyright (c) 2011 Debao Zhang
|
** Copyright (c) 2011 Debao Zhang
|
||||||
** All right reserved.
|
** All right reserved.
|
||||||
** Web: http://code.google.com/p/qextserialport/
|
** Web: http://code.google.com/p/qextserialport/
|
||||||
**
|
**
|
||||||
** Permission is hereby granted, free of charge, to any person obtaining
|
** Permission is hereby granted, free of charge, to any person obtaining
|
||||||
** a copy of this software and associated documentation files (the
|
** a copy of this software and associated documentation files (the
|
||||||
** "Software"), to deal in the Software without restriction, including
|
** "Software"), to deal in the Software without restriction, including
|
||||||
** without limitation the rights to use, copy, modify, merge, publish,
|
** without limitation the rights to use, copy, modify, merge, publish,
|
||||||
** distribute, sublicense, and/or sell copies of the Software, and to
|
** distribute, sublicense, and/or sell copies of the Software, and to
|
||||||
** permit persons to whom the Software is furnished to do so, subject to
|
** permit persons to whom the Software is furnished to do so, subject to
|
||||||
** the following conditions:
|
** the following conditions:
|
||||||
**
|
**
|
||||||
** The above copyright notice and this permission notice shall be
|
** The above copyright notice and this permission notice shall be
|
||||||
** included in all copies or substantial portions of the Software.
|
** included in all copies or substantial portions of the Software.
|
||||||
**
|
**
|
||||||
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
** NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
** NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||||
** LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
** LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||||
** OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
** OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
** WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
** WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#ifndef _QEXTSERIALPORT_P_H_
|
#ifndef _QEXTSERIALPORT_P_H_
|
||||||
#define _QEXTSERIALPORT_P_H_
|
#define _QEXTSERIALPORT_P_H_
|
||||||
|
|
||||||
//
|
//
|
||||||
// W A R N I N G
|
// W A R N I N G
|
||||||
// -------------
|
// -------------
|
||||||
//
|
//
|
||||||
// This file is not part of the QESP API. It exists for the convenience
|
// This file is not part of the QESP API. It exists for the convenience
|
||||||
// of other QESP classes. This header file may change from version to
|
// of other QESP classes. This header file may change from version to
|
||||||
// version without notice, or even be removed.
|
// version without notice, or even be removed.
|
||||||
//
|
//
|
||||||
// We mean it.
|
// We mean it.
|
||||||
//
|
//
|
||||||
|
|
||||||
#include "qextserialport.h"
|
#include "qextserialport.h"
|
||||||
#include <QtCore/QReadWriteLock>
|
#include <QtCore/QReadWriteLock>
|
||||||
#ifdef Q_OS_UNIX
|
#ifdef Q_OS_UNIX
|
||||||
# include <termios.h>
|
# include <termios.h>
|
||||||
#elif (defined Q_OS_WIN)
|
#elif (defined Q_OS_WIN)
|
||||||
# include <QtCore/qt_windows.h>
|
# include <QtCore/qt_windows.h>
|
||||||
#endif
|
#endif
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
// This is QextSerialPort's read buffer, needed by posix system.
|
// This is QextSerialPort's read buffer, needed by posix system.
|
||||||
// ref: QRingBuffer & QIODevicePrivateLinearBuffer
|
// ref: QRingBuffer & QIODevicePrivateLinearBuffer
|
||||||
class QextReadBuffer
|
class QextReadBuffer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
inline QextReadBuffer(size_t growth=4096)
|
inline QextReadBuffer(size_t growth=4096)
|
||||||
: len(0), first(0), buf(0), capacity(0), basicBlockSize(growth) {
|
: len(0), first(0), buf(0), capacity(0), basicBlockSize(growth) {
|
||||||
}
|
}
|
||||||
|
|
||||||
~QextReadBuffer() {
|
~QextReadBuffer() {
|
||||||
delete [] buf;
|
delete [] buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline void clear() {
|
inline void clear() {
|
||||||
first = buf;
|
first = buf;
|
||||||
len = 0;
|
len = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline int size() const {
|
inline int size() const {
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline bool isEmpty() const {
|
inline bool isEmpty() const {
|
||||||
return len == 0;
|
return len == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline int read(char *target, int size) {
|
inline int read(char *target, int size) {
|
||||||
int r = qMin(size, len);
|
int r = qMin(size, len);
|
||||||
if (r == 1) {
|
if (r == 1) {
|
||||||
*target = *first;
|
*target = *first;
|
||||||
--len;
|
--len;
|
||||||
++first;
|
++first;
|
||||||
} else {
|
} else {
|
||||||
memcpy(target, first, r);
|
memcpy(target, first, r);
|
||||||
len -= r;
|
len -= r;
|
||||||
first += r;
|
first += r;
|
||||||
}
|
}
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline char *reserve(size_t size) {
|
inline char *reserve(size_t size) {
|
||||||
if ((first - buf) + len + size > capacity) {
|
if ((first - buf) + len + size > capacity) {
|
||||||
size_t newCapacity = qMax(capacity, basicBlockSize);
|
size_t newCapacity = qMax(capacity, basicBlockSize);
|
||||||
while (newCapacity < len + size)
|
while (newCapacity < len + size)
|
||||||
newCapacity *= 2;
|
newCapacity *= 2;
|
||||||
if (newCapacity > capacity) {
|
if (newCapacity > capacity) {
|
||||||
// allocate more space
|
// allocate more space
|
||||||
char *newBuf = new char[newCapacity];
|
char *newBuf = new char[newCapacity];
|
||||||
memmove(newBuf, first, len);
|
memmove(newBuf, first, len);
|
||||||
delete [] buf;
|
delete [] buf;
|
||||||
buf = newBuf;
|
buf = newBuf;
|
||||||
capacity = newCapacity;
|
capacity = newCapacity;
|
||||||
} else {
|
} else {
|
||||||
// shift any existing data to make space
|
// shift any existing data to make space
|
||||||
memmove(buf, first, len);
|
memmove(buf, first, len);
|
||||||
}
|
}
|
||||||
first = buf;
|
first = buf;
|
||||||
}
|
}
|
||||||
char *writePtr = first + len;
|
char *writePtr = first + len;
|
||||||
len += (int)size;
|
len += (int)size;
|
||||||
return writePtr;
|
return writePtr;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline void chop(int size) {
|
inline void chop(int size) {
|
||||||
if (size >= len)
|
if (size >= len)
|
||||||
clear();
|
clear();
|
||||||
else
|
else
|
||||||
len -= size;
|
len -= size;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline void squeeze() {
|
inline void squeeze() {
|
||||||
if (first != buf) {
|
if (first != buf) {
|
||||||
memmove(buf, first, len);
|
memmove(buf, first, len);
|
||||||
first = buf;
|
first = buf;
|
||||||
}
|
}
|
||||||
size_t newCapacity = basicBlockSize;
|
size_t newCapacity = basicBlockSize;
|
||||||
while (newCapacity < size_t(len))
|
while (newCapacity < size_t(len))
|
||||||
newCapacity *= 2;
|
newCapacity *= 2;
|
||||||
if (newCapacity < capacity) {
|
if (newCapacity < capacity) {
|
||||||
char *tmp = static_cast<char *>(realloc(buf, newCapacity));
|
char *tmp = static_cast<char *>(realloc(buf, newCapacity));
|
||||||
if (tmp) {
|
if (tmp) {
|
||||||
buf = tmp;
|
buf = tmp;
|
||||||
capacity = newCapacity;
|
capacity = newCapacity;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
inline QByteArray readAll() {
|
inline QByteArray readAll() {
|
||||||
char *f = first;
|
char *f = first;
|
||||||
int l = len;
|
int l = len;
|
||||||
clear();
|
clear();
|
||||||
return QByteArray(f, l);
|
return QByteArray(f, l);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline int readLine(char *target, int size) {
|
inline int readLine(char *target, int size) {
|
||||||
int r = qMin(size, len);
|
int r = qMin(size, len);
|
||||||
char *eol = static_cast<char *>(memchr(first, '\n', r));
|
char *eol = static_cast<char *>(memchr(first, '\n', r));
|
||||||
if (eol)
|
if (eol)
|
||||||
r = 1+(eol-first);
|
r = 1+(eol-first);
|
||||||
memcpy(target, first, r);
|
memcpy(target, first, r);
|
||||||
len -= r;
|
len -= r;
|
||||||
first += r;
|
first += r;
|
||||||
return int(r);
|
return int(r);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline bool canReadLine() const {
|
inline bool canReadLine() const {
|
||||||
return memchr(first, '\n', len);
|
return memchr(first, '\n', len);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int len;
|
int len;
|
||||||
char *first;
|
char *first;
|
||||||
char *buf;
|
char *buf;
|
||||||
size_t capacity;
|
size_t capacity;
|
||||||
size_t basicBlockSize;
|
size_t basicBlockSize;
|
||||||
};
|
};
|
||||||
|
|
||||||
class QWinEventNotifier;
|
class QWinEventNotifier;
|
||||||
class QReadWriteLock;
|
class QReadWriteLock;
|
||||||
class QSocketNotifier;
|
class QSocketNotifier;
|
||||||
|
|
||||||
class QextSerialPortPrivate
|
class QextSerialPortPrivate
|
||||||
{
|
{
|
||||||
Q_DECLARE_PUBLIC(QextSerialPort)
|
Q_DECLARE_PUBLIC(QextSerialPort)
|
||||||
public:
|
public:
|
||||||
QextSerialPortPrivate(QextSerialPort *q);
|
QextSerialPortPrivate(QextSerialPort *q);
|
||||||
~QextSerialPortPrivate();
|
~QextSerialPortPrivate();
|
||||||
enum DirtyFlagEnum
|
enum DirtyFlagEnum
|
||||||
{
|
{
|
||||||
DFE_BaudRate = 0x0001,
|
DFE_BaudRate = 0x0001,
|
||||||
DFE_Parity = 0x0002,
|
DFE_Parity = 0x0002,
|
||||||
DFE_StopBits = 0x0004,
|
DFE_StopBits = 0x0004,
|
||||||
DFE_DataBits = 0x0008,
|
DFE_DataBits = 0x0008,
|
||||||
DFE_Flow = 0x0010,
|
DFE_Flow = 0x0010,
|
||||||
DFE_TimeOut = 0x0100,
|
DFE_TimeOut = 0x0100,
|
||||||
DFE_ALL = 0x0fff,
|
DFE_ALL = 0x0fff,
|
||||||
DFE_Settings_Mask = 0x00ff //without TimeOut
|
DFE_Settings_Mask = 0x00ff //without TimeOut
|
||||||
};
|
};
|
||||||
mutable QReadWriteLock lock;
|
mutable QReadWriteLock lock;
|
||||||
QString port;
|
QString port;
|
||||||
PortSettings settings;
|
PortSettings settings;
|
||||||
QextReadBuffer readBuffer;
|
QextReadBuffer readBuffer;
|
||||||
int settingsDirtyFlags;
|
int settingsDirtyFlags;
|
||||||
ulong lastErr;
|
ulong lastErr;
|
||||||
QextSerialPort::QueryMode queryMode;
|
QextSerialPort::QueryMode queryMode;
|
||||||
|
|
||||||
// platform specific members
|
// platform specific members
|
||||||
#ifdef Q_OS_UNIX
|
#ifdef Q_OS_UNIX
|
||||||
int fd;
|
int fd;
|
||||||
QSocketNotifier *readNotifier;
|
QSocketNotifier *readNotifier;
|
||||||
struct termios currentTermios;
|
struct termios currentTermios;
|
||||||
struct termios oldTermios;
|
struct termios oldTermios;
|
||||||
#elif (defined Q_OS_WIN)
|
#elif (defined Q_OS_WIN)
|
||||||
HANDLE handle;
|
HANDLE handle;
|
||||||
OVERLAPPED overlap;
|
OVERLAPPED overlap;
|
||||||
COMMCONFIG commConfig;
|
COMMCONFIG commConfig;
|
||||||
COMMTIMEOUTS commTimeouts;
|
COMMTIMEOUTS commTimeouts;
|
||||||
QWinEventNotifier *winEventNotifier;
|
QWinEventNotifier *winEventNotifier;
|
||||||
DWORD eventMask;
|
DWORD eventMask;
|
||||||
QList<OVERLAPPED *> pendingWrites;
|
QList<OVERLAPPED *> pendingWrites;
|
||||||
QReadWriteLock *bytesToWriteLock;
|
QReadWriteLock *bytesToWriteLock;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*fill PortSettings*/
|
/*fill PortSettings*/
|
||||||
void setBaudRate(BaudRateType baudRate, bool update=true);
|
void setBaudRate(BaudRateType baudRate, bool update=true);
|
||||||
void setDataBits(DataBitsType dataBits, bool update=true);
|
void setDataBits(DataBitsType dataBits, bool update=true);
|
||||||
void setParity(ParityType parity, bool update=true);
|
void setParity(ParityType parity, bool update=true);
|
||||||
void setStopBits(StopBitsType stopbits, bool update=true);
|
void setStopBits(StopBitsType stopbits, bool update=true);
|
||||||
void setFlowControl(FlowType flow, bool update=true);
|
void setFlowControl(FlowType flow, bool update=true);
|
||||||
void setTimeout(long millisec, bool update=true);
|
void setTimeout(long millisec, bool update=true);
|
||||||
void setPortSettings(const PortSettings &settings, bool update=true);
|
void setPortSettings(const PortSettings &settings, bool update=true);
|
||||||
|
|
||||||
void platformSpecificDestruct();
|
void platformSpecificDestruct();
|
||||||
void platformSpecificInit();
|
void platformSpecificInit();
|
||||||
void translateError(ulong error);
|
void translateError(ulong error);
|
||||||
void updatePortSettings();
|
void updatePortSettings();
|
||||||
|
|
||||||
qint64 readData_sys(char *data, qint64 maxSize);
|
qint64 readData_sys(char *data, qint64 maxSize);
|
||||||
qint64 writeData_sys(const char *data, qint64 maxSize);
|
qint64 writeData_sys(const char *data, qint64 maxSize);
|
||||||
void setDtr_sys(bool set=true);
|
void setDtr_sys(bool set=true);
|
||||||
void setRts_sys(bool set=true);
|
void setRts_sys(bool set=true);
|
||||||
bool open_sys(QIODevice::OpenMode mode);
|
bool open_sys(QIODevice::OpenMode mode);
|
||||||
bool close_sys();
|
bool close_sys();
|
||||||
bool flush_sys();
|
bool flush_sys();
|
||||||
ulong lineStatus_sys();
|
ulong lineStatus_sys();
|
||||||
qint64 bytesAvailable_sys() const;
|
qint64 bytesAvailable_sys() const;
|
||||||
|
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
void _q_onWinEvent(HANDLE h);
|
void _q_onWinEvent(HANDLE h);
|
||||||
#endif
|
#endif
|
||||||
void _q_canRead();
|
void _q_canRead();
|
||||||
|
|
||||||
QextSerialPort *q_ptr;
|
QextSerialPort *q_ptr;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif //_QEXTSERIALPORT_P_H_
|
#endif //_QEXTSERIALPORT_P_H_
|
||||||
|
|||||||
1
3rdparty/quazip/quazip.pro
vendored
1
3rdparty/quazip/quazip.pro
vendored
@ -1,3 +1,4 @@
|
|||||||
|
PREFIX=/usr/local/
|
||||||
TEMPLATE=subdirs
|
TEMPLATE=subdirs
|
||||||
SUBDIRS=quazip
|
SUBDIRS=quazip
|
||||||
#SUBDIRS += qztest
|
#SUBDIRS += qztest
|
||||||
|
|||||||
3
3rdparty/quazip/quazip/quazip.pro
vendored
3
3rdparty/quazip/quazip/quazip.pro
vendored
@ -31,6 +31,7 @@ zip.h
|
|||||||
|
|
||||||
SOURCES += *.c *.cpp
|
SOURCES += *.c *.cpp
|
||||||
|
|
||||||
|
PREFIX = /usr/local
|
||||||
unix:!symbian {
|
unix:!symbian {
|
||||||
headers.path=$$PREFIX/include/quazip
|
headers.path=$$PREFIX/include/quazip
|
||||||
headers.files=$$HEADERS
|
headers.files=$$HEADERS
|
||||||
@ -39,6 +40,8 @@ unix:!symbian {
|
|||||||
|
|
||||||
OBJECTS_DIR=.obj
|
OBJECTS_DIR=.obj
|
||||||
MOC_DIR=.moc
|
MOC_DIR=.moc
|
||||||
|
|
||||||
|
LIBS += -lz
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -4,5 +4,11 @@ SUBDIRS = 3rdparty src
|
|||||||
|
|
||||||
CONFIG += ordered
|
CONFIG += ordered
|
||||||
|
|
||||||
src.depends = 3rdparty
|
TRANSLATIONS += \
|
||||||
|
Translations/Nederlands.nl_NL.ts \
|
||||||
|
Translations/Francais.fr.ts \
|
||||||
|
Translations/Svenska.se.ts \
|
||||||
|
Translations/Deutsch.de_DE.ts \
|
||||||
|
Translations/Espaniol.es.ts
|
||||||
|
|
||||||
|
src.depends = 3rdparty
|
||||||
|
|||||||
@ -205,7 +205,11 @@ int main(int argc, char *argv[])
|
|||||||
lang_layout.addWidget(&lang_combo,1);
|
lang_layout.addWidget(&lang_combo,1);
|
||||||
lang_layout.addWidget(&lang_okbtn);
|
lang_layout.addWidget(&lang_okbtn);
|
||||||
|
|
||||||
|
#ifdef Q_WS_MAC
|
||||||
|
QString transdir=QCoreApplication::applicationDirPath()+"/Contents/Resources/Translations/";
|
||||||
|
#else
|
||||||
QString transdir=QCoreApplication::applicationDirPath()+"/Translations/";
|
QString transdir=QCoreApplication::applicationDirPath()+"/Translations/";
|
||||||
|
#endif
|
||||||
QDir dir(transdir);
|
QDir dir(transdir);
|
||||||
qDebug() << "Scanning \"" << transdir << "\" for translations";
|
qDebug() << "Scanning \"" << transdir << "\" for translations";
|
||||||
dir.setFilter(QDir::Files);
|
dir.setFilter(QDir::Files);
|
||||||
|
|||||||
@ -9,7 +9,7 @@
|
|||||||
#include <QCalendarWidget>
|
#include <QCalendarWidget>
|
||||||
#include <QTextCharFormat>
|
#include <QTextCharFormat>
|
||||||
|
|
||||||
#include "qextserialport/src/qextserialenumerator.h"
|
#include "src/qextserialenumerator.h"
|
||||||
|
|
||||||
#include "oximetry.h"
|
#include "oximetry.h"
|
||||||
#include "ui_oximetry.h"
|
#include "ui_oximetry.h"
|
||||||
|
|||||||
@ -14,7 +14,7 @@
|
|||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
#include <QMutex>
|
#include <QMutex>
|
||||||
|
|
||||||
#include "qextserialport/src/qextserialport.h"
|
#include "src/qextserialport.h"
|
||||||
|
|
||||||
#include "SleepLib/profiles.h"
|
#include "SleepLib/profiles.h"
|
||||||
#include "SleepLib/day.h"
|
#include "SleepLib/day.h"
|
||||||
|
|||||||
55
src/src.pro
55
src/src.pro
@ -8,7 +8,7 @@ QT += core gui opengl network xml
|
|||||||
|
|
||||||
greaterThan(QT_MAJOR_VERSION,4) {
|
greaterThan(QT_MAJOR_VERSION,4) {
|
||||||
QT += widgets webkitwidgets
|
QT += widgets webkitwidgets
|
||||||
} else {
|
} else { # qt4
|
||||||
QT += webkit
|
QT += webkit
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -41,8 +41,8 @@ unix:!macx:LIBS += -lX11 -lz -lGLU
|
|||||||
|
|
||||||
macx {
|
macx {
|
||||||
SOURCES +=
|
SOURCES +=
|
||||||
LIBS += -framework IOKit -framework CoreFoundation -lz
|
LIBS += -lz
|
||||||
ICON = icons/iconfile.icns
|
ICON = ../icons/iconfile.icns
|
||||||
}
|
}
|
||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
@ -182,13 +182,6 @@ OTHER_FILES += \
|
|||||||
docs/update_notes.html \
|
docs/update_notes.html \
|
||||||
qextserialport/qextserialport.pri
|
qextserialport/qextserialport.pri
|
||||||
|
|
||||||
TRANSLATIONS += \
|
|
||||||
../Translations/Nederlands.nl_NL.ts \
|
|
||||||
../Translations/Francais.fr.ts \
|
|
||||||
../Translations/Svenska.se.ts \
|
|
||||||
../Translations/Deutsch.de_DE.ts \
|
|
||||||
../Translations/Espaniol.es.ts
|
|
||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
CONFIG(debug, debug|release) {
|
CONFIG(debug, debug|release) {
|
||||||
DDIR = $$OUT_PWD/debug/Translations
|
DDIR = $$OUT_PWD/debug/Translations
|
||||||
@ -210,30 +203,36 @@ win32 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
mac {
|
mac {
|
||||||
TransFiles.files = ../Translations
|
TransFiles.files = $$files(../Translations/*.qm)
|
||||||
TransFiles.path = Contents/MacOS
|
TransFiles.path = Contents/Resources/Translations
|
||||||
QMAKE_BUNDLE_DATA += TransFiles
|
QMAKE_BUNDLE_DATA += TransFiles
|
||||||
|
|
||||||
|
# Precopy some frameworks
|
||||||
|
# LibFiles.files = $$OUT_PWD/../3rdparty/qextserialport/qextserialport.framework
|
||||||
|
# LibFiles.path = Contents/Frameworks
|
||||||
|
# QMAKE_BUNDLE_DATA += LibFiles
|
||||||
|
|
||||||
|
#CONFIG(release, debug|release) {
|
||||||
|
# TmpFiles.files = $$files($$OUT_PWD/../3rdparty/quazip/quazip/libquazip.1.dylib) \
|
||||||
|
# $$files($$OUT_PWD/../3rdparty/qextserialport/libqextserialport.1.dylib)
|
||||||
|
#} else: CONFIG(debug, debug|release) {
|
||||||
|
# TmpFiles.files = $$files($$OUT_PWD/../3rdparty/quazip/quazip/libquazip.1.dylib) \
|
||||||
|
# $$files($$OUT_PWD/../3rdparty/qextserialport/libqextserialport_debug.1.dylib)
|
||||||
|
#}
|
||||||
|
# TmpFiles.path = Contents/Frameworks
|
||||||
|
# QMAKE_BUNDLE_DATA += TmpFiles
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
INCLUDEPATH += src \
|
|
||||||
../3rdparty \
|
|
||||||
../3rdparty/quazip
|
|
||||||
|
|
||||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/release/ -lquazip
|
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/release/ -lquazip
|
||||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/debug/ -lquazip
|
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/debug/ -lquazip
|
||||||
else:unix: LIBS += -L$$OUT_PWD/../3rdparty/quazip/quazip/ -lquazip
|
else:unix: LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/ -lquazip
|
||||||
|
|
||||||
DEPENDPATH += $$PWD/../3rdparty/quazip/quazip
|
INCLUDEPATH += $$PWD/../3rdparty/quazip
|
||||||
|
DEPENDPATH += $$PWD/../3rdparty/quazip
|
||||||
|
|
||||||
|
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lqextserialport
|
||||||
|
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lqextserialport
|
||||||
|
else:unix: LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/ -lqextserialport
|
||||||
|
|
||||||
greaterThan(QT_MAJOR_VERSION,4) {
|
|
||||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lQt5ExtSerialPortd
|
|
||||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lQt5ExtSerialPortd
|
|
||||||
else:unix: LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/ -lQt5ExtSerialPortd
|
|
||||||
} else {
|
|
||||||
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/release/ -lqextserialportd
|
|
||||||
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/debug/ -lqextserialportd
|
|
||||||
else:unix: LIBS += -L$$OUT_PWD/../3rdparty/qextserialport/ -lqextserialportd
|
|
||||||
}
|
|
||||||
INCLUDEPATH += $$PWD/../3rdparty/qextserialport
|
INCLUDEPATH += $$PWD/../3rdparty/qextserialport
|
||||||
DEPENDPATH += $$PWD/../3rdparty/qextserialport
|
DEPENDPATH += $$PWD/../3rdparty/qextserialport
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user