#2174

- adjusted power conversion test to force no watt gain
- adjusted bike::resistanceFromPowerRequest to make it easier to see what it's comparing and to cache calculations
- many power conversion tests now passing, but some strange values remain in the failing tests

src/devices/bike.cpp

@@ -138,20 +138,27 @@ resistance_t bike::resistanceFromPowerRequest(uint16_t power) {
 
     auto minMaxR = this->resistanceLimits();
 
-    for (resistance_t i = minMaxR.min(); i < minMaxR.max(); i++) {
-        if (((wattsFromResistance(i) * watt_gain) + watt_offset) <= power &&
-            ((wattsFromResistance(i + 1) * watt_gain) + watt_offset) >= power) {
-            qDebug() << QStringLiteral("resistanceFromPowerRequest")
-                     << ((wattsFromResistance(i) * watt_gain) + watt_offset)
-                     << ((wattsFromResistance(i + 1) * watt_gain) + watt_offset) << power;
+    uint16_t power0 = (wattsFromResistance(minMaxR.min()) * watt_gain) + watt_offset;
+
+    // Is the requested power at or below the power of the minimum resistance the device provides?
+    if (power <= power0)
+        return minMaxR.min();
+
+    // Search from the 1st resistance level above minimum to the maximum
+    for (resistance_t i = 1 + minMaxR.min(); i < minMaxR.max(); i++) {
+        uint16_t power1 = wattsFromResistance(i)*watt_gain + watt_offset;
+
+        if(power0 <= power && power1>=power) {
+            qDebug() << QStringLiteral("resistanceFromPowerRequest") << power0 << power1 << power;
             return i;
         }
+
+        power0 = power1;
     }
-    if (power < ((wattsFromResistance(minMaxR.min()) * watt_gain) + watt_offset))
-        return minMaxR.min();
-    else
-        return minMaxR.max();
-} // in order to have something
+
+    // requested power requires resistance beyond the maximum
+    return minMaxR.max();
+}
 void bike::cadenceSensor(uint8_t cadence) { Cadence.setValue(cadence); }
 void bike::powerSensor(uint16_t power) { m_watt.setValue(power, false); }
 

tst/Devices/biketestsuite.cpp

@@ -131,6 +131,10 @@ void BikeTestSuite<T>::test_powerFunctions_maxCadence() {
         GTEST_SKIP() << "No maximum cadence defined";
     }
 
+    ASSERT_TRUE(this->testSettings.get_active()) << "TestSettings object should be active.";
+    this->testSettings.qsettings.setValue(QZSettings::watt_gain, 1.0);
+    this->testSettings.qsettings.setValue(QZSettings::watt_offset, 0.0);
+
     // traverse the resistance edge checking the power is clipped to the values for the max and min cadence
 
     QString  powerBeyondCadenceLimit = QStringLiteral("Power at R:%1 not bounded at %6 cadence (C:%2 RPM, P:%3W), (C:%4 RPM, P:%5W)");
@@ -159,20 +163,20 @@ void BikeTestSuite<T>::test_powerFunctions_resistancePowerConversion() {
     for(uint16_t cadenceRPM : this->getCadenceSamples())
     {
         uint16_t lastPower=0xFFFF;
-        for(resistance_t r=minResistance; r<=maxResistance; r++)
+        for(resistance_t resistanceToPower=minResistance; resistanceToPower<=maxResistance; resistanceToPower++)
         {
-            uint16_t power = erg->getPower(cadenceRPM, r);
+            uint16_t power = erg->getPower(cadenceRPM, resistanceToPower);
 
             // if this resistance reaches a new power level, check the inverse
             if(power!=lastPower)
             {
                 lastPower = power;
-                resistance_t resistance = erg->getResistance(cadenceRPM, power);
+                resistance_t resistanceFromPower = erg->getResistance(cadenceRPM, power);
 
-                if(r!=resistance) {
-                    uint16_t newPower = erg->getPower(cadenceRPM, resistance);
+                if(resistanceToPower!=resistanceFromPower) {
+                    uint16_t newPower = erg->getPower(cadenceRPM, resistanceFromPower);
 
-                    errors.append(unexpectedResistance.arg(r).arg(power).arg(cadenceRPM).arg(resistance).arg(newPower));
+                    errors.append(unexpectedResistance.arg(resistanceToPower).arg(power).arg(cadenceRPM).arg(resistanceFromPower).arg(newPower));
                 }
 
             }