Fix PM5 advertising on Android and optimize UUID handling

- Add startAdvertisingRowerPM5() method in BleAdvertiser.java that
  uses the PM5 discovery service UUID (CE060000) instead of FTMS
- Call the correct advertising method based on pm5Mode flag
- Reduce advertised UUIDs to only discovery service (128-bit UUIDs
  are large, other services are discovered after connection)

https://claude.ai/code/session_01XWBgRPWze8Mb7DEEm4oXiF

Author: claude

src/android/src/BleAdvertiser.java

@@ -37,6 +37,9 @@
 
 public class BleAdvertiser {
     private static final UUID SERVICE_UUID = UUID.fromString("00001826-0000-1000-8000-00805f9b34fb");
+    // PM5 Concept2 UUIDs
+    private static final UUID PM5_DISCOVERY_SERVICE_UUID = UUID.fromString("CE060000-43E5-11E4-916C-0800200C9A66");
+    private static final UUID PM5_ROWING_SERVICE_UUID = UUID.fromString("CE060030-43E5-11E4-916C-0800200C9A66");
     private static final byte[] SERVICE_DATA_ROWER = {0x01, 0x10, 0x00};
     private static final byte[] SERVICE_DATA_TREADMILL = {0x01, 0x01, 0x00};
 
@@ -63,6 +66,31 @@ public static void startAdvertisingRower(Context context) {
         }
     }
 
+    public static void startAdvertisingRowerPM5(Context context) {
+        BluetoothManager bluetoothManager = (BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE);
+        if (bluetoothManager != null) {
+            android.bluetooth.le.BluetoothLeAdvertiser advertiser = bluetoothManager.getAdapter().getBluetoothLeAdvertiser();
+
+            AdvertiseSettings settings = new AdvertiseSettings.Builder()
+                    .setAdvertiseMode(AdvertiseSettings.ADVERTISE_MODE_LOW_LATENCY)
+                    .setTxPowerLevel(AdvertiseSettings.ADVERTISE_TX_POWER_HIGH)
+                    .setConnectable(true)
+                    .build();
+
+            // PM5 advertising - use discovery service UUID
+            // Note: 128-bit UUIDs take more space, so we only advertise the discovery UUID
+            AdvertiseData advertiseData = new AdvertiseData.Builder()
+                    .setIncludeDeviceName(true)
+                    .addServiceUuid(new ParcelUuid(PM5_DISCOVERY_SERVICE_UUID))
+                    .build();
+
+            if (advertiser != null) {
+                QLog.d("BleAdvertiser", "Starting PM5 advertising with UUID: " + PM5_DISCOVERY_SERVICE_UUID.toString());
+                advertiser.startAdvertising(settings, advertiseData, advertiseCallback);
+            }
+        }
+    }
+
     public static void startAdvertisingTreadmill(Context context) {
         BluetoothManager bluetoothManager = (BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE);
         if (bluetoothManager != null) {

src/virtualdevices/virtualrower.cpp

@@ -124,11 +124,9 @@ virtualrower::virtualrower(bluetoothdevice *t, bool noWriteResistance, bool noHe
         if (!heart_only) {
             if (pm5Mode) {
                 // PM5 uses Concept2 proprietary services
-                // Advertise the discovery service UUID for PM5 identification
+                // Only advertise the discovery service UUID (128-bit UUIDs are large)
+                // The other services will be discovered after connection
                 services << PM5_DISCOVERY_SERVICE_UUID;
-                services << PM5_ROWING_SERVICE_UUID;
-                services << PM5_DEVICE_INFO_SERVICE_UUID;
-                services << PM5_CONTROL_SERVICE_UUID;
             } else {
                 services << ((QBluetoothUuid::ServiceClassUuid)0x1826);
             }
@@ -287,8 +285,13 @@ virtualrower::virtualrower(bluetoothdevice *t, bool noWriteResistance, bool noHe
         }
 
 #ifdef Q_OS_ANDROID
-        QAndroidJniObject::callStaticMethod<void>("org/cagnulen/qdomyoszwift/BleAdvertiser", "startAdvertisingRower",
-                                                  "(Landroid/content/Context;)V", QtAndroid::androidContext().object());
+        if (pm5Mode) {
+            QAndroidJniObject::callStaticMethod<void>("org/cagnulen/qdomyoszwift/BleAdvertiser", "startAdvertisingRowerPM5",
+                                                      "(Landroid/content/Context;)V", QtAndroid::androidContext().object());
+        } else {
+            QAndroidJniObject::callStaticMethod<void>("org/cagnulen/qdomyoszwift/BleAdvertiser", "startAdvertisingRower",
+                                                      "(Landroid/content/Context;)V", QtAndroid::androidContext().object());
+        }
 #else
         leController->startAdvertising(pars, advertisingData, advertisingData);
 #endif
@@ -438,8 +441,13 @@ void virtualrower::reconnect() {
     QLowEnergyAdvertisingParameters pars;
     pars.setInterval(100, 100);
 #ifdef Q_OS_ANDROID
-    QAndroidJniObject::callStaticMethod<void>("org/cagnulen/qdomyoszwift/BleAdvertiser", "startAdvertisingRower",
-                                              "(Landroid/content/Context;)V", QtAndroid::androidContext().object());
+    if (pm5Mode) {
+        QAndroidJniObject::callStaticMethod<void>("org/cagnulen/qdomyoszwift/BleAdvertiser", "startAdvertisingRowerPM5",
+                                                  "(Landroid/content/Context;)V", QtAndroid::androidContext().object());
+    } else {
+        QAndroidJniObject::callStaticMethod<void>("org/cagnulen/qdomyoszwift/BleAdvertiser", "startAdvertisingRower",
+                                                  "(Landroid/content/Context;)V", QtAndroid::androidContext().object());
+    }
 #else
     leController->startAdvertising(pars, advertisingData, advertisingData);
 #endif