projects
/
pierogi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Search for Power Button Panel
[pierogi]
/
protocols
/
rc5protocol.cpp
diff --git
a/protocols/rc5protocol.cpp
b/protocols/rc5protocol.cpp
index
36322a1
..
deffdd7
100644
(file)
--- a/
protocols/rc5protocol.cpp
+++ b/
protocols/rc5protocol.cpp
@@
-52,8
+52,11
@@
void RC5Protocol::startSendingCommand(
// Sanity check, make sure command exists first:
if (i == keycodes.end())
{
// Sanity check, make sure command exists first:
if (i == keycodes.end())
{
- std::string s = "Tried to send a non-existent command.\n";
- throw PIRException(s);
+ QMutexLocker cifLocker(&commandIFMutex);
+ commandInFlight = false;
+ return;
+// std::string s = "Tried to send a non-existent command.\n";
+// throw PIRException(s);
}
// Construct the object that communicates with the device driver:
}
// Construct the object that communicates with the device driver:
@@
-104,24
+107,27
@@
void RC5Protocol::startSendingCommand(
// Have we been told to stop yet?
if (checkRepeatFlag())
{
// Have we been told to stop yet?
if (checkRepeatFlag())
{
+ break;
+/*
// Ok, then we can quit now:
++keypressCount;
QMutexLocker cifLocker(&commandIFMutex);
commandInFlight = false;
return;
// Ok, then we can quit now:
++keypressCount;
QMutexLocker cifLocker(&commandIFMutex);
commandInFlight = false;
return;
+*/
}
++repeatCount;
}
}
++repeatCount;
}
+
+ ++keypressCount;
+ QMutexLocker cifLocker(&commandIFMutex);
+ commandInFlight = false;
}
catch (PIRException e)
{
emit commandFailed(e.getError().c_str());
}
}
catch (PIRException e)
{
emit commandFailed(e.getError().c_str());
}
-
- ++keypressCount;
- QMutexLocker cifLocker(&commandIFMutex);
- commandInFlight = false;
}
}
@@
-162,7
+168,7
@@
int RC5Protocol::pushControlBits(
// Simply push the rest of the bits:
while (i != preData.end())
{
// Simply push the rest of the bits:
while (i != preData.end())
{
- pushBit(*i, rx51device);
+ duration += pushBit(*i, rx51device);
++i;
}
++i;
}
@@
-226,7
+232,7
@@
int RC5Protocol::pushNonStandardRC5(
// Simply push the rest of the bits:
while (i != pkb.firstCode.end())
{
// Simply push the rest of the bits:
while (i != pkb.firstCode.end())
{
- pushBit(*i, rx51device);
+ duration += pushBit(*i, rx51device);
++i;
}
++i;
}