Kettler serial connection fixes

.travis.yml

@@ -7,7 +7,6 @@ compiler:
 - gcc
 env:
   matrix:
-  - BRANCH=master QT=qt4 QT_PATH=qt
   - BRANCH=master QT=qt5 QT_PATH=qt5 QT_VER=5.5.1
   global:
   - secure: iqYW7f3//ZkMVzeCEarYn0S0DqKjFU9juBh0KF6WTlUsKX902Jtsk7dFoJlNDYBf63HLgV+wW2Hc6MxI9sGiUkom0gY9/To/aeGIJFGEX2sLm/e0Ok3qN521FA0Q/OiCFsD0RC6J+yrHxzI+rf8Z1rujceUsz2KgsrfAjYYv+BY=

src/ANT/ANT.cpp

@@ -120,6 +120,11 @@ ANT::ANT(QObject *parent, DeviceConfiguration *devConf, QString athlete) : QThre
     currentRollingResistance = rollingResistance = 0.004; // typical for road
     gradient = 0.1;
 
+    // elapsed time reference
+    elapsedTimer.start();
+    if (!elapsedTimer.isMonotonic())
+        qDebug() << "Caution: ANT timer is not monotonic";
+
     // state machine
     state = ST_WAIT_FOR_SYNC;
     length = bytes = 0;
@@ -1297,3 +1302,29 @@ void ANT::setControlChannel(int channel)
 {
     controlChannel = channel;
 }
+
+qint64 ANT::getElapsedTime()
+{
+    return elapsedTimer.elapsed();
+}
+
+// blacklist a specific sensor
+void ANT::blacklistSensor(int device_number, int device_id)
+{
+    for (int i=0; i<channels; i++) {
+        if ((antChannel[i]->device_number == device_number) && (antChannel[i]->device_id == device_id)) {
+            if (!antChannel[i]->blacklisted) {
+                char *name = NULL;
+                for (int i=0; ant_sensor_types[i].suffix !=  '\0'; i++) {
+                    if (ant_sensor_types[i].device_id == device_id)
+                        name = (char*)ant_sensor_types[i].descriptive_name;
+                }
+
+                if (name)
+                    qDebug() << "*** Blacklisting" << name << "sensor id" << device_number;
+
+                antChannel[i]->blacklisted = 1;
+            }
+        }
+    }
+}

src/ANT/ANT.h

@@ -37,6 +37,7 @@
 #include <QStringList>
 #include <QTime>
 #include <QTimer>
+#include <QElapsedTimer>
 #include <QProgressDialog>
 #include <QFile>
 
@@ -476,6 +477,7 @@ public slots:
     int removeDevice(int device_number, int channel_type);
     ANTChannel *findDevice(int device_number, int channel_type);
     int startWaitingSearch();
+    void blacklistSensor(int device_number, int channel_type);
 
     // transmission
     void sendMessage(ANTMessage);
@@ -564,6 +566,8 @@ public slots:
     void setTrainerReady(bool status) { telemetry.setTrainerReady(status); }
     void setTrainerRunning(bool status) { telemetry.setTrainerRunning(status); }
 
+    qint64 getElapsedTime();
+
 private:
 
     void run();
@@ -609,6 +613,8 @@ public slots:
     int powerchannels; // how many power channels do we have?
     QDateTime lastCadenceMessage;
 
+    QElapsedTimer elapsedTimer;
+
     QQueue<setChannelAtom> channelQueue; // messages for configuring channels from controller
 
     // generic trainer settings

src/ANT/ANTChannel.cpp

@@ -59,7 +59,8 @@ ANTChannel::init()
     status = Closed;
     fecPrevRawDistance=0;
     fecCapabilities=0;
-    lastMessageTimestamp = lastMessageTimestamp2 = QTime::currentTime();
+    lastMessageTimestamp = lastMessageTimestamp2 = parent->getElapsedTime();
+    blacklisted=0;
 }
 
 //
@@ -342,6 +343,12 @@ void ANTChannel::broadcastEvent(unsigned char *ant_message)
         product_id=MANUFACTURER_MODEL_NUMBER_ID(message);
         checkCinqo();
 
+        // If we are a Tacx FE-C trainer then blacklist the Speed and Cadence channel
+        // on the same device, as known to cause problems due to poor quality data
+        // (multiple unchanged messages between valid updates)
+        if (is_fec && manufacturer_id == 0x59)
+            parent->blacklistSensor(device_number, ANT_SPORT_SandC_TYPE);
+
     } else if (MESSAGE_IS_BATTERY_VOLTAGE(message)) {
         // todo: push battery status up to train view when we have a means to display notifications
     }
@@ -631,9 +638,9 @@ void ANTChannel::broadcastEvent(unsigned char *ant_message)
                if (time) {
                    rpm = 1024*60*revs / time;
                    last_measured_rpm = rpm;
-                   lastMessageTimestamp = QTime::currentTime();
+                   lastMessageTimestamp = parent->getElapsedTime();
                } else {
-                   int ms = lastMessageTimestamp.msecsTo(QTime::currentTime());
+                   qint64 ms = parent->getElapsedTime() - lastMessageTimestamp;
                    rpm = qMin((float)(1000.0*60.0*1.0) / ms, parent->getCadence());
                    // If we received a message but timestamp remain unchanged then we know that sensor have not detected magnet thus we deduct that rpm cannot be higher than this
                    if (rpm < last_measured_rpm / 2.0)
@@ -649,43 +656,48 @@ void ANTChannel::broadcastEvent(unsigned char *ant_message)
            {
                float rpm;
                static float last_measured_rpm;
-               // cadence first...
-               uint16_t time = antMessage.crankMeasurementTime - lastMessage.crankMeasurementTime;
-               uint16_t revs = antMessage.crankRevolutions - lastMessage.crankRevolutions;
-               if (time) {
-                   rpm = 1024*60*revs / time;
-                   last_measured_rpm = rpm;
 
-                   if (is_moxy) /* do nothing for now */ ; //XXX fixme when moxy arrives XXX
-                   else parent->setCadence(rpm);
-                   lastMessageTimestamp = QTime::currentTime();
-               } else {
-                   int ms = lastMessageTimestamp.msecsTo(QTime::currentTime());
-                   rpm = qMin((float)(1000.0*60.0*1.0) / ms, parent->getCadence());
-                   // If we received a message but timestamp remain unchanged then we know that sensor have not detected magnet thus we deduct that rpm cannot be higher than this
-                   if (rpm < last_measured_rpm / 2.0)
-                       rpm = 0.0; // if rpm is less than half previous cadence we consider that we are stopped
-                   parent->setCadence(rpm);
-               }
-               value = rpm;
-
-               // now speed ...
-               time = antMessage.wheelMeasurementTime - lastMessage.wheelMeasurementTime;
-               revs = antMessage.wheelRevolutions - lastMessage.wheelRevolutions;
-               if (time) {
-                   rpm = 1024*60*revs / time;
-                   if (is_moxy) /* do nothing for now */ ; //XXX fixme when moxy arrives XXX
-                   else parent->setWheelRpm(rpm);
-                   lastMessageTimestamp2 = QTime::currentTime();
-               } else {
-                   int ms = lastMessageTimestamp2.msecsTo(QTime::currentTime());
-                   rpm = qMin((float)(1000.0*60.0*1.0) / ms, parent->getWheelRpm());
-                   // If we received a message but timestamp remain unchanged then we know that sensor have not detected magnet thus we deduct that rpm cannot be higher than this
-                   if (rpm < (float) 15.0)
-                       rpm = 0.0; // if rpm is less than 15rpm (=4s) then we consider that we are stopped
-                   parent->setWheelRpm(rpm);
+               if (!blacklisted) {
+                   // cadence first...
+                   uint16_t time = antMessage.crankMeasurementTime - lastMessage.crankMeasurementTime;
+                   uint16_t revs = antMessage.crankRevolutions - lastMessage.crankRevolutions;
+                   if (time) {
+                       rpm = 1024*60*revs / time;
+                       last_measured_rpm = rpm;
+
+                       if (is_moxy) /* do nothing for now */ ; //XXX fixme when moxy arrives XXX
+                       else parent->setCadence(rpm);
+                       lastMessageTimestamp = parent->getElapsedTime();
+                   } else {
+                       qint64 ms = parent->getElapsedTime() - lastMessageTimestamp;
+                       //qDebug() << "cadence ms:" << ms;
+                       rpm = qMin((float)(1000.0*60.0*1.0) / ms, parent->getCadence());
+                       // If we received a message but timestamp remain unchanged then we know that sensor have not detected magnet thus we deduct that rpm cannot be higher than this
+                       if (rpm < last_measured_rpm / 2.0)
+                           rpm = 0.0; // if rpm is less than half previous cadence we consider that we are stopped
+                       parent->setCadence(rpm);
+                   }
+                   value = rpm;
+
+                   // now speed ...
+                   time = antMessage.wheelMeasurementTime - lastMessage.wheelMeasurementTime;
+                   revs = antMessage.wheelRevolutions - lastMessage.wheelRevolutions;
+                   if (time) {
+                       rpm = 1024*60*revs / time;
+                       if (is_moxy) /* do nothing for now */ ; //XXX fixme when moxy arrives XXX
+                       else parent->setWheelRpm(rpm);
+                       lastMessageTimestamp2 = parent->getElapsedTime();
+                   } else {
+                       qint64 ms = parent->getElapsedTime() - lastMessageTimestamp2;
+                       //qDebug() << "speed ms:" << ms;
+                       rpm = qMin((float)(1000.0*60.0*1.0) / ms, parent->getWheelRpm());
+                       // If we received a message but timestamp remain unchanged then we know that sensor have not detected magnet thus we deduct that rpm cannot be higher than this
+                       if (rpm < (float) 15.0)
+                           rpm = 0.0; // if rpm is less than 15rpm (=4s) then we consider that we are stopped
+                       parent->setWheelRpm(rpm);
+                   }
+                   value2 = rpm;
                }
-               value2 = rpm;
            }
            break;
 
@@ -697,9 +709,9 @@ void ANTChannel::broadcastEvent(unsigned char *ant_message)
                uint16_t revs = antMessage.wheelRevolutions - lastMessage.wheelRevolutions;
                if (time) {
                    rpm = 1024*60*revs / time;
-                   lastMessageTimestamp = QTime::currentTime();
+                   lastMessageTimestamp = parent->getElapsedTime();
                } else {
-                   int ms = lastMessageTimestamp.msecsTo(QTime::currentTime());
+                   qint64 ms = parent->getElapsedTime() - lastMessageTimestamp;
                    rpm = qMin((float)(1000.0*60.0*1.0) / ms, parent->getWheelRpm());
                    // If we received a message but timestamp remain unchanged then we know that sensor have not detected magnet thus we deduct that rpm cannot be higher than this
                    if (rpm < (float) 15.0)
@@ -748,14 +760,14 @@ void ANTChannel::broadcastEvent(unsigned char *ant_message)
                    parent->setTrainerStatusAvailable(true);
                    // temporarily disabled until calibration included in the code / TODO : remove && false
                    parent->setTrainerCalibRequired((antMessage.fecPowerCalibRequired || antMessage.fecResisCalibRequired) && false);
-                   if (antMessage.fecPowerCalibRequired)
-                        qDebug() << "Trainer calibration required (power)";
-                   if (antMessage.fecResisCalibRequired)
-                        qDebug() << "Trainer calibration required (resistance)";
+                   //if (antMessage.fecPowerCalibRequired)
+                   //     qDebug() << "Trainer calibration required (power)";
+                   //if (antMessage.fecResisCalibRequired)
+                   //     qDebug() << "Trainer calibration required (resistance)";
                    // temporarily disabled until calibration included in the code / TODO : remove && false
                    parent->setTrainerConfigRequired(antMessage.fecUserConfigRequired && false);
-                   if (antMessage.fecUserConfigRequired)
-                        qDebug() << "Trainer configuration required";
+                   //if (antMessage.fecUserConfigRequired)
+                   //     qDebug() << "Trainer configuration required";
                    parent->setTrainerBrakeFault(antMessage.fecPowerOverLimits==FITNESS_EQUIPMENT_POWER_NOK_LOWSPEED
                                             ||  antMessage.fecPowerOverLimits==FITNESS_EQUIPMENT_POWER_NOK_HIGHSPEED
                                             ||  antMessage.fecPowerOverLimits==FITNESS_EQUIPMENT_POWER_NOK);
@@ -823,8 +835,8 @@ void ANTChannel::broadcastEvent(unsigned char *ant_message)
                 // just process strides for now
                 if (antMessage.fpodInstant == false) {
 
-                    QTime now=QTime::currentTime();
-                    int ms = lastMessageTimestamp.msecsTo(now);
+                    qint64 now = parent->getElapsedTime();
+                    qint64 ms = now - lastMessageTimestamp;
                     lastMessageTimestamp = now;
 
                     // how many strides since last ?

src/ANT/ANTChannel.h

@@ -102,10 +102,10 @@ class ANTChannel : public QObject {
         char id[10]; // short identifier
         ANTChannelInitialisation mi;
 
-        int   messages_received; // for signal strength metric
-        int   messages_dropped;
-        QTime lastMessageTimestamp;
-        QTime lastMessageTimestamp2;
+        int    messages_received; // for signal strength metric
+        int    messages_dropped;
+        qint64 lastMessageTimestamp; // for time comparisons
+        qint64 lastMessageTimestamp2;
 
         unsigned char rx_burst_data[RX_BURST_DATA_LEN];
         int           rx_burst_data_index;
@@ -114,9 +114,9 @@ class ANTChannel : public QObject {
         void (*tx_ack_disposition)(struct ant_channel *);
 
         // what we got
-        int manufacturer_id;
         int product_id;
         int product_version;
+        int manufacturer_id;
 
     public:
 
@@ -153,6 +153,7 @@ class ANTChannel : public QObject {
         int device_number;
         int channel_type_flags;
         int device_id;
+        int blacklisted;
 
         // special cases
         bool is_kickr;