Yandrik/abawo-bt-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ios): show FTMS trainers advertised as 16-bit UUID

Browse Source
This commit is contained in:
Yandrik
2026-04-28 20:25:30 +02:00
parent ac93c01cea
commit 96416a2f73
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/model/shifter_types.dart
View File

@ -1,5 +1,7 @@
import 'dart:convert'; import 'dart:convert';
import 'package:flutter_reactive_ble/flutter_reactive_ble.dart';
const String universalShifterControlServiceUuid = const String universalShifterControlServiceUuid =
'0993826f-0ee4-4b37-9614-d13ecba4ffc2'; '0993826f-0ee4-4b37-9614-d13ecba4ffc2';
const String universalShifterStatusCharacteristicUuid = const String universalShifterStatusCharacteristicUuid =
@ -25,6 +27,10 @@ const String deviceInformationServiceUuid =
const String firmwareRevisionCharacteristicUuid = const String firmwareRevisionCharacteristicUuid =
'00002a26-0000-1000-8000-00805f9b34fb'; '00002a26-0000-1000-8000-00805f9b34fb';
bool isFtmsUuid(Uuid uuid) {
return uuid.expanded == Uuid.parse(ftmsServiceUuid).expanded;
}
const int universalShifterDfuOpcodeStart = 0x01; const int universalShifterDfuOpcodeStart = 0x01;
const int universalShifterDfuOpcodeFinish = 0x02; const int universalShifterDfuOpcodeFinish = 0x02;
const int universalShifterDfuOpcodeAbort = 0x03; const int universalShifterDfuOpcodeAbort = 0x03;

11
lib/widgets/bike_scan_dialog.dart
View File

@ -137,8 +137,7 @@ class _BikeScanDialogState extends ConsumerState<BikeScanDialog> {
const SizedBox(height: 12), const SizedBox(height: 12),
itemBuilder: (context, index) { itemBuilder: (context, index) {
final device = devices[index]; final device = devices[index];
final isFtms = device.serviceUuids final isFtms = _advertisesFtms(device);
.contains(Uuid.parse(ftmsServiceUuid));
return Material( return Material(
color: Theme.of(context).colorScheme.surface, color: Theme.of(context).colorScheme.surface,
borderRadius: BorderRadius.circular(22), borderRadius: BorderRadius.circular(22),
@ -268,7 +267,6 @@ class _BikeScanDialogState extends ConsumerState<BikeScanDialog> {
} }
List<DiscoveredDevice> _filteredDevices(List<DiscoveredDevice> devices) { List<DiscoveredDevice> _filteredDevices(List<DiscoveredDevice> devices) {
final ftmsUuid = Uuid.parse(ftmsServiceUuid);
return devices.where((device) { return devices.where((device) {
if (device.id == widget.excludedDeviceId) { if (device.id == widget.excludedDeviceId) {
return false; return false;
@ -276,9 +274,14 @@ class _BikeScanDialogState extends ConsumerState<BikeScanDialog> {
if (_showAll) { if (_showAll) {
return true; return true;
} }
return device.serviceUuids.contains(ftmsUuid); return _advertisesFtms(device);
}).toList(growable: false); }).toList(growable: false);
} }
bool _advertisesFtms(DiscoveredDevice device) {
return device.serviceUuids.any(isFtmsUuid) ||
device.serviceData.keys.any(isFtmsUuid);
}
} }
class _DialogHeader extends StatelessWidget { class _DialogHeader extends StatelessWidget {

9
test/model/shifter_types_test.dart
View File

@ -1,7 +1,16 @@
import 'package:abawo_bt_app/model/shifter_types.dart'; import 'package:abawo_bt_app/model/shifter_types.dart';
import 'package:flutter_reactive_ble/flutter_reactive_ble.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
void main() { void main() {
group('isFtmsUuid', () {
test('matches 16-bit and expanded FTMS UUIDs', () {
expect(isFtmsUuid(Uuid.parse('1826')), isTrue);
expect(isFtmsUuid(Uuid.parse(ftmsServiceUuid)), isTrue);
expect(isFtmsUuid(Uuid.parse('180f')), isFalse);
});
});
group('CentralStatus.fromBytes', () { group('CentralStatus.fromBytes', () {
test('decodes status with FTMS ready', () { test('decodes status with FTMS ready', () {
final status = CentralStatus.fromBytes( final status = CentralStatus.fromBytes(