Enhance BLE_Zwift_Service with new payload handling methods and update command codes for trainer configuration

Author: doudar

include/BLE_Zwift_Service.h

@@ -75,13 +75,30 @@ class BLE_Zwift_Service {
 
   // Encode uint64 as ULEB128 varint, returns number of bytes written
   static size_t encodeUleb128(uint64_t value, uint8_t *buffer);
+  // Returns the number of bytes a ULEB128-encoded value would occupy
+  static size_t encodeUleb128Len(uint64_t value);
 
   // Decode ULEB128 varint from buffer, returns number of bytes consumed
   static size_t decodeUleb128(const uint8_t *buf, size_t bufLen, uint64_t *result);
 
   // Send the "all buttons released" state
   void sendAllButtonsReleased();
 
+  // Send a fully-built payload on sync_tx and mirror it through DirCon.
+  void sendSyncTxPayload(const uint8_t *payload, size_t length);
+
+  // Send a fully-built payload on async and mirror it through DirCon.
+  void sendAsyncPayload(const uint8_t *payload, size_t length);
+
+  // Send current GearRatio device information on sync_tx.
+  void sendGearRatioSyncTx();
+
+  // Send current GeneralInfo device information on sync_tx.
+  void sendGeneralInfoSyncTx();
+
+  // Send TRAINER_CONFIG_STATUS with virtual_shifting_mode=1 on async.
+  void sendTrainerConfigStatus();
+
   // Handle Zwift trainer protocol command (non-RideOn messages)
   void handleZwiftCommand(const uint8_t *data, size_t length);
 

include/Zwift_Protocol_Messages.h

@@ -21,6 +21,7 @@ enum class CommandCode : uint8_t {
 	HubRequest = 0x00,
 	HubRidingData = 0x03,
 	HubCommand = 0x04,
+	TrainerConfigStatus = 0x05,  // Device → Zwift: report trainer config (virtual shifting)
 	PlayKeyPadStatus = 0x07,
 	PlayCommand = 0x12,
 	Idle = 0x19,

platformio.ini

@@ -66,15 +66,15 @@ build_flags =
     ;-D CONFIG_BT_NIMBLE_BLOCK_COUNT=20
     -std=gnu++17
 lib_deps = 
-    ;https://github.com/h2zero/esp-nimble-cpp/
+    https://github.com/doudar/esp-nimble-cpp/
     https://github.com/teemuatlut/TMCStepper/archive/refs/tags/v0.7.3.zip
     https://github.com/bblanchon/ArduinoJson/archive/refs/tags/v7.3.1.zip
     ;https://github.com/gin66/FastAccelStepper/archive/refs/tags/0.31.2.zip
     https://github.com/doudar/FastAccelStepper/
     ;https://github.com/gilmaimon/ArduinoWebsockets/archive/refs/tags/0.5.4.zip
     https://github.com/doudar/ArduinoWebsockets/
     ;https://github.com/Links2004/arduinoWebSockets
-    https://github.com/h2zero/NimBLE-Arduino/
+    ;https://github.com/h2zero/NimBLE-Arduino/
 
 [env:release]
 extends = esp32doit

src/BLE_Client.cpp

@@ -305,7 +305,7 @@ bool SpinBLEClient::connectToServer() {
     return false;
   };
   // Always create a brand-new client for each connection attempt.
-  if (NimBLEDevice::getCreatedClientCount() >= 3) {
+  if (NimBLEDevice::getCreatedClientCount() >= NIMBLE_MAX_CONNECTIONS) {
     Serial.println("Max clients reached - no more connections available");
     return false;
   }

src/BLE_Device_Information_Service.cpp

@@ -34,10 +34,10 @@ void BLE_Device_Information_Service::setupService(NimBLEServer* pServer) {
   pHardwareRevisionCharacteristic->setValue((String)userConfig->getDeviceName());
 
   pFirmwareRevisionCharacteristic = pDeviceInformationService->createCharacteristic(FIRMWARE_REVISION_UUID, NIMBLE_PROPERTY::READ);
-  pFirmwareRevisionCharacteristic->setValue((String)ESP.getChipRevision());
+  pFirmwareRevisionCharacteristic->setValue(219);
 
   pSoftwareRevisionCharacteristic = pDeviceInformationService->createCharacteristic(SOFTWARE_REVISION_UUID, NIMBLE_PROPERTY::READ);
-  pSoftwareRevisionCharacteristic->setValue(FIRMWARE_VERSION);
+  pSoftwareRevisionCharacteristic->setValue(219);
 
   pSystemIDCharacteristic = pDeviceInformationService->createCharacteristic(SYSTEM_ID_UUID, NIMBLE_PROPERTY::READ);
   pSystemIDCharacteristic->setValue((String)userConfig->getDeviceName());

src/BLE_Server.cpp

@@ -57,7 +57,7 @@ void startBLEServer() {
 
   // Zwift identifies controllers via manufacturer data with company ID 0x094A.
   // Set the last two bytes to the last two bytes of our BLE address in little endian.
-  uint8_t zwiftMfrData[] = {0x4A, 0x09, 0x01, 0x58, 0x9A};
+  uint8_t zwiftMfrData[] = {0x4A, 0x09, 0x0B, 0x58, 0x9A};
   const std::string bleAddress = BLEDevice::getAddress().toString();  // "aa:bb:cc:dd:ee:ff"
   unsigned int mac[6]          = {0};
   if (sscanf(bleAddress.c_str(), "%02x:%02x:%02x:%02x:%02x:%02x", &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]) == 6) {
@@ -67,7 +67,7 @@ void startBLEServer() {
   }
   pAdvertising->setManufacturerData(zwiftMfrData, sizeof(zwiftMfrData));
   pAdvertising->addServiceUUID(HEARTSERVICE_UUID);
-  pAdvertising->addServiceUUID(ZWIFT_CUSTOM_SERVICE_UUID);
+  pAdvertising->addServiceUUID(ZWIFT_RIDE_CUSTOM_SERVICE_UUID);
 
   // Put the device name and SmartSpin2k service UUID in the scan response to avoid
   // overflowing the primary ad packet (which already carries manufacturer data + service UUIDs).