Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
7680355b
Commit
7680355b
authored
Jul 01, 2013
by
Bill Bonney
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adds back in mutex for stop flag changes
parent
2d63bb40
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
15 deletions
+18
-15
SerialLink.cc
src/comm/SerialLink.cc
+18
-15
No files found.
src/comm/SerialLink.cc
View file @
7680355b
...
...
@@ -156,19 +156,22 @@ void SerialLink::run()
forever
{
if
(
m_stopp
)
{
m_stopp
=
false
;
break
;
// exit the thread
}
QMutexLocker
locker
(
&
this
->
m_stoppMutex
);
if
(
m_stopp
)
{
m_stopp
=
false
;
break
;
// exit the thread
}
if
(
m_reqReset
)
{
m_reqReset
=
false
;
communicationUpdate
(
getName
(),
"Reset requested via DTR signal"
);
m_port
->
setDataTerminalReady
(
true
);
msleep
(
250
);
m_port
->
setDataTerminalReady
(
false
);
if
(
m_reqReset
)
{
m_reqReset
=
false
;
communicationUpdate
(
getName
(),
"Reset requested via DTR signal"
);
m_port
->
setDataTerminalReady
(
true
);
msleep
(
250
);
m_port
->
setDataTerminalReady
(
false
);
}
}
bool
error
=
m_port
->
waitForReadyRead
(
500
);
...
...
@@ -440,12 +443,12 @@ bool SerialLink::isConnected()
if
(
m_port
)
{
bool
isConnected
=
m_port
->
isOpen
();
qDebug
()
<<
"SerialLink #"
<<
__LINE__
<<
":"
<<
m_port
->
portName
()
<<
" isConnected ="
<<
QString
::
number
(
isConnected
);
//
qDebug() << "SerialLink #" << __LINE__ << ":"<< m_port->portName()
//
<< " isConnected =" << QString::number(isConnected);
return
isConnected
;
}
else
{
qDebug
()
<<
"SerialLink #"
<<
__LINE__
<<
":"
<<
m_portName
<<
" isConnected = NULL"
;
//
qDebug() << "SerialLink #" << __LINE__ << ":" << m_portName
//
<< " isConnected = NULL";
return
false
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment