Cleanup

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added new BLE firmware update protocol.
 
 ### Changed
+- Truncate only the BLE-advertised device name when needed so the SmartSpin2k service UUID remains present in the legacy scan response.
+- Resume the latest ERG target automatically when cadence recovers after a low-cadence fallback, unless another FTMS command selects a different mode.
 
 ### Hardware
 

include/ERG_Mode.h

@@ -25,10 +25,11 @@ class ErgMode {
   // What used to be in the ERGTaskLoop(). This is the main control function for ERG Mode and the powertable operations.
   void runERG();
   void computeErg();
+  void onFTMSCommand(uint8_t opcode);
   void _writeLog(float currentIncline, float newIncline, int currentSetPoint, int newSetPoint, int currentWatts, int newWatts, int currentCadence, int newCadence);
 
  private:
-  bool engineStopped = false;
+  bool resumeErgOnCadence = false;
 
   int mode = Mode::MAINTAIN;
   Measurement prevWatts;

src/BLE_Fitness_Machine_Service.cpp

@@ -6,6 +6,7 @@
  */
 #include "BLE_Fitness_Machine_Service.h"
 #include "DirConManager.h"
+#include "ERG_Mode.h"
 #include "Main.h"
 #include <Constants.h>
 #include <vector>
@@ -168,6 +169,8 @@ void BLE_Fitness_Machine_Service::processFTMSWrite() {
       int logBufLength = ss2k_log_hex_to_buffer(pData, length, logBuf, 0, kLogBufCapacity);
       int port         = 0;
 
+      ergMode->onFTMSCommand(static_cast<uint8_t>(rxValue[0]));
+
       switch ((uint8_t)rxValue[0]) {
         case FitnessMachineControlPointProcedure::RequestControl:
           returnValue[2] = FitnessMachineControlPointResultCode::Success;

src/BLE_Server.cpp

@@ -15,7 +15,9 @@
 #include <WiFi.h>
 #include <host/ble_gatt.h>
 #include <cmath>
+#include <cstring>
 #include <limits>
+#include <string>
 #include "BLE_Cycling_Speed_Cadence.h"
 #include "BLE_Cycling_Power_Service.h"
 #include "BLE_Heart_Service.h"
@@ -43,6 +45,22 @@ BLE_OpenBikeControl_Service openBikeControlService;
 
 namespace {
 constexpr uint8_t SMARTSPIN2K_IP_ADVERTISEMENT_VERSION = 1;
+// Leaves room for the 128-bit SmartSpin2k service UUID in the 31-byte scan response.
+constexpr size_t BLE_ADVERTISED_NAME_MAX_SIZE = 11;
+
+std::string bleAdvertisementName(const char* deviceName) {
+  std::string name = deviceName;
+  if (name.size() <= BLE_ADVERTISED_NAME_MAX_SIZE) {
+    return name;
+  }
+
+  size_t length = BLE_ADVERTISED_NAME_MAX_SIZE;
+  while (length > 0 && (static_cast<uint8_t>(name[length]) & 0xc0) == 0x80) {
+    --length;
+  }
+  name.resize(length);
+  return name;
+}
 
 void addIpAddressToAdvertisement(NimBLEAdvertising* advertising) {
   IPAddress ipAddress = WiFi.status() == WL_CONNECTED ? WiFi.localIP() : WiFi.softAPIP();
@@ -103,7 +121,13 @@ void startBLEServer() {
   // Keep the name and 128-bit SmartSpin2k UUID in the scan response. The primary
   // advertisement uses the space previously occupied by the duplicate name for the IP address.
   addIpAddressToAdvertisement(pAdvertising);
-  oScanResponseData.setName(userConfig->getDeviceName());
+  const std::string advertisedName = bleAdvertisementName(userConfig->getDeviceName());
+  if (advertisedName.size() < std::strlen(userConfig->getDeviceName())) {
+    oScanResponseData.setShortName(advertisedName);
+    SS2K_LOGW(BLE_SERVER_LOG_TAG, "BLE device name shortened to '%s' to fit scan response", advertisedName.c_str());
+  } else {
+    oScanResponseData.setName(advertisedName);
+  }
   oScanResponseData.setCompleteServices(SMARTSPIN2K_SERVICE_UUID);
   pAdvertising->setScanResponseData(oScanResponseData);
 

src/ERG_Mode.cpp

@@ -69,12 +69,20 @@ double clampErgGain(double gain, double sensitivity) {
 }  // namespace
 
 void ErgMode::runERG() {
-  static ErgMode ergMode;
   static PowerBuffer powerBuffer;
   static bool hasConnectedPowerMeter = false;
   static bool simulationRunning      = false;
   static int loopCounter             = 0;
 
+  if (resumeErgOnCadence && rtConfig->cad.getValue() > MIN_ERG_CADENCE) {
+    if (rtConfig->getFTMSMode() == FitnessMachineControlPointProcedure::SetIndoorBikeSimulationParameters) {
+      rtConfig->setFTMSMode(FitnessMachineControlPointProcedure::SetTargetPower);
+      SS2K_LOG(ERG_MODE_LOG_TAG, "Cadence resumed; restoring ERG mode at %dw", rtConfig->watts.getTarget());
+    }
+    resumeErgOnCadence = false;
+    ergTimer           = 0;
+  }
+
   if (mode == Mode::INCREASING) {
     if (rtConfig->watts.getValue() > rtConfig->watts.getTarget()) {  // Resume PID control
       ergTimer = 0;
@@ -144,7 +152,7 @@ void ErgMode::runERG() {
 
       // compute ERG
       if ((rtConfig->getFTMSMode() == FitnessMachineControlPointProcedure::SetTargetPower) && (hasConnectedPowerMeter || simulationRunning)) {
-        ergMode.computeErg();
+        this->computeErg();
       }
 
       // Set Min and Max Stepper positions
@@ -357,14 +365,23 @@ void ErgMode::_updateValues(float newIncline) {
 
 bool ErgMode::_userIsSpinning(int cadence, float incline) {
   if (cadence <= MIN_ERG_CADENCE) {
+    resumeErgOnCadence = true;
+    mode               = Mode::MAINTAIN;
+    isDelayed          = false;
     rtConfig->setFTMSMode(FitnessMachineControlPointProcedure::SetIndoorBikeSimulationParameters);
     rtConfig->setTargetIncline(1.0f);
     return false;  // Cadence too low, nothing to do here
   }
-  this->engineStopped = false;
   return true;
 }
 
+void ErgMode::onFTMSCommand(uint8_t opcode) {
+  if (resumeErgOnCadence && opcode != FitnessMachineControlPointProcedure::SetTargetPower) {
+    resumeErgOnCadence = false;
+    SS2K_LOG(ERG_MODE_LOG_TAG, "ERG cadence resume cancelled by FTMS command 0x%02x", opcode);
+  }
+}
+
 void ErgMode::_writeLog(float currentIncline, float newIncline, int currentSetPoint, int newSetPoint, int currentWatts, int newWatts, int currentCadence, int newCadence) {
   SS2K_LOGW(ERG_MODE_LOG_CSV_TAG, "%d;%.2f;%.2f;%d;%d;%d;%d;%d", currentIncline, newIncline, currentSetPoint, newSetPoint, currentWatts, newWatts, currentCadence, newCadence);
 }