less messages when calibrating

Updated YouTube video link in README.

.github/workflows/build.yml

@@ -240,6 +240,9 @@ jobs:
       #1 Checkout Repository
       - name: Checkout Repository
         uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          token: ${{ secrets.PAT_TOKEN }}
 
       - name: Extract version from pubspec.yaml (Windows)
         shell: pwsh
@@ -257,7 +260,7 @@ jobs:
       - name: Set Up Flutter
         uses: subosito/flutter-action@v2
         with:
-          channel: 'beta'
+          channel: 'stable'
           flutter-version: ${{ env.FLUTTER_VERSION }}
 
       - name: Generate translation files

.github/workflows/patch.yml

@@ -162,6 +162,9 @@ jobs:
       #1 Checkout Repository
       - name: Checkout Repository
         uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          token: ${{ secrets.PAT_TOKEN }}
 
       - name: 🐦 Setup Shorebird
         uses: shorebirdtech/setup-shorebird@v1

README.md

@@ -11,10 +11,7 @@ With BikeControl you can **control your favorite trainer app** using your Zwift
 - control music on your device
 - more? If you can do it via keyboard, mouse, or touch, you can do it with BikeControl
 
-
-https://github.com/user-attachments/assets/1f81b674-1628-4763-ad66-5f3ed7a3f159
-
-
+[![Youtube Video](https://github.com/user-attachments/assets/14a45ca1-e31b-4fbd-8d03-95aa60470405)](https://youtu.be/0r3LO5lFlyc)
 
 
 ## Download

WINDOWS_STORE_VERSION.txt

@@ -1 +1 @@
-4.4.1
+4.6.2

lib/bluetooth/devices/gyroscope/gyroscope_steering.dart

@@ -10,7 +10,6 @@ import 'package:bike_control/widgets/ui/beta_pill.dart';
 import 'package:bike_control/widgets/ui/device_info.dart';
 import 'package:bike_control/widgets/ui/small_progress_indicator.dart';
 import 'package:flutter/foundation.dart';
-import 'package:prop/prop.dart';
 import 'package:sensors_plus/sensors_plus.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 
@@ -120,9 +119,9 @@ class GyroscopeSteering extends BaseDevice {
       if (_estimator.stillTimeSec >= 0.6) {
         _estimator.calibrate(seedBiasZRadPerSec: _estimator.biasZRadPerSec);
         _isCalibrated = true;
-        actionStreamInternal.add(
+        /*actionStreamInternal.add(
           AlertNotification(LogLevel.LOGLEVEL_INFO, 'Calibration complete.'),
-        );
+        );*/
       }
       return;
     }
@@ -246,9 +245,6 @@ class GyroscopeSteering extends BaseDevice {
                         _lastGyroUpdate = null;
                         _lastRoundedAngle = null;
                         _lastSteeringButton = null;
-                        actionStreamInternal.add(
-                          AlertNotification(LogLevel.LOGLEVEL_INFO, 'Calibrating the sensors now.'),
-                        );
                         setState(() {});
                       },
                 child: Text(_isCalibrated ? 'Calibrate' : 'Calibrating...'),

lib/bluetooth/devices/zwift/ftms_mdns_emulator.dart

@@ -83,18 +83,18 @@ class FtmsMdnsEmulator extends TrainerConnection {
 
       final bytes = status.writeToBuffer();
 
-      clickEmulator.write(bytes);
+      clickEmulator.writeNotification(bytes);
     }
 
     if (isKeyUp) {
-      clickEmulator.write(
-        Uint8List.fromList([Opcode.CONTROLLER_NOTIFICATION.value, 0x08, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F]),
+      clickEmulator.writeNotification(
+        Uint8List.fromList([0x08, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F]),
       );
     }
     if (kDebugMode) {
-      print('Sent action $isKeyUp vs $isKeyDown ${keyPair.inGameAction!.title} to Zwift Emulator');
+      print('Sent action up $isKeyUp vs down $isKeyDown ${keyPair.inGameAction!.title} to Zwift Emulator');
     }
-    return Success('Sent action: ${keyPair.inGameAction!.title}');
+    return Success('Sent action ${isKeyDown ? 'down' : ''} ${isKeyUp ? 'up' : ''}: ${keyPair.inGameAction!.title}');
   }
 }
 

lib/bluetooth/devices/zwift/zwift_clickv2.dart

@@ -56,6 +56,13 @@ class ZwiftClickV2 extends ZwiftRide {
     return lastUnlock > DateTime.now().subtract(const Duration(days: 1));
   }
 
+  @override
+  Future<void> setupHandshake() async {
+    if (isUnlocked) {
+      super.setupHandshake();
+    }
+  }
+
   @override
   Future<void> handleServices(List<BleService> services) async {
     emulator.handleServices(services);

lib/utils/iap/revenuecat_service.dart

@@ -314,19 +314,27 @@ class RevenueCatService {
 
   /// Increment the daily command count
   Future<void> incrementCommandCount() async {
-    final today = DateTime.now().toIso8601String().split('T')[0];
-    final lastDate = await _prefs.read(key: _lastCommandDateKey);
+    try {
+      final today = DateTime.now().toIso8601String().split('T')[0];
+      final lastDate = await _prefs.read(key: _lastCommandDateKey);
 
-    if (lastDate != today) {
-      // Reset counter for new day
-      _lastCommandDate = today;
-      _dailyCommandCount = 1;
-      await _prefs.write(key: _lastCommandDateKey, value: today);
-      await _prefs.write(key: _dailyCommandCountKey, value: '1');
-    } else {
+      if (lastDate != today) {
+        // Reset counter for new day
+        _lastCommandDate = today;
+        _dailyCommandCount = 1;
+        await _prefs.write(key: _lastCommandDateKey, value: today);
+        await _prefs.write(key: _dailyCommandCountKey, value: '1');
+      } else {
+        final count = _dailyCommandCount ?? 0;
+        _dailyCommandCount = count + 1;
+        await _prefs.write(key: _dailyCommandCountKey, value: _dailyCommandCount.toString());
+      }
+    } catch (e, s) {
       final count = _dailyCommandCount ?? 0;
       _dailyCommandCount = count + 1;
-      await _prefs.write(key: _dailyCommandCountKey, value: _dailyCommandCount.toString());
+      // e.g. https://github.com/jonasbark/swiftcontrol/issues/279
+      debugPrint('Error incrementing command count: $e');
+      recordError(e, s, context: 'Incrementing command count');
     }
   }
 

lib/utils/keymap/keymap.dart

@@ -108,6 +108,7 @@ class Keymap {
         KeyPair(
           touchPosition: Offset.zero,
           buttons: [button],
+          inGameAction: button.action,
           physicalKey: null,
           logicalKey: null,
           isLongPress: false,

lib/utils/keymap/manager.dart

@@ -247,9 +247,11 @@ class KeymapManager {
       } else {
         final customApp = CustomApp(profileName: newName);
 
-        final connectedDevice = core.connection.devices.firstOrNull;
+        final connectedDeviceButtons = IterableFlatMap(
+          core.connection.controllerDevices,
+        ).flatMap((e) => e.availableButtons).toSet();
         core.actionHandler.supportedApp!.keymap.keyPairs.forEachIndexed((pair, index) {
-          pair.buttons.filter((button) => connectedDevice?.availableButtons.contains(button) == true).forEachIndexed((
+          pair.buttons.filter((button) => connectedDeviceButtons.contains(button) == true).forEachIndexed((
             button,
             indexB,
           ) {
@@ -288,9 +290,11 @@ class KeymapManager {
     } else {
       final customApp = CustomApp(profileName: newName);
 
-      final connectedDevice = core.connection.devices.firstOrNull;
+      final connectedDeviceButtons = IterableFlatMap(
+        core.connection.controllerDevices,
+      ).flatMap((e) => e.availableButtons).toSet();
       core.actionHandler.supportedApp!.keymap.keyPairs.forEachIndexed((pair, index) {
-        pair.buttons.filter((button) => connectedDevice?.availableButtons.contains(button) == true).forEachIndexed((
+        pair.buttons.filter((button) => connectedDeviceButtons.contains(button) == true).forEachIndexed((
           button,
           indexB,
         ) {

pubspec.yaml

@@ -1,7 +1,7 @@
 name: bike_control
 description: "BikeControl - Control your virtual riding"
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
-version: 4.6.0+88
+version: 4.6.2+91
 
 environment:
   sdk: ^3.9.0