nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-04-15 05:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix power blips from Standard Power with Quarq

Browse Source 
Added a check to insure that we don't display the same power event more
than once.

Fixes Bug #635
This commit is contained in:
Andrew Bryson
2012-02-04 17:48:05 +00:00
committed by Mark Liversedge
parent 3dd9f49049
commit e415e3489e
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ANTChannel.cpp
View File

@@ -442,10 +442,19 @@ void ANTChannel::broadcastEvent(unsigned char *ant_message)
// //
case ANT_STANDARD_POWER: // 0x10 - standard power case ANT_STANDARD_POWER: // 0x10 - standard power
{ {
if (lastStdPwrMessage.type != 0) { uint8_t events = antMessage.eventCount - lastStdPwrMessage.eventCount;
if (lastStdPwrMessage.type && events) {
stdNullCount = 0;
is_alt ? parent->setAltWatts(antMessage.instantPower) : parent->setWatts(antMessage.instantPower); is_alt ? parent->setAltWatts(antMessage.instantPower) : parent->setWatts(antMessage.instantPower);
value2 = value = antMessage.instantPower; value2 = value = antMessage.instantPower;
parent->setCadence(antMessage.instantCadence); // cadence parent->setCadence(antMessage.instantCadence); // cadence
} else {
stdNullCount++;
if (stdNullCount >= 2) { //XXX 2 for standard power?
parent->setCadence(0);
is_alt ? parent->setAltWatts(0) : parent->setWatts(0);
value2 = value = 0;
}
} }
lastStdPwrMessage = antMessage; lastStdPwrMessage = antMessage;
savemessage = false; savemessage = false;

2
src/ANTChannel.h
View File

@@ -81,7 +81,7 @@ class ANTChannel : public QObject {
ANT *parent; ANT *parent;
ANTMessage lastMessage, lastStdPwrMessage; ANTMessage lastMessage, lastStdPwrMessage;
int dualNullCount, nullCount; int dualNullCount, nullCount, stdNullCount;
double last_message_timestamp; double last_message_timestamp;
double blanking_timestamp; double blanking_timestamp;
int blanked; int blanked;