less messages when calibrating

Updated YouTube video link in README.

.github/workflows/build.yml

@@ -28,14 +28,10 @@ on:
         required: false
         default: true
         type: boolean
-      build_web:
-        description: 'Build for Web'
-        required: false
-        default: false
-        type: boolean
 
 env:
   SHOREBIRD_TOKEN: ${{ secrets.SHOREBIRD_TOKEN }}
+  FLUTTER_VERSION_MAC: 3.41.0-0.0.pre
   FLUTTER_VERSION: 3.38.7
 
 jobs:
@@ -52,6 +48,9 @@ jobs:
       #1 Checkout Repository
       - name: Checkout Repository
         uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          token: ${{ secrets.PAT_TOKEN }}
 
       - name: Install certificates
         if: inputs.build_mac || inputs.build_ios
@@ -97,16 +96,17 @@ jobs:
           cp $PP_PATH_MACOS ~/Library/MobileDevice/Provisioning\ Profiles
 
       - name: 🐦 Setup Shorebird
-        if: inputs.build_mac || inputs.build_android || inputs.build_ios || inputs.build_web
+        #if: inputs.build_mac || inputs.build_android || inputs.build_ios
+        if: inputs.build_android || inputs.build_ios
         uses: shorebirdtech/setup-shorebird@v1
         with:
           cache: true
 
-      - name: Set Up Flutter
+      - name: Set Up Flutter maCOS
         uses: subosito/flutter-action@v2
         with:
           channel: 'beta'
-          #flutter-version: ${{ env.FLUTTER_VERSION }}
+          flutter-version: ${{ env.FLUTTER_VERSION_MAC }}
 
       - name: Generate translation files
         run: |
@@ -114,12 +114,23 @@ jobs:
           flutter pub global run intl_utils:generate;
 
       - name: 🚀 Shorebird Release macOS
-        if: inputs.build_mac
+        if: inputs.build_mac && false
         uses: shorebirdtech/shorebird-release@v1
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
           platform: macos
-          args: "-- --dart-define=VERIFYING_SHARED_SECRET=${{ secrets.VERIFYING_SHARED_SECRET }} --dart-define=REVENUECAT_API_KEY_IOS=${{ secrets.REVENUECAT_API_KEY_IOS }}"
+          args: "-- --obfuscate --split-debug-info=symbols --dart-define=VERIFYING_SHARED_SECRET=${{ secrets.VERIFYING_SHARED_SECRET }} --dart-define=REVENUECAT_API_KEY_IOS=${{ secrets.REVENUECAT_API_KEY_IOS }}"
+
+      - name: Flutter Release macOS
+        if: inputs.build_mac
+        run:
+          flutter build macos --release --obfuscate --split-debug-info=symbols --dart-define=VERIFYING_SHARED_SECRET=${{ secrets.VERIFYING_SHARED_SECRET }} --dart-define=REVENUECAT_API_KEY_IOS=${{ secrets.REVENUECAT_API_KEY_IOS }}
+
+      - name: Set Up Flutter Rest
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+          flutter-version: ${{ env.FLUTTER_VERSION }}
 
       - name: Decode Keystore
         if: inputs.build_android
@@ -133,7 +144,7 @@ jobs:
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
           platform: android
-          args: "-- --dart-define=REVENUECAT_API_KEY_ANDROID=${{ secrets.REVENUECAT_API_KEY_ANDROID }}"
+          args: "-- --obfuscate --split-debug-info=symbols --dart-define=REVENUECAT_API_KEY_ANDROID=${{ secrets.REVENUECAT_API_KEY_ANDROID }}"
 
       - name: Extract latest changelog
         id: changelog
@@ -201,6 +212,13 @@ jobs:
           version=$(grep '^version: ' pubspec.yaml | cut -d ' ' -f 2 | tr -d '\r')
           echo "VERSION=$version" >> $GITHUB_ENV
 
+      - name: Upload Symbols
+        uses: actions/upload-artifact@v4
+        with:
+          overwrite: true
+          name: Symbols
+          path: symbols/
+
         #13 Create Release
       - name: Create Release
         if: inputs.build_github
@@ -222,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
@@ -239,8 +260,8 @@ jobs:
       - name: Set Up Flutter
         uses: subosito/flutter-action@v2
         with:
-          channel: 'beta'
-          #flutter-version: ${{ env.FLUTTER_VERSION }}
+          channel: 'stable'
+          flutter-version: ${{ env.FLUTTER_VERSION }}
 
       - name: Generate translation files
         run: |
@@ -252,6 +273,7 @@ jobs:
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
           platform: windows
+          args: "-- --obfuscate --split-debug-info=symbols-win"
 
       - name: Zip directory (Windows)
         shell: pwsh
@@ -298,3 +320,4 @@ jobs:
           name: Releases
           path: |
             build/windows/x64/runner/Release/bike_control.msix
+            symbols-win/

.github/workflows/patch.yml

@@ -21,6 +21,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
@@ -159,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

.github/workflows/web.yml

@@ -17,6 +17,7 @@ jobs:
   build:
     name: Build Web
     runs-on: macos-latest
+    if: false
 
     permissions:
       id-token: write
@@ -27,6 +28,9 @@ jobs:
       #1 Checkout Repository
       - name: Checkout Repository
         uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          token: ${{ secrets.PAT_TOKEN }}
 
         #3 Setup Flutter
       - name: Set Up Flutter

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "prop"]
+	path = prop
+	url = git@github.com:OpenBikeControl/prop.git

CHANGELOG.md

@@ -1,3 +1,9 @@
+### 4.6.0 (28-01-2026)
+
+**Features**:
+- Improve Zwift Click V2 connection and handling
+- Buttons in Configuration are now grouped by device
+
 ### 4.5.0 (22-01-2026)
 
 **Features**:

INSTRUCTIONS_MYWHOOSH_LINK.md

@@ -17,7 +17,7 @@ This is a network/local-discovery problem. BikeControl needs the same kind of lo
 Checklist:
 - Use the MyWhoosh Link app to confirm if "Link" works in general
 - Use MyWhoosh Link app and connect, then close it, then open up BikeControl - this is key for some users
-- Both devices are on the **same Wi‑Fi SSID**
+- Both devices (if you use BikeControl on another device than MyWhoosh) are on the **same Wi‑Fi SSID**
   - Avoid “Guest” networks
   - Avoid “extenders/mesh guest mode” and networks with device isolation
 - If your router has it, disable:

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/connection.dart

@@ -6,8 +6,6 @@ import 'package:bike_control/bluetooth/devices/gamepad/gamepad_device.dart';
 import 'package:bike_control/bluetooth/devices/gyroscope/gyroscope_steering.dart';
 import 'package:bike_control/bluetooth/devices/hid/hid_device.dart';
 import 'package:bike_control/bluetooth/devices/wahoo/wahoo_kickr_headwind.dart';
-import 'package:bike_control/bluetooth/devices/zwift/ftms_mdns_emulator.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
 import 'package:bike_control/gen/l10n.dart';
 import 'package:bike_control/main.dart';
 import 'package:bike_control/utils/core.dart';
@@ -17,6 +15,7 @@ import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:gamepads/gamepads.dart';
+import 'package:prop/prop.dart';
 import 'package:universal_ble/universal_ble.dart';
 
 import 'devices/base_device.dart';
@@ -95,7 +94,7 @@ class Connection {
       if (_lastScanResult.none((e) => e.deviceId == result.deviceId && e.services.contentEquals(result.services))) {
         _lastScanResult.add(result);
 
-        if (kDebugMode) {
+        if (false) {
           debugPrint('Scan result: ${result.name} - ${result.deviceId}');
         }
 

lib/bluetooth/devices/base_device.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:bike_control/bluetooth/devices/zwift/constants.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart' show LogLevel;
 import 'package:bike_control/gen/l10n.dart';
 import 'package:bike_control/main.dart';
 import 'package:bike_control/utils/actions/desktop.dart';
@@ -12,6 +11,7 @@ import 'package:bike_control/utils/keymap/manager.dart';
 import 'package:dartx/dartx.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:prop/prop.dart' show LogLevel;
 
 import '../../utils/keymap/buttons.dart';
 import '../messages/notification.dart';
@@ -19,12 +19,25 @@ import '../messages/notification.dart';
 abstract class BaseDevice {
   final String? _name;
   final bool isBeta;
+  final String uniqueId;
   final List<ControllerButton> availableButtons;
 
-  BaseDevice(this._name, {required this.availableButtons, this.isBeta = false}) {
+  BaseDevice(
+    this._name, {
+    required this.uniqueId,
+    required this.availableButtons,
+    this.isBeta = false,
+    String? buttonPrefix,
+  }) {
     if (availableButtons.isEmpty && core.actionHandler.supportedApp is CustomApp) {
-      // TODO we should verify where the buttons came from
-      final allButtons = core.actionHandler.supportedApp!.keymap.keyPairs.flatMap((e) => e.buttons);
+      final allButtons = core.actionHandler.supportedApp!.keymap.keyPairs
+          .flatMap((e) => e.buttons)
+          .filter(
+            (e) =>
+                e.sourceDeviceId == uniqueId ||
+                (e.sourceDeviceId == null && buttonPrefix != null && e.name.startsWith(buttonPrefix)),
+          )
+          .toSet();
       availableButtons.addAll(allButtons);
     }
   }
@@ -214,7 +227,11 @@ abstract class BaseDevice {
       // should we display this to the user?
       KeymapManager().duplicateSync(currentProfile, '$currentProfile (Copy)');
     }
-    final button = core.actionHandler.supportedApp!.keymap.getOrAddButton(key, creator);
+    var createdButton = creator();
+    if (createdButton.sourceDeviceId == null) {
+      createdButton = createdButton.copyWith(sourceDeviceId: uniqueId);
+    }
+    final button = core.actionHandler.supportedApp!.keymap.getOrAddButton(key, createdButton);
 
     if (availableButtons.none((e) => e.name == button.name)) {
       availableButtons.add(button);

lib/bluetooth/devices/bluetooth_device.dart

@@ -42,12 +42,15 @@ abstract class BluetoothDevice extends BaseDevice {
     required List<ControllerButton> availableButtons,
     bool allowMultiple = false,
     bool isBeta = false,
+    String? buttonPrefix,
   }) : super(
          scanResult.name,
+         uniqueId: scanResult.deviceId,
          availableButtons: allowMultiple
              ? availableButtons.map((b) => b.copyWith(sourceDeviceId: scanResult.deviceId)).toList()
              : availableButtons,
          isBeta: isBeta,
+         buttonPrefix: buttonPrefix,
        ) {
     rssi = scanResult.rssi;
   }
@@ -127,9 +130,6 @@ abstract class BluetoothDevice extends BaseDevice {
           OpenBikeControlDevice(scanResult),
         _ when scanResult.services.contains(WahooKickrHeadwindConstants.SERVICE_UUID.toLowerCase()) =>
           WahooKickrHeadwind(scanResult),
-        _ when scanResult.services.contains(ThinkRiderVs200Constants.SERVICE_UUID.toLowerCase()) => ThinkRiderVs200(
-          scanResult,
-        ),
         // otherwise the service UUIDs will be used
         _ => null,
       };

lib/bluetooth/devices/gamepad/gamepad_device.dart

@@ -14,7 +14,7 @@ import 'package:shadcn_flutter/shadcn_flutter.dart';
 class GamepadDevice extends BaseDevice {
   final String id;
 
-  GamepadDevice(super.name, {required this.id}) : super(availableButtons: []);
+  GamepadDevice(super.name, {required this.id}) : super(availableButtons: [], uniqueId: id);
 
   List<ControllerButton> _lastButtonsClicked = [];
 
@@ -32,7 +32,7 @@ class GamepadDevice extends BaseDevice {
       final buttonKey = event.type == KeyType.analog ? '${event.key}_$normalizedValue' : event.key;
       ControllerButton button = getOrAddButton(
         buttonKey,
-        () => ControllerButton(buttonKey),
+        () => ControllerButton(buttonKey, sourceDeviceId: id),
       );
 
       switch (event.type) {

lib/bluetooth/devices/gyroscope/gyroscope_steering.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:bike_control/bluetooth/devices/base_device.dart';
 import 'package:bike_control/bluetooth/devices/gyroscope/steering_estimator.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/pages/device.dart';
 import 'package:bike_control/utils/core.dart';
@@ -22,6 +21,8 @@ class GyroscopeSteering extends BaseDevice {
         'Phone Steering',
         availableButtons: GyroscopeSteeringButtons.values,
         isBeta: true,
+        uniqueId: 'gyroscope_steering_device',
+        buttonPrefix: 'gyro',
       );
 
   StreamSubscription<GyroscopeEvent>? _gyroscopeSubscription;
@@ -118,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;
     }
@@ -244,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/hid/hid_device.dart

@@ -8,7 +8,7 @@ import 'package:flutter/material.dart' show PopupMenuButton, PopupMenuItem;
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 
 class HidDevice extends BaseDevice {
-  HidDevice(super.name) : super(availableButtons: []);
+  HidDevice(super.name) : super(availableButtons: [], uniqueId: name!);
 
   @override
   Future<void> connect() {
@@ -21,7 +21,7 @@ class HidDevice extends BaseDevice {
       children: [
         Row(
           children: [
-            Expanded(child: Text(toString())),
+            Expanded(child: Text(toString()).bold),
             PopupMenuButton(
               itemBuilder: (c) => [
                 PopupMenuItem(

lib/bluetooth/devices/mywhoosh/link.dart

@@ -2,7 +2,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:bike_control/bluetooth/devices/trainer_connection.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
+import 'package:prop/prop.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/gen/l10n.dart';
 import 'package:bike_control/utils/actions/base_actions.dart';

lib/bluetooth/devices/openbikecontrol/obc_ble_emulator.dart

@@ -4,8 +4,6 @@ import 'package:bike_control/bluetooth/ble.dart';
 import 'package:bike_control/bluetooth/devices/openbikecontrol/openbikecontrol_device.dart';
 import 'package:bike_control/bluetooth/devices/openbikecontrol/protocol_parser.dart';
 import 'package:bike_control/bluetooth/devices/trainer_connection.dart';
-import 'package:bike_control/bluetooth/devices/zwift/ftms_mdns_emulator.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pbenum.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart' show AlertNotification, LogNotification;
 import 'package:bike_control/utils/actions/base_actions.dart';
 import 'package:bike_control/utils/core.dart';
@@ -15,6 +13,7 @@ import 'package:bike_control/widgets/title.dart';
 import 'package:bluetooth_low_energy/bluetooth_low_energy.dart';
 import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
+import 'package:prop/prop.dart';
 
 class OpenBikeControlBluetoothEmulator extends TrainerConnection {
   late final _peripheralManager = PeripheralManager();

lib/bluetooth/devices/openbikecontrol/obc_mdns_emulator.dart

@@ -3,8 +3,6 @@ import 'dart:io';
 import 'package:bike_control/bluetooth/devices/openbikecontrol/openbikecontrol_device.dart';
 import 'package:bike_control/bluetooth/devices/openbikecontrol/protocol_parser.dart';
 import 'package:bike_control/bluetooth/devices/trainer_connection.dart';
-import 'package:bike_control/bluetooth/devices/zwift/ftms_mdns_emulator.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/utils/actions/base_actions.dart';
 import 'package:bike_control/utils/core.dart';
@@ -13,6 +11,7 @@ import 'package:bike_control/utils/keymap/keymap.dart';
 import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
 import 'package:nsd/nsd.dart';
+import 'package:prop/prop.dart';
 
 class OpenBikeControlMdnsEmulator extends TrainerConnection {
   ServerSocket? _server;

lib/bluetooth/devices/openbikecontrol/openbikecontrol_device.dart

@@ -1,6 +1,6 @@
 import 'dart:typed_data';
 
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
+import 'package:prop/prop.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/widgets/title.dart';
 import 'package:universal_ble/universal_ble.dart';

lib/bluetooth/devices/openbikecontrol/protocol_parser.dart

@@ -8,9 +8,9 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:bike_control/bluetooth/devices/zwift/ftms_mdns_emulator.dart';
 import 'package:bike_control/utils/keymap/buttons.dart';
 import 'package:dartx/dartx.dart';
+import 'package:prop/prop.dart';
 
 class ProtocolParseException implements Exception {
   final String message;

lib/bluetooth/devices/shimano/shimano_di2.dart

@@ -10,7 +10,7 @@ import 'package:universal_ble/universal_ble.dart';
 import '../bluetooth_device.dart';
 
 class ShimanoDi2 extends BluetoothDevice {
-  ShimanoDi2(super.scanResult) : super(availableButtons: []);
+  ShimanoDi2(super.scanResult) : super(availableButtons: [], buttonPrefix: 'D-Fly Channel ');
 
   @override
   Future<void> handleServices(List<BleService> services) async {
@@ -42,7 +42,7 @@ class ShimanoDi2 extends BluetoothDevice {
 
           getOrAddButton(
             'D-Fly Channel $readableIndex',
-            () => ControllerButton('D-Fly Channel $readableIndex'),
+            () => ControllerButton('D-Fly Channel $readableIndex', sourceDeviceId: device.deviceId),
           );
         });
         _isInitialized = true;
@@ -59,7 +59,7 @@ class ShimanoDi2 extends BluetoothDevice {
 
         final button = getOrAddButton(
           'D-Fly Channel $readableIndex',
-          () => ControllerButton('D-Fly Channel $readableIndex'),
+          () => ControllerButton('D-Fly Channel $readableIndex', sourceDeviceId: device.deviceId),
         );
         if (didChange) {
           clickedButtons.add(button);

lib/bluetooth/devices/sram/sram_axs.dart

@@ -1,9 +1,9 @@
 import 'dart:async';
 
-import 'package:bike_control/bluetooth/devices/zwift/ftms_mdns_emulator.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/keymap/buttons.dart';
 import 'package:flutter/foundation.dart';
+import 'package:prop/prop.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:universal_ble/universal_ble.dart';
 
@@ -43,12 +43,12 @@ class SramAxs extends BluetoothDevice {
 
   ControllerButton _singleClickButton() => getOrAddButton(
     'SRAM Tap',
-    () => const ControllerButton('SRAM Tap', action: InGameAction.shiftUp),
+    () => ControllerButton('SRAM Tap', action: InGameAction.shiftUp, sourceDeviceId: device.deviceId),
   );
 
   ControllerButton _doubleClickButton() => getOrAddButton(
     'SRAM Double Tap',
-    () => const ControllerButton('SRAM Double Tap', action: InGameAction.shiftDown),
+    () => ControllerButton('SRAM Double Tap', action: InGameAction.shiftDown, sourceDeviceId: device.deviceId),
   );
 
   void _emitClick(ControllerButton button) {

lib/bluetooth/devices/wahoo/wahoo_kickr_headwind.dart

@@ -1,10 +1,10 @@
 import 'dart:typed_data';
 
-import 'package:bike_control/bluetooth/devices/zwift/ftms_mdns_emulator.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/utils/actions/base_actions.dart';
 import 'package:bike_control/utils/keymap/buttons.dart';
 import 'package:bike_control/utils/keymap/keymap.dart';
+import 'package:prop/prop.dart';
 import 'package:universal_ble/universal_ble.dart';
 
 import '../bluetooth_device.dart';

lib/bluetooth/devices/zwift/ftms_mdns_emulator.dart

@@ -1,9 +1,4 @@
-import 'dart:io';
-
 import 'package:bike_control/bluetooth/devices/trainer_connection.dart';
-import 'package:bike_control/bluetooth/devices/zwift/constants.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pbenum.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zwift.pb.dart' show RideKeyPadStatus;
 import 'package:bike_control/bluetooth/devices/zwift/zwift_ride.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/gen/l10n.dart';
@@ -11,17 +6,13 @@ import 'package:bike_control/utils/actions/base_actions.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/keymap/buttons.dart';
 import 'package:bike_control/utils/keymap/keymap.dart';
-import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
-import 'package:nsd/nsd.dart';
+import 'package:prop/prop.dart' hide RideButtonMask;
 
 class FtmsMdnsEmulator extends TrainerConnection {
-  ServerSocket? _tcpServer;
-  Registration? _mdnsRegistration;
-
   static const String connectionTitle = 'Zwift Network Emulator';
 
-  Socket? _socket;
+  late final ClickEmulator clickEmulator = ClickEmulator();
   var lastMessageId = 0;
 
   FtmsMdnsEmulator()
@@ -39,299 +30,30 @@ class FtmsMdnsEmulator extends TrainerConnection {
           InGameAction.back,
           InGameAction.rideOnBomb,
         ],
-      );
-
-  Future<void> startServer() async {
-    isStarted.value = true;
-    print('Starting mDNS server...');
-
-    // Get local IP
-    final interfaces = await NetworkInterface.list();
-    InternetAddress? localIP;
-
-    for (final interface in interfaces) {
-      for (final addr in interface.addresses) {
-        if (addr.type == InternetAddressType.IPv4 && !addr.isLoopback) {
-          localIP = addr;
-          break;
-        }
-      }
-      if (localIP != null) break;
-    }
-
-    if (localIP == null) {
-      throw 'Could not find network interface';
-    }
-
-    await _createTcpServer();
-
-    if (kDebugMode) {
-      enableLogging(LogTopic.calls);
-      enableLogging(LogTopic.errors);
-    }
-    disableServiceTypeValidation(true);
-
-    _mdnsRegistration = await register(
-      Service(
-        name: 'KICKR BIKE PRO 1337',
-        addresses: [localIP],
-        port: 36867,
-        type: '_wahoo-fitness-tnp._tcp',
-        txt: {
-          'ble-service-uuids': Uint8List.fromList('FC82'.codeUnits),
-          'mac-address': Uint8List.fromList('50-50-25-6C-66-9C'.codeUnits),
-          'serial-number': Uint8List.fromList('244700181'.codeUnits),
-          'manufacturer-data': Uint8List.fromList('094A0BAAAA'.codeUnits),
-        },
-      ),
-    );
-    print('Server started - advertising service!');
-  }
-
-  void stop() {
-    isStarted.value = false;
-    isConnected.value = false;
-    _tcpServer?.close();
-    if (_mdnsRegistration != null) {
-      unregister(_mdnsRegistration!);
-    }
-    _tcpServer = null;
-    _mdnsRegistration = null;
-    _socket = null;
-    print('Stopped FtmsMdnsEmulator');
-  }
-
-  Future<void> _createTcpServer() async {
-    try {
-      _tcpServer = await ServerSocket.bind(
-        InternetAddress.anyIPv6,
-        36867,
-        shared: true,
-        v6Only: false,
-      );
-    } catch (e) {
-      if (kDebugMode) {
-        print('Failed to start server: $e');
-      }
-      rethrow;
-    }
-    if (kDebugMode) {
-      print('Server started on port ${_tcpServer!.port}');
-    }
-
-    // Accept connection
-    _tcpServer!.listen(
-      (Socket socket) {
-        _socket = socket;
-        isConnected.value = true;
-        if (kDebugMode) {
-          print('Client connected: ${socket.remoteAddress.address}:${socket.remotePort}');
-        }
+      ) {
+    clickEmulator.isStarted.addListener(() {
+      isStarted.value = clickEmulator.isStarted.value;
+    });
+    clickEmulator.isConnected.addListener(() {
+      isConnected.value = clickEmulator.isConnected.value;
+      if (isConnected.value) {
         core.connection.signalNotification(
           AlertNotification(LogLevel.LOGLEVEL_INFO, AppLocalizations.current.connected),
         );
-
-        // Listen for data from the client
-        socket.listen(
-          (List<int> data) {
-            if (kDebugMode) {
-              print('Received message: ${bytesToHex(data)}');
-            }
-
-            final mutable = data.toList();
-            while (mutable.isNotEmpty) {
-              final msgVersion = mutable.takeUInt8();
-              final msgId = mutable.takeUInt8();
-              lastMessageId = msgId;
-              final seqNum = mutable.takeUInt8();
-              final respCode = mutable.takeUInt8(); // Response Code
-              final length = mutable.takeUInt16BE(); // Length of the message body
-
-              final body = mutable.takeBytes(length);
-              if (kDebugMode) {
-                print('Parsed message: ID: $msgId, Body: ${bytesToHex(body)}');
-              }
-
-              Uint8List buildHeader(int responseCode, int bodyLength) {
-                return Uint8List.fromList([
-                  msgVersion,
-                  msgId,
-                  seqNum,
-                  responseCode,
-                  (bodyLength >> 8) & 0xFF,
-                  bodyLength & 0xFF,
-                ]);
-              }
-
-              switch (msgId) {
-                case FtmsMdnsConstants.DC_MESSAGE_DISCOVER_SERVICES:
-                  final body = hexToBytes(ZwiftConstants.ZWIFT_RIDE_CUSTOM_SERVICE_UUID.toNonDash());
-
-                  final header = buildHeader(FtmsMdnsConstants.DC_RC_REQUEST_COMPLETED_SUCCESSFULLY, body.length);
-                  final bytes = [...header, ...body];
-
-                  // Expected 0101000000100000fc8200001000800000805f9b34fb
-                  // Got      0101000000100000fc8200001000800000805f9b34fb
-                  _write(socket, bytes);
-                case FtmsMdnsConstants.DC_MESSAGE_DISCOVER_CHARACTERISTICS:
-                  final rawUUID = body.takeBytes(16);
-                  final serviceUUID = bytesToHex(rawUUID).toUUID();
-                  if (serviceUUID == ZwiftConstants.ZWIFT_RIDE_CUSTOM_SERVICE_UUID) {
-                    final responseBody = [
-                      ...rawUUID,
-                      ...hexToBytes(ZwiftConstants.ZWIFT_SYNC_RX_CHARACTERISTIC_UUID.toNonDash()),
-                      ...[
-                        _propertyVal(['write']),
-                      ],
-                      ...hexToBytes(ZwiftConstants.ZWIFT_ASYNC_CHARACTERISTIC_UUID.toNonDash()),
-                      ...[
-                        _propertyVal(['notify']),
-                      ],
-                      ...hexToBytes(ZwiftConstants.ZWIFT_SYNC_TX_CHARACTERISTIC_UUID.toNonDash()),
-                      ...[
-                        _propertyVal(['notify']),
-                      ],
-                    ];
-
-                    final responseData = [
-                      ...buildHeader(
-                        FtmsMdnsConstants.DC_RC_REQUEST_COMPLETED_SUCCESSFULLY,
-                        responseBody.length,
-                      ),
-                      ...responseBody,
-                    ];
-
-                    // OK: 0102010000430000fc8200001000800000805f9b34fb0000000319ca465186e5fa29dcdd09d1020000000219ca465186e5fa29dcdd09d1040000000419ca465186e5fa29dcdd09d104
-                    _write(socket, responseData);
-                  }
-                case FtmsMdnsConstants.DC_MESSAGE_READ_CHARACTERISTIC:
-                  final rawUUID = body.takeBytes(16);
-                  final characteristicUUID = bytesToHex(rawUUID).toUUID();
-
-                  print(
-                    'Got Read Characteristic UUID: $characteristicUUID',
-                  );
-
-                  final responseBody = rawUUID;
-                  final responseData = [
-                    ...buildHeader(
-                      FtmsMdnsConstants.DC_RC_REQUEST_COMPLETED_SUCCESSFULLY,
-                      responseBody.length,
-                    ),
-                    ...responseBody,
-                  ];
-
-                  _write(socket, responseData);
-                case FtmsMdnsConstants.DC_MESSAGE_WRITE_CHARACTERISTIC:
-                  final rawUUID = body.takeBytes(16);
-                  final characteristicUUID = bytesToHex(rawUUID).toUUID();
-                  final characteristicData = body.takeBytes(body.length);
-
-                  print(
-                    'Got Write Characteristic UUID: $characteristicUUID, Data: ${bytesToHex(characteristicData)}',
-                  );
-
-                  final responseBody = rawUUID;
-                  final responseData = [
-                    ...buildHeader(
-                      FtmsMdnsConstants.DC_RC_REQUEST_COMPLETED_SUCCESSFULLY,
-                      responseBody.length,
-                    ),
-                    ...responseBody,
-                  ];
-
-                  _write(socket, responseData);
-
-                  final response = core.zwiftEmulator.handleWriteRequest(
-                    characteristicUUID,
-                    Uint8List.fromList(characteristicData),
-                  );
-
-                  if (response != null) {
-                    final seqNum = (lastMessageId + 1) % 256;
-                    lastMessageId = seqNum;
-
-                    final responseBody = [
-                      ...hexToBytes(ZwiftConstants.ZWIFT_SYNC_TX_CHARACTERISTIC_UUID.toLowerCase().toNonDash()),
-                      ...response,
-                    ];
-                    final responseData = [
-                      // header
-                      ...Uint8List.fromList([
-                        msgVersion,
-                        FtmsMdnsConstants.DC_MESSAGE_CHARACTERISTIC_NOTIFICATION,
-                        seqNum,
-                        FtmsMdnsConstants.DC_RC_REQUEST_COMPLETED_SUCCESSFULLY,
-                        (responseBody.length >> 8) & 0xFF,
-                        responseBody.length & 0xFF,
-                      ]),
-                      // body
-                      ...responseBody,
-                    ];
-
-                    // 0106050000180000000419ca465186e5fa29dcdd09d1526964654f6e0203
-                    _write(socket, responseData);
-
-                    if (response.contentEquals(ZwiftConstants.RIDE_ON)) {
-                      _sendKeepAlive();
-                    }
-                  }
-                  return;
-                case FtmsMdnsConstants.DC_MESSAGE_ENABLE_CHARACTERISTIC_NOTIFICATIONS:
-                  final rawUUID = body.takeBytes(16);
-                  final characteristicUUID = bytesToHex(rawUUID).toUUID();
-                  final enabled = body.takeUInt8();
-                  print(
-                    'Got Enable Notifications for Characteristic UUID: $characteristicUUID, Enabled: $enabled',
-                  );
-
-                  final responseBody = rawUUID;
-                  final responseData = [
-                    ...buildHeader(
-                      FtmsMdnsConstants.DC_RC_REQUEST_COMPLETED_SUCCESSFULLY,
-                      responseBody.length,
-                    ),
-                    ...responseBody,
-                  ];
-
-                  _write(socket, responseData);
-                case FtmsMdnsConstants.DC_MESSAGE_CHARACTERISTIC_NOTIFICATION:
-                  print('Hamlo');
-                default:
-                  throw 'DC_ERROR_UNKNOWN_MESSAGE_TYPE';
-              }
-            }
-          },
-          onDone: () {
-            print('Client disconnected: $socket');
-            isConnected.value = false;
-
-            core.connection.signalNotification(
-              AlertNotification(LogLevel.LOGLEVEL_INFO, AppLocalizations.current.disconnected),
-            );
-            _socket = null;
-          },
+      } else {
+        core.connection.signalNotification(
+          AlertNotification(LogLevel.LOGLEVEL_INFO, AppLocalizations.current.disconnected),
         );
-      },
-    );
+      }
+    });
   }
 
-  void _write(Socket socket, List<int> responseData) {
-    if (kDebugMode) {
-      print('Sending response: ${bytesToHex(responseData)}');
-    }
-    socket.add(responseData);
+  Future<void> startServer() async {
+    return clickEmulator.startServer();
   }
 
-  int _propertyVal(List<String> properties) {
-    int res = 0;
-
-    if (properties.contains('read')) res |= 0x01;
-    if (properties.contains('write')) res |= 0x02;
-    if (properties.contains('indicate')) res |= 0x03;
-    if (properties.contains('notify')) res |= 0x04;
-
-    return res;
+  void stop() {
+    clickEmulator.stop();
   }
 
   @override
@@ -361,125 +83,19 @@ class FtmsMdnsEmulator extends TrainerConnection {
 
       final bytes = status.writeToBuffer();
 
-      final commandProto = _buildNotify(
-        ZwiftConstants.ZWIFT_ASYNC_CHARACTERISTIC_UUID,
-        Uint8List.fromList([
-          Opcode.CONTROLLER_NOTIFICATION.value,
-          ...bytes,
-        ]),
-      );
-
-      _write(_socket!, commandProto);
+      clickEmulator.writeNotification(bytes);
     }
 
     if (isKeyUp) {
-      final zero = _buildNotify(
-        ZwiftConstants.ZWIFT_ASYNC_CHARACTERISTIC_UUID,
-        Uint8List.fromList([Opcode.CONTROLLER_NOTIFICATION.value, 0x08, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F]),
+      clickEmulator.writeNotification(
+        Uint8List.fromList([0x08, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F]),
       );
-
-      _write(_socket!, zero);
     }
     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}');
   }
-
-  List<int> _buildNotify(String uuid, final List<int> data) {
-    final seqNum = (lastMessageId + 1) % 256;
-    lastMessageId = seqNum;
-
-    final responseBody = [
-      ...hexToBytes(uuid.toLowerCase().toNonDash()),
-      ...data,
-    ];
-    final responseData = [
-      // header
-      ...Uint8List.fromList([
-        0x01,
-        FtmsMdnsConstants.DC_MESSAGE_CHARACTERISTIC_NOTIFICATION,
-        seqNum,
-        FtmsMdnsConstants.DC_RC_REQUEST_COMPLETED_SUCCESSFULLY,
-        (responseBody.length >> 8) & 0xFF,
-        responseBody.length & 0xFF,
-      ]),
-      // body
-      ...responseBody,
-    ];
-    return responseData;
-  }
-
-  Future<void> _sendKeepAlive() async {
-    await Future.delayed(const Duration(seconds: 5));
-    if (_socket != null) {
-      _write(
-        _socket!,
-        _buildNotify(
-          ZwiftConstants.ZWIFT_SYNC_TX_CHARACTERISTIC_UUID,
-          hexToBytes('B70100002041201C00180004001B4F00B701000020798EC5BDEFCBE4563418269E4926FBE1'),
-        ),
-      );
-      _sendKeepAlive();
-    }
-  }
-}
-
-extension on String {
-  String toNonDash() {
-    return replaceAll('-', '');
-  }
-
-  String toUUID() {
-    return '${substring(0, 8)}-${substring(8, 12)}-${substring(12, 16)}-${substring(16, 20)}-${substring(20)}';
-  }
-}
-
-extension on List<int> {
-  int takeUInt8() {
-    final value = this[0];
-    removeAt(0);
-    return value;
-  }
-
-  int readUInt8(int offset) {
-    return this[offset];
-  }
-
-  int takeUInt16BE() {
-    final value = (this[0] << 8) | this[0 + 1];
-    removeAt(0);
-    removeAt(0);
-    return value;
-  }
-
-  List<int> takeBytes(int length) {
-    final value = sublist(0, length);
-    removeRange(0, length);
-    return value;
-  }
-
-  int readUInt16BE(int i) {
-    final value = (this[i] << 8) | this[i + 1];
-    return value;
-  }
-}
-
-String bytesToHex(List<int> bytes, {bool spaced = false}) {
-  return bytes.map((byte) => byte.toRadixString(16).padLeft(2, '0')).join(spaced ? ' ' : '');
-}
-
-String bytesToReadableHex(List<int> bytes) {
-  return bytes.map((byte) => byte.toRadixString(16).padLeft(2, '0')).join(' ');
-}
-
-List<int> hexToBytes(String hex) {
-  final bytes = <int>[];
-  for (var i = 0; i < hex.length; i += 2) {
-    final byte = hex.substring(i, i + 2);
-    bytes.add(int.parse(byte, radix: 16));
-  }
-  return bytes;
 }
 
 class FtmsMdnsConstants {

lib/bluetooth/devices/zwift/protocol/zp.pbenum.dart

@@ -1,583 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: zp.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-import 'dart:core' as $core;
-
-import 'package:protobuf/protobuf.dart' as $pb;
-
-/// ///////////////////////////////////////////////////////////////
-///  Enumerations
-/// ///////////////////////////////////////////////////////////////
-class Opcode extends $pb.ProtobufEnum {
-  static const Opcode GET = Opcode._(0, _omitEnumNames ? '' : 'GET');
-  static const Opcode DEV_INFO_STATUS = Opcode._(1, _omitEnumNames ? '' : 'DEV_INFO_STATUS');
-  static const Opcode BLE_SECURITY_REQUEST = Opcode._(2, _omitEnumNames ? '' : 'BLE_SECURITY_REQUEST');
-  static const Opcode TRAINER_NOTIF = Opcode._(3, _omitEnumNames ? '' : 'TRAINER_NOTIF');
-  static const Opcode TRAINER_CONFIG_SET = Opcode._(4, _omitEnumNames ? '' : 'TRAINER_CONFIG_SET');
-  static const Opcode TRAINER_CONFIG_STATUS = Opcode._(5, _omitEnumNames ? '' : 'TRAINER_CONFIG_STATUS');
-  static const Opcode DEV_INFO_SET = Opcode._(12, _omitEnumNames ? '' : 'DEV_INFO_SET');
-  static const Opcode POWER_OFF = Opcode._(15, _omitEnumNames ? '' : 'POWER_OFF');
-  static const Opcode RESET = Opcode._(24, _omitEnumNames ? '' : 'RESET');
-  static const Opcode BATTERY_NOTIF = Opcode._(25, _omitEnumNames ? '' : 'BATTERY_NOTIF');
-  static const Opcode CONTROLLER_NOTIFICATION = Opcode._(35, _omitEnumNames ? '' : 'CONTROLLER_NOTIFICATION');
-  static const Opcode LOG_DATA = Opcode._(42, _omitEnumNames ? '' : 'LOG_DATA');
-  static const Opcode SPINDOWN_REQUEST = Opcode._(58, _omitEnumNames ? '' : 'SPINDOWN_REQUEST');
-  static const Opcode SPINDOWN_NOTIFICATION = Opcode._(59, _omitEnumNames ? '' : 'SPINDOWN_NOTIFICATION');
-  static const Opcode GET_RESPONSE = Opcode._(60, _omitEnumNames ? '' : 'GET_RESPONSE');
-  static const Opcode STATUS_RESPONSE = Opcode._(62, _omitEnumNames ? '' : 'STATUS_RESPONSE');
-  static const Opcode SET = Opcode._(63, _omitEnumNames ? '' : 'SET');
-  static const Opcode SET_RESPONSE = Opcode._(64, _omitEnumNames ? '' : 'SET_RESPONSE');
-  static const Opcode LOG_LEVEL_SET = Opcode._(65, _omitEnumNames ? '' : 'LOG_LEVEL_SET');
-  static const Opcode DATA_CHANGE_NOTIFICATION = Opcode._(66, _omitEnumNames ? '' : 'DATA_CHANGE_NOTIFICATION');
-  static const Opcode GAME_STATE_NOTIFICATION = Opcode._(67, _omitEnumNames ? '' : 'GAME_STATE_NOTIFICATION');
-  static const Opcode SENSOR_RELAY_CONFIG = Opcode._(68, _omitEnumNames ? '' : 'SENSOR_RELAY_CONFIG');
-  static const Opcode SENSOR_RELAY_GET = Opcode._(69, _omitEnumNames ? '' : 'SENSOR_RELAY_GET');
-  static const Opcode SENSOR_RELAY_RESPONSE = Opcode._(70, _omitEnumNames ? '' : 'SENSOR_RELAY_RESPONSE');
-  static const Opcode SENSOR_RELAY_NOTIFICATION = Opcode._(71, _omitEnumNames ? '' : 'SENSOR_RELAY_NOTIFICATION');
-  static const Opcode HRM_DATA_NOTIFICATION = Opcode._(72, _omitEnumNames ? '' : 'HRM_DATA_NOTIFICATION');
-  static const Opcode WIFI_CONFIG_REQUEST = Opcode._(73, _omitEnumNames ? '' : 'WIFI_CONFIG_REQUEST');
-  static const Opcode WIFI_NOTIFICATION = Opcode._(74, _omitEnumNames ? '' : 'WIFI_NOTIFICATION');
-  static const Opcode POWER_METER_NOTIFICATION = Opcode._(75, _omitEnumNames ? '' : 'POWER_METER_NOTIFICATION');
-  static const Opcode CADENCE_SENSOR_NOTIFICATION = Opcode._(76, _omitEnumNames ? '' : 'CADENCE_SENSOR_NOTIFICATION');
-  static const Opcode DEVICE_UPDATE_REQUEST = Opcode._(77, _omitEnumNames ? '' : 'DEVICE_UPDATE_REQUEST');
-  static const Opcode RELAY_ZP_MESSAGE = Opcode._(78, _omitEnumNames ? '' : 'RELAY_ZP_MESSAGE');
-  static const Opcode RIDE_ON = Opcode._(82, _omitEnumNames ? '' : 'RIDE_ON');
-  static const Opcode RESERVED = Opcode._(253, _omitEnumNames ? '' : 'RESERVED');
-  static const Opcode LOST_CONTROL = Opcode._(254, _omitEnumNames ? '' : 'LOST_CONTROL');
-  static const Opcode VENDOR_MESSAGE = Opcode._(255, _omitEnumNames ? '' : 'VENDOR_MESSAGE');
-
-  static const $core.List<Opcode> values = <Opcode> [
-    GET,
-    DEV_INFO_STATUS,
-    BLE_SECURITY_REQUEST,
-    TRAINER_NOTIF,
-    TRAINER_CONFIG_SET,
-    TRAINER_CONFIG_STATUS,
-    DEV_INFO_SET,
-    POWER_OFF,
-    RESET,
-    BATTERY_NOTIF,
-    CONTROLLER_NOTIFICATION,
-    LOG_DATA,
-    SPINDOWN_REQUEST,
-    SPINDOWN_NOTIFICATION,
-    GET_RESPONSE,
-    STATUS_RESPONSE,
-    SET,
-    SET_RESPONSE,
-    LOG_LEVEL_SET,
-    DATA_CHANGE_NOTIFICATION,
-    GAME_STATE_NOTIFICATION,
-    SENSOR_RELAY_CONFIG,
-    SENSOR_RELAY_GET,
-    SENSOR_RELAY_RESPONSE,
-    SENSOR_RELAY_NOTIFICATION,
-    HRM_DATA_NOTIFICATION,
-    WIFI_CONFIG_REQUEST,
-    WIFI_NOTIFICATION,
-    POWER_METER_NOTIFICATION,
-    CADENCE_SENSOR_NOTIFICATION,
-    DEVICE_UPDATE_REQUEST,
-    RELAY_ZP_MESSAGE,
-    RIDE_ON,
-    RESERVED,
-    LOST_CONTROL,
-    VENDOR_MESSAGE,
-  ];
-
-  static final $core.Map<$core.int, Opcode> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static Opcode? valueOf($core.int value) => _byValue[value];
-
-  const Opcode._($core.int v, $core.String n) : super(v, n);
-}
-
-/// Data Objects
-class DO extends $pb.ProtobufEnum {
-  static const DO PAGE_DEV_INFO = DO._(0, _omitEnumNames ? '' : 'PAGE_DEV_INFO');
-  static const DO PROTOCOL_VERSION = DO._(1, _omitEnumNames ? '' : 'PROTOCOL_VERSION');
-  static const DO SYSTEM_FW_VERSION = DO._(2, _omitEnumNames ? '' : 'SYSTEM_FW_VERSION');
-  static const DO DEVICE_NAME = DO._(3, _omitEnumNames ? '' : 'DEVICE_NAME');
-  static const DO SERIAL_NUMBER = DO._(5, _omitEnumNames ? '' : 'SERIAL_NUMBER');
-  static const DO SYSTEM_HW_REVISION = DO._(6, _omitEnumNames ? '' : 'SYSTEM_HW_REVISION');
-  static const DO DEVICE_CAPABILITIES = DO._(7, _omitEnumNames ? '' : 'DEVICE_CAPABILITIES');
-  static const DO MANUFACTURER_ID = DO._(8, _omitEnumNames ? '' : 'MANUFACTURER_ID');
-  static const DO PRODUCT_ID = DO._(9, _omitEnumNames ? '' : 'PRODUCT_ID');
-  static const DO DEVICE_UID = DO._(10, _omitEnumNames ? '' : 'DEVICE_UID');
-  static const DO PAGE_CLIENT_SERVER_CONFIGURATION = DO._(16, _omitEnumNames ? '' : 'PAGE_CLIENT_SERVER_CONFIGURATION');
-  static const DO CLIENT_SERVER_NOTIFICATIONS = DO._(17, _omitEnumNames ? '' : 'CLIENT_SERVER_NOTIFICATIONS');
-  static const DO PAGE_DEVICE_UPDATE_INFO = DO._(32, _omitEnumNames ? '' : 'PAGE_DEVICE_UPDATE_INFO');
-  static const DO DEVICE_UPDATE_STATUS = DO._(33, _omitEnumNames ? '' : 'DEVICE_UPDATE_STATUS');
-  static const DO DEVICE_UPDATE_NEW_VERSION = DO._(34, _omitEnumNames ? '' : 'DEVICE_UPDATE_NEW_VERSION');
-  static const DO PAGE_DATE_TIME = DO._(48, _omitEnumNames ? '' : 'PAGE_DATE_TIME');
-  static const DO UTC_DATE_TIME = DO._(49, _omitEnumNames ? '' : 'UTC_DATE_TIME');
-  static const DO PAGE_BLE_SECURITY = DO._(64, _omitEnumNames ? '' : 'PAGE_BLE_SECURITY');
-  static const DO BLE_SECURE_CONNECTION_STATUS = DO._(65, _omitEnumNames ? '' : 'BLE_SECURE_CONNECTION_STATUS');
-  static const DO BLE_SECURE_CONNECTION_WINDOW_STATUS = DO._(66, _omitEnumNames ? '' : 'BLE_SECURE_CONNECTION_WINDOW_STATUS');
-  static const DO PAGE_TRAINER_CONFIG = DO._(512, _omitEnumNames ? '' : 'PAGE_TRAINER_CONFIG');
-  static const DO TRAINER_MODE = DO._(513, _omitEnumNames ? '' : 'TRAINER_MODE');
-  static const DO CFG_RESISTANCE = DO._(514, _omitEnumNames ? '' : 'CFG_RESISTANCE');
-  static const DO ERG_POWER = DO._(515, _omitEnumNames ? '' : 'ERG_POWER');
-  static const DO AVERAGING_WINDOW = DO._(516, _omitEnumNames ? '' : 'AVERAGING_WINDOW');
-  static const DO SIM_WIND = DO._(517, _omitEnumNames ? '' : 'SIM_WIND');
-  static const DO SIM_GRADE = DO._(518, _omitEnumNames ? '' : 'SIM_GRADE');
-  static const DO SIM_REAL_GEAR_RATIO = DO._(519, _omitEnumNames ? '' : 'SIM_REAL_GEAR_RATIO');
-  static const DO SIM_VIRT_GEAR_RATIO = DO._(520, _omitEnumNames ? '' : 'SIM_VIRT_GEAR_RATIO');
-  static const DO SIM_CW = DO._(521, _omitEnumNames ? '' : 'SIM_CW');
-  static const DO SIM_WHEEL_DIAMETER = DO._(522, _omitEnumNames ? '' : 'SIM_WHEEL_DIAMETER');
-  static const DO SIM_BIKE_MASS = DO._(523, _omitEnumNames ? '' : 'SIM_BIKE_MASS');
-  static const DO SIM_RIDER_MASS = DO._(524, _omitEnumNames ? '' : 'SIM_RIDER_MASS');
-  static const DO SIM_CRR = DO._(525, _omitEnumNames ? '' : 'SIM_CRR');
-  static const DO SIM_RESERVED_FRONTAL_AREA = DO._(526, _omitEnumNames ? '' : 'SIM_RESERVED_FRONTAL_AREA');
-  static const DO SIM_EBRAKE = DO._(527, _omitEnumNames ? '' : 'SIM_EBRAKE');
-  static const DO PAGE_TRAINER_GEAR_INDEX_CONFIG = DO._(528, _omitEnumNames ? '' : 'PAGE_TRAINER_GEAR_INDEX_CONFIG');
-  static const DO FRONT_GEAR_INDEX = DO._(529, _omitEnumNames ? '' : 'FRONT_GEAR_INDEX');
-  static const DO FRONT_GEAR_INDEX_MAX = DO._(530, _omitEnumNames ? '' : 'FRONT_GEAR_INDEX_MAX');
-  static const DO FRONT_GEAR_INDEX_MIN = DO._(531, _omitEnumNames ? '' : 'FRONT_GEAR_INDEX_MIN');
-  static const DO REAR_GEAR_INDEX = DO._(532, _omitEnumNames ? '' : 'REAR_GEAR_INDEX');
-  static const DO REAR_GEAR_INDEX_MAX = DO._(533, _omitEnumNames ? '' : 'REAR_GEAR_INDEX_MAX');
-  static const DO REAR_GEAR_INDEX_MIN = DO._(534, _omitEnumNames ? '' : 'REAR_GEAR_INDEX_MIN');
-  static const DO PAGE_TRAINER_CONFIG2 = DO._(544, _omitEnumNames ? '' : 'PAGE_TRAINER_CONFIG2');
-  static const DO HIGH_SPEED_DATA = DO._(545, _omitEnumNames ? '' : 'HIGH_SPEED_DATA');
-  static const DO ERG_POWER_SMOOTHING = DO._(546, _omitEnumNames ? '' : 'ERG_POWER_SMOOTHING');
-  static const DO VIRTUAL_SHIFTING_MODE = DO._(547, _omitEnumNames ? '' : 'VIRTUAL_SHIFTING_MODE');
-  static const DO PAGE_DEVICE_TILT_CONFIG = DO._(560, _omitEnumNames ? '' : 'PAGE_DEVICE_TILT_CONFIG');
-  static const DO DEVICE_TILT_ENABLED = DO._(561, _omitEnumNames ? '' : 'DEVICE_TILT_ENABLED');
-  static const DO DEVICE_TILT_GRADIENT_MIN = DO._(562, _omitEnumNames ? '' : 'DEVICE_TILT_GRADIENT_MIN');
-  static const DO DEVICE_TILT_GRADIENT_MAX = DO._(563, _omitEnumNames ? '' : 'DEVICE_TILT_GRADIENT_MAX');
-  static const DO DEVICE_TILT_GRADIENT = DO._(564, _omitEnumNames ? '' : 'DEVICE_TILT_GRADIENT');
-  static const DO BATTERY_STATE = DO._(771, _omitEnumNames ? '' : 'BATTERY_STATE');
-  static const DO PAGE_CONTROLLER_INPUT_CONFIG = DO._(1024, _omitEnumNames ? '' : 'PAGE_CONTROLLER_INPUT_CONFIG');
-  static const DO INPUT_SUPPORTED_DIGITAL_INPUTS = DO._(1025, _omitEnumNames ? '' : 'INPUT_SUPPORTED_DIGITAL_INPUTS');
-  static const DO INPUT_SUPPORTED_ANALOG_INPUTS = DO._(1026, _omitEnumNames ? '' : 'INPUT_SUPPORTED_ANALOG_INPUTS');
-  static const DO INPUT_ANALOG_INPUT_RANGE = DO._(1027, _omitEnumNames ? '' : 'INPUT_ANALOG_INPUT_RANGE');
-  static const DO INPUT_ANALOG_INPUT_DEADZONE = DO._(1028, _omitEnumNames ? '' : 'INPUT_ANALOG_INPUT_DEADZONE');
-  static const DO PAGE_WIFI_CONFIGURATION = DO._(1056, _omitEnumNames ? '' : 'PAGE_WIFI_CONFIGURATION');
-  static const DO WIFI_ENABLED = DO._(1057, _omitEnumNames ? '' : 'WIFI_ENABLED');
-  static const DO WIFI_STATUS = DO._(1058, _omitEnumNames ? '' : 'WIFI_STATUS');
-  static const DO WIFI_SSID = DO._(1059, _omitEnumNames ? '' : 'WIFI_SSID');
-  static const DO WIFI_BAND = DO._(1060, _omitEnumNames ? '' : 'WIFI_BAND');
-  static const DO WIFI_RSSI = DO._(1061, _omitEnumNames ? '' : 'WIFI_RSSI');
-  static const DO WIFI_REGION_CODE = DO._(1062, _omitEnumNames ? '' : 'WIFI_REGION_CODE');
-  static const DO SENSOR_RELAY_DATA_PAGE = DO._(1280, _omitEnumNames ? '' : 'SENSOR_RELAY_DATA_PAGE');
-  static const DO SENSOR_RELAY_SUPPORTED_SENSORS = DO._(1281, _omitEnumNames ? '' : 'SENSOR_RELAY_SUPPORTED_SENSORS');
-  static const DO SENSOR_RELAY_PAIRED_SENSORS = DO._(1282, _omitEnumNames ? '' : 'SENSOR_RELAY_PAIRED_SENSORS');
-
-  static const $core.List<DO> values = <DO> [
-    PAGE_DEV_INFO,
-    PROTOCOL_VERSION,
-    SYSTEM_FW_VERSION,
-    DEVICE_NAME,
-    SERIAL_NUMBER,
-    SYSTEM_HW_REVISION,
-    DEVICE_CAPABILITIES,
-    MANUFACTURER_ID,
-    PRODUCT_ID,
-    DEVICE_UID,
-    PAGE_CLIENT_SERVER_CONFIGURATION,
-    CLIENT_SERVER_NOTIFICATIONS,
-    PAGE_DEVICE_UPDATE_INFO,
-    DEVICE_UPDATE_STATUS,
-    DEVICE_UPDATE_NEW_VERSION,
-    PAGE_DATE_TIME,
-    UTC_DATE_TIME,
-    PAGE_BLE_SECURITY,
-    BLE_SECURE_CONNECTION_STATUS,
-    BLE_SECURE_CONNECTION_WINDOW_STATUS,
-    PAGE_TRAINER_CONFIG,
-    TRAINER_MODE,
-    CFG_RESISTANCE,
-    ERG_POWER,
-    AVERAGING_WINDOW,
-    SIM_WIND,
-    SIM_GRADE,
-    SIM_REAL_GEAR_RATIO,
-    SIM_VIRT_GEAR_RATIO,
-    SIM_CW,
-    SIM_WHEEL_DIAMETER,
-    SIM_BIKE_MASS,
-    SIM_RIDER_MASS,
-    SIM_CRR,
-    SIM_RESERVED_FRONTAL_AREA,
-    SIM_EBRAKE,
-    PAGE_TRAINER_GEAR_INDEX_CONFIG,
-    FRONT_GEAR_INDEX,
-    FRONT_GEAR_INDEX_MAX,
-    FRONT_GEAR_INDEX_MIN,
-    REAR_GEAR_INDEX,
-    REAR_GEAR_INDEX_MAX,
-    REAR_GEAR_INDEX_MIN,
-    PAGE_TRAINER_CONFIG2,
-    HIGH_SPEED_DATA,
-    ERG_POWER_SMOOTHING,
-    VIRTUAL_SHIFTING_MODE,
-    PAGE_DEVICE_TILT_CONFIG,
-    DEVICE_TILT_ENABLED,
-    DEVICE_TILT_GRADIENT_MIN,
-    DEVICE_TILT_GRADIENT_MAX,
-    DEVICE_TILT_GRADIENT,
-    BATTERY_STATE,
-    PAGE_CONTROLLER_INPUT_CONFIG,
-    INPUT_SUPPORTED_DIGITAL_INPUTS,
-    INPUT_SUPPORTED_ANALOG_INPUTS,
-    INPUT_ANALOG_INPUT_RANGE,
-    INPUT_ANALOG_INPUT_DEADZONE,
-    PAGE_WIFI_CONFIGURATION,
-    WIFI_ENABLED,
-    WIFI_STATUS,
-    WIFI_SSID,
-    WIFI_BAND,
-    WIFI_RSSI,
-    WIFI_REGION_CODE,
-    SENSOR_RELAY_DATA_PAGE,
-    SENSOR_RELAY_SUPPORTED_SENSORS,
-    SENSOR_RELAY_PAIRED_SENSORS,
-  ];
-
-  static final $core.Map<$core.int, DO> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static DO? valueOf($core.int value) => _byValue[value];
-
-  const DO._($core.int v, $core.String n) : super(v, n);
-}
-
-class Status extends $pb.ProtobufEnum {
-  static const Status SUCCESS = Status._(0, _omitEnumNames ? '' : 'SUCCESS');
-  static const Status FAILURE = Status._(1, _omitEnumNames ? '' : 'FAILURE');
-  static const Status BUSY = Status._(2, _omitEnumNames ? '' : 'BUSY');
-  static const Status INVALID_PARAM = Status._(3, _omitEnumNames ? '' : 'INVALID_PARAM');
-  static const Status NOT_PERMITTED = Status._(4, _omitEnumNames ? '' : 'NOT_PERMITTED');
-  static const Status NOT_SUPPORTED = Status._(5, _omitEnumNames ? '' : 'NOT_SUPPORTED');
-  static const Status INVALID_MODE = Status._(6, _omitEnumNames ? '' : 'INVALID_MODE');
-
-  static const $core.List<Status> values = <Status> [
-    SUCCESS,
-    FAILURE,
-    BUSY,
-    INVALID_PARAM,
-    NOT_PERMITTED,
-    NOT_SUPPORTED,
-    INVALID_MODE,
-  ];
-
-  static final $core.Map<$core.int, Status> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static Status? valueOf($core.int value) => _byValue[value];
-
-  const Status._($core.int v, $core.String n) : super(v, n);
-}
-
-class DeviceType extends $pb.ProtobufEnum {
-  static const DeviceType UNDEFINED = DeviceType._(0, _omitEnumNames ? '' : 'UNDEFINED');
-  static const DeviceType CYCLING_TURBO_TRAINER = DeviceType._(1, _omitEnumNames ? '' : 'CYCLING_TURBO_TRAINER');
-  static const DeviceType USER_INPUT_DEVICE = DeviceType._(2, _omitEnumNames ? '' : 'USER_INPUT_DEVICE');
-  static const DeviceType TREADMILL = DeviceType._(3, _omitEnumNames ? '' : 'TREADMILL');
-  static const DeviceType SENSOR_RELAY = DeviceType._(4, _omitEnumNames ? '' : 'SENSOR_RELAY');
-  static const DeviceType HEART_RATE_MONITOR = DeviceType._(5, _omitEnumNames ? '' : 'HEART_RATE_MONITOR');
-  static const DeviceType POWER_METER = DeviceType._(6, _omitEnumNames ? '' : 'POWER_METER');
-  static const DeviceType CADENCE_SENSOR = DeviceType._(7, _omitEnumNames ? '' : 'CADENCE_SENSOR');
-  static const DeviceType WIFI = DeviceType._(8, _omitEnumNames ? '' : 'WIFI');
-
-  static const $core.List<DeviceType> values = <DeviceType> [
-    UNDEFINED,
-    CYCLING_TURBO_TRAINER,
-    USER_INPUT_DEVICE,
-    TREADMILL,
-    SENSOR_RELAY,
-    HEART_RATE_MONITOR,
-    POWER_METER,
-    CADENCE_SENSOR,
-    WIFI,
-  ];
-
-  static final $core.Map<$core.int, DeviceType> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static DeviceType? valueOf($core.int value) => _byValue[value];
-
-  const DeviceType._($core.int v, $core.String n) : super(v, n);
-}
-
-class TrainerMode extends $pb.ProtobufEnum {
-  static const TrainerMode MODE_UNKNOWN = TrainerMode._(0, _omitEnumNames ? '' : 'MODE_UNKNOWN');
-  static const TrainerMode MODE_ERG = TrainerMode._(1, _omitEnumNames ? '' : 'MODE_ERG');
-  static const TrainerMode MODE_RESISTANCE = TrainerMode._(2, _omitEnumNames ? '' : 'MODE_RESISTANCE');
-  static const TrainerMode MODE_SIM = TrainerMode._(3, _omitEnumNames ? '' : 'MODE_SIM');
-
-  static const $core.List<TrainerMode> values = <TrainerMode> [
-    MODE_UNKNOWN,
-    MODE_ERG,
-    MODE_RESISTANCE,
-    MODE_SIM,
-  ];
-
-  static final $core.Map<$core.int, TrainerMode> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static TrainerMode? valueOf($core.int value) => _byValue[value];
-
-  const TrainerMode._($core.int v, $core.String n) : super(v, n);
-}
-
-class ChargingState extends $pb.ProtobufEnum {
-  static const ChargingState CHARGING_IDLE = ChargingState._(0, _omitEnumNames ? '' : 'CHARGING_IDLE');
-  static const ChargingState CHARGING_PROGRESS = ChargingState._(1, _omitEnumNames ? '' : 'CHARGING_PROGRESS');
-  static const ChargingState CHARGING_DONE = ChargingState._(2, _omitEnumNames ? '' : 'CHARGING_DONE');
-
-  static const $core.List<ChargingState> values = <ChargingState> [
-    CHARGING_IDLE,
-    CHARGING_PROGRESS,
-    CHARGING_DONE,
-  ];
-
-  static final $core.Map<$core.int, ChargingState> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static ChargingState? valueOf($core.int value) => _byValue[value];
-
-  const ChargingState._($core.int v, $core.String n) : super(v, n);
-}
-
-class SpindownStatus extends $pb.ProtobufEnum {
-  static const SpindownStatus SPINDOWN_IDLE = SpindownStatus._(0, _omitEnumNames ? '' : 'SPINDOWN_IDLE');
-  static const SpindownStatus SPINDOWN_REQUESTED = SpindownStatus._(1, _omitEnumNames ? '' : 'SPINDOWN_REQUESTED');
-  static const SpindownStatus SPINDOWN_SUCCESS = SpindownStatus._(2, _omitEnumNames ? '' : 'SPINDOWN_SUCCESS');
-  static const SpindownStatus SPINDOWN_ERROR = SpindownStatus._(3, _omitEnumNames ? '' : 'SPINDOWN_ERROR');
-  static const SpindownStatus SPINDOWN_STOP_PEDALLING = SpindownStatus._(4, _omitEnumNames ? '' : 'SPINDOWN_STOP_PEDALLING');
-  static const SpindownStatus SPINDOWN_ERROR_TIMEOUT = SpindownStatus._(5, _omitEnumNames ? '' : 'SPINDOWN_ERROR_TIMEOUT');
-  static const SpindownStatus SPINDOWN_ERROR_TOSHORT = SpindownStatus._(6, _omitEnumNames ? '' : 'SPINDOWN_ERROR_TOSHORT');
-  static const SpindownStatus SPINDOWN_ERROR_TOSLOW = SpindownStatus._(7, _omitEnumNames ? '' : 'SPINDOWN_ERROR_TOSLOW');
-  static const SpindownStatus SPINDOWN_ERROR_TOFAST = SpindownStatus._(8, _omitEnumNames ? '' : 'SPINDOWN_ERROR_TOFAST');
-  static const SpindownStatus SPINDOWN_ERROR_SAMPLEERROR = SpindownStatus._(9, _omitEnumNames ? '' : 'SPINDOWN_ERROR_SAMPLEERROR');
-  static const SpindownStatus SPINDOWN_ERROR_ABORT = SpindownStatus._(10, _omitEnumNames ? '' : 'SPINDOWN_ERROR_ABORT');
-
-  static const $core.List<SpindownStatus> values = <SpindownStatus> [
-    SPINDOWN_IDLE,
-    SPINDOWN_REQUESTED,
-    SPINDOWN_SUCCESS,
-    SPINDOWN_ERROR,
-    SPINDOWN_STOP_PEDALLING,
-    SPINDOWN_ERROR_TIMEOUT,
-    SPINDOWN_ERROR_TOSHORT,
-    SPINDOWN_ERROR_TOSLOW,
-    SPINDOWN_ERROR_TOFAST,
-    SPINDOWN_ERROR_SAMPLEERROR,
-    SPINDOWN_ERROR_ABORT,
-  ];
-
-  static final $core.Map<$core.int, SpindownStatus> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static SpindownStatus? valueOf($core.int value) => _byValue[value];
-
-  const SpindownStatus._($core.int v, $core.String n) : super(v, n);
-}
-
-class LogLevel extends $pb.ProtobufEnum {
-  static const LogLevel LOGLEVEL_OFF = LogLevel._(0, _omitEnumNames ? '' : 'LOGLEVEL_OFF');
-  static const LogLevel LOGLEVEL_ERROR = LogLevel._(1, _omitEnumNames ? '' : 'LOGLEVEL_ERROR');
-  static const LogLevel LOGLEVEL_WARNING = LogLevel._(2, _omitEnumNames ? '' : 'LOGLEVEL_WARNING');
-  static const LogLevel LOGLEVEL_INFO = LogLevel._(3, _omitEnumNames ? '' : 'LOGLEVEL_INFO');
-  static const LogLevel LOGLEVEL_DEBUG = LogLevel._(4, _omitEnumNames ? '' : 'LOGLEVEL_DEBUG');
-  static const LogLevel LOGLEVEL_TRACE = LogLevel._(5, _omitEnumNames ? '' : 'LOGLEVEL_TRACE');
-
-  static const $core.List<LogLevel> values = <LogLevel> [
-    LOGLEVEL_OFF,
-    LOGLEVEL_ERROR,
-    LOGLEVEL_WARNING,
-    LOGLEVEL_INFO,
-    LOGLEVEL_DEBUG,
-    LOGLEVEL_TRACE,
-  ];
-
-  static final $core.Map<$core.int, LogLevel> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static LogLevel? valueOf($core.int value) => _byValue[value];
-
-  const LogLevel._($core.int v, $core.String n) : super(v, n);
-}
-
-class RoadSurfaceType extends $pb.ProtobufEnum {
-  static const RoadSurfaceType ROAD_SURFACE_SMOOTH_TARMAC = RoadSurfaceType._(0, _omitEnumNames ? '' : 'ROAD_SURFACE_SMOOTH_TARMAC');
-  static const RoadSurfaceType ROAD_SURFACE_BRICK_ROAD = RoadSurfaceType._(1, _omitEnumNames ? '' : 'ROAD_SURFACE_BRICK_ROAD');
-  static const RoadSurfaceType ROAD_SURFACE_HARD_COBBLES = RoadSurfaceType._(2, _omitEnumNames ? '' : 'ROAD_SURFACE_HARD_COBBLES');
-  static const RoadSurfaceType ROAD_SURFACE_SOFT_COBBLES = RoadSurfaceType._(3, _omitEnumNames ? '' : 'ROAD_SURFACE_SOFT_COBBLES');
-  static const RoadSurfaceType ROAD_SURFACE_NARROW_WOODEN_PLANKS = RoadSurfaceType._(4, _omitEnumNames ? '' : 'ROAD_SURFACE_NARROW_WOODEN_PLANKS');
-  static const RoadSurfaceType ROAD_SURFACE_WIDE_WOODEN_PLANKS = RoadSurfaceType._(5, _omitEnumNames ? '' : 'ROAD_SURFACE_WIDE_WOODEN_PLANKS');
-  static const RoadSurfaceType ROAD_SURFACE_DIRT = RoadSurfaceType._(6, _omitEnumNames ? '' : 'ROAD_SURFACE_DIRT');
-  static const RoadSurfaceType ROAD_SURFACE_GRAVEL = RoadSurfaceType._(7, _omitEnumNames ? '' : 'ROAD_SURFACE_GRAVEL');
-  static const RoadSurfaceType ROAD_SURFACE_CATTLE_GRID = RoadSurfaceType._(8, _omitEnumNames ? '' : 'ROAD_SURFACE_CATTLE_GRID');
-  static const RoadSurfaceType ROAD_SURFACE_CONCRETE_FLAG_STONES = RoadSurfaceType._(9, _omitEnumNames ? '' : 'ROAD_SURFACE_CONCRETE_FLAG_STONES');
-  static const RoadSurfaceType ROAD_SURFACE_ICE = RoadSurfaceType._(10, _omitEnumNames ? '' : 'ROAD_SURFACE_ICE');
-
-  static const $core.List<RoadSurfaceType> values = <RoadSurfaceType> [
-    ROAD_SURFACE_SMOOTH_TARMAC,
-    ROAD_SURFACE_BRICK_ROAD,
-    ROAD_SURFACE_HARD_COBBLES,
-    ROAD_SURFACE_SOFT_COBBLES,
-    ROAD_SURFACE_NARROW_WOODEN_PLANKS,
-    ROAD_SURFACE_WIDE_WOODEN_PLANKS,
-    ROAD_SURFACE_DIRT,
-    ROAD_SURFACE_GRAVEL,
-    ROAD_SURFACE_CATTLE_GRID,
-    ROAD_SURFACE_CONCRETE_FLAG_STONES,
-    ROAD_SURFACE_ICE,
-  ];
-
-  static final $core.Map<$core.int, RoadSurfaceType> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static RoadSurfaceType? valueOf($core.int value) => _byValue[value];
-
-  const RoadSurfaceType._($core.int v, $core.String n) : super(v, n);
-}
-
-class WifiStatusCode extends $pb.ProtobufEnum {
-  static const WifiStatusCode WIFI_STATUS_DISABLED = WifiStatusCode._(0, _omitEnumNames ? '' : 'WIFI_STATUS_DISABLED');
-  static const WifiStatusCode WIFI_STATUS_NOT_PROVISIONED = WifiStatusCode._(1, _omitEnumNames ? '' : 'WIFI_STATUS_NOT_PROVISIONED');
-  static const WifiStatusCode WIFI_STATUS_SCANNING = WifiStatusCode._(2, _omitEnumNames ? '' : 'WIFI_STATUS_SCANNING');
-  static const WifiStatusCode WIFI_STATUS_DISCONNECTED = WifiStatusCode._(3, _omitEnumNames ? '' : 'WIFI_STATUS_DISCONNECTED');
-  static const WifiStatusCode WIFI_STATUS_CONNECTING = WifiStatusCode._(4, _omitEnumNames ? '' : 'WIFI_STATUS_CONNECTING');
-  static const WifiStatusCode WIFI_STATUS_CONNECTED = WifiStatusCode._(5, _omitEnumNames ? '' : 'WIFI_STATUS_CONNECTED');
-  static const WifiStatusCode WIFI_STATUS_ERROR = WifiStatusCode._(6, _omitEnumNames ? '' : 'WIFI_STATUS_ERROR');
-
-  static const $core.List<WifiStatusCode> values = <WifiStatusCode> [
-    WIFI_STATUS_DISABLED,
-    WIFI_STATUS_NOT_PROVISIONED,
-    WIFI_STATUS_SCANNING,
-    WIFI_STATUS_DISCONNECTED,
-    WIFI_STATUS_CONNECTING,
-    WIFI_STATUS_CONNECTED,
-    WIFI_STATUS_ERROR,
-  ];
-
-  static final $core.Map<$core.int, WifiStatusCode> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static WifiStatusCode? valueOf($core.int value) => _byValue[value];
-
-  const WifiStatusCode._($core.int v, $core.String n) : super(v, n);
-}
-
-class WifiErrorCode extends $pb.ProtobufEnum {
-  static const WifiErrorCode WIFI_ERROR_UNKNOWN = WifiErrorCode._(0, _omitEnumNames ? '' : 'WIFI_ERROR_UNKNOWN');
-  static const WifiErrorCode WIFI_ERROR_NO_MEMORY = WifiErrorCode._(1, _omitEnumNames ? '' : 'WIFI_ERROR_NO_MEMORY');
-  static const WifiErrorCode WIFI_ERROR_INVALID_PARAMETERS = WifiErrorCode._(2, _omitEnumNames ? '' : 'WIFI_ERROR_INVALID_PARAMETERS');
-  static const WifiErrorCode WIFI_ERROR_INVALID_STATE = WifiErrorCode._(3, _omitEnumNames ? '' : 'WIFI_ERROR_INVALID_STATE');
-  static const WifiErrorCode WIFI_ERROR_NOT_FOUND = WifiErrorCode._(4, _omitEnumNames ? '' : 'WIFI_ERROR_NOT_FOUND');
-  static const WifiErrorCode WIFI_ERROR_NOT_SUPPORTED = WifiErrorCode._(5, _omitEnumNames ? '' : 'WIFI_ERROR_NOT_SUPPORTED');
-  static const WifiErrorCode WIFI_ERROR_NOT_ALLOWED = WifiErrorCode._(6, _omitEnumNames ? '' : 'WIFI_ERROR_NOT_ALLOWED');
-  static const WifiErrorCode WIFI_ERROR_NOT_INITIALISED = WifiErrorCode._(7, _omitEnumNames ? '' : 'WIFI_ERROR_NOT_INITIALISED');
-  static const WifiErrorCode WIFI_ERROR_NOT_STARTED = WifiErrorCode._(8, _omitEnumNames ? '' : 'WIFI_ERROR_NOT_STARTED');
-  static const WifiErrorCode WIFI_ERROR_TIMEOUT = WifiErrorCode._(9, _omitEnumNames ? '' : 'WIFI_ERROR_TIMEOUT');
-  static const WifiErrorCode WIFI_ERROR_MODE = WifiErrorCode._(10, _omitEnumNames ? '' : 'WIFI_ERROR_MODE');
-  static const WifiErrorCode WIFI_ERROR_SSID_INVALID = WifiErrorCode._(11, _omitEnumNames ? '' : 'WIFI_ERROR_SSID_INVALID');
-
-  static const $core.List<WifiErrorCode> values = <WifiErrorCode> [
-    WIFI_ERROR_UNKNOWN,
-    WIFI_ERROR_NO_MEMORY,
-    WIFI_ERROR_INVALID_PARAMETERS,
-    WIFI_ERROR_INVALID_STATE,
-    WIFI_ERROR_NOT_FOUND,
-    WIFI_ERROR_NOT_SUPPORTED,
-    WIFI_ERROR_NOT_ALLOWED,
-    WIFI_ERROR_NOT_INITIALISED,
-    WIFI_ERROR_NOT_STARTED,
-    WIFI_ERROR_TIMEOUT,
-    WIFI_ERROR_MODE,
-    WIFI_ERROR_SSID_INVALID,
-  ];
-
-  static final $core.Map<$core.int, WifiErrorCode> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static WifiErrorCode? valueOf($core.int value) => _byValue[value];
-
-  const WifiErrorCode._($core.int v, $core.String n) : super(v, n);
-}
-
-class InterfaceType extends $pb.ProtobufEnum {
-  static const InterfaceType INTERFACE_BLE = InterfaceType._(1, _omitEnumNames ? '' : 'INTERFACE_BLE');
-  static const InterfaceType INTERFACE_ANT = InterfaceType._(2, _omitEnumNames ? '' : 'INTERFACE_ANT');
-  static const InterfaceType INTERFACE_USB = InterfaceType._(3, _omitEnumNames ? '' : 'INTERFACE_USB');
-  static const InterfaceType INTERFACE_ETH = InterfaceType._(4, _omitEnumNames ? '' : 'INTERFACE_ETH');
-  static const InterfaceType INTERFACE_WIFI = InterfaceType._(5, _omitEnumNames ? '' : 'INTERFACE_WIFI');
-
-  static const $core.List<InterfaceType> values = <InterfaceType> [
-    INTERFACE_BLE,
-    INTERFACE_ANT,
-    INTERFACE_USB,
-    INTERFACE_ETH,
-    INTERFACE_WIFI,
-  ];
-
-  static final $core.Map<$core.int, InterfaceType> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static InterfaceType? valueOf($core.int value) => _byValue[value];
-
-  const InterfaceType._($core.int v, $core.String n) : super(v, n);
-}
-
-class SensorConnectionStatus extends $pb.ProtobufEnum {
-  static const SensorConnectionStatus SENSOR_STATUS_DISCOVERED = SensorConnectionStatus._(1, _omitEnumNames ? '' : 'SENSOR_STATUS_DISCOVERED');
-  static const SensorConnectionStatus SENSOR_STATUS_DISCONNECTED = SensorConnectionStatus._(2, _omitEnumNames ? '' : 'SENSOR_STATUS_DISCONNECTED');
-  static const SensorConnectionStatus SENSOR_STATUS_PAIRING = SensorConnectionStatus._(3, _omitEnumNames ? '' : 'SENSOR_STATUS_PAIRING');
-  static const SensorConnectionStatus SENSOR_STATUS_CONNECTED = SensorConnectionStatus._(4, _omitEnumNames ? '' : 'SENSOR_STATUS_CONNECTED');
-
-  static const $core.List<SensorConnectionStatus> values = <SensorConnectionStatus> [
-    SENSOR_STATUS_DISCOVERED,
-    SENSOR_STATUS_DISCONNECTED,
-    SENSOR_STATUS_PAIRING,
-    SENSOR_STATUS_CONNECTED,
-  ];
-
-  static final $core.Map<$core.int, SensorConnectionStatus> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static SensorConnectionStatus? valueOf($core.int value) => _byValue[value];
-
-  const SensorConnectionStatus._($core.int v, $core.String n) : super(v, n);
-}
-
-class BleSecureConnectionStatus extends $pb.ProtobufEnum {
-  static const BleSecureConnectionStatus BLE_CONNECTION_SECURITY_STATUS_NONE = BleSecureConnectionStatus._(0, _omitEnumNames ? '' : 'BLE_CONNECTION_SECURITY_STATUS_NONE');
-  static const BleSecureConnectionStatus BLE_CONNECTION_SECURITY_STATUS_INPROGRESS = BleSecureConnectionStatus._(1, _omitEnumNames ? '' : 'BLE_CONNECTION_SECURITY_STATUS_INPROGRESS');
-  static const BleSecureConnectionStatus BLE_CONNECTION_SECURITY_STATUS_ACTIVE = BleSecureConnectionStatus._(2, _omitEnumNames ? '' : 'BLE_CONNECTION_SECURITY_STATUS_ACTIVE');
-  static const BleSecureConnectionStatus BLE_CONNECTION_SECURITY_STATUS_REJECTED = BleSecureConnectionStatus._(3, _omitEnumNames ? '' : 'BLE_CONNECTION_SECURITY_STATUS_REJECTED');
-
-  static const $core.List<BleSecureConnectionStatus> values = <BleSecureConnectionStatus> [
-    BLE_CONNECTION_SECURITY_STATUS_NONE,
-    BLE_CONNECTION_SECURITY_STATUS_INPROGRESS,
-    BLE_CONNECTION_SECURITY_STATUS_ACTIVE,
-    BLE_CONNECTION_SECURITY_STATUS_REJECTED,
-  ];
-
-  static final $core.Map<$core.int, BleSecureConnectionStatus> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static BleSecureConnectionStatus? valueOf($core.int value) => _byValue[value];
-
-  const BleSecureConnectionStatus._($core.int v, $core.String n) : super(v, n);
-}
-
-class BleSecureConnectionWindowStatus extends $pb.ProtobufEnum {
-  static const BleSecureConnectionWindowStatus BLE_SECURE_CONNECTION_WINDOW_STATUS_CLOSED = BleSecureConnectionWindowStatus._(0, _omitEnumNames ? '' : 'BLE_SECURE_CONNECTION_WINDOW_STATUS_CLOSED');
-  static const BleSecureConnectionWindowStatus BLE_SECURE_CONNECTION_WINDOW_STATUS_OPEN = BleSecureConnectionWindowStatus._(1, _omitEnumNames ? '' : 'BLE_SECURE_CONNECTION_WINDOW_STATUS_OPEN');
-
-  static const $core.List<BleSecureConnectionWindowStatus> values = <BleSecureConnectionWindowStatus> [
-    BLE_SECURE_CONNECTION_WINDOW_STATUS_CLOSED,
-    BLE_SECURE_CONNECTION_WINDOW_STATUS_OPEN,
-  ];
-
-  static final $core.Map<$core.int, BleSecureConnectionWindowStatus> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static BleSecureConnectionWindowStatus? valueOf($core.int value) => _byValue[value];
-
-  const BleSecureConnectionWindowStatus._($core.int v, $core.String n) : super(v, n);
-}
-
-class WifiRegionCode_RegionCodeType extends $pb.ProtobufEnum {
-  static const WifiRegionCode_RegionCodeType ALPHA_2 = WifiRegionCode_RegionCodeType._(0, _omitEnumNames ? '' : 'ALPHA_2');
-  static const WifiRegionCode_RegionCodeType ALPHA_3 = WifiRegionCode_RegionCodeType._(1, _omitEnumNames ? '' : 'ALPHA_3');
-  static const WifiRegionCode_RegionCodeType NUMERIC = WifiRegionCode_RegionCodeType._(2, _omitEnumNames ? '' : 'NUMERIC');
-  static const WifiRegionCode_RegionCodeType UNKNOWN = WifiRegionCode_RegionCodeType._(3, _omitEnumNames ? '' : 'UNKNOWN');
-
-  static const $core.List<WifiRegionCode_RegionCodeType> values = <WifiRegionCode_RegionCodeType> [
-    ALPHA_2,
-    ALPHA_3,
-    NUMERIC,
-    UNKNOWN,
-  ];
-
-  static final $core.Map<$core.int, WifiRegionCode_RegionCodeType> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static WifiRegionCode_RegionCodeType? valueOf($core.int value) => _byValue[value];
-
-  const WifiRegionCode_RegionCodeType._($core.int v, $core.String n) : super(v, n);
-}
-
-
-const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');

lib/bluetooth/devices/zwift/protocol/zp.pbserver.dart

@@ -1,14 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: zp.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-export 'zp.pb.dart';
-

lib/bluetooth/devices/zwift/protocol/zp_vendor.pb.dart

@@ -1,896 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: zp_vendor.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-import 'dart:core' as $core;
-
-import 'package:protobuf/protobuf.dart' as $pb;
-
-import 'zp_vendor.pbenum.dart';
-
-export 'zp_vendor.pbenum.dart';
-
-class ControllerSync extends $pb.GeneratedMessage {
-  factory ControllerSync({
-    ControllerSyncStatus? status,
-    $core.int? timeStamp,
-  }) {
-    final $result = create();
-    if (status != null) {
-      $result.status = status;
-    }
-    if (timeStamp != null) {
-      $result.timeStamp = timeStamp;
-    }
-    return $result;
-  }
-  ControllerSync._() : super();
-  factory ControllerSync.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory ControllerSync.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ControllerSync', package: const $pb.PackageName(_omitMessageNames ? '' : 'com.zwift.protobuf'), createEmptyInstance: create)
-    ..e<ControllerSyncStatus>(1, _omitFieldNames ? '' : 'status', $pb.PbFieldType.OE, defaultOrMaker: ControllerSyncStatus.NOT_CONNECTED, valueOf: ControllerSyncStatus.valueOf, enumValues: ControllerSyncStatus.values)
-    ..a<$core.int>(2, _omitFieldNames ? '' : 'timeStamp', $pb.PbFieldType.O3, protoName: 'timeStamp')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  ControllerSync clone() => ControllerSync()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  ControllerSync copyWith(void Function(ControllerSync) updates) => super.copyWith((message) => updates(message as ControllerSync)) as ControllerSync;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static ControllerSync create() => ControllerSync._();
-  ControllerSync createEmptyInstance() => create();
-  static $pb.PbList<ControllerSync> createRepeated() => $pb.PbList<ControllerSync>();
-  @$core.pragma('dart2js:noInline')
-  static ControllerSync getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ControllerSync>(create);
-  static ControllerSync? _defaultInstance;
-
-  /// optional in code; proto3 treats as present when non-zero
-  @$pb.TagNumber(1)
-  ControllerSyncStatus get status => $_getN(0);
-  @$pb.TagNumber(1)
-  set status(ControllerSyncStatus v) { setField(1, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasStatus() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearStatus() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.int get timeStamp => $_getIZ(1);
-  @$pb.TagNumber(2)
-  set timeStamp($core.int v) { $_setSignedInt32(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasTimeStamp() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearTimeStamp() => clearField(2);
-}
-
-class EnableTestMode extends $pb.GeneratedMessage {
-  factory EnableTestMode({
-    $core.bool? enable,
-  }) {
-    final $result = create();
-    if (enable != null) {
-      $result.enable = enable;
-    }
-    return $result;
-  }
-  EnableTestMode._() : super();
-  factory EnableTestMode.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory EnableTestMode.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'EnableTestMode', package: const $pb.PackageName(_omitMessageNames ? '' : 'com.zwift.protobuf'), createEmptyInstance: create)
-    ..aOB(1, _omitFieldNames ? '' : 'enable')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  EnableTestMode clone() => EnableTestMode()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  EnableTestMode copyWith(void Function(EnableTestMode) updates) => super.copyWith((message) => updates(message as EnableTestMode)) as EnableTestMode;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static EnableTestMode create() => EnableTestMode._();
-  EnableTestMode createEmptyInstance() => create();
-  static $pb.PbList<EnableTestMode> createRepeated() => $pb.PbList<EnableTestMode>();
-  @$core.pragma('dart2js:noInline')
-  static EnableTestMode getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<EnableTestMode>(create);
-  static EnableTestMode? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.bool get enable => $_getBF(0);
-  @$pb.TagNumber(1)
-  set enable($core.bool v) { $_setBool(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasEnable() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearEnable() => clearField(1);
-}
-
-class PairDevices extends $pb.GeneratedMessage {
-  factory PairDevices({
-    $core.bool? pair,
-    PairDeviceType? type,
-    $core.List<$core.int>? deviceId,
-  }) {
-    final $result = create();
-    if (pair != null) {
-      $result.pair = pair;
-    }
-    if (type != null) {
-      $result.type = type;
-    }
-    if (deviceId != null) {
-      $result.deviceId = deviceId;
-    }
-    return $result;
-  }
-  PairDevices._() : super();
-  factory PairDevices.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory PairDevices.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PairDevices', package: const $pb.PackageName(_omitMessageNames ? '' : 'com.zwift.protobuf'), createEmptyInstance: create)
-    ..aOB(1, _omitFieldNames ? '' : 'pair')
-    ..e<PairDeviceType>(2, _omitFieldNames ? '' : 'type', $pb.PbFieldType.OE, defaultOrMaker: PairDeviceType.BLE, valueOf: PairDeviceType.valueOf, enumValues: PairDeviceType.values)
-    ..a<$core.List<$core.int>>(3, _omitFieldNames ? '' : 'deviceId', $pb.PbFieldType.OY, protoName: 'deviceId')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  PairDevices clone() => PairDevices()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  PairDevices copyWith(void Function(PairDevices) updates) => super.copyWith((message) => updates(message as PairDevices)) as PairDevices;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static PairDevices create() => PairDevices._();
-  PairDevices createEmptyInstance() => create();
-  static $pb.PbList<PairDevices> createRepeated() => $pb.PbList<PairDevices>();
-  @$core.pragma('dart2js:noInline')
-  static PairDevices getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PairDevices>(create);
-  static PairDevices? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.bool get pair => $_getBF(0);
-  @$pb.TagNumber(1)
-  set pair($core.bool v) { $_setBool(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasPair() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearPair() => clearField(1);
-
-  @$pb.TagNumber(2)
-  PairDeviceType get type => $_getN(1);
-  @$pb.TagNumber(2)
-  set type(PairDeviceType v) { setField(2, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasType() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearType() => clearField(2);
-
-  @$pb.TagNumber(3)
-  $core.List<$core.int> get deviceId => $_getN(2);
-  @$pb.TagNumber(3)
-  set deviceId($core.List<$core.int> v) { $_setBytes(2, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasDeviceId() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearDeviceId() => clearField(3);
-}
-
-class DevicePairingDataPage_PairedDevice extends $pb.GeneratedMessage {
-  factory DevicePairingDataPage_PairedDevice({
-    $core.List<$core.int>? device,
-  }) {
-    final $result = create();
-    if (device != null) {
-      $result.device = device;
-    }
-    return $result;
-  }
-  DevicePairingDataPage_PairedDevice._() : super();
-  factory DevicePairingDataPage_PairedDevice.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory DevicePairingDataPage_PairedDevice.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DevicePairingDataPage.PairedDevice', package: const $pb.PackageName(_omitMessageNames ? '' : 'com.zwift.protobuf'), createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(1, _omitFieldNames ? '' : 'device', $pb.PbFieldType.OY)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  DevicePairingDataPage_PairedDevice clone() => DevicePairingDataPage_PairedDevice()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  DevicePairingDataPage_PairedDevice copyWith(void Function(DevicePairingDataPage_PairedDevice) updates) => super.copyWith((message) => updates(message as DevicePairingDataPage_PairedDevice)) as DevicePairingDataPage_PairedDevice;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static DevicePairingDataPage_PairedDevice create() => DevicePairingDataPage_PairedDevice._();
-  DevicePairingDataPage_PairedDevice createEmptyInstance() => create();
-  static $pb.PbList<DevicePairingDataPage_PairedDevice> createRepeated() => $pb.PbList<DevicePairingDataPage_PairedDevice>();
-  @$core.pragma('dart2js:noInline')
-  static DevicePairingDataPage_PairedDevice getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<DevicePairingDataPage_PairedDevice>(create);
-  static DevicePairingDataPage_PairedDevice? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.List<$core.int> get device => $_getN(0);
-  @$pb.TagNumber(1)
-  set device($core.List<$core.int> v) { $_setBytes(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasDevice() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearDevice() => clearField(1);
-}
-
-class DevicePairingDataPage extends $pb.GeneratedMessage {
-  factory DevicePairingDataPage({
-    $core.int? devicesCount,
-    $core.int? pairingStatus,
-    $core.Iterable<DevicePairingDataPage_PairedDevice>? pairingDevList,
-  }) {
-    final $result = create();
-    if (devicesCount != null) {
-      $result.devicesCount = devicesCount;
-    }
-    if (pairingStatus != null) {
-      $result.pairingStatus = pairingStatus;
-    }
-    if (pairingDevList != null) {
-      $result.pairingDevList.addAll(pairingDevList);
-    }
-    return $result;
-  }
-  DevicePairingDataPage._() : super();
-  factory DevicePairingDataPage.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory DevicePairingDataPage.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DevicePairingDataPage', package: const $pb.PackageName(_omitMessageNames ? '' : 'com.zwift.protobuf'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'devicesCount', $pb.PbFieldType.O3, protoName: 'devicesCount')
-    ..a<$core.int>(2, _omitFieldNames ? '' : 'pairingStatus', $pb.PbFieldType.O3, protoName: 'pairingStatus')
-    ..pc<DevicePairingDataPage_PairedDevice>(3, _omitFieldNames ? '' : 'pairingDevList', $pb.PbFieldType.PM, protoName: 'pairingDevList', subBuilder: DevicePairingDataPage_PairedDevice.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  DevicePairingDataPage clone() => DevicePairingDataPage()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  DevicePairingDataPage copyWith(void Function(DevicePairingDataPage) updates) => super.copyWith((message) => updates(message as DevicePairingDataPage)) as DevicePairingDataPage;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static DevicePairingDataPage create() => DevicePairingDataPage._();
-  DevicePairingDataPage createEmptyInstance() => create();
-  static $pb.PbList<DevicePairingDataPage> createRepeated() => $pb.PbList<DevicePairingDataPage>();
-  @$core.pragma('dart2js:noInline')
-  static DevicePairingDataPage getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<DevicePairingDataPage>(create);
-  static DevicePairingDataPage? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.int get devicesCount => $_getIZ(0);
-  @$pb.TagNumber(1)
-  set devicesCount($core.int v) { $_setSignedInt32(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasDevicesCount() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearDevicesCount() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.int get pairingStatus => $_getIZ(1);
-  @$pb.TagNumber(2)
-  set pairingStatus($core.int v) { $_setSignedInt32(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasPairingStatus() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearPairingStatus() => clearField(2);
-
-  @$pb.TagNumber(3)
-  $core.List<DevicePairingDataPage_PairedDevice> get pairingDevList => $_getList(2);
-}
-
-enum SetDfuTest_TestCase {
-  failedEnterDfu, 
-  failedStartAdvertising, 
-  crcFailure, 
-  notSet
-}
-
-class SetDfuTest extends $pb.GeneratedMessage {
-  factory SetDfuTest({
-    $core.bool? failedEnterDfu,
-    $core.bool? failedStartAdvertising,
-    $core.int? crcFailure,
-  }) {
-    final $result = create();
-    if (failedEnterDfu != null) {
-      $result.failedEnterDfu = failedEnterDfu;
-    }
-    if (failedStartAdvertising != null) {
-      $result.failedStartAdvertising = failedStartAdvertising;
-    }
-    if (crcFailure != null) {
-      $result.crcFailure = crcFailure;
-    }
-    return $result;
-  }
-  SetDfuTest._() : super();
-  factory SetDfuTest.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory SetDfuTest.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static const $core.Map<$core.int, SetDfuTest_TestCase> _SetDfuTest_TestCaseByTag = {
-    1 : SetDfuTest_TestCase.failedEnterDfu,
-    2 : SetDfuTest_TestCase.failedStartAdvertising,
-    3 : SetDfuTest_TestCase.crcFailure,
-    0 : SetDfuTest_TestCase.notSet
-  };
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'SetDfuTest', package: const $pb.PackageName(_omitMessageNames ? '' : 'com.zwift.protobuf'), createEmptyInstance: create)
-    ..oo(0, [1, 2, 3])
-    ..aOB(1, _omitFieldNames ? '' : 'failedEnterDfu', protoName: 'failedEnterDfu')
-    ..aOB(2, _omitFieldNames ? '' : 'failedStartAdvertising', protoName: 'failedStartAdvertising')
-    ..a<$core.int>(3, _omitFieldNames ? '' : 'crcFailure', $pb.PbFieldType.O3, protoName: 'crcFailure')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  SetDfuTest clone() => SetDfuTest()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  SetDfuTest copyWith(void Function(SetDfuTest) updates) => super.copyWith((message) => updates(message as SetDfuTest)) as SetDfuTest;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static SetDfuTest create() => SetDfuTest._();
-  SetDfuTest createEmptyInstance() => create();
-  static $pb.PbList<SetDfuTest> createRepeated() => $pb.PbList<SetDfuTest>();
-  @$core.pragma('dart2js:noInline')
-  static SetDfuTest getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<SetDfuTest>(create);
-  static SetDfuTest? _defaultInstance;
-
-  SetDfuTest_TestCase whichTestCase() => _SetDfuTest_TestCaseByTag[$_whichOneof(0)]!;
-  void clearTestCase() => clearField($_whichOneof(0));
-
-  @$pb.TagNumber(1)
-  $core.bool get failedEnterDfu => $_getBF(0);
-  @$pb.TagNumber(1)
-  set failedEnterDfu($core.bool v) { $_setBool(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasFailedEnterDfu() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearFailedEnterDfu() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.bool get failedStartAdvertising => $_getBF(1);
-  @$pb.TagNumber(2)
-  set failedStartAdvertising($core.bool v) { $_setBool(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasFailedStartAdvertising() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearFailedStartAdvertising() => clearField(2);
-
-  @$pb.TagNumber(3)
-  $core.int get crcFailure => $_getIZ(2);
-  @$pb.TagNumber(3)
-  set crcFailure($core.int v) { $_setSignedInt32(2, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasCrcFailure() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearCrcFailure() => clearField(3);
-}
-
-class SetGearTestData extends $pb.GeneratedMessage {
-  factory SetGearTestData({
-    $core.int? frontGearIdx,
-    $core.int? rearGearIdx,
-  }) {
-    final $result = create();
-    if (frontGearIdx != null) {
-      $result.frontGearIdx = frontGearIdx;
-    }
-    if (rearGearIdx != null) {
-      $result.rearGearIdx = rearGearIdx;
-    }
-    return $result;
-  }
-  SetGearTestData._() : super();
-  factory SetGearTestData.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory SetGearTestData.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'SetGearTestData', package: const $pb.PackageName(_omitMessageNames ? '' : 'com.zwift.protobuf'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'frontGearIdx', $pb.PbFieldType.O3, protoName: 'frontGearIdx')
-    ..a<$core.int>(2, _omitFieldNames ? '' : 'rearGearIdx', $pb.PbFieldType.O3, protoName: 'rearGearIdx')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  SetGearTestData clone() => SetGearTestData()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  SetGearTestData copyWith(void Function(SetGearTestData) updates) => super.copyWith((message) => updates(message as SetGearTestData)) as SetGearTestData;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static SetGearTestData create() => SetGearTestData._();
-  SetGearTestData createEmptyInstance() => create();
-  static $pb.PbList<SetGearTestData> createRepeated() => $pb.PbList<SetGearTestData>();
-  @$core.pragma('dart2js:noInline')
-  static SetGearTestData getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<SetGearTestData>(create);
-  static SetGearTestData? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.int get frontGearIdx => $_getIZ(0);
-  @$pb.TagNumber(1)
-  set frontGearIdx($core.int v) { $_setSignedInt32(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasFrontGearIdx() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearFrontGearIdx() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.int get rearGearIdx => $_getIZ(1);
-  @$pb.TagNumber(2)
-  set rearGearIdx($core.int v) { $_setSignedInt32(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasRearGearIdx() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearRearGearIdx() => clearField(2);
-}
-
-class SetHrmTestData extends $pb.GeneratedMessage {
-  factory SetHrmTestData({
-    $core.bool? hrmPresent,
-    $core.int? heartRate,
-  }) {
-    final $result = create();
-    if (hrmPresent != null) {
-      $result.hrmPresent = hrmPresent;
-    }
-    if (heartRate != null) {
-      $result.heartRate = heartRate;
-    }
-    return $result;
-  }
-  SetHrmTestData._() : super();
-  factory SetHrmTestData.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory SetHrmTestData.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'SetHrmTestData', package: const $pb.PackageName(_omitMessageNames ? '' : 'com.zwift.protobuf'), createEmptyInstance: create)
-    ..aOB(1, _omitFieldNames ? '' : 'hrmPresent', protoName: 'hrmPresent')
-    ..a<$core.int>(2, _omitFieldNames ? '' : 'heartRate', $pb.PbFieldType.O3, protoName: 'heartRate')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  SetHrmTestData clone() => SetHrmTestData()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  SetHrmTestData copyWith(void Function(SetHrmTestData) updates) => super.copyWith((message) => updates(message as SetHrmTestData)) as SetHrmTestData;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static SetHrmTestData create() => SetHrmTestData._();
-  SetHrmTestData createEmptyInstance() => create();
-  static $pb.PbList<SetHrmTestData> createRepeated() => $pb.PbList<SetHrmTestData>();
-  @$core.pragma('dart2js:noInline')
-  static SetHrmTestData getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<SetHrmTestData>(create);
-  static SetHrmTestData? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.bool get hrmPresent => $_getBF(0);
-  @$pb.TagNumber(1)
-  set hrmPresent($core.bool v) { $_setBool(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasHrmPresent() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearHrmPresent() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.int get heartRate => $_getIZ(1);
-  @$pb.TagNumber(2)
-  set heartRate($core.int v) { $_setSignedInt32(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasHeartRate() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearHeartRate() => clearField(2);
-}
-
-class SetInputDeviceTestData_ControllerAnalogEvent extends $pb.GeneratedMessage {
-  factory SetInputDeviceTestData_ControllerAnalogEvent({
-    $core.int? sensorId,
-    $core.int? value,
-  }) {
-    final $result = create();
-    if (sensorId != null) {
-      $result.sensorId = sensorId;
-    }
-    if (value != null) {
-      $result.value = value;
-    }
-    return $result;
-  }
-  SetInputDeviceTestData_ControllerAnalogEvent._() : super();
-  factory SetInputDeviceTestData_ControllerAnalogEvent.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory SetInputDeviceTestData_ControllerAnalogEvent.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'SetInputDeviceTestData.ControllerAnalogEvent', package: const $pb.PackageName(_omitMessageNames ? '' : 'com.zwift.protobuf'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'sensorId', $pb.PbFieldType.O3, protoName: 'sensorId')
-    ..a<$core.int>(2, _omitFieldNames ? '' : 'value', $pb.PbFieldType.O3)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  SetInputDeviceTestData_ControllerAnalogEvent clone() => SetInputDeviceTestData_ControllerAnalogEvent()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  SetInputDeviceTestData_ControllerAnalogEvent copyWith(void Function(SetInputDeviceTestData_ControllerAnalogEvent) updates) => super.copyWith((message) => updates(message as SetInputDeviceTestData_ControllerAnalogEvent)) as SetInputDeviceTestData_ControllerAnalogEvent;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static SetInputDeviceTestData_ControllerAnalogEvent create() => SetInputDeviceTestData_ControllerAnalogEvent._();
-  SetInputDeviceTestData_ControllerAnalogEvent createEmptyInstance() => create();
-  static $pb.PbList<SetInputDeviceTestData_ControllerAnalogEvent> createRepeated() => $pb.PbList<SetInputDeviceTestData_ControllerAnalogEvent>();
-  @$core.pragma('dart2js:noInline')
-  static SetInputDeviceTestData_ControllerAnalogEvent getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<SetInputDeviceTestData_ControllerAnalogEvent>(create);
-  static SetInputDeviceTestData_ControllerAnalogEvent? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.int get sensorId => $_getIZ(0);
-  @$pb.TagNumber(1)
-  set sensorId($core.int v) { $_setSignedInt32(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasSensorId() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearSensorId() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.int get value => $_getIZ(1);
-  @$pb.TagNumber(2)
-  set value($core.int v) { $_setSignedInt32(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasValue() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearValue() => clearField(2);
-}
-
-class SetInputDeviceTestData extends $pb.GeneratedMessage {
-  factory SetInputDeviceTestData({
-    $core.int? duration,
-    $core.int? buttonEvent,
-    $core.Iterable<SetInputDeviceTestData_ControllerAnalogEvent>? analogEventList,
-  }) {
-    final $result = create();
-    if (duration != null) {
-      $result.duration = duration;
-    }
-    if (buttonEvent != null) {
-      $result.buttonEvent = buttonEvent;
-    }
-    if (analogEventList != null) {
-      $result.analogEventList.addAll(analogEventList);
-    }
-    return $result;
-  }
-  SetInputDeviceTestData._() : super();
-  factory SetInputDeviceTestData.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory SetInputDeviceTestData.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'SetInputDeviceTestData', package: const $pb.PackageName(_omitMessageNames ? '' : 'com.zwift.protobuf'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'duration', $pb.PbFieldType.O3)
-    ..a<$core.int>(2, _omitFieldNames ? '' : 'buttonEvent', $pb.PbFieldType.O3, protoName: 'buttonEvent')
-    ..pc<SetInputDeviceTestData_ControllerAnalogEvent>(3, _omitFieldNames ? '' : 'analogEventList', $pb.PbFieldType.PM, protoName: 'analogEventList', subBuilder: SetInputDeviceTestData_ControllerAnalogEvent.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  SetInputDeviceTestData clone() => SetInputDeviceTestData()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  SetInputDeviceTestData copyWith(void Function(SetInputDeviceTestData) updates) => super.copyWith((message) => updates(message as SetInputDeviceTestData)) as SetInputDeviceTestData;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static SetInputDeviceTestData create() => SetInputDeviceTestData._();
-  SetInputDeviceTestData createEmptyInstance() => create();
-  static $pb.PbList<SetInputDeviceTestData> createRepeated() => $pb.PbList<SetInputDeviceTestData>();
-  @$core.pragma('dart2js:noInline')
-  static SetInputDeviceTestData getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<SetInputDeviceTestData>(create);
-  static SetInputDeviceTestData? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.int get duration => $_getIZ(0);
-  @$pb.TagNumber(1)
-  set duration($core.int v) { $_setSignedInt32(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasDuration() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearDuration() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.int get buttonEvent => $_getIZ(1);
-  @$pb.TagNumber(2)
-  set buttonEvent($core.int v) { $_setSignedInt32(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasButtonEvent() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearButtonEvent() => clearField(2);
-
-  @$pb.TagNumber(3)
-  $core.List<SetInputDeviceTestData_ControllerAnalogEvent> get analogEventList => $_getList(2);
-}
-
-class SetTrainerTestData extends $pb.GeneratedMessage {
-  factory SetTrainerTestData({
-    $core.int? dataMode,
-    $core.int? interfaces,
-    TestTrainerData? testTrainerData,
-  }) {
-    final $result = create();
-    if (dataMode != null) {
-      $result.dataMode = dataMode;
-    }
-    if (interfaces != null) {
-      $result.interfaces = interfaces;
-    }
-    if (testTrainerData != null) {
-      $result.testTrainerData = testTrainerData;
-    }
-    return $result;
-  }
-  SetTrainerTestData._() : super();
-  factory SetTrainerTestData.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory SetTrainerTestData.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'SetTrainerTestData', package: const $pb.PackageName(_omitMessageNames ? '' : 'com.zwift.protobuf'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'dataMode', $pb.PbFieldType.O3, protoName: 'dataMode')
-    ..a<$core.int>(2, _omitFieldNames ? '' : 'interfaces', $pb.PbFieldType.O3)
-    ..aOM<TestTrainerData>(3, _omitFieldNames ? '' : 'testTrainerData', protoName: 'testTrainerData', subBuilder: TestTrainerData.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  SetTrainerTestData clone() => SetTrainerTestData()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  SetTrainerTestData copyWith(void Function(SetTrainerTestData) updates) => super.copyWith((message) => updates(message as SetTrainerTestData)) as SetTrainerTestData;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static SetTrainerTestData create() => SetTrainerTestData._();
-  SetTrainerTestData createEmptyInstance() => create();
-  static $pb.PbList<SetTrainerTestData> createRepeated() => $pb.PbList<SetTrainerTestData>();
-  @$core.pragma('dart2js:noInline')
-  static SetTrainerTestData getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<SetTrainerTestData>(create);
-  static SetTrainerTestData? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.int get dataMode => $_getIZ(0);
-  @$pb.TagNumber(1)
-  set dataMode($core.int v) { $_setSignedInt32(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasDataMode() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearDataMode() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.int get interfaces => $_getIZ(1);
-  @$pb.TagNumber(2)
-  set interfaces($core.int v) { $_setSignedInt32(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasInterfaces() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearInterfaces() => clearField(2);
-
-  @$pb.TagNumber(3)
-  TestTrainerData get testTrainerData => $_getN(2);
-  @$pb.TagNumber(3)
-  set testTrainerData(TestTrainerData v) { setField(3, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasTestTrainerData() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearTestTrainerData() => clearField(3);
-  @$pb.TagNumber(3)
-  TestTrainerData ensureTestTrainerData() => $_ensure(2);
-}
-
-class TestTrainerData extends $pb.GeneratedMessage {
-  factory TestTrainerData({
-    $core.int? power,
-    $core.int? cadence,
-    $core.int? bikeSpeed,
-    $core.int? averagedPower,
-    $core.int? wheelSpeed,
-    $core.int? calculatedRealGearRatio,
-  }) {
-    final $result = create();
-    if (power != null) {
-      $result.power = power;
-    }
-    if (cadence != null) {
-      $result.cadence = cadence;
-    }
-    if (bikeSpeed != null) {
-      $result.bikeSpeed = bikeSpeed;
-    }
-    if (averagedPower != null) {
-      $result.averagedPower = averagedPower;
-    }
-    if (wheelSpeed != null) {
-      $result.wheelSpeed = wheelSpeed;
-    }
-    if (calculatedRealGearRatio != null) {
-      $result.calculatedRealGearRatio = calculatedRealGearRatio;
-    }
-    return $result;
-  }
-  TestTrainerData._() : super();
-  factory TestTrainerData.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory TestTrainerData.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'TestTrainerData', package: const $pb.PackageName(_omitMessageNames ? '' : 'com.zwift.protobuf'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'power', $pb.PbFieldType.O3)
-    ..a<$core.int>(2, _omitFieldNames ? '' : 'cadence', $pb.PbFieldType.O3)
-    ..a<$core.int>(3, _omitFieldNames ? '' : 'bikeSpeed', $pb.PbFieldType.O3, protoName: 'bikeSpeed')
-    ..a<$core.int>(4, _omitFieldNames ? '' : 'averagedPower', $pb.PbFieldType.O3, protoName: 'averagedPower')
-    ..a<$core.int>(5, _omitFieldNames ? '' : 'wheelSpeed', $pb.PbFieldType.O3, protoName: 'wheelSpeed')
-    ..a<$core.int>(6, _omitFieldNames ? '' : 'calculatedRealGearRatio', $pb.PbFieldType.O3, protoName: 'calculatedRealGearRatio')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  TestTrainerData clone() => TestTrainerData()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  TestTrainerData copyWith(void Function(TestTrainerData) updates) => super.copyWith((message) => updates(message as TestTrainerData)) as TestTrainerData;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static TestTrainerData create() => TestTrainerData._();
-  TestTrainerData createEmptyInstance() => create();
-  static $pb.PbList<TestTrainerData> createRepeated() => $pb.PbList<TestTrainerData>();
-  @$core.pragma('dart2js:noInline')
-  static TestTrainerData getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<TestTrainerData>(create);
-  static TestTrainerData? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.int get power => $_getIZ(0);
-  @$pb.TagNumber(1)
-  set power($core.int v) { $_setSignedInt32(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasPower() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearPower() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.int get cadence => $_getIZ(1);
-  @$pb.TagNumber(2)
-  set cadence($core.int v) { $_setSignedInt32(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasCadence() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearCadence() => clearField(2);
-
-  @$pb.TagNumber(3)
-  $core.int get bikeSpeed => $_getIZ(2);
-  @$pb.TagNumber(3)
-  set bikeSpeed($core.int v) { $_setSignedInt32(2, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasBikeSpeed() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearBikeSpeed() => clearField(3);
-
-  @$pb.TagNumber(4)
-  $core.int get averagedPower => $_getIZ(3);
-  @$pb.TagNumber(4)
-  set averagedPower($core.int v) { $_setSignedInt32(3, v); }
-  @$pb.TagNumber(4)
-  $core.bool hasAveragedPower() => $_has(3);
-  @$pb.TagNumber(4)
-  void clearAveragedPower() => clearField(4);
-
-  @$pb.TagNumber(5)
-  $core.int get wheelSpeed => $_getIZ(4);
-  @$pb.TagNumber(5)
-  set wheelSpeed($core.int v) { $_setSignedInt32(4, v); }
-  @$pb.TagNumber(5)
-  $core.bool hasWheelSpeed() => $_has(4);
-  @$pb.TagNumber(5)
-  void clearWheelSpeed() => clearField(5);
-
-  @$pb.TagNumber(6)
-  $core.int get calculatedRealGearRatio => $_getIZ(5);
-  @$pb.TagNumber(6)
-  set calculatedRealGearRatio($core.int v) { $_setSignedInt32(5, v); }
-  @$pb.TagNumber(6)
-  $core.bool hasCalculatedRealGearRatio() => $_has(5);
-  @$pb.TagNumber(6)
-  void clearCalculatedRealGearRatio() => clearField(6);
-}
-
-
-const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');

lib/bluetooth/devices/zwift/protocol/zp_vendor.pbenum.dart

@@ -1,101 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: zp_vendor.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-import 'dart:core' as $core;
-
-import 'package:protobuf/protobuf.dart' as $pb;
-
-class VendorOpcode extends $pb.ProtobufEnum {
-  static const VendorOpcode UNDEFINED = VendorOpcode._(0, _omitEnumNames ? '' : 'UNDEFINED');
-  static const VendorOpcode CONTROLLER_SYNC = VendorOpcode._(1, _omitEnumNames ? '' : 'CONTROLLER_SYNC');
-  static const VendorOpcode PAIR_DEVICES = VendorOpcode._(2, _omitEnumNames ? '' : 'PAIR_DEVICES');
-  static const VendorOpcode ENABLE_TEST_MODE = VendorOpcode._(65280, _omitEnumNames ? '' : 'ENABLE_TEST_MODE');
-  static const VendorOpcode SET_DFU_TEST = VendorOpcode._(65281, _omitEnumNames ? '' : 'SET_DFU_TEST');
-  static const VendorOpcode SET_TRAINER_TEST_DATA = VendorOpcode._(65282, _omitEnumNames ? '' : 'SET_TRAINER_TEST_DATA');
-  static const VendorOpcode SET_INPUT_DEVICE_TEST_DATA = VendorOpcode._(65283, _omitEnumNames ? '' : 'SET_INPUT_DEVICE_TEST_DATA');
-  static const VendorOpcode SET_GEAR_TEST_DATA = VendorOpcode._(65284, _omitEnumNames ? '' : 'SET_GEAR_TEST_DATA');
-  static const VendorOpcode SET_HRM_TEST_DATA = VendorOpcode._(65285, _omitEnumNames ? '' : 'SET_HRM_TEST_DATA');
-  static const VendorOpcode SET_TEST_DATA = VendorOpcode._(65286, _omitEnumNames ? '' : 'SET_TEST_DATA');
-
-  static const $core.List<VendorOpcode> values = <VendorOpcode> [
-    UNDEFINED,
-    CONTROLLER_SYNC,
-    PAIR_DEVICES,
-    ENABLE_TEST_MODE,
-    SET_DFU_TEST,
-    SET_TRAINER_TEST_DATA,
-    SET_INPUT_DEVICE_TEST_DATA,
-    SET_GEAR_TEST_DATA,
-    SET_HRM_TEST_DATA,
-    SET_TEST_DATA,
-  ];
-
-  static final $core.Map<$core.int, VendorOpcode> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static VendorOpcode? valueOf($core.int value) => _byValue[value];
-
-  const VendorOpcode._($core.int v, $core.String n) : super(v, n);
-}
-
-class PairDeviceType extends $pb.ProtobufEnum {
-  static const PairDeviceType BLE = PairDeviceType._(0, _omitEnumNames ? '' : 'BLE');
-  static const PairDeviceType ANT = PairDeviceType._(1, _omitEnumNames ? '' : 'ANT');
-
-  static const $core.List<PairDeviceType> values = <PairDeviceType> [
-    BLE,
-    ANT,
-  ];
-
-  static final $core.Map<$core.int, PairDeviceType> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static PairDeviceType? valueOf($core.int value) => _byValue[value];
-
-  const PairDeviceType._($core.int v, $core.String n) : super(v, n);
-}
-
-/// Status used by ControllerSync
-class ControllerSyncStatus extends $pb.ProtobufEnum {
-  static const ControllerSyncStatus NOT_CONNECTED = ControllerSyncStatus._(0, _omitEnumNames ? '' : 'NOT_CONNECTED');
-  static const ControllerSyncStatus CONNECTED = ControllerSyncStatus._(1, _omitEnumNames ? '' : 'CONNECTED');
-
-  static const $core.List<ControllerSyncStatus> values = <ControllerSyncStatus> [
-    NOT_CONNECTED,
-    CONNECTED,
-  ];
-
-  static final $core.Map<$core.int, ControllerSyncStatus> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static ControllerSyncStatus? valueOf($core.int value) => _byValue[value];
-
-  const ControllerSyncStatus._($core.int v, $core.String n) : super(v, n);
-}
-
-/// Looks like “data object / page” IDs used with pairing pages
-class VendorDO extends $pb.ProtobufEnum {
-  static const VendorDO NO_CLUE = VendorDO._(0, _omitEnumNames ? '' : 'NO_CLUE');
-  static const VendorDO PAGE_DEVICE_PAIRING = VendorDO._(61440, _omitEnumNames ? '' : 'PAGE_DEVICE_PAIRING');
-  static const VendorDO DEVICE_COUNT = VendorDO._(61441, _omitEnumNames ? '' : 'DEVICE_COUNT');
-  static const VendorDO PAIRING_STATUS = VendorDO._(61442, _omitEnumNames ? '' : 'PAIRING_STATUS');
-  static const VendorDO PAIRED_DEVICE = VendorDO._(61443, _omitEnumNames ? '' : 'PAIRED_DEVICE');
-
-  static const $core.List<VendorDO> values = <VendorDO> [
-    NO_CLUE,
-    PAGE_DEVICE_PAIRING,
-    DEVICE_COUNT,
-    PAIRING_STATUS,
-    PAIRED_DEVICE,
-  ];
-
-  static final $core.Map<$core.int, VendorDO> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static VendorDO? valueOf($core.int value) => _byValue[value];
-
-  const VendorDO._($core.int v, $core.String n) : super(v, n);
-}
-
-
-const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');

lib/bluetooth/devices/zwift/protocol/zp_vendor.pbjson.dart

@@ -1,267 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: zp_vendor.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-import 'dart:convert' as $convert;
-import 'dart:core' as $core;
-import 'dart:typed_data' as $typed_data;
-
-@$core.Deprecated('Use vendorOpcodeDescriptor instead')
-const VendorOpcode$json = {
-  '1': 'VendorOpcode',
-  '2': [
-    {'1': 'UNDEFINED', '2': 0},
-    {'1': 'CONTROLLER_SYNC', '2': 1},
-    {'1': 'PAIR_DEVICES', '2': 2},
-    {'1': 'ENABLE_TEST_MODE', '2': 65280},
-    {'1': 'SET_DFU_TEST', '2': 65281},
-    {'1': 'SET_TRAINER_TEST_DATA', '2': 65282},
-    {'1': 'SET_INPUT_DEVICE_TEST_DATA', '2': 65283},
-    {'1': 'SET_GEAR_TEST_DATA', '2': 65284},
-    {'1': 'SET_HRM_TEST_DATA', '2': 65285},
-    {'1': 'SET_TEST_DATA', '2': 65286},
-  ],
-};
-
-/// Descriptor for `VendorOpcode`. Decode as a `google.protobuf.EnumDescriptorProto`.
-final $typed_data.Uint8List vendorOpcodeDescriptor = $convert.base64Decode(
-    'CgxWZW5kb3JPcGNvZGUSDQoJVU5ERUZJTkVEEAASEwoPQ09OVFJPTExFUl9TWU5DEAESEAoMUE'
-    'FJUl9ERVZJQ0VTEAISFgoQRU5BQkxFX1RFU1RfTU9ERRCA/gMSEgoMU0VUX0RGVV9URVNUEIH+'
-    'AxIbChVTRVRfVFJBSU5FUl9URVNUX0RBVEEQgv4DEiAKGlNFVF9JTlBVVF9ERVZJQ0VfVEVTVF'
-    '9EQVRBEIP+AxIYChJTRVRfR0VBUl9URVNUX0RBVEEQhP4DEhcKEVNFVF9IUk1fVEVTVF9EQVRB'
-    'EIX+AxITCg1TRVRfVEVTVF9EQVRBEIb+Aw==');
-
-@$core.Deprecated('Use pairDeviceTypeDescriptor instead')
-const PairDeviceType$json = {
-  '1': 'PairDeviceType',
-  '2': [
-    {'1': 'BLE', '2': 0},
-    {'1': 'ANT', '2': 1},
-  ],
-};
-
-/// Descriptor for `PairDeviceType`. Decode as a `google.protobuf.EnumDescriptorProto`.
-final $typed_data.Uint8List pairDeviceTypeDescriptor = $convert.base64Decode(
-    'Cg5QYWlyRGV2aWNlVHlwZRIHCgNCTEUQABIHCgNBTlQQAQ==');
-
-@$core.Deprecated('Use controllerSyncStatusDescriptor instead')
-const ControllerSyncStatus$json = {
-  '1': 'ControllerSyncStatus',
-  '2': [
-    {'1': 'NOT_CONNECTED', '2': 0},
-    {'1': 'CONNECTED', '2': 1},
-  ],
-};
-
-/// Descriptor for `ControllerSyncStatus`. Decode as a `google.protobuf.EnumDescriptorProto`.
-final $typed_data.Uint8List controllerSyncStatusDescriptor = $convert.base64Decode(
-    'ChRDb250cm9sbGVyU3luY1N0YXR1cxIRCg1OT1RfQ09OTkVDVEVEEAASDQoJQ09OTkVDVEVEEA'
-    'E=');
-
-@$core.Deprecated('Use vendorDODescriptor instead')
-const VendorDO$json = {
-  '1': 'VendorDO',
-  '2': [
-    {'1': 'NO_CLUE', '2': 0},
-    {'1': 'PAGE_DEVICE_PAIRING', '2': 61440},
-    {'1': 'DEVICE_COUNT', '2': 61441},
-    {'1': 'PAIRING_STATUS', '2': 61442},
-    {'1': 'PAIRED_DEVICE', '2': 61443},
-  ],
-};
-
-/// Descriptor for `VendorDO`. Decode as a `google.protobuf.EnumDescriptorProto`.
-final $typed_data.Uint8List vendorDODescriptor = $convert.base64Decode(
-    'CghWZW5kb3JETxILCgdOT19DTFVFEAASGQoTUEFHRV9ERVZJQ0VfUEFJUklORxCA4AMSEgoMRE'
-    'VWSUNFX0NPVU5UEIHgAxIUCg5QQUlSSU5HX1NUQVRVUxCC4AMSEwoNUEFJUkVEX0RFVklDRRCD'
-    '4AM=');
-
-@$core.Deprecated('Use controllerSyncDescriptor instead')
-const ControllerSync$json = {
-  '1': 'ControllerSync',
-  '2': [
-    {'1': 'status', '3': 1, '4': 1, '5': 14, '6': '.com.zwift.protobuf.ControllerSyncStatus', '10': 'status'},
-    {'1': 'timeStamp', '3': 2, '4': 1, '5': 5, '10': 'timeStamp'},
-  ],
-};
-
-/// Descriptor for `ControllerSync`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List controllerSyncDescriptor = $convert.base64Decode(
-    'Cg5Db250cm9sbGVyU3luYxJACgZzdGF0dXMYASABKA4yKC5jb20uendpZnQucHJvdG9idWYuQ2'
-    '9udHJvbGxlclN5bmNTdGF0dXNSBnN0YXR1cxIcCgl0aW1lU3RhbXAYAiABKAVSCXRpbWVTdGFt'
-    'cA==');
-
-@$core.Deprecated('Use enableTestModeDescriptor instead')
-const EnableTestMode$json = {
-  '1': 'EnableTestMode',
-  '2': [
-    {'1': 'enable', '3': 1, '4': 1, '5': 8, '10': 'enable'},
-  ],
-};
-
-/// Descriptor for `EnableTestMode`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List enableTestModeDescriptor = $convert.base64Decode(
-    'Cg5FbmFibGVUZXN0TW9kZRIWCgZlbmFibGUYASABKAhSBmVuYWJsZQ==');
-
-@$core.Deprecated('Use pairDevicesDescriptor instead')
-const PairDevices$json = {
-  '1': 'PairDevices',
-  '2': [
-    {'1': 'pair', '3': 1, '4': 1, '5': 8, '10': 'pair'},
-    {'1': 'type', '3': 2, '4': 1, '5': 14, '6': '.com.zwift.protobuf.PairDeviceType', '10': 'type'},
-    {'1': 'deviceId', '3': 3, '4': 1, '5': 12, '10': 'deviceId'},
-  ],
-};
-
-/// Descriptor for `PairDevices`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List pairDevicesDescriptor = $convert.base64Decode(
-    'CgtQYWlyRGV2aWNlcxISCgRwYWlyGAEgASgIUgRwYWlyEjYKBHR5cGUYAiABKA4yIi5jb20uen'
-    'dpZnQucHJvdG9idWYuUGFpckRldmljZVR5cGVSBHR5cGUSGgoIZGV2aWNlSWQYAyABKAxSCGRl'
-    'dmljZUlk');
-
-@$core.Deprecated('Use devicePairingDataPageDescriptor instead')
-const DevicePairingDataPage$json = {
-  '1': 'DevicePairingDataPage',
-  '2': [
-    {'1': 'devicesCount', '3': 1, '4': 1, '5': 5, '10': 'devicesCount'},
-    {'1': 'pairingStatus', '3': 2, '4': 1, '5': 5, '10': 'pairingStatus'},
-    {'1': 'pairingDevList', '3': 3, '4': 3, '5': 11, '6': '.com.zwift.protobuf.DevicePairingDataPage.PairedDevice', '10': 'pairingDevList'},
-  ],
-  '3': [DevicePairingDataPage_PairedDevice$json],
-};
-
-@$core.Deprecated('Use devicePairingDataPageDescriptor instead')
-const DevicePairingDataPage_PairedDevice$json = {
-  '1': 'PairedDevice',
-  '2': [
-    {'1': 'device', '3': 1, '4': 1, '5': 12, '10': 'device'},
-  ],
-};
-
-/// Descriptor for `DevicePairingDataPage`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List devicePairingDataPageDescriptor = $convert.base64Decode(
-    'ChVEZXZpY2VQYWlyaW5nRGF0YVBhZ2USIgoMZGV2aWNlc0NvdW50GAEgASgFUgxkZXZpY2VzQ2'
-    '91bnQSJAoNcGFpcmluZ1N0YXR1cxgCIAEoBVINcGFpcmluZ1N0YXR1cxJeCg5wYWlyaW5nRGV2'
-    'TGlzdBgDIAMoCzI2LmNvbS56d2lmdC5wcm90b2J1Zi5EZXZpY2VQYWlyaW5nRGF0YVBhZ2UuUG'
-    'FpcmVkRGV2aWNlUg5wYWlyaW5nRGV2TGlzdBomCgxQYWlyZWREZXZpY2USFgoGZGV2aWNlGAEg'
-    'ASgMUgZkZXZpY2U=');
-
-@$core.Deprecated('Use setDfuTestDescriptor instead')
-const SetDfuTest$json = {
-  '1': 'SetDfuTest',
-  '2': [
-    {'1': 'failedEnterDfu', '3': 1, '4': 1, '5': 8, '9': 0, '10': 'failedEnterDfu'},
-    {'1': 'failedStartAdvertising', '3': 2, '4': 1, '5': 8, '9': 0, '10': 'failedStartAdvertising'},
-    {'1': 'crcFailure', '3': 3, '4': 1, '5': 5, '9': 0, '10': 'crcFailure'},
-  ],
-  '8': [
-    {'1': 'test_case'},
-  ],
-};
-
-/// Descriptor for `SetDfuTest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List setDfuTestDescriptor = $convert.base64Decode(
-    'CgpTZXREZnVUZXN0EigKDmZhaWxlZEVudGVyRGZ1GAEgASgISABSDmZhaWxlZEVudGVyRGZ1Ej'
-    'gKFmZhaWxlZFN0YXJ0QWR2ZXJ0aXNpbmcYAiABKAhIAFIWZmFpbGVkU3RhcnRBZHZlcnRpc2lu'
-    'ZxIgCgpjcmNGYWlsdXJlGAMgASgFSABSCmNyY0ZhaWx1cmVCCwoJdGVzdF9jYXNl');
-
-@$core.Deprecated('Use setGearTestDataDescriptor instead')
-const SetGearTestData$json = {
-  '1': 'SetGearTestData',
-  '2': [
-    {'1': 'frontGearIdx', '3': 1, '4': 1, '5': 5, '10': 'frontGearIdx'},
-    {'1': 'rearGearIdx', '3': 2, '4': 1, '5': 5, '10': 'rearGearIdx'},
-  ],
-};
-
-/// Descriptor for `SetGearTestData`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List setGearTestDataDescriptor = $convert.base64Decode(
-    'Cg9TZXRHZWFyVGVzdERhdGESIgoMZnJvbnRHZWFySWR4GAEgASgFUgxmcm9udEdlYXJJZHgSIA'
-    'oLcmVhckdlYXJJZHgYAiABKAVSC3JlYXJHZWFySWR4');
-
-@$core.Deprecated('Use setHrmTestDataDescriptor instead')
-const SetHrmTestData$json = {
-  '1': 'SetHrmTestData',
-  '2': [
-    {'1': 'hrmPresent', '3': 1, '4': 1, '5': 8, '10': 'hrmPresent'},
-    {'1': 'heartRate', '3': 2, '4': 1, '5': 5, '10': 'heartRate'},
-  ],
-};
-
-/// Descriptor for `SetHrmTestData`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List setHrmTestDataDescriptor = $convert.base64Decode(
-    'Cg5TZXRIcm1UZXN0RGF0YRIeCgpocm1QcmVzZW50GAEgASgIUgpocm1QcmVzZW50EhwKCWhlYX'
-    'J0UmF0ZRgCIAEoBVIJaGVhcnRSYXRl');
-
-@$core.Deprecated('Use setInputDeviceTestDataDescriptor instead')
-const SetInputDeviceTestData$json = {
-  '1': 'SetInputDeviceTestData',
-  '2': [
-    {'1': 'duration', '3': 1, '4': 1, '5': 5, '10': 'duration'},
-    {'1': 'buttonEvent', '3': 2, '4': 1, '5': 5, '10': 'buttonEvent'},
-    {'1': 'analogEventList', '3': 3, '4': 3, '5': 11, '6': '.com.zwift.protobuf.SetInputDeviceTestData.ControllerAnalogEvent', '10': 'analogEventList'},
-  ],
-  '3': [SetInputDeviceTestData_ControllerAnalogEvent$json],
-};
-
-@$core.Deprecated('Use setInputDeviceTestDataDescriptor instead')
-const SetInputDeviceTestData_ControllerAnalogEvent$json = {
-  '1': 'ControllerAnalogEvent',
-  '2': [
-    {'1': 'sensorId', '3': 1, '4': 1, '5': 5, '10': 'sensorId'},
-    {'1': 'value', '3': 2, '4': 1, '5': 5, '10': 'value'},
-  ],
-};
-
-/// Descriptor for `SetInputDeviceTestData`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List setInputDeviceTestDataDescriptor = $convert.base64Decode(
-    'ChZTZXRJbnB1dERldmljZVRlc3REYXRhEhoKCGR1cmF0aW9uGAEgASgFUghkdXJhdGlvbhIgCg'
-    'tidXR0b25FdmVudBgCIAEoBVILYnV0dG9uRXZlbnQSagoPYW5hbG9nRXZlbnRMaXN0GAMgAygL'
-    'MkAuY29tLnp3aWZ0LnByb3RvYnVmLlNldElucHV0RGV2aWNlVGVzdERhdGEuQ29udHJvbGxlck'
-    'FuYWxvZ0V2ZW50Ug9hbmFsb2dFdmVudExpc3QaSQoVQ29udHJvbGxlckFuYWxvZ0V2ZW50EhoK'
-    'CHNlbnNvcklkGAEgASgFUghzZW5zb3JJZBIUCgV2YWx1ZRgCIAEoBVIFdmFsdWU=');
-
-@$core.Deprecated('Use setTrainerTestDataDescriptor instead')
-const SetTrainerTestData$json = {
-  '1': 'SetTrainerTestData',
-  '2': [
-    {'1': 'dataMode', '3': 1, '4': 1, '5': 5, '10': 'dataMode'},
-    {'1': 'interfaces', '3': 2, '4': 1, '5': 5, '10': 'interfaces'},
-    {'1': 'testTrainerData', '3': 3, '4': 1, '5': 11, '6': '.com.zwift.protobuf.TestTrainerData', '10': 'testTrainerData'},
-  ],
-};
-
-/// Descriptor for `SetTrainerTestData`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List setTrainerTestDataDescriptor = $convert.base64Decode(
-    'ChJTZXRUcmFpbmVyVGVzdERhdGESGgoIZGF0YU1vZGUYASABKAVSCGRhdGFNb2RlEh4KCmludG'
-    'VyZmFjZXMYAiABKAVSCmludGVyZmFjZXMSTQoPdGVzdFRyYWluZXJEYXRhGAMgASgLMiMuY29t'
-    'Lnp3aWZ0LnByb3RvYnVmLlRlc3RUcmFpbmVyRGF0YVIPdGVzdFRyYWluZXJEYXRh');
-
-@$core.Deprecated('Use testTrainerDataDescriptor instead')
-const TestTrainerData$json = {
-  '1': 'TestTrainerData',
-  '2': [
-    {'1': 'power', '3': 1, '4': 1, '5': 5, '10': 'power'},
-    {'1': 'cadence', '3': 2, '4': 1, '5': 5, '10': 'cadence'},
-    {'1': 'bikeSpeed', '3': 3, '4': 1, '5': 5, '10': 'bikeSpeed'},
-    {'1': 'averagedPower', '3': 4, '4': 1, '5': 5, '10': 'averagedPower'},
-    {'1': 'wheelSpeed', '3': 5, '4': 1, '5': 5, '10': 'wheelSpeed'},
-    {'1': 'calculatedRealGearRatio', '3': 6, '4': 1, '5': 5, '10': 'calculatedRealGearRatio'},
-  ],
-};
-
-/// Descriptor for `TestTrainerData`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List testTrainerDataDescriptor = $convert.base64Decode(
-    'Cg9UZXN0VHJhaW5lckRhdGESFAoFcG93ZXIYASABKAVSBXBvd2VyEhgKB2NhZGVuY2UYAiABKA'
-    'VSB2NhZGVuY2USHAoJYmlrZVNwZWVkGAMgASgFUgliaWtlU3BlZWQSJAoNYXZlcmFnZWRQb3dl'
-    'chgEIAEoBVINYXZlcmFnZWRQb3dlchIeCgp3aGVlbFNwZWVkGAUgASgFUgp3aGVlbFNwZWVkEj'
-    'gKF2NhbGN1bGF0ZWRSZWFsR2VhclJhdGlvGAYgASgFUhdjYWxjdWxhdGVkUmVhbEdlYXJSYXRp'
-    'bw==');
-

lib/bluetooth/devices/zwift/protocol/zp_vendor.pbserver.dart

@@ -1,14 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: zp_vendor.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-export 'zp_vendor.pb.dart';
-

lib/bluetooth/devices/zwift/protocol/zwift.pb.dart

@@ -1,965 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: zwift.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-import 'dart:core' as $core;
-
-import 'package:protobuf/protobuf.dart' as $pb;
-
-import 'zwift.pbenum.dart';
-
-export 'zwift.pbenum.dart';
-
-/// The command code prepending this message is 0x07
-class PlayKeyPadStatus extends $pb.GeneratedMessage {
-  factory PlayKeyPadStatus({
-    PlayButtonStatus? rightPad,
-    PlayButtonStatus? buttonYUp,
-    PlayButtonStatus? buttonZLeft,
-    PlayButtonStatus? buttonARight,
-    PlayButtonStatus? buttonBDown,
-    PlayButtonStatus? buttonShift,
-    PlayButtonStatus? buttonOn,
-    $core.int? analogLR,
-    $core.int? analogUD,
-  }) {
-    final $result = create();
-    if (rightPad != null) {
-      $result.rightPad = rightPad;
-    }
-    if (buttonYUp != null) {
-      $result.buttonYUp = buttonYUp;
-    }
-    if (buttonZLeft != null) {
-      $result.buttonZLeft = buttonZLeft;
-    }
-    if (buttonARight != null) {
-      $result.buttonARight = buttonARight;
-    }
-    if (buttonBDown != null) {
-      $result.buttonBDown = buttonBDown;
-    }
-    if (buttonShift != null) {
-      $result.buttonShift = buttonShift;
-    }
-    if (buttonOn != null) {
-      $result.buttonOn = buttonOn;
-    }
-    if (analogLR != null) {
-      $result.analogLR = analogLR;
-    }
-    if (analogUD != null) {
-      $result.analogUD = analogUD;
-    }
-    return $result;
-  }
-  PlayKeyPadStatus._() : super();
-  factory PlayKeyPadStatus.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory PlayKeyPadStatus.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PlayKeyPadStatus', package: const $pb.PackageName(_omitMessageNames ? '' : 'de.jonasbark'), createEmptyInstance: create)
-    ..e<PlayButtonStatus>(1, _omitFieldNames ? '' : 'RightPad', $pb.PbFieldType.OE, protoName: 'RightPad', defaultOrMaker: PlayButtonStatus.ON, valueOf: PlayButtonStatus.valueOf, enumValues: PlayButtonStatus.values)
-    ..e<PlayButtonStatus>(2, _omitFieldNames ? '' : 'ButtonYUp', $pb.PbFieldType.OE, protoName: 'Button_Y_Up', defaultOrMaker: PlayButtonStatus.ON, valueOf: PlayButtonStatus.valueOf, enumValues: PlayButtonStatus.values)
-    ..e<PlayButtonStatus>(3, _omitFieldNames ? '' : 'ButtonZLeft', $pb.PbFieldType.OE, protoName: 'Button_Z_Left', defaultOrMaker: PlayButtonStatus.ON, valueOf: PlayButtonStatus.valueOf, enumValues: PlayButtonStatus.values)
-    ..e<PlayButtonStatus>(4, _omitFieldNames ? '' : 'ButtonARight', $pb.PbFieldType.OE, protoName: 'Button_A_Right', defaultOrMaker: PlayButtonStatus.ON, valueOf: PlayButtonStatus.valueOf, enumValues: PlayButtonStatus.values)
-    ..e<PlayButtonStatus>(5, _omitFieldNames ? '' : 'ButtonBDown', $pb.PbFieldType.OE, protoName: 'Button_B_Down', defaultOrMaker: PlayButtonStatus.ON, valueOf: PlayButtonStatus.valueOf, enumValues: PlayButtonStatus.values)
-    ..e<PlayButtonStatus>(6, _omitFieldNames ? '' : 'ButtonShift', $pb.PbFieldType.OE, protoName: 'Button_Shift', defaultOrMaker: PlayButtonStatus.ON, valueOf: PlayButtonStatus.valueOf, enumValues: PlayButtonStatus.values)
-    ..e<PlayButtonStatus>(7, _omitFieldNames ? '' : 'ButtonOn', $pb.PbFieldType.OE, protoName: 'Button_On', defaultOrMaker: PlayButtonStatus.ON, valueOf: PlayButtonStatus.valueOf, enumValues: PlayButtonStatus.values)
-    ..a<$core.int>(8, _omitFieldNames ? '' : 'AnalogLR', $pb.PbFieldType.OS3, protoName: 'Analog_LR')
-    ..a<$core.int>(9, _omitFieldNames ? '' : 'AnalogUD', $pb.PbFieldType.OS3, protoName: 'Analog_UD')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  PlayKeyPadStatus clone() => PlayKeyPadStatus()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  PlayKeyPadStatus copyWith(void Function(PlayKeyPadStatus) updates) => super.copyWith((message) => updates(message as PlayKeyPadStatus)) as PlayKeyPadStatus;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static PlayKeyPadStatus create() => PlayKeyPadStatus._();
-  PlayKeyPadStatus createEmptyInstance() => create();
-  static $pb.PbList<PlayKeyPadStatus> createRepeated() => $pb.PbList<PlayKeyPadStatus>();
-  @$core.pragma('dart2js:noInline')
-  static PlayKeyPadStatus getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PlayKeyPadStatus>(create);
-  static PlayKeyPadStatus? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  PlayButtonStatus get rightPad => $_getN(0);
-  @$pb.TagNumber(1)
-  set rightPad(PlayButtonStatus v) { setField(1, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasRightPad() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearRightPad() => clearField(1);
-
-  @$pb.TagNumber(2)
-  PlayButtonStatus get buttonYUp => $_getN(1);
-  @$pb.TagNumber(2)
-  set buttonYUp(PlayButtonStatus v) { setField(2, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasButtonYUp() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearButtonYUp() => clearField(2);
-
-  @$pb.TagNumber(3)
-  PlayButtonStatus get buttonZLeft => $_getN(2);
-  @$pb.TagNumber(3)
-  set buttonZLeft(PlayButtonStatus v) { setField(3, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasButtonZLeft() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearButtonZLeft() => clearField(3);
-
-  @$pb.TagNumber(4)
-  PlayButtonStatus get buttonARight => $_getN(3);
-  @$pb.TagNumber(4)
-  set buttonARight(PlayButtonStatus v) { setField(4, v); }
-  @$pb.TagNumber(4)
-  $core.bool hasButtonARight() => $_has(3);
-  @$pb.TagNumber(4)
-  void clearButtonARight() => clearField(4);
-
-  @$pb.TagNumber(5)
-  PlayButtonStatus get buttonBDown => $_getN(4);
-  @$pb.TagNumber(5)
-  set buttonBDown(PlayButtonStatus v) { setField(5, v); }
-  @$pb.TagNumber(5)
-  $core.bool hasButtonBDown() => $_has(4);
-  @$pb.TagNumber(5)
-  void clearButtonBDown() => clearField(5);
-
-  @$pb.TagNumber(6)
-  PlayButtonStatus get buttonShift => $_getN(5);
-  @$pb.TagNumber(6)
-  set buttonShift(PlayButtonStatus v) { setField(6, v); }
-  @$pb.TagNumber(6)
-  $core.bool hasButtonShift() => $_has(5);
-  @$pb.TagNumber(6)
-  void clearButtonShift() => clearField(6);
-
-  @$pb.TagNumber(7)
-  PlayButtonStatus get buttonOn => $_getN(6);
-  @$pb.TagNumber(7)
-  set buttonOn(PlayButtonStatus v) { setField(7, v); }
-  @$pb.TagNumber(7)
-  $core.bool hasButtonOn() => $_has(6);
-  @$pb.TagNumber(7)
-  void clearButtonOn() => clearField(7);
-
-  @$pb.TagNumber(8)
-  $core.int get analogLR => $_getIZ(7);
-  @$pb.TagNumber(8)
-  set analogLR($core.int v) { $_setSignedInt32(7, v); }
-  @$pb.TagNumber(8)
-  $core.bool hasAnalogLR() => $_has(7);
-  @$pb.TagNumber(8)
-  void clearAnalogLR() => clearField(8);
-
-  @$pb.TagNumber(9)
-  $core.int get analogUD => $_getIZ(8);
-  @$pb.TagNumber(9)
-  set analogUD($core.int v) { $_setSignedInt32(8, v); }
-  @$pb.TagNumber(9)
-  $core.bool hasAnalogUD() => $_has(8);
-  @$pb.TagNumber(9)
-  void clearAnalogUD() => clearField(9);
-}
-
-class PlayCommandParameters extends $pb.GeneratedMessage {
-  factory PlayCommandParameters({
-    $core.int? param1,
-    $core.int? param2,
-    $core.int? hapticPattern,
-  }) {
-    final $result = create();
-    if (param1 != null) {
-      $result.param1 = param1;
-    }
-    if (param2 != null) {
-      $result.param2 = param2;
-    }
-    if (hapticPattern != null) {
-      $result.hapticPattern = hapticPattern;
-    }
-    return $result;
-  }
-  PlayCommandParameters._() : super();
-  factory PlayCommandParameters.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory PlayCommandParameters.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PlayCommandParameters', package: const $pb.PackageName(_omitMessageNames ? '' : 'de.jonasbark'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'param1', $pb.PbFieldType.OU3)
-    ..a<$core.int>(2, _omitFieldNames ? '' : 'param2', $pb.PbFieldType.OU3)
-    ..a<$core.int>(3, _omitFieldNames ? '' : 'HapticPattern', $pb.PbFieldType.OU3, protoName: 'HapticPattern')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  PlayCommandParameters clone() => PlayCommandParameters()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  PlayCommandParameters copyWith(void Function(PlayCommandParameters) updates) => super.copyWith((message) => updates(message as PlayCommandParameters)) as PlayCommandParameters;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static PlayCommandParameters create() => PlayCommandParameters._();
-  PlayCommandParameters createEmptyInstance() => create();
-  static $pb.PbList<PlayCommandParameters> createRepeated() => $pb.PbList<PlayCommandParameters>();
-  @$core.pragma('dart2js:noInline')
-  static PlayCommandParameters getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PlayCommandParameters>(create);
-  static PlayCommandParameters? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.int get param1 => $_getIZ(0);
-  @$pb.TagNumber(1)
-  set param1($core.int v) { $_setUnsignedInt32(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasParam1() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearParam1() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.int get param2 => $_getIZ(1);
-  @$pb.TagNumber(2)
-  set param2($core.int v) { $_setUnsignedInt32(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasParam2() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearParam2() => clearField(2);
-
-  @$pb.TagNumber(3)
-  $core.int get hapticPattern => $_getIZ(2);
-  @$pb.TagNumber(3)
-  set hapticPattern($core.int v) { $_setUnsignedInt32(2, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasHapticPattern() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearHapticPattern() => clearField(3);
-}
-
-class PlayCommandContents extends $pb.GeneratedMessage {
-  factory PlayCommandContents({
-    PlayCommandParameters? commandParameters,
-  }) {
-    final $result = create();
-    if (commandParameters != null) {
-      $result.commandParameters = commandParameters;
-    }
-    return $result;
-  }
-  PlayCommandContents._() : super();
-  factory PlayCommandContents.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory PlayCommandContents.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PlayCommandContents', package: const $pb.PackageName(_omitMessageNames ? '' : 'de.jonasbark'), createEmptyInstance: create)
-    ..aOM<PlayCommandParameters>(1, _omitFieldNames ? '' : 'CommandParameters', protoName: 'CommandParameters', subBuilder: PlayCommandParameters.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  PlayCommandContents clone() => PlayCommandContents()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  PlayCommandContents copyWith(void Function(PlayCommandContents) updates) => super.copyWith((message) => updates(message as PlayCommandContents)) as PlayCommandContents;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static PlayCommandContents create() => PlayCommandContents._();
-  PlayCommandContents createEmptyInstance() => create();
-  static $pb.PbList<PlayCommandContents> createRepeated() => $pb.PbList<PlayCommandContents>();
-  @$core.pragma('dart2js:noInline')
-  static PlayCommandContents getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PlayCommandContents>(create);
-  static PlayCommandContents? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  PlayCommandParameters get commandParameters => $_getN(0);
-  @$pb.TagNumber(1)
-  set commandParameters(PlayCommandParameters v) { setField(1, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasCommandParameters() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearCommandParameters() => clearField(1);
-  @$pb.TagNumber(1)
-  PlayCommandParameters ensureCommandParameters() => $_ensure(0);
-}
-
-/// The command code prepending this message is 0x12
-/// This is sent to the control point to configure and make the controller vibrate
-class PlayCommand extends $pb.GeneratedMessage {
-  factory PlayCommand({
-    PlayCommandContents? commandContents,
-  }) {
-    final $result = create();
-    if (commandContents != null) {
-      $result.commandContents = commandContents;
-    }
-    return $result;
-  }
-  PlayCommand._() : super();
-  factory PlayCommand.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory PlayCommand.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'PlayCommand', package: const $pb.PackageName(_omitMessageNames ? '' : 'de.jonasbark'), createEmptyInstance: create)
-    ..aOM<PlayCommandContents>(2, _omitFieldNames ? '' : 'CommandContents', protoName: 'CommandContents', subBuilder: PlayCommandContents.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  PlayCommand clone() => PlayCommand()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  PlayCommand copyWith(void Function(PlayCommand) updates) => super.copyWith((message) => updates(message as PlayCommand)) as PlayCommand;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static PlayCommand create() => PlayCommand._();
-  PlayCommand createEmptyInstance() => create();
-  static $pb.PbList<PlayCommand> createRepeated() => $pb.PbList<PlayCommand>();
-  @$core.pragma('dart2js:noInline')
-  static PlayCommand getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<PlayCommand>(create);
-  static PlayCommand? _defaultInstance;
-
-  @$pb.TagNumber(2)
-  PlayCommandContents get commandContents => $_getN(0);
-  @$pb.TagNumber(2)
-  set commandContents(PlayCommandContents v) { setField(2, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasCommandContents() => $_has(0);
-  @$pb.TagNumber(2)
-  void clearCommandContents() => clearField(2);
-  @$pb.TagNumber(2)
-  PlayCommandContents ensureCommandContents() => $_ensure(0);
-}
-
-/// The command code prepending this message is 0x19
-/// This is sent periodically when there are no button presses
-class Idle extends $pb.GeneratedMessage {
-  factory Idle({
-    $core.int? unknown2,
-  }) {
-    final $result = create();
-    if (unknown2 != null) {
-      $result.unknown2 = unknown2;
-    }
-    return $result;
-  }
-  Idle._() : super();
-  factory Idle.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory Idle.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Idle', package: const $pb.PackageName(_omitMessageNames ? '' : 'de.jonasbark'), createEmptyInstance: create)
-    ..a<$core.int>(2, _omitFieldNames ? '' : 'Unknown2', $pb.PbFieldType.OU3, protoName: 'Unknown2')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  Idle clone() => Idle()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  Idle copyWith(void Function(Idle) updates) => super.copyWith((message) => updates(message as Idle)) as Idle;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static Idle create() => Idle._();
-  Idle createEmptyInstance() => create();
-  static $pb.PbList<Idle> createRepeated() => $pb.PbList<Idle>();
-  @$core.pragma('dart2js:noInline')
-  static Idle getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<Idle>(create);
-  static Idle? _defaultInstance;
-
-  @$pb.TagNumber(2)
-  $core.int get unknown2 => $_getIZ(0);
-  @$pb.TagNumber(2)
-  set unknown2($core.int v) { $_setUnsignedInt32(0, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasUnknown2() => $_has(0);
-  @$pb.TagNumber(2)
-  void clearUnknown2() => clearField(2);
-}
-
-class RideAnalogKeyPress extends $pb.GeneratedMessage {
-  factory RideAnalogKeyPress({
-    RideAnalogLocation? location,
-    $core.int? analogValue,
-  }) {
-    final $result = create();
-    if (location != null) {
-      $result.location = location;
-    }
-    if (analogValue != null) {
-      $result.analogValue = analogValue;
-    }
-    return $result;
-  }
-  RideAnalogKeyPress._() : super();
-  factory RideAnalogKeyPress.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory RideAnalogKeyPress.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RideAnalogKeyPress', package: const $pb.PackageName(_omitMessageNames ? '' : 'de.jonasbark'), createEmptyInstance: create)
-    ..e<RideAnalogLocation>(1, _omitFieldNames ? '' : 'Location', $pb.PbFieldType.OE, protoName: 'Location', defaultOrMaker: RideAnalogLocation.LEFT, valueOf: RideAnalogLocation.valueOf, enumValues: RideAnalogLocation.values)
-    ..a<$core.int>(2, _omitFieldNames ? '' : 'AnalogValue', $pb.PbFieldType.OS3, protoName: 'AnalogValue')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  RideAnalogKeyPress clone() => RideAnalogKeyPress()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  RideAnalogKeyPress copyWith(void Function(RideAnalogKeyPress) updates) => super.copyWith((message) => updates(message as RideAnalogKeyPress)) as RideAnalogKeyPress;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static RideAnalogKeyPress create() => RideAnalogKeyPress._();
-  RideAnalogKeyPress createEmptyInstance() => create();
-  static $pb.PbList<RideAnalogKeyPress> createRepeated() => $pb.PbList<RideAnalogKeyPress>();
-  @$core.pragma('dart2js:noInline')
-  static RideAnalogKeyPress getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<RideAnalogKeyPress>(create);
-  static RideAnalogKeyPress? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  RideAnalogLocation get location => $_getN(0);
-  @$pb.TagNumber(1)
-  set location(RideAnalogLocation v) { setField(1, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasLocation() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearLocation() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.int get analogValue => $_getIZ(1);
-  @$pb.TagNumber(2)
-  set analogValue($core.int v) { $_setSignedInt32(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasAnalogValue() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearAnalogValue() => clearField(2);
-}
-
-/// The command code prepending this message is 0x23
-/// All analog paddles (L0-L3) appear as repeated RideAnalogKeyPress in field 3
-class RideKeyPadStatus extends $pb.GeneratedMessage {
-  factory RideKeyPadStatus({
-    $core.int? buttonMap,
-    $core.Iterable<RideAnalogKeyPress>? analogPaddles,
-  }) {
-    final $result = create();
-    if (buttonMap != null) {
-      $result.buttonMap = buttonMap;
-    }
-    if (analogPaddles != null) {
-      $result.analogPaddles.addAll(analogPaddles);
-    }
-    return $result;
-  }
-  RideKeyPadStatus._() : super();
-  factory RideKeyPadStatus.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory RideKeyPadStatus.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RideKeyPadStatus', package: const $pb.PackageName(_omitMessageNames ? '' : 'de.jonasbark'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'ButtonMap', $pb.PbFieldType.OU3, protoName: 'ButtonMap')
-    ..pc<RideAnalogKeyPress>(3, _omitFieldNames ? '' : 'AnalogPaddles', $pb.PbFieldType.PM, protoName: 'AnalogPaddles', subBuilder: RideAnalogKeyPress.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  RideKeyPadStatus clone() => RideKeyPadStatus()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  RideKeyPadStatus copyWith(void Function(RideKeyPadStatus) updates) => super.copyWith((message) => updates(message as RideKeyPadStatus)) as RideKeyPadStatus;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static RideKeyPadStatus create() => RideKeyPadStatus._();
-  RideKeyPadStatus createEmptyInstance() => create();
-  static $pb.PbList<RideKeyPadStatus> createRepeated() => $pb.PbList<RideKeyPadStatus>();
-  @$core.pragma('dart2js:noInline')
-  static RideKeyPadStatus getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<RideKeyPadStatus>(create);
-  static RideKeyPadStatus? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.int get buttonMap => $_getIZ(0);
-  @$pb.TagNumber(1)
-  set buttonMap($core.int v) { $_setUnsignedInt32(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasButtonMap() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearButtonMap() => clearField(1);
-
-  @$pb.TagNumber(3)
-  $core.List<RideAnalogKeyPress> get analogPaddles => $_getList(1);
-}
-
-/// ------------------ Zwift Click messages
-///  The command code prepending this message is 0x37
-class ClickKeyPadStatus extends $pb.GeneratedMessage {
-  factory ClickKeyPadStatus({
-    PlayButtonStatus? buttonPlus,
-    PlayButtonStatus? buttonMinus,
-  }) {
-    final $result = create();
-    if (buttonPlus != null) {
-      $result.buttonPlus = buttonPlus;
-    }
-    if (buttonMinus != null) {
-      $result.buttonMinus = buttonMinus;
-    }
-    return $result;
-  }
-  ClickKeyPadStatus._() : super();
-  factory ClickKeyPadStatus.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory ClickKeyPadStatus.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ClickKeyPadStatus', package: const $pb.PackageName(_omitMessageNames ? '' : 'de.jonasbark'), createEmptyInstance: create)
-    ..e<PlayButtonStatus>(1, _omitFieldNames ? '' : 'ButtonPlus', $pb.PbFieldType.OE, protoName: 'Button_Plus', defaultOrMaker: PlayButtonStatus.ON, valueOf: PlayButtonStatus.valueOf, enumValues: PlayButtonStatus.values)
-    ..e<PlayButtonStatus>(2, _omitFieldNames ? '' : 'ButtonMinus', $pb.PbFieldType.OE, protoName: 'Button_Minus', defaultOrMaker: PlayButtonStatus.ON, valueOf: PlayButtonStatus.valueOf, enumValues: PlayButtonStatus.values)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  ClickKeyPadStatus clone() => ClickKeyPadStatus()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  ClickKeyPadStatus copyWith(void Function(ClickKeyPadStatus) updates) => super.copyWith((message) => updates(message as ClickKeyPadStatus)) as ClickKeyPadStatus;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static ClickKeyPadStatus create() => ClickKeyPadStatus._();
-  ClickKeyPadStatus createEmptyInstance() => create();
-  static $pb.PbList<ClickKeyPadStatus> createRepeated() => $pb.PbList<ClickKeyPadStatus>();
-  @$core.pragma('dart2js:noInline')
-  static ClickKeyPadStatus getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<ClickKeyPadStatus>(create);
-  static ClickKeyPadStatus? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  PlayButtonStatus get buttonPlus => $_getN(0);
-  @$pb.TagNumber(1)
-  set buttonPlus(PlayButtonStatus v) { setField(1, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasButtonPlus() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearButtonPlus() => clearField(1);
-
-  @$pb.TagNumber(2)
-  PlayButtonStatus get buttonMinus => $_getN(1);
-  @$pb.TagNumber(2)
-  set buttonMinus(PlayButtonStatus v) { setField(2, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasButtonMinus() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearButtonMinus() => clearField(2);
-}
-
-/// ------------------ Device Information requested after connection
-///  The command code prepending this message is 0x3c
-class DeviceInformationContent extends $pb.GeneratedMessage {
-  factory DeviceInformationContent({
-    $core.int? unknown1,
-    $core.Iterable<$core.int>? softwareVersion,
-    $core.String? deviceName,
-    $core.int? unknown4,
-    $core.int? unknown5,
-    $core.String? serialNumber,
-    $core.String? hardwareVersion,
-    $core.Iterable<$core.int>? replyData,
-    $core.int? unknown9,
-    $core.int? unknown10,
-    $core.int? unknown13,
-  }) {
-    final $result = create();
-    if (unknown1 != null) {
-      $result.unknown1 = unknown1;
-    }
-    if (softwareVersion != null) {
-      $result.softwareVersion.addAll(softwareVersion);
-    }
-    if (deviceName != null) {
-      $result.deviceName = deviceName;
-    }
-    if (unknown4 != null) {
-      $result.unknown4 = unknown4;
-    }
-    if (unknown5 != null) {
-      $result.unknown5 = unknown5;
-    }
-    if (serialNumber != null) {
-      $result.serialNumber = serialNumber;
-    }
-    if (hardwareVersion != null) {
-      $result.hardwareVersion = hardwareVersion;
-    }
-    if (replyData != null) {
-      $result.replyData.addAll(replyData);
-    }
-    if (unknown9 != null) {
-      $result.unknown9 = unknown9;
-    }
-    if (unknown10 != null) {
-      $result.unknown10 = unknown10;
-    }
-    if (unknown13 != null) {
-      $result.unknown13 = unknown13;
-    }
-    return $result;
-  }
-  DeviceInformationContent._() : super();
-  factory DeviceInformationContent.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory DeviceInformationContent.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeviceInformationContent', package: const $pb.PackageName(_omitMessageNames ? '' : 'de.jonasbark'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'Unknown1', $pb.PbFieldType.OU3, protoName: 'Unknown1')
-    ..p<$core.int>(2, _omitFieldNames ? '' : 'SoftwareVersion', $pb.PbFieldType.PU3, protoName: 'SoftwareVersion')
-    ..aOS(3, _omitFieldNames ? '' : 'DeviceName', protoName: 'DeviceName')
-    ..a<$core.int>(4, _omitFieldNames ? '' : 'Unknown4', $pb.PbFieldType.OU3, protoName: 'Unknown4')
-    ..a<$core.int>(5, _omitFieldNames ? '' : 'Unknown5', $pb.PbFieldType.OU3, protoName: 'Unknown5')
-    ..aOS(6, _omitFieldNames ? '' : 'SerialNumber', protoName: 'SerialNumber')
-    ..aOS(7, _omitFieldNames ? '' : 'HardwareVersion', protoName: 'HardwareVersion')
-    ..p<$core.int>(8, _omitFieldNames ? '' : 'ReplyData', $pb.PbFieldType.PU3, protoName: 'ReplyData')
-    ..a<$core.int>(9, _omitFieldNames ? '' : 'Unknown9', $pb.PbFieldType.OU3, protoName: 'Unknown9')
-    ..a<$core.int>(10, _omitFieldNames ? '' : 'Unknown10', $pb.PbFieldType.OU3, protoName: 'Unknown10')
-    ..a<$core.int>(13, _omitFieldNames ? '' : 'Unknown13', $pb.PbFieldType.OU3, protoName: 'Unknown13')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  DeviceInformationContent clone() => DeviceInformationContent()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  DeviceInformationContent copyWith(void Function(DeviceInformationContent) updates) => super.copyWith((message) => updates(message as DeviceInformationContent)) as DeviceInformationContent;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static DeviceInformationContent create() => DeviceInformationContent._();
-  DeviceInformationContent createEmptyInstance() => create();
-  static $pb.PbList<DeviceInformationContent> createRepeated() => $pb.PbList<DeviceInformationContent>();
-  @$core.pragma('dart2js:noInline')
-  static DeviceInformationContent getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<DeviceInformationContent>(create);
-  static DeviceInformationContent? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.int get unknown1 => $_getIZ(0);
-  @$pb.TagNumber(1)
-  set unknown1($core.int v) { $_setUnsignedInt32(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasUnknown1() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearUnknown1() => clearField(1);
-
-  @$pb.TagNumber(2)
-  $core.List<$core.int> get softwareVersion => $_getList(1);
-
-  @$pb.TagNumber(3)
-  $core.String get deviceName => $_getSZ(2);
-  @$pb.TagNumber(3)
-  set deviceName($core.String v) { $_setString(2, v); }
-  @$pb.TagNumber(3)
-  $core.bool hasDeviceName() => $_has(2);
-  @$pb.TagNumber(3)
-  void clearDeviceName() => clearField(3);
-
-  @$pb.TagNumber(4)
-  $core.int get unknown4 => $_getIZ(3);
-  @$pb.TagNumber(4)
-  set unknown4($core.int v) { $_setUnsignedInt32(3, v); }
-  @$pb.TagNumber(4)
-  $core.bool hasUnknown4() => $_has(3);
-  @$pb.TagNumber(4)
-  void clearUnknown4() => clearField(4);
-
-  @$pb.TagNumber(5)
-  $core.int get unknown5 => $_getIZ(4);
-  @$pb.TagNumber(5)
-  set unknown5($core.int v) { $_setUnsignedInt32(4, v); }
-  @$pb.TagNumber(5)
-  $core.bool hasUnknown5() => $_has(4);
-  @$pb.TagNumber(5)
-  void clearUnknown5() => clearField(5);
-
-  @$pb.TagNumber(6)
-  $core.String get serialNumber => $_getSZ(5);
-  @$pb.TagNumber(6)
-  set serialNumber($core.String v) { $_setString(5, v); }
-  @$pb.TagNumber(6)
-  $core.bool hasSerialNumber() => $_has(5);
-  @$pb.TagNumber(6)
-  void clearSerialNumber() => clearField(6);
-
-  @$pb.TagNumber(7)
-  $core.String get hardwareVersion => $_getSZ(6);
-  @$pb.TagNumber(7)
-  set hardwareVersion($core.String v) { $_setString(6, v); }
-  @$pb.TagNumber(7)
-  $core.bool hasHardwareVersion() => $_has(6);
-  @$pb.TagNumber(7)
-  void clearHardwareVersion() => clearField(7);
-
-  @$pb.TagNumber(8)
-  $core.List<$core.int> get replyData => $_getList(7);
-
-  @$pb.TagNumber(9)
-  $core.int get unknown9 => $_getIZ(8);
-  @$pb.TagNumber(9)
-  set unknown9($core.int v) { $_setUnsignedInt32(8, v); }
-  @$pb.TagNumber(9)
-  $core.bool hasUnknown9() => $_has(8);
-  @$pb.TagNumber(9)
-  void clearUnknown9() => clearField(9);
-
-  @$pb.TagNumber(10)
-  $core.int get unknown10 => $_getIZ(9);
-  @$pb.TagNumber(10)
-  set unknown10($core.int v) { $_setUnsignedInt32(9, v); }
-  @$pb.TagNumber(10)
-  $core.bool hasUnknown10() => $_has(9);
-  @$pb.TagNumber(10)
-  void clearUnknown10() => clearField(10);
-
-  @$pb.TagNumber(13)
-  $core.int get unknown13 => $_getIZ(10);
-  @$pb.TagNumber(13)
-  set unknown13($core.int v) { $_setUnsignedInt32(10, v); }
-  @$pb.TagNumber(13)
-  $core.bool hasUnknown13() => $_has(10);
-  @$pb.TagNumber(13)
-  void clearUnknown13() => clearField(13);
-}
-
-class SubContent extends $pb.GeneratedMessage {
-  factory SubContent({
-    DeviceInformationContent? content,
-    $core.int? unknown2,
-    $core.int? unknown4,
-    $core.int? unknown5,
-    $core.int? unknown6,
-  }) {
-    final $result = create();
-    if (content != null) {
-      $result.content = content;
-    }
-    if (unknown2 != null) {
-      $result.unknown2 = unknown2;
-    }
-    if (unknown4 != null) {
-      $result.unknown4 = unknown4;
-    }
-    if (unknown5 != null) {
-      $result.unknown5 = unknown5;
-    }
-    if (unknown6 != null) {
-      $result.unknown6 = unknown6;
-    }
-    return $result;
-  }
-  SubContent._() : super();
-  factory SubContent.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory SubContent.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'SubContent', package: const $pb.PackageName(_omitMessageNames ? '' : 'de.jonasbark'), createEmptyInstance: create)
-    ..aOM<DeviceInformationContent>(1, _omitFieldNames ? '' : 'Content', protoName: 'Content', subBuilder: DeviceInformationContent.create)
-    ..a<$core.int>(2, _omitFieldNames ? '' : 'Unknown2', $pb.PbFieldType.OU3, protoName: 'Unknown2')
-    ..a<$core.int>(4, _omitFieldNames ? '' : 'Unknown4', $pb.PbFieldType.OU3, protoName: 'Unknown4')
-    ..a<$core.int>(5, _omitFieldNames ? '' : 'Unknown5', $pb.PbFieldType.OU3, protoName: 'Unknown5')
-    ..a<$core.int>(6, _omitFieldNames ? '' : 'Unknown6', $pb.PbFieldType.OU3, protoName: 'Unknown6')
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  SubContent clone() => SubContent()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  SubContent copyWith(void Function(SubContent) updates) => super.copyWith((message) => updates(message as SubContent)) as SubContent;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static SubContent create() => SubContent._();
-  SubContent createEmptyInstance() => create();
-  static $pb.PbList<SubContent> createRepeated() => $pb.PbList<SubContent>();
-  @$core.pragma('dart2js:noInline')
-  static SubContent getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<SubContent>(create);
-  static SubContent? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  DeviceInformationContent get content => $_getN(0);
-  @$pb.TagNumber(1)
-  set content(DeviceInformationContent v) { setField(1, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasContent() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearContent() => clearField(1);
-  @$pb.TagNumber(1)
-  DeviceInformationContent ensureContent() => $_ensure(0);
-
-  @$pb.TagNumber(2)
-  $core.int get unknown2 => $_getIZ(1);
-  @$pb.TagNumber(2)
-  set unknown2($core.int v) { $_setUnsignedInt32(1, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasUnknown2() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearUnknown2() => clearField(2);
-
-  @$pb.TagNumber(4)
-  $core.int get unknown4 => $_getIZ(2);
-  @$pb.TagNumber(4)
-  set unknown4($core.int v) { $_setUnsignedInt32(2, v); }
-  @$pb.TagNumber(4)
-  $core.bool hasUnknown4() => $_has(2);
-  @$pb.TagNumber(4)
-  void clearUnknown4() => clearField(4);
-
-  @$pb.TagNumber(5)
-  $core.int get unknown5 => $_getIZ(3);
-  @$pb.TagNumber(5)
-  set unknown5($core.int v) { $_setUnsignedInt32(3, v); }
-  @$pb.TagNumber(5)
-  $core.bool hasUnknown5() => $_has(3);
-  @$pb.TagNumber(5)
-  void clearUnknown5() => clearField(5);
-
-  @$pb.TagNumber(6)
-  $core.int get unknown6 => $_getIZ(4);
-  @$pb.TagNumber(6)
-  set unknown6($core.int v) { $_setUnsignedInt32(4, v); }
-  @$pb.TagNumber(6)
-  $core.bool hasUnknown6() => $_has(4);
-  @$pb.TagNumber(6)
-  void clearUnknown6() => clearField(6);
-}
-
-class DeviceInformation extends $pb.GeneratedMessage {
-  factory DeviceInformation({
-    $core.int? informationId,
-    SubContent? subContent,
-  }) {
-    final $result = create();
-    if (informationId != null) {
-      $result.informationId = informationId;
-    }
-    if (subContent != null) {
-      $result.subContent = subContent;
-    }
-    return $result;
-  }
-  DeviceInformation._() : super();
-  factory DeviceInformation.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory DeviceInformation.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'DeviceInformation', package: const $pb.PackageName(_omitMessageNames ? '' : 'de.jonasbark'), createEmptyInstance: create)
-    ..a<$core.int>(1, _omitFieldNames ? '' : 'InformationId', $pb.PbFieldType.OU3, protoName: 'InformationId')
-    ..aOM<SubContent>(2, _omitFieldNames ? '' : 'SubContent', protoName: 'SubContent', subBuilder: SubContent.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  DeviceInformation clone() => DeviceInformation()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  DeviceInformation copyWith(void Function(DeviceInformation) updates) => super.copyWith((message) => updates(message as DeviceInformation)) as DeviceInformation;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static DeviceInformation create() => DeviceInformation._();
-  DeviceInformation createEmptyInstance() => create();
-  static $pb.PbList<DeviceInformation> createRepeated() => $pb.PbList<DeviceInformation>();
-  @$core.pragma('dart2js:noInline')
-  static DeviceInformation getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<DeviceInformation>(create);
-  static DeviceInformation? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.int get informationId => $_getIZ(0);
-  @$pb.TagNumber(1)
-  set informationId($core.int v) { $_setUnsignedInt32(0, v); }
-  @$pb.TagNumber(1)
-  $core.bool hasInformationId() => $_has(0);
-  @$pb.TagNumber(1)
-  void clearInformationId() => clearField(1);
-
-  @$pb.TagNumber(2)
-  SubContent get subContent => $_getN(1);
-  @$pb.TagNumber(2)
-  set subContent(SubContent v) { setField(2, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasSubContent() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearSubContent() => clearField(2);
-  @$pb.TagNumber(2)
-  SubContent ensureSubContent() => $_ensure(1);
-}
-
-
-const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
-const _omitMessageNames = $core.bool.fromEnvironment('protobuf.omit_message_names');

lib/bluetooth/devices/zwift/protocol/zwift.pbenum.dart

@@ -1,95 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: zwift.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-import 'dart:core' as $core;
-
-import 'package:protobuf/protobuf.dart' as $pb;
-
-class PlayButtonStatus extends $pb.ProtobufEnum {
-  static const PlayButtonStatus ON = PlayButtonStatus._(0, _omitEnumNames ? '' : 'ON');
-  static const PlayButtonStatus OFF = PlayButtonStatus._(1, _omitEnumNames ? '' : 'OFF');
-
-  static const $core.List<PlayButtonStatus> values = <PlayButtonStatus> [
-    ON,
-    OFF,
-  ];
-
-  static final $core.Map<$core.int, PlayButtonStatus> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static PlayButtonStatus? valueOf($core.int value) => _byValue[value];
-
-  const PlayButtonStatus._($core.int v, $core.String n) : super(v, n);
-}
-
-/// ----------------- Zwift Ride messages
-class RideButtonMask extends $pb.ProtobufEnum {
-  static const RideButtonMask LEFT_BTN = RideButtonMask._(1, _omitEnumNames ? '' : 'LEFT_BTN');
-  static const RideButtonMask UP_BTN = RideButtonMask._(2, _omitEnumNames ? '' : 'UP_BTN');
-  static const RideButtonMask RIGHT_BTN = RideButtonMask._(4, _omitEnumNames ? '' : 'RIGHT_BTN');
-  static const RideButtonMask DOWN_BTN = RideButtonMask._(8, _omitEnumNames ? '' : 'DOWN_BTN');
-  static const RideButtonMask A_BTN = RideButtonMask._(16, _omitEnumNames ? '' : 'A_BTN');
-  static const RideButtonMask B_BTN = RideButtonMask._(32, _omitEnumNames ? '' : 'B_BTN');
-  static const RideButtonMask Y_BTN = RideButtonMask._(64, _omitEnumNames ? '' : 'Y_BTN');
-  static const RideButtonMask Z_BTN = RideButtonMask._(256, _omitEnumNames ? '' : 'Z_BTN');
-  static const RideButtonMask SHFT_UP_L_BTN = RideButtonMask._(512, _omitEnumNames ? '' : 'SHFT_UP_L_BTN');
-  static const RideButtonMask SHFT_DN_L_BTN = RideButtonMask._(1024, _omitEnumNames ? '' : 'SHFT_DN_L_BTN');
-  static const RideButtonMask POWERUP_L_BTN = RideButtonMask._(2048, _omitEnumNames ? '' : 'POWERUP_L_BTN');
-  static const RideButtonMask ONOFF_L_BTN = RideButtonMask._(4096, _omitEnumNames ? '' : 'ONOFF_L_BTN');
-  static const RideButtonMask SHFT_UP_R_BTN = RideButtonMask._(8192, _omitEnumNames ? '' : 'SHFT_UP_R_BTN');
-  static const RideButtonMask SHFT_DN_R_BTN = RideButtonMask._(16384, _omitEnumNames ? '' : 'SHFT_DN_R_BTN');
-  static const RideButtonMask POWERUP_R_BTN = RideButtonMask._(65536, _omitEnumNames ? '' : 'POWERUP_R_BTN');
-  static const RideButtonMask ONOFF_R_BTN = RideButtonMask._(131072, _omitEnumNames ? '' : 'ONOFF_R_BTN');
-
-  static const $core.List<RideButtonMask> values = <RideButtonMask> [
-    LEFT_BTN,
-    UP_BTN,
-    RIGHT_BTN,
-    DOWN_BTN,
-    A_BTN,
-    B_BTN,
-    Y_BTN,
-    Z_BTN,
-    SHFT_UP_L_BTN,
-    SHFT_DN_L_BTN,
-    POWERUP_L_BTN,
-    ONOFF_L_BTN,
-    SHFT_UP_R_BTN,
-    SHFT_DN_R_BTN,
-    POWERUP_R_BTN,
-    ONOFF_R_BTN,
-  ];
-
-  static final $core.Map<$core.int, RideButtonMask> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static RideButtonMask? valueOf($core.int value) => _byValue[value];
-
-  const RideButtonMask._($core.int v, $core.String n) : super(v, n);
-}
-
-class RideAnalogLocation extends $pb.ProtobufEnum {
-  static const RideAnalogLocation LEFT = RideAnalogLocation._(0, _omitEnumNames ? '' : 'LEFT');
-  static const RideAnalogLocation RIGHT = RideAnalogLocation._(1, _omitEnumNames ? '' : 'RIGHT');
-  static const RideAnalogLocation UP = RideAnalogLocation._(2, _omitEnumNames ? '' : 'UP');
-  static const RideAnalogLocation DOWN = RideAnalogLocation._(3, _omitEnumNames ? '' : 'DOWN');
-
-  static const $core.List<RideAnalogLocation> values = <RideAnalogLocation> [
-    LEFT,
-    RIGHT,
-    UP,
-    DOWN,
-  ];
-
-  static final $core.Map<$core.int, RideAnalogLocation> _byValue = $pb.ProtobufEnum.initByValue(values);
-  static RideAnalogLocation? valueOf($core.int value) => _byValue[value];
-
-  const RideAnalogLocation._($core.int v, $core.String n) : super(v, n);
-}
-
-
-const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');

lib/bluetooth/devices/zwift/protocol/zwift.pbjson.dart

@@ -1,264 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: zwift.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-import 'dart:convert' as $convert;
-import 'dart:core' as $core;
-import 'dart:typed_data' as $typed_data;
-
-@$core.Deprecated('Use playButtonStatusDescriptor instead')
-const PlayButtonStatus$json = {
-  '1': 'PlayButtonStatus',
-  '2': [
-    {'1': 'ON', '2': 0},
-    {'1': 'OFF', '2': 1},
-  ],
-};
-
-/// Descriptor for `PlayButtonStatus`. Decode as a `google.protobuf.EnumDescriptorProto`.
-final $typed_data.Uint8List playButtonStatusDescriptor = $convert.base64Decode(
-    'ChBQbGF5QnV0dG9uU3RhdHVzEgYKAk9OEAASBwoDT0ZGEAE=');
-
-@$core.Deprecated('Use rideButtonMaskDescriptor instead')
-const RideButtonMask$json = {
-  '1': 'RideButtonMask',
-  '2': [
-    {'1': 'LEFT_BTN', '2': 1},
-    {'1': 'UP_BTN', '2': 2},
-    {'1': 'RIGHT_BTN', '2': 4},
-    {'1': 'DOWN_BTN', '2': 8},
-    {'1': 'A_BTN', '2': 16},
-    {'1': 'B_BTN', '2': 32},
-    {'1': 'Y_BTN', '2': 64},
-    {'1': 'Z_BTN', '2': 256},
-    {'1': 'SHFT_UP_L_BTN', '2': 512},
-    {'1': 'SHFT_DN_L_BTN', '2': 1024},
-    {'1': 'POWERUP_L_BTN', '2': 2048},
-    {'1': 'ONOFF_L_BTN', '2': 4096},
-    {'1': 'SHFT_UP_R_BTN', '2': 8192},
-    {'1': 'SHFT_DN_R_BTN', '2': 16384},
-    {'1': 'POWERUP_R_BTN', '2': 65536},
-    {'1': 'ONOFF_R_BTN', '2': 131072},
-  ],
-};
-
-/// Descriptor for `RideButtonMask`. Decode as a `google.protobuf.EnumDescriptorProto`.
-final $typed_data.Uint8List rideButtonMaskDescriptor = $convert.base64Decode(
-    'Cg5SaWRlQnV0dG9uTWFzaxIMCghMRUZUX0JUThABEgoKBlVQX0JUThACEg0KCVJJR0hUX0JUTh'
-    'AEEgwKCERPV05fQlROEAgSCQoFQV9CVE4QEBIJCgVCX0JUThAgEgkKBVlfQlROEEASCgoFWl9C'
-    'VE4QgAISEgoNU0hGVF9VUF9MX0JUThCABBISCg1TSEZUX0ROX0xfQlROEIAIEhIKDVBPV0VSVV'
-    'BfTF9CVE4QgBASEAoLT05PRkZfTF9CVE4QgCASEgoNU0hGVF9VUF9SX0JUThCAQBITCg1TSEZU'
-    'X0ROX1JfQlROEICAARITCg1QT1dFUlVQX1JfQlROEICABBIRCgtPTk9GRl9SX0JUThCAgAg=');
-
-@$core.Deprecated('Use rideAnalogLocationDescriptor instead')
-const RideAnalogLocation$json = {
-  '1': 'RideAnalogLocation',
-  '2': [
-    {'1': 'LEFT', '2': 0},
-    {'1': 'RIGHT', '2': 1},
-    {'1': 'UP', '2': 2},
-    {'1': 'DOWN', '2': 3},
-  ],
-};
-
-/// Descriptor for `RideAnalogLocation`. Decode as a `google.protobuf.EnumDescriptorProto`.
-final $typed_data.Uint8List rideAnalogLocationDescriptor = $convert.base64Decode(
-    'ChJSaWRlQW5hbG9nTG9jYXRpb24SCAoETEVGVBAAEgkKBVJJR0hUEAESBgoCVVAQAhIICgRET1'
-    'dOEAM=');
-
-@$core.Deprecated('Use playKeyPadStatusDescriptor instead')
-const PlayKeyPadStatus$json = {
-  '1': 'PlayKeyPadStatus',
-  '2': [
-    {'1': 'RightPad', '3': 1, '4': 1, '5': 14, '6': '.de.jonasbark.PlayButtonStatus', '10': 'RightPad'},
-    {'1': 'Button_Y_Up', '3': 2, '4': 1, '5': 14, '6': '.de.jonasbark.PlayButtonStatus', '10': 'ButtonYUp'},
-    {'1': 'Button_Z_Left', '3': 3, '4': 1, '5': 14, '6': '.de.jonasbark.PlayButtonStatus', '10': 'ButtonZLeft'},
-    {'1': 'Button_A_Right', '3': 4, '4': 1, '5': 14, '6': '.de.jonasbark.PlayButtonStatus', '10': 'ButtonARight'},
-    {'1': 'Button_B_Down', '3': 5, '4': 1, '5': 14, '6': '.de.jonasbark.PlayButtonStatus', '10': 'ButtonBDown'},
-    {'1': 'Button_Shift', '3': 6, '4': 1, '5': 14, '6': '.de.jonasbark.PlayButtonStatus', '10': 'ButtonShift'},
-    {'1': 'Button_On', '3': 7, '4': 1, '5': 14, '6': '.de.jonasbark.PlayButtonStatus', '10': 'ButtonOn'},
-    {'1': 'Analog_LR', '3': 8, '4': 1, '5': 17, '10': 'AnalogLR'},
-    {'1': 'Analog_UD', '3': 9, '4': 1, '5': 17, '10': 'AnalogUD'},
-  ],
-};
-
-/// Descriptor for `PlayKeyPadStatus`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List playKeyPadStatusDescriptor = $convert.base64Decode(
-    'ChBQbGF5S2V5UGFkU3RhdHVzEjoKCFJpZ2h0UGFkGAEgASgOMh4uZGUuam9uYXNiYXJrLlBsYX'
-    'lCdXR0b25TdGF0dXNSCFJpZ2h0UGFkEj4KC0J1dHRvbl9ZX1VwGAIgASgOMh4uZGUuam9uYXNi'
-    'YXJrLlBsYXlCdXR0b25TdGF0dXNSCUJ1dHRvbllVcBJCCg1CdXR0b25fWl9MZWZ0GAMgASgOMh'
-    '4uZGUuam9uYXNiYXJrLlBsYXlCdXR0b25TdGF0dXNSC0J1dHRvblpMZWZ0EkQKDkJ1dHRvbl9B'
-    'X1JpZ2h0GAQgASgOMh4uZGUuam9uYXNiYXJrLlBsYXlCdXR0b25TdGF0dXNSDEJ1dHRvbkFSaW'
-    'dodBJCCg1CdXR0b25fQl9Eb3duGAUgASgOMh4uZGUuam9uYXNiYXJrLlBsYXlCdXR0b25TdGF0'
-    'dXNSC0J1dHRvbkJEb3duEkEKDEJ1dHRvbl9TaGlmdBgGIAEoDjIeLmRlLmpvbmFzYmFyay5QbG'
-    'F5QnV0dG9uU3RhdHVzUgtCdXR0b25TaGlmdBI7CglCdXR0b25fT24YByABKA4yHi5kZS5qb25h'
-    'c2JhcmsuUGxheUJ1dHRvblN0YXR1c1IIQnV0dG9uT24SGwoJQW5hbG9nX0xSGAggASgRUghBbm'
-    'Fsb2dMUhIbCglBbmFsb2dfVUQYCSABKBFSCEFuYWxvZ1VE');
-
-@$core.Deprecated('Use playCommandParametersDescriptor instead')
-const PlayCommandParameters$json = {
-  '1': 'PlayCommandParameters',
-  '2': [
-    {'1': 'param1', '3': 1, '4': 1, '5': 13, '10': 'param1'},
-    {'1': 'param2', '3': 2, '4': 1, '5': 13, '10': 'param2'},
-    {'1': 'HapticPattern', '3': 3, '4': 1, '5': 13, '10': 'HapticPattern'},
-  ],
-};
-
-/// Descriptor for `PlayCommandParameters`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List playCommandParametersDescriptor = $convert.base64Decode(
-    'ChVQbGF5Q29tbWFuZFBhcmFtZXRlcnMSFgoGcGFyYW0xGAEgASgNUgZwYXJhbTESFgoGcGFyYW'
-    '0yGAIgASgNUgZwYXJhbTISJAoNSGFwdGljUGF0dGVybhgDIAEoDVINSGFwdGljUGF0dGVybg==');
-
-@$core.Deprecated('Use playCommandContentsDescriptor instead')
-const PlayCommandContents$json = {
-  '1': 'PlayCommandContents',
-  '2': [
-    {'1': 'CommandParameters', '3': 1, '4': 1, '5': 11, '6': '.de.jonasbark.PlayCommandParameters', '10': 'CommandParameters'},
-  ],
-};
-
-/// Descriptor for `PlayCommandContents`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List playCommandContentsDescriptor = $convert.base64Decode(
-    'ChNQbGF5Q29tbWFuZENvbnRlbnRzElEKEUNvbW1hbmRQYXJhbWV0ZXJzGAEgASgLMiMuZGUuam'
-    '9uYXNiYXJrLlBsYXlDb21tYW5kUGFyYW1ldGVyc1IRQ29tbWFuZFBhcmFtZXRlcnM=');
-
-@$core.Deprecated('Use playCommandDescriptor instead')
-const PlayCommand$json = {
-  '1': 'PlayCommand',
-  '2': [
-    {'1': 'CommandContents', '3': 2, '4': 1, '5': 11, '6': '.de.jonasbark.PlayCommandContents', '10': 'CommandContents'},
-  ],
-};
-
-/// Descriptor for `PlayCommand`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List playCommandDescriptor = $convert.base64Decode(
-    'CgtQbGF5Q29tbWFuZBJLCg9Db21tYW5kQ29udGVudHMYAiABKAsyIS5kZS5qb25hc2JhcmsuUG'
-    'xheUNvbW1hbmRDb250ZW50c1IPQ29tbWFuZENvbnRlbnRz');
-
-@$core.Deprecated('Use idleDescriptor instead')
-const Idle$json = {
-  '1': 'Idle',
-  '2': [
-    {'1': 'Unknown2', '3': 2, '4': 1, '5': 13, '10': 'Unknown2'},
-  ],
-};
-
-/// Descriptor for `Idle`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List idleDescriptor = $convert.base64Decode(
-    'CgRJZGxlEhoKCFVua25vd24yGAIgASgNUghVbmtub3duMg==');
-
-@$core.Deprecated('Use rideAnalogKeyPressDescriptor instead')
-const RideAnalogKeyPress$json = {
-  '1': 'RideAnalogKeyPress',
-  '2': [
-    {'1': 'Location', '3': 1, '4': 1, '5': 14, '6': '.de.jonasbark.RideAnalogLocation', '10': 'Location'},
-    {'1': 'AnalogValue', '3': 2, '4': 1, '5': 17, '10': 'AnalogValue'},
-  ],
-};
-
-/// Descriptor for `RideAnalogKeyPress`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List rideAnalogKeyPressDescriptor = $convert.base64Decode(
-    'ChJSaWRlQW5hbG9nS2V5UHJlc3MSPAoITG9jYXRpb24YASABKA4yIC5kZS5qb25hc2JhcmsuUm'
-    'lkZUFuYWxvZ0xvY2F0aW9uUghMb2NhdGlvbhIgCgtBbmFsb2dWYWx1ZRgCIAEoEVILQW5hbG9n'
-    'VmFsdWU=');
-
-@$core.Deprecated('Use rideKeyPadStatusDescriptor instead')
-const RideKeyPadStatus$json = {
-  '1': 'RideKeyPadStatus',
-  '2': [
-    {'1': 'ButtonMap', '3': 1, '4': 1, '5': 13, '10': 'ButtonMap'},
-    {'1': 'AnalogPaddles', '3': 3, '4': 3, '5': 11, '6': '.de.jonasbark.RideAnalogKeyPress', '10': 'AnalogPaddles'},
-  ],
-};
-
-/// Descriptor for `RideKeyPadStatus`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List rideKeyPadStatusDescriptor = $convert.base64Decode(
-    'ChBSaWRlS2V5UGFkU3RhdHVzEhwKCUJ1dHRvbk1hcBgBIAEoDVIJQnV0dG9uTWFwEkYKDUFuYW'
-    'xvZ1BhZGRsZXMYAyADKAsyIC5kZS5qb25hc2JhcmsuUmlkZUFuYWxvZ0tleVByZXNzUg1BbmFs'
-    'b2dQYWRkbGVz');
-
-@$core.Deprecated('Use clickKeyPadStatusDescriptor instead')
-const ClickKeyPadStatus$json = {
-  '1': 'ClickKeyPadStatus',
-  '2': [
-    {'1': 'Button_Plus', '3': 1, '4': 1, '5': 14, '6': '.de.jonasbark.PlayButtonStatus', '10': 'ButtonPlus'},
-    {'1': 'Button_Minus', '3': 2, '4': 1, '5': 14, '6': '.de.jonasbark.PlayButtonStatus', '10': 'ButtonMinus'},
-  ],
-};
-
-/// Descriptor for `ClickKeyPadStatus`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List clickKeyPadStatusDescriptor = $convert.base64Decode(
-    'ChFDbGlja0tleVBhZFN0YXR1cxI/CgtCdXR0b25fUGx1cxgBIAEoDjIeLmRlLmpvbmFzYmFyay'
-    '5QbGF5QnV0dG9uU3RhdHVzUgpCdXR0b25QbHVzEkEKDEJ1dHRvbl9NaW51cxgCIAEoDjIeLmRl'
-    'LmpvbmFzYmFyay5QbGF5QnV0dG9uU3RhdHVzUgtCdXR0b25NaW51cw==');
-
-@$core.Deprecated('Use deviceInformationContentDescriptor instead')
-const DeviceInformationContent$json = {
-  '1': 'DeviceInformationContent',
-  '2': [
-    {'1': 'Unknown1', '3': 1, '4': 1, '5': 13, '10': 'Unknown1'},
-    {'1': 'SoftwareVersion', '3': 2, '4': 3, '5': 13, '10': 'SoftwareVersion'},
-    {'1': 'DeviceName', '3': 3, '4': 1, '5': 9, '10': 'DeviceName'},
-    {'1': 'Unknown4', '3': 4, '4': 1, '5': 13, '10': 'Unknown4'},
-    {'1': 'Unknown5', '3': 5, '4': 1, '5': 13, '10': 'Unknown5'},
-    {'1': 'SerialNumber', '3': 6, '4': 1, '5': 9, '10': 'SerialNumber'},
-    {'1': 'HardwareVersion', '3': 7, '4': 1, '5': 9, '10': 'HardwareVersion'},
-    {'1': 'ReplyData', '3': 8, '4': 3, '5': 13, '10': 'ReplyData'},
-    {'1': 'Unknown9', '3': 9, '4': 1, '5': 13, '10': 'Unknown9'},
-    {'1': 'Unknown10', '3': 10, '4': 1, '5': 13, '10': 'Unknown10'},
-    {'1': 'Unknown13', '3': 13, '4': 1, '5': 13, '10': 'Unknown13'},
-  ],
-};
-
-/// Descriptor for `DeviceInformationContent`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List deviceInformationContentDescriptor = $convert.base64Decode(
-    'ChhEZXZpY2VJbmZvcm1hdGlvbkNvbnRlbnQSGgoIVW5rbm93bjEYASABKA1SCFVua25vd24xEi'
-    'gKD1NvZnR3YXJlVmVyc2lvbhgCIAMoDVIPU29mdHdhcmVWZXJzaW9uEh4KCkRldmljZU5hbWUY'
-    'AyABKAlSCkRldmljZU5hbWUSGgoIVW5rbm93bjQYBCABKA1SCFVua25vd240EhoKCFVua25vd2'
-    '41GAUgASgNUghVbmtub3duNRIiCgxTZXJpYWxOdW1iZXIYBiABKAlSDFNlcmlhbE51bWJlchIo'
-    'Cg9IYXJkd2FyZVZlcnNpb24YByABKAlSD0hhcmR3YXJlVmVyc2lvbhIcCglSZXBseURhdGEYCC'
-    'ADKA1SCVJlcGx5RGF0YRIaCghVbmtub3duORgJIAEoDVIIVW5rbm93bjkSHAoJVW5rbm93bjEw'
-    'GAogASgNUglVbmtub3duMTASHAoJVW5rbm93bjEzGA0gASgNUglVbmtub3duMTM=');
-
-@$core.Deprecated('Use subContentDescriptor instead')
-const SubContent$json = {
-  '1': 'SubContent',
-  '2': [
-    {'1': 'Content', '3': 1, '4': 1, '5': 11, '6': '.de.jonasbark.DeviceInformationContent', '10': 'Content'},
-    {'1': 'Unknown2', '3': 2, '4': 1, '5': 13, '10': 'Unknown2'},
-    {'1': 'Unknown4', '3': 4, '4': 1, '5': 13, '10': 'Unknown4'},
-    {'1': 'Unknown5', '3': 5, '4': 1, '5': 13, '10': 'Unknown5'},
-    {'1': 'Unknown6', '3': 6, '4': 1, '5': 13, '10': 'Unknown6'},
-  ],
-};
-
-/// Descriptor for `SubContent`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List subContentDescriptor = $convert.base64Decode(
-    'CgpTdWJDb250ZW50EkAKB0NvbnRlbnQYASABKAsyJi5kZS5qb25hc2JhcmsuRGV2aWNlSW5mb3'
-    'JtYXRpb25Db250ZW50UgdDb250ZW50EhoKCFVua25vd24yGAIgASgNUghVbmtub3duMhIaCghV'
-    'bmtub3duNBgEIAEoDVIIVW5rbm93bjQSGgoIVW5rbm93bjUYBSABKA1SCFVua25vd241EhoKCF'
-    'Vua25vd242GAYgASgNUghVbmtub3duNg==');
-
-@$core.Deprecated('Use deviceInformationDescriptor instead')
-const DeviceInformation$json = {
-  '1': 'DeviceInformation',
-  '2': [
-    {'1': 'InformationId', '3': 1, '4': 1, '5': 13, '10': 'InformationId'},
-    {'1': 'SubContent', '3': 2, '4': 1, '5': 11, '6': '.de.jonasbark.SubContent', '10': 'SubContent'},
-  ],
-};
-
-/// Descriptor for `DeviceInformation`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List deviceInformationDescriptor = $convert.base64Decode(
-    'ChFEZXZpY2VJbmZvcm1hdGlvbhIkCg1JbmZvcm1hdGlvbklkGAEgASgNUg1JbmZvcm1hdGlvbk'
-    'lkEjgKClN1YkNvbnRlbnQYAiABKAsyGC5kZS5qb25hc2JhcmsuU3ViQ29udGVudFIKU3ViQ29u'
-    'dGVudA==');
-

lib/bluetooth/devices/zwift/protocol/zwift.pbserver.dart

@@ -1,14 +0,0 @@
-//
-//  Generated code. Do not modify.
-//  source: zwift.proto
-//
-// @dart = 2.12
-
-// ignore_for_file: annotate_overrides, camel_case_types, comment_references
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
-// ignore_for_file: non_constant_identifier_names, prefer_final_fields
-// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
-
-export 'zwift.pb.dart';
-

lib/bluetooth/devices/zwift/zwift_click.dart

@@ -1,7 +1,7 @@
-import 'package:flutter/foundation.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zwift.pb.dart';
 import 'package:bike_control/bluetooth/devices/zwift/zwift_device.dart';
 import 'package:bike_control/utils/keymap/buttons.dart';
+import 'package:flutter/foundation.dart';
+import 'package:prop/prop.dart';
 
 import 'constants.dart';
 

lib/bluetooth/devices/zwift/zwift_clickv2.dart

@@ -1,14 +1,18 @@
 import 'package:bike_control/bluetooth/devices/zwift/constants.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pbenum.dart';
 import 'package:bike_control/bluetooth/devices/zwift/zwift_ride.dart';
 import 'package:bike_control/gen/l10n.dart';
-import 'package:bike_control/pages/markdown.dart';
+import 'package:bike_control/pages/unlock.dart';
 import 'package:bike_control/utils/core.dart';
-import 'package:bike_control/utils/i18n_extension.dart';
 import 'package:bike_control/widgets/ui/warning.dart';
 import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
+import 'package:intl/intl.dart';
+import 'package:prop/emulators/ftms_emulator.dart';
+import 'package:prop/prop.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:universal_ble/universal_ble.dart';
+
+final FtmsEmulator emulator = FtmsEmulator();
 
 class ZwiftClickV2 extends ZwiftRide {
   ZwiftClickV2(super.scanResult)
@@ -26,9 +30,9 @@ class ZwiftClickV2 extends ZwiftRide {
           ZwiftButtons.shiftUpLeft,
           ZwiftButtons.shiftUpRight,
         ],
-      );
-
-  bool _noLongerSendsEvents = false;
+      ) {
+    emulator.setScanResult(scanResult);
+  }
 
   @override
   List<int> get startCommand => ZwiftConstants.RIDE_ON + ZwiftConstants.RESPONSE_START_CLICK_V2;
@@ -44,23 +48,37 @@ class ZwiftClickV2 extends ZwiftRide {
     return "$name V2";
   }
 
-  @override
-  Future<void> setupHandshake() async {
-    super.setupHandshake();
-    await sendCommandBuffer(Uint8List.fromList([0xFF, 0x04, 0x00]));
+  bool get isUnlocked {
+    final lastUnlock = propPrefs.getZwiftClickV2LastUnlock(scanResult.deviceId);
+    if (lastUnlock == null) {
+      return false;
+    }
+    return lastUnlock > DateTime.now().subtract(const Duration(days: 1));
   }
 
   @override
-  Future<void> processData(Uint8List bytes) {
-    if (bytes.startsWith(ZwiftConstants.RESPONSE_STOPPED_CLICK_V2_VARIANT_1) ||
-        bytes.startsWith(ZwiftConstants.RESPONSE_STOPPED_CLICK_V2_VARIANT_2)) {
-      _noLongerSendsEvents = true;
+  Future<void> setupHandshake() async {
+    if (isUnlocked) {
+      super.setupHandshake();
+    }
+  }
+
+  @override
+  Future<void> handleServices(List<BleService> services) async {
+    emulator.handleServices(services);
+    await super.handleServices(services);
+  }
+
+  @override
+  Future<void> processCharacteristic(String characteristic, Uint8List bytes) async {
+    if (!emulator.processCharacteristic(characteristic, bytes)) {
+      await super.processCharacteristic(characteristic, bytes);
     }
-    return super.processData(bytes);
   }
 
   @override
   Widget showInformation(BuildContext context) {
+    final lastUnlockDate = propPrefs.getZwiftClickV2LastUnlock(scanResult.deviceId);
     return StatefulBuilder(
       builder: (context, setState) {
         return Column(
@@ -70,80 +88,98 @@ class ZwiftClickV2 extends ZwiftRide {
           children: [
             super.showInformation(context),
 
-            if (isConnected)
-              if (core.settings.getShowZwiftClickV2ReconnectWarning())
-                Stack(
+            if (isConnected && !core.settings.getShowOnboarding())
+              if (isUnlocked && lastUnlockDate != null)
+                Warning(
+                  important: false,
                   children: [
-                    Warning(
+                    Row(
+                      spacing: 8,
                       children: [
-                        Text(
-                          'Important Setup Information',
-                          style: TextStyle(
-                            fontWeight: FontWeight.bold,
-                            color: Theme.of(context).colorScheme.destructive,
-                          ),
-                        ).small,
-                        Text(
-                          AppLocalizations.of(context).clickV2Instructions,
-                          style: TextStyle(
-                            color: Theme.of(context).colorScheme.destructive,
-                          ),
-                        ).xSmall,
-                        if (kDebugMode)
-                          GhostButton(
-                            onPressed: () {
-                              sendCommand(Opcode.RESET, null);
-                            },
-                            child: Text('Reset now'),
+                        Container(
+                          decoration: BoxDecoration(
+                            color: Colors.green,
+                            borderRadius: BorderRadius.circular(24),
                           ),
+                          padding: const EdgeInsets.all(4),
+                          child: Icon(Icons.lock_open_rounded, color: Colors.white),
+                        ),
+                        Flexible(
+                          child: Text(
+                            AppLocalizations.of(context).unlock_unlockedUntilAroundDate(
+                              DateFormat('EEEE, HH:MM').format(lastUnlockDate.add(const Duration(days: 1))),
+                            ),
+                          ).xSmall,
+                        ),
+                        Tooltip(
+                          tooltip: (c) => Text('Unlock again'),
+                          child: IconButton.ghost(
+                            icon: Icon(Icons.lock_reset_rounded),
 
-                        Button.secondary(
-                          onPressed: () {
-                            openDrawer(
-                              context: context,
-                              position: OverlayPosition.bottom,
-                              builder: (_) => MarkdownPage(assetPath: 'TROUBLESHOOTING.md'),
-                            );
-                          },
-                          leading: const Icon(Icons.help_outline_outlined),
-                          child: Text(context.i18n.instructions),
+                            onPressed: () {
+                              openDrawer(
+                                context: context,
+                                position: OverlayPosition.bottom,
+                                builder: (_) => UnlockPage(device: this),
+                              );
+                            },
+                          ),
                         ),
                       ],
                     ),
-                    Align(
-                      alignment: Alignment.topRight,
-                      child: IconButton.link(
-                        icon: Icon(
-                          Icons.close,
-                          color: Theme.of(context).colorScheme.destructive,
-                        ),
-                        onPressed: () {
-                          core.settings.setShowZwiftClickV2ReconnectWarning(false);
-                          setState(() {});
-                        },
-                      ),
-                    ),
                   ],
                 )
               else
                 Warning(
                   important: false,
                   children: [
-                    Text(
-                      AppLocalizations.of(context).clickV2EventInfo,
-                    ).xSmall,
-                    LinkButton(
-                      child: Text(context.i18n.troubleshootingGuide),
-                      onPressed: () {
-                        openDrawer(
-                          context: context,
-                          position: OverlayPosition.bottom,
-                          builder: (_) => MarkdownPage(assetPath: 'TROUBLESHOOTING.md'),
-                        );
-                      },
+                    Row(
+                      spacing: 8,
+                      children: [
+                        Container(
+                          decoration: BoxDecoration(
+                            color: Colors.red,
+                            borderRadius: BorderRadius.circular(24),
+                          ),
+                          padding: const EdgeInsets.all(4),
+                          child: Icon(Icons.lock_rounded, color: Colors.white),
+                        ),
+                        Flexible(child: Text(AppLocalizations.of(context).unlock_deviceIsCurrentlyLocked).xSmall),
+                        Button(
+                          onPressed: () {
+                            openDrawer(
+                              context: context,
+                              position: OverlayPosition.bottom,
+                              builder: (_) => UnlockPage(device: this),
+                            );
+                          },
+                          leading: const Icon(Icons.lock_open_rounded),
+                          style: ButtonStyle.primary(size: ButtonSize.small),
+                          child: Text(AppLocalizations.of(context).unlock_unlockNow),
+                        ),
+                      ],
                     ),
                   ],
                 ),
+            /*else
+              Warning(
+                important: false,
+                children: [
+                  Text(
+                    AppLocalizations.of(context).clickV2EventInfo,
+                  ).xSmall,
+                  LinkButton(
+                    child: Text(context.i18n.troubleshootingGuide),
+                    onPressed: () {
+                      openDrawer(
+                        context: context,
+                        position: OverlayPosition.bottom,
+                        builder: (_) => MarkdownPage(assetPath: 'TROUBLESHOOTING.md'),
+                      );
+                    },
+                  ),
+                ],
+              ),*/
           ],
         );
       },

lib/bluetooth/devices/zwift/zwift_device.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:bike_control/bluetooth/devices/bluetooth_device.dart';
 import 'package:bike_control/bluetooth/devices/zwift/constants.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pbenum.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/i18n_extension.dart';
@@ -10,6 +9,7 @@ import 'package:bike_control/utils/keymap/buttons.dart';
 import 'package:bike_control/utils/single_line_exception.dart';
 import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
+import 'package:prop/prop.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:universal_ble/universal_ble.dart';
 

lib/bluetooth/devices/zwift/zwift_emulator.dart

@@ -3,9 +3,6 @@ import 'dart:io';
 import 'package:bike_control/bluetooth/ble.dart';
 import 'package:bike_control/bluetooth/devices/trainer_connection.dart';
 import 'package:bike_control/bluetooth/devices/zwift/constants.dart';
-import 'package:bike_control/bluetooth/devices/zwift/ftms_mdns_emulator.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zwift.pbserver.dart' hide RideButtonMask;
 import 'package:bike_control/bluetooth/devices/zwift/zwift_ride.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/gen/l10n.dart';
@@ -18,6 +15,7 @@ import 'package:bike_control/widgets/title.dart';
 import 'package:bluetooth_low_energy/bluetooth_low_energy.dart';
 import 'package:flutter/foundation.dart';
 import 'package:permission_handler/permission_handler.dart';
+import 'package:prop/prop.dart' hide RideButtonMask;
 
 class ZwiftEmulator extends TrainerConnection {
   bool get isLoading => _isLoading;
@@ -163,7 +161,7 @@ class ZwiftEmulator extends TrainerConnection {
           );
 
           final request = eventArgs.request;
-          final response = handleWriteRequest(eventArgs.characteristic.uuid.toString(), request.value);
+          final response = SharedLogic.handleWriteRequest(eventArgs.characteristic.uuid.toString(), request.value);
           if (response != null) {
             await _peripheralManager.notifyCharacteristic(
               _central!,
@@ -362,106 +360,6 @@ class ZwiftEmulator extends TrainerConnection {
     return Success('Sent action: ${keyPair.inGameAction!.name}');
   }
 
-  Uint8List? handleWriteRequest(String characteristic, Uint8List value) {
-    print(
-      'Write request for characteristic: $characteristic',
-    );
-
-    switch (characteristic.toUpperCase()) {
-      case ZwiftConstants.ZWIFT_SYNC_RX_CHARACTERISTIC_UUID:
-        print(
-          'Handling write request for SYNC RX characteristic, value: ${value.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')}\n${String.fromCharCodes(value)}',
-        );
-
-        Opcode? opcode = Opcode.valueOf(value[0]);
-        Uint8List message = value.sublist(1);
-
-        switch (opcode) {
-          case Opcode.RIDE_ON:
-            print('Sending handshake');
-            return ZwiftConstants.RIDE_ON;
-          case Opcode.GET:
-            final response = Get.fromBuffer(message);
-            final dataObjectType = DO.valueOf(response.dataObjectId);
-            print('Received GET for data object: $dataObjectType');
-            switch (dataObjectType) {
-              case DO.PAGE_DEV_INFO:
-                /*final devInfo = DevInfoPage(
-                        deviceName: 'Zwift Click'.codeUnits,
-                        deviceUid: '0B-58D15ABB4363'.codeUnits,
-                        manufacturerId: 0x01,
-                        serialNumber: '58D15ABB4363'.codeUnits,
-                        protocolVersion: 515,
-                        systemFwVersion: [0, 0, 1, 1],
-                        productId: 11,
-                        systemHwRevision: 'B.0'.codeUnits,
-                        deviceCapabilities: [DevInfoPage_DeviceCapabilities(deviceType: 2, capabilities: 1)],
-                      );
-                      final serverInfoResponse = Uint8List.fromList([
-                        Opcode.GET_RESPONSE.value,
-                        ...GetResponse(
-                          dataObjectId: DO.PAGE_DEV_INFO.value,
-                          dataObjectData: devInfo.writeToBuffer(),
-                        ).writeToBuffer(),
-                      ]);*/
-                // 3C080012460A440883041204000001011A0B5A7769667420436C69636B320F30422D3538443135414242343336333A03422E304204080210014801500B5A0C353844313541424234333633
-                final expected = Uint8List.fromList(
-                  hexToBytes(
-                    '3C080012460A440883041204000001011A0B5A7769667420436C69636B320F30422D3538443135414242343336333A03422E304204080210014801500B5A0C353844313541424234333633',
-                  ),
-                );
-                return expected;
-              case DO.PAGE_CLIENT_SERVER_CONFIGURATION:
-                final response = Uint8List.fromList([
-                  Opcode.GET_RESPONSE.value,
-                  ...GetResponse(
-                    dataObjectId: DO.PAGE_CLIENT_SERVER_CONFIGURATION.value,
-                    dataObjectData: ClientServerCfgPage(
-                      notifications: 0,
-                    ).writeToBuffer(),
-                  ).writeToBuffer(),
-                ]);
-                return response;
-              case DO.PAGE_CONTROLLER_INPUT_CONFIG:
-                final response = Uint8List.fromList([
-                  Opcode.GET_RESPONSE.value,
-                  ...GetResponse(
-                    dataObjectId: DO.PAGE_CONTROLLER_INPUT_CONFIG.value,
-                    dataObjectData: ControllerInputConfigPage(
-                      supportedDigitalInputs: 4607,
-                      supportedAnalogInputs: 0,
-                      analogDeadZone: [],
-                      analogInputRange: [],
-                    ).writeToBuffer(),
-                  ).writeToBuffer(),
-                ]);
-                return response;
-              case DO.BATTERY_STATE:
-                final response = Uint8List.fromList([
-                  Opcode.GET_RESPONSE.value,
-                  ...GetResponse(
-                    dataObjectId: DO.BATTERY_STATE.value,
-                    dataObjectData: BatteryStatus(
-                      chgState: ChargingState.CHARGING_IDLE,
-                      percLevel: 100,
-                      timeToEmpty: 0,
-                      timeToFull: 0,
-                    ).writeToBuffer(),
-                  ).writeToBuffer(),
-                ]);
-                return response;
-              default:
-                print('Unhandled data object type for GET: $dataObjectType');
-            }
-            break;
-        }
-        break;
-      default:
-        print('Unhandled write request for characteristic: $characteristic $value');
-    }
-    return null;
-  }
-
   void cleanup() {
     _peripheralManager.stopAdvertising();
     _peripheralManager.removeAllServices();

lib/bluetooth/devices/zwift/zwift_play.dart

@@ -1,9 +1,9 @@
 import 'package:bike_control/bluetooth/devices/zwift/constants.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zwift.pb.dart';
 import 'package:bike_control/bluetooth/devices/zwift/zwift_device.dart';
 import 'package:bike_control/utils/keymap/buttons.dart';
 import 'package:bike_control/widgets/keymap_explanation.dart';
 import 'package:flutter/foundation.dart';
+import 'package:prop/prop.dart';
 
 class ZwiftPlay extends ZwiftDevice {
   final ZwiftDeviceType deviceType;
@@ -11,20 +11,24 @@ class ZwiftPlay extends ZwiftDevice {
   ZwiftPlay(super.scanResult, {required this.deviceType})
     : super(
         availableButtons: [
-          ZwiftButtons.y,
-          ZwiftButtons.z,
-          ZwiftButtons.a,
-          ZwiftButtons.b,
-          ZwiftButtons.onOffRight,
-          ZwiftButtons.sideButtonRight,
-          ZwiftButtons.paddleRight,
-          ZwiftButtons.navigationUp,
-          ZwiftButtons.navigationLeft,
-          ZwiftButtons.navigationRight,
-          ZwiftButtons.navigationDown,
-          ZwiftButtons.onOffLeft,
-          ZwiftButtons.sideButtonLeft,
-          ZwiftButtons.paddleLeft,
+          if (deviceType == ZwiftDeviceType.playLeft) ...[
+            ZwiftButtons.navigationUp,
+            ZwiftButtons.navigationLeft,
+            ZwiftButtons.navigationRight,
+            ZwiftButtons.navigationDown,
+            ZwiftButtons.onOffLeft,
+            ZwiftButtons.sideButtonLeft,
+            ZwiftButtons.paddleLeft,
+          ],
+          if (deviceType == ZwiftDeviceType.playRight) ...[
+            ZwiftButtons.y,
+            ZwiftButtons.z,
+            ZwiftButtons.a,
+            ZwiftButtons.b,
+            ZwiftButtons.onOffRight,
+            ZwiftButtons.sideButtonRight,
+            ZwiftButtons.paddleRight,
+          ],
         ],
       );
 

lib/bluetooth/devices/zwift/zwift_ride.dart

@@ -1,14 +1,12 @@
-import 'package:dartx/dartx.dart';
-import 'package:flutter/foundation.dart';
-import 'package:protobuf/protobuf.dart' as $pb;
 import 'package:bike_control/bluetooth/devices/zwift/constants.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp_vendor.pb.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zwift.pb.dart';
 import 'package:bike_control/bluetooth/devices/zwift/zwift_device.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/keymap/buttons.dart';
+import 'package:dartx/dartx.dart';
+import 'package:flutter/foundation.dart';
+import 'package:prop/prop.dart';
+import 'package:protobuf/protobuf.dart' as $pb;
 import 'package:universal_ble/universal_ble.dart';
 
 class ZwiftRide extends ZwiftDevice {
@@ -56,7 +54,7 @@ class ZwiftRide extends ZwiftDevice {
 
     if (kDebugMode) {
       print(
-        '${DateTime.now().toString().split(" ").last} Received $opcode: ${bytes.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')} => ${String.fromCharCodes(bytes)} ',
+        '${DateTime.now().toString().split(" ").last} Received $opcode: ${bytes.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')}',
       );
     }
 

lib/bluetooth/messages/notification.dart

@@ -1,9 +1,9 @@
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
 import 'package:bike_control/utils/actions/base_actions.dart';
 import 'package:bike_control/utils/keymap/buttons.dart';
 import 'package:bike_control/widgets/keymap_explanation.dart';
 import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
+import 'package:prop/prop.dart';
 
 class BaseNotification {}
 
@@ -12,7 +12,7 @@ class LogNotification extends BaseNotification {
 
   LogNotification(this.message) {
     if (kDebugMode) {
-      print('LogNotification: $message');
+      //print('LogNotification: $message');
     }
   }
 

lib/bluetooth/remote_pairing.dart

@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:bike_control/bluetooth/devices/trainer_connection.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/gen/l10n.dart';
 import 'package:bike_control/utils/actions/base_actions.dart';
@@ -12,6 +11,7 @@ import 'package:bike_control/utils/requirements/multi.dart';
 import 'package:bluetooth_low_energy/bluetooth_low_energy.dart';
 import 'package:flutter/foundation.dart';
 import 'package:permission_handler/permission_handler.dart';
+import 'package:prop/prop.dart';
 
 import '../utils/keymap/keymap.dart';
 
@@ -257,7 +257,7 @@ class RemotePairing extends TrainerConnection {
               : ''}',
       serviceUUIDs: [UUID.fromString(Platform.isIOS ? '1812' : '00001812-0000-1000-8000-00805F9B34FB')],
     );
-    print('Starting advertising with Zwift service...');
+    print('Starting advertising with Remote service...');
 
     await _peripheralManager.startAdvertising(advertisement);
     _isLoading = false;

lib/i10n/intl_de.arb

@@ -155,7 +155,7 @@
   "enableMywhooshLinkInTheConnectionSettingsFirst": "Aktiviere zuerst MyWhoosh Link in den Verbindungseinstellungen.",
   "enablePairingProcess": "Kopplungsprozess aktivieren",
   "enablePermissions": "Berechtigungen aktivieren",
-  "enableSteeringWithPhone": "Sensoren Ihres Telefons aktivieren z.B. zum Lenken",
+  "enableSteeringWithPhone": "Lenkung über Handy-Sensoren aktivieren",
   "enableVibrationFeedback": "Vibrationsfeedback beim Gangwechsel aktivieren",
   "enableZwiftControllerBluetooth": "Zwift Controller aktivieren (Bluetooth)",
   "enableZwiftControllerNetwork": "Zwift Controller aktivieren (Netzwerk)",
@@ -413,6 +413,21 @@
   "tryingToConnectAgain": "Verbinde erneut...",
   "unassignAction": "Zuweisung aufheben",
   "unlockFullVersion": "Vollversion freischalten",
+  "unlock_bikecontrolAndZwiftNetwork": "BikeControl und Zwift müssen sich im selben Netzwerk befinden. Es kann einige Sekunden dauern, bis sie angezeigt werden.",
+  "unlock_confirmByPressingAButtonOnYourDevice": "Bestätigen Sie durch Drücken einer Taste auf Ihrem Gerät.",
+  "unlock_connectToBikecontrol": "Verbinden mit BikeControl",
+  "unlock_deviceIsCurrentlyLocked": "Das Gerät ist derzeit gesperrt.",
+  "unlock_isnowunlocked": "{device} ist jetzt freigeschaltet",
+  "unlock_markAsUnlocked": "Als entsperrt markieren",
+  "unlock_notWorking": "Funktioniert nicht?",
+  "unlock_openZwift": "Öffnen Sie Zwift (nicht die Companion-App) auf diesem oder einem anderen Gerät.",
+  "unlock_unlockManually": "Manuelles Entsperren",
+  "unlock_unlockNow": "Jetzt freischalten",
+  "unlock_unlockedUntilAroundDate": "Entsperrt bis etwa {date}",
+  "unlock_waitingForZwift": "Warten auf die Entsperrung Ihres Geräts durch Zwift...",
+  "unlock_youCanNowCloseZwift": "Zwift kann jetzt geschlossen werden.",
+  "unlock_yourTrialPhaseHasExpired": "Testphase ist abgelaufen. Bitte erwerbe die Vollversion, um die komfortable Entsperrfunktion freizuschalten.",
+  "unlock_yourZwiftClickMightBeUnlockedAlready": "Ihr Zwift Click ist möglicherweise bereits freigeschaltet.",
   "unlockingNotPossible": "Eine Freischaltung ist derzeit noch nicht möglich, daher ist die App vorerst uneingeschränkt nutzbar!",
   "update": "Aktualisieren",
   "useCustomKeymapForButton": "Verwende eine benutzerdefinierte Tastaturbelegung, um die",

lib/i10n/intl_en.arb

@@ -155,7 +155,7 @@
   "enableMywhooshLinkInTheConnectionSettingsFirst": "Enable MyWhoosh Link in the connection settings first.",
   "enablePairingProcess": "Enable Pairing Process",
   "enablePermissions": "Enable Permissions",
-  "enableSteeringWithPhone": "Enable Phones' sensors to enable e.g. steering",
+  "enableSteeringWithPhone": "Enable Steering with your phone's sensors",
   "enableVibrationFeedback": "Enable vibration feedback when shifting gears",
   "enableZwiftControllerBluetooth": "Enable Zwift Controller (Bluetooth)",
   "enableZwiftControllerNetwork": "Enable Zwift Controller (Network)",
@@ -413,6 +413,21 @@
   "tryingToConnectAgain": "Trying to connect again...",
   "unassignAction": "Unassign action",
   "unlockFullVersion": "Unlock Full Version",
+  "unlock_bikecontrolAndZwiftNetwork": "BikeControl and Zwift need to be on the same network. It may take a few seconds to appear.",
+  "unlock_confirmByPressingAButtonOnYourDevice": "Confirm by pressing a button on your device.",
+  "unlock_connectToBikecontrol": "Connect to BikeControl",
+  "unlock_deviceIsCurrentlyLocked": "Device is currently locked",
+  "unlock_isnowunlocked": "{device} is now unlocked",
+  "unlock_markAsUnlocked": "Mark as Unlocked",
+  "unlock_notWorking": "Not working?",
+  "unlock_openZwift": "Open Zwift (not the Companion) on this or another device",
+  "unlock_unlockManually": "Unlock manually",
+  "unlock_unlockNow": "Unlock now",
+  "unlock_unlockedUntilAroundDate": "Unlocked until around {date}",
+  "unlock_waitingForZwift": "Waiting for Zwift to unlock your device...",
+  "unlock_youCanNowCloseZwift": "You can now close Zwift and return to BikeControl.",
+  "unlock_yourTrialPhaseHasExpired": "Your trial phase has expired. Please purchase the full version to unlock the comfortable unlocking feature :)",
+  "unlock_yourZwiftClickMightBeUnlockedAlready": "Your Zwift Click might be unlocked already.",
   "unlockingNotPossible": "Unlocking is currently not yet possible, so enjoy unlimited usage for the time being!",
   "update": "Update",
   "useCustomKeymapForButton": "Use a custom keymap to support the",

lib/i10n/intl_fr.arb

@@ -155,7 +155,7 @@
   "enableMywhooshLinkInTheConnectionSettingsFirst": "Activez d'abord MyWhoosh Link dans les paramètres de connexion.",
   "enablePairingProcess": "Activer le processus d'appairage",
   "enablePermissions": "Activer les autorisations",
-  "enableSteeringWithPhone": "Activez les capteurs du téléphone pour permettre, par exemple, la direction.",
+  "enableSteeringWithPhone": "Activez la direction avec les capteurs de votre téléphone",
   "enableVibrationFeedback": "Activer le retour haptique par vibration lors du changement de vitesse",
   "enableZwiftControllerBluetooth": "Activer le contrôleur Zwift (Bluetooth)",
   "enableZwiftControllerNetwork": "Activer le contrôleur Zwift (réseau)",
@@ -413,6 +413,21 @@
   "tryingToConnectAgain": "Tentative de reconnexion...",
   "unassignAction": "Action de désaffectation",
   "unlockFullVersion": "Débloquer la version complète",
+  "unlock_bikecontrolAndZwiftNetwork": "BikeControl et Zwift doivent être connectés au même réseau. L'affichage peut prendre quelques secondes.",
+  "unlock_confirmByPressingAButtonOnYourDevice": "Confirmez en appuyant sur un bouton de votre appareil.",
+  "unlock_connectToBikecontrol": "Se connecter à ",
+  "unlock_deviceIsCurrentlyLocked": "L'appareil est actuellement verrouillé.",
+  "unlock_isnowunlocked": "{device} est maintenant déverrouillé",
+  "unlock_markAsUnlocked": "Marquer comme déverrouillé",
+  "unlock_notWorking": "Ça ne fonctionne pas ?",
+  "unlock_openZwift": "Ouvrez Zwift (et non l'application Companion) sur cet appareil ou un autre.",
+  "unlock_unlockManually": "Déverrouiller manuellement",
+  "unlock_unlockNow": "Déverrouiller maintenant",
+  "unlock_unlockedUntilAroundDate": "Déverrouillé jusqu'à environ {date}",
+  "unlock_waitingForZwift": "En attente du déverrouillage de votre appareil par Zwift...",
+  "unlock_youCanNowCloseZwift": "Vous pouvez maintenant fermer Zwift et revenir à BikeControl.",
+  "unlock_yourTrialPhaseHasExpired": "Votre période d'essai est terminée. Veuillez acheter la version complète pour débloquer la fonction de déverrouillage simplifiée :)",
+  "unlock_yourZwiftClickMightBeUnlockedAlready": "Votre Zwift Click est peut-être déjà déverrouillé.",
   "unlockingNotPossible": "Le déverrouillage n'est pas encore possible pour le moment, alors profitez d'une utilisation illimitée pour l'instant !",
   "update": "Mise à jour",
   "useCustomKeymapForButton": "Utilisez une configuration de touches personnalisée pour prendre en charge",

lib/i10n/intl_it.arb

@@ -155,7 +155,7 @@
   "enableMywhooshLinkInTheConnectionSettingsFirst": "Per prima cosa, abilita MyWhoosh Link nelle impostazioni di connessione.",
   "enablePairingProcess": "Abilita processo di associazione",
   "enablePermissions": "Abilita autorizzazioni",
-  "enableSteeringWithPhone": "Abilita i sensori dei telefoni per abilitare ad esempio lo sterzo",
+  "enableSteeringWithPhone": "Abilita lo sterzo con i sensori del tuo telefono",
   "enableVibrationFeedback": "Abilita il feedback delle vibrazioni durante il cambio marcia",
   "enableZwiftControllerBluetooth": "Abilita il controller Zwift (Bluetooth)",
   "enableZwiftControllerNetwork": "Abilita Zwift Controller (rete)",
@@ -413,6 +413,21 @@
   "tryingToConnectAgain": "Sto provando a connettermi di nuovo...",
   "unassignAction": "Annulla assegnazione azione",
   "unlockFullVersion": "Sblocca la versione completa",
+  "unlock_bikecontrolAndZwiftNetwork": "BikeControl e Zwift devono essere sulla stessa rete. Potrebbero essere necessari alcuni secondi per visualizzarli.",
+  "unlock_confirmByPressingAButtonOnYourDevice": "Conferma premendo un pulsante sul tuo dispositivo.",
+  "unlock_connectToBikecontrol": "Connettiti a ",
+  "unlock_deviceIsCurrentlyLocked": "Il dispositivo è attualmente bloccato",
+  "unlock_isnowunlocked": "{device} è ora sbloccato",
+  "unlock_markAsUnlocked": "Segna come sbloccato",
+  "unlock_notWorking": "Non funziona?",
+  "unlock_openZwift": "Apri Zwift (non il Companion) su questo o un altro dispositivo",
+  "unlock_unlockManually": "Sblocca manualmente",
+  "unlock_unlockNow": "Sblocca ora",
+  "unlock_unlockedUntilAroundDate": "Sbloccato fino a circa {date}",
+  "unlock_waitingForZwift": "In attesa che Zwift sblocchi il tuo dispositivo...",
+  "unlock_youCanNowCloseZwift": "Ora puoi chiudere Zwift e tornare a BikeControl.",
+  "unlock_yourTrialPhaseHasExpired": "La tua fase di prova è scaduta. Acquista la versione completa per sbloccare la comoda funzione di sblocco :)",
+  "unlock_yourZwiftClickMightBeUnlockedAlready": "Il tuo Zwift Click potrebbe essere già sbloccato.",
   "unlockingNotPossible": "Al momento non è ancora possibile sbloccarlo, quindi per il momento goditi un utilizzo illimitato!",
   "update": "Aggiorna",
   "useCustomKeymapForButton": "Utilizzare una mappa dei tasti personalizzata per supportare",

lib/i10n/intl_pl.arb

@@ -155,7 +155,7 @@
   "enableMywhooshLinkInTheConnectionSettingsFirst": "Najpierw włącz MyWhoosh Link w ustawieniach połączenia.",
   "enablePairingProcess": "Włącz proces parowania",
   "enablePermissions": "Nadaj uprawnienia",
-  "enableSteeringWithPhone": "Włącz czujniki telefonów, aby umożliwić np. sterowanie",
+  "enableSteeringWithPhone": "Włącz sterowanie za pomocą czujników telefonu",
   "enableVibrationFeedback": "Włącz wibracje podczas zmiany biegów",
   "enableZwiftControllerBluetooth": "Włącz kontroler Zwift (Bluetooth)",
   "enableZwiftControllerNetwork": "Włącz kontroler Zwift (sieć)",
@@ -413,6 +413,21 @@
   "tryingToConnectAgain": "Próba ponownego połączenia...",
   "unassignAction": "Anuluj przypisanie akcji",
   "unlockFullVersion": "Odblokuj pełną wersję",
+  "unlock_bikecontrolAndZwiftNetwork": "BikeControl i Zwift muszą być w tej samej sieci. Pojawienie się aplikacji może potrwać kilka sekund.",
+  "unlock_confirmByPressingAButtonOnYourDevice": "Potwierdź, naciskając przycisk na swoim urządzeniu.",
+  "unlock_connectToBikecontrol": "Połącz się z BikeControl",
+  "unlock_deviceIsCurrentlyLocked": "Urządzenie jest obecnie zablokowane",
+  "unlock_isnowunlocked": "{device} jest teraz odblokowany",
+  "unlock_markAsUnlocked": "Oznacz jako odblokowane",
+  "unlock_notWorking": "Nie działa?",
+  "unlock_openZwift": "Otwórz aplikację Zwift (nie Companion) na tym lub innym urządzeniu",
+  "unlock_unlockManually": "Odblokuj ręcznie",
+  "unlock_unlockNow": "Odblokuj teraz",
+  "unlock_unlockedUntilAroundDate": "Odblokowane do około {date}",
+  "unlock_waitingForZwift": "Czekamy, aż Zwift odblokuje Twoje urządzenie...",
+  "unlock_youCanNowCloseZwift": "Możesz teraz zamknąć aplikację Zwift i wrócić do BikeControl.",
+  "unlock_yourTrialPhaseHasExpired": "Twój okres próbny wygasł. Kup pełną wersję, aby odblokować wygodną funkcję odblokowywania :)",
+  "unlock_yourZwiftClickMightBeUnlockedAlready": "Twoje urządzenie Zwift Click może być już odblokowane.",
   "unlockingNotPossible": "Odblokowanie nie jest obecnie możliwe, więc ciesz się nieograniczonym użytkowaniem!",
   "update": "Aktualizacja",
   "useCustomKeymapForButton": "Użyj niestandardowej mapy klawiszy, aby obsługiwać",

lib/main.dart

@@ -110,13 +110,15 @@ Future<void> _persistCrash({
 
     final directory = await _getLogDirectory();
     final file = File('${directory.path}/app.log');
-    final fileLength = await file.length();
-    if (fileLength > 5 * 1024 * 1024) {
-      // If log file exceeds 5MB, truncate it
-      final lines = await file.readAsLines();
-      final half = lines.length ~/ 2;
-      final truncatedLines = lines.sublist(half);
-      await file.writeAsString(truncatedLines.join('\n'));
+    if (file.existsSync()) {
+      final fileLength = await file.length();
+      if (fileLength > 5 * 1024 * 1024) {
+        // If log file exceeds 5MB, truncate it
+        final lines = await file.readAsLines();
+        final half = lines.length ~/ 2;
+        final truncatedLines = lines.sublist(half);
+        await file.writeAsString(truncatedLines.join('\n'));
+      }
     }
 
     await file.writeAsString(crashData.toString(), mode: FileMode.append);
@@ -183,8 +185,8 @@ class _BikeControlAppState extends State<BikeControlApp> {
     return ShadcnApp(
       navigatorKey: navigatorKey,
       debugShowCheckedModeBanner: false,
-      menuHandler: PopoverOverlayHandler(),
-      popoverHandler: PopoverOverlayHandler(),
+      menuHandler: OverlayHandler.popover,
+      popoverHandler: OverlayHandler.popover,
       localizationsDelegates: [
         ...ShadcnLocalizations.localizationsDelegates,
         OtherLocalizationsDelegate(),

lib/pages/device.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 
 import 'package:bike_control/gen/l10n.dart';
 import 'package:bike_control/main.dart';
@@ -10,10 +11,13 @@ import 'package:bike_control/widgets/iap_status_widget.dart';
 import 'package:bike_control/widgets/ignored_devices_dialog.dart';
 import 'package:bike_control/widgets/scan.dart';
 import 'package:bike_control/widgets/ui/colored_title.dart';
+import 'package:flutter/foundation.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
 import '../bluetooth/devices/base_device.dart';
+import '../utils/keymap/buttons.dart';
+import 'button_edit.dart';
 
 class DevicePage extends StatefulWidget {
   final bool isMobile;
@@ -106,6 +110,56 @@ class _DevicePageState extends State<DevicePage> {
               ),
             ],
 
+            if (!kIsWeb && (Platform.isMacOS || Platform.isWindows))
+              ValueListenableBuilder(
+                valueListenable: core.mediaKeyHandler.isMediaKeyDetectionEnabled,
+                builder: (context, value, child) {
+                  return SelectableCard(
+                    isActive: value,
+                    icon: value ? Icons.check_box : Icons.check_box_outline_blank,
+                    title: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      spacing: 8,
+                      children: [
+                        Text(context.i18n.enableMediaKeyDetection),
+                        Text(
+                          context.i18n.mediaKeyDetectionTooltip,
+                          style: TextStyle(
+                            fontSize: 12,
+                            fontWeight: FontWeight.normal,
+                          ),
+                        ),
+                      ],
+                    ),
+                    onPressed: () {
+                      core.mediaKeyHandler.isMediaKeyDetectionEnabled.value =
+                          !core.mediaKeyHandler.isMediaKeyDetectionEnabled.value;
+                    },
+                  );
+                },
+              ),
+            SizedBox(),
+            if (!kIsWeb && (Platform.isAndroid || Platform.isIOS) && !core.settings.getShowOnboarding())
+              SelectableCard(
+                isActive: core.settings.getPhoneSteeringEnabled(),
+                icon: core.settings.getPhoneSteeringEnabled() ? Icons.check_box : Icons.check_box_outline_blank,
+                title: Row(
+                  spacing: 4,
+                  children: [
+                    Icon(InGameAction.navigateRight.icon!, size: 16),
+                    Icon(InGameAction.navigateLeft.icon!, size: 16),
+                    SizedBox(),
+                    Expanded(child: Text(AppLocalizations.of(context).enableSteeringWithPhone)),
+                  ],
+                ),
+                onPressed: () {
+                  final enable = !core.settings.getPhoneSteeringEnabled();
+                  core.settings.setPhoneSteeringEnabled(enable);
+                  core.connection.toggleGyroscopeSteering(enable);
+                  setState(() {});
+                },
+              ),
+
             Gap(12),
             if (!screenshotMode)
               Column(

lib/pages/trainer.dart

@@ -19,11 +19,11 @@ import 'package:bike_control/widgets/ui/colored_title.dart';
 import 'package:bike_control/widgets/ui/toast.dart';
 import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
+import 'package:prop/prop.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:universal_ble/universal_ble.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';
 
-import '../bluetooth/devices/zwift/protocol/zp.pbenum.dart';
 import '../utils/keymap/apps/supported_app.dart';
 
 class TrainerPage extends StatefulWidget {

lib/pages/unlock.dart

@@ -0,0 +1,239 @@
+import 'package:bike_control/bluetooth/devices/zwift/zwift_clickv2.dart';
+import 'package:bike_control/bluetooth/messages/notification.dart';
+import 'package:bike_control/gen/l10n.dart';
+import 'package:bike_control/main.dart';
+import 'package:bike_control/pages/markdown.dart';
+import 'package:bike_control/utils/core.dart';
+import 'package:bike_control/utils/i18n_extension.dart';
+import 'package:bike_control/utils/iap/iap_manager.dart';
+import 'package:bike_control/widgets/ui/warning.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/src/scheduler/ticker.dart';
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:prop/prop.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart';
+
+import '../widgets/ui/small_progress_indicator.dart';
+
+class UnlockPage extends StatefulWidget {
+  final ZwiftClickV2 device;
+  const UnlockPage({super.key, required this.device});
+
+  @override
+  State<UnlockPage> createState() => _UnlockPageState();
+}
+
+class _UnlockPageState extends State<UnlockPage> with SingleTickerProviderStateMixin {
+  late final bool _wasZwiftMdnsEmulatorActive;
+  late final bool _wasObpMdnsEmulatorActive;
+  bool _showManualSteps = false;
+
+  late final bool _isInTrialPhase;
+
+  late final Ticker _ticker;
+
+  int _secondsRemaining = 60;
+
+  void _isConnectedUpdate() {
+    setState(() {});
+    if (emulator.isUnlocked.value) {
+      _close();
+    }
+  }
+
+  @override
+  void initState() {
+    super.initState();
+    _isInTrialPhase = !IAPManager.instance.isPurchased.value && IAPManager.instance.isTrialExpired;
+
+    _ticker = createTicker((_) {
+      if (emulator.waiting.value) {
+        final waitUntil = emulator.connectionDate!.add(Duration(minutes: 1));
+        final secondsUntil = waitUntil.difference(DateTime.now()).inSeconds;
+
+        if (mounted) {
+          _secondsRemaining = secondsUntil;
+          setState(() {});
+        }
+      }
+    })..start();
+
+    /*Future.delayed(Duration(seconds: 5), () {
+      emulator.waiting.value = true;
+
+      Future.delayed(Duration(seconds: 3), () {
+        propPrefs.setZwiftClickV2LastUnlock(widget.device.device.deviceId, DateTime.now());
+        emulator.isUnlocked.value = true;
+      });
+    });*/
+
+    _wasZwiftMdnsEmulatorActive = core.zwiftMdnsEmulator.isStarted.value;
+    _wasObpMdnsEmulatorActive = core.obpMdnsEmulator.isStarted.value;
+    if (!_isInTrialPhase) {
+      if (_wasZwiftMdnsEmulatorActive) {
+        core.zwiftMdnsEmulator.stop();
+        core.settings.setZwiftMdnsEmulatorEnabled(false);
+      }
+      if (_wasObpMdnsEmulatorActive) {
+        core.obpMdnsEmulator.stopServer();
+        core.settings.setObpMdnsEnabled(false);
+      }
+
+      emulator.isUnlocked.value = false;
+      emulator.alreadyUnlocked.value = false;
+      emulator.waiting.value = false;
+      emulator.isConnected.addListener(_isConnectedUpdate);
+      emulator.isUnlocked.addListener(_isConnectedUpdate);
+      emulator.alreadyUnlocked.addListener(_isConnectedUpdate);
+      emulator.startServer().then((_) {}).catchError((e, s) {
+        recordError(e, s, context: 'Emulator');
+        core.connection.signalNotification(AlertNotification(LogLevel.LOGLEVEL_ERROR, e.toString()));
+      });
+    }
+  }
+
+  @override
+  void dispose() {
+    _ticker.dispose();
+    if (!_isInTrialPhase) {
+      emulator.isConnected.removeListener(_isConnectedUpdate);
+      emulator.isUnlocked.removeListener(_isConnectedUpdate);
+      emulator.alreadyUnlocked.removeListener(_isConnectedUpdate);
+      emulator.stop();
+
+      if (_wasZwiftMdnsEmulatorActive) {
+        core.zwiftMdnsEmulator.startServer();
+        core.settings.setZwiftMdnsEmulatorEnabled(true);
+      }
+      if (_wasObpMdnsEmulatorActive) {
+        core.obpMdnsEmulator.startServer();
+        core.settings.setObpMdnsEnabled(true);
+      }
+    }
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      constraints: BoxConstraints(maxWidth: 400),
+      padding: const EdgeInsets.symmetric(horizontal: 32.0),
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          if (_isInTrialPhase && !_showManualSteps)
+            Text(
+              AppLocalizations.of(context).unlock_yourTrialPhaseHasExpired,
+            )
+          else if (_showManualSteps) ...[
+            Warning(
+              children: [
+                Text(
+                  'Important Setup Information',
+                  style: TextStyle(
+                    fontWeight: FontWeight.bold,
+                    color: Theme.of(context).colorScheme.destructive,
+                  ),
+                ).small,
+                Text(
+                  AppLocalizations.of(context).clickV2Instructions,
+                  style: TextStyle(
+                    color: Theme.of(context).colorScheme.destructive,
+                  ),
+                ).xSmall,
+                if (kDebugMode)
+                  GhostButton(
+                    onPressed: () {
+                      widget.device.sendCommand(Opcode.RESET, null);
+                    },
+                    child: Text('Reset now'),
+                  ),
+
+                Button.secondary(
+                  onPressed: () {
+                    openDrawer(
+                      context: context,
+                      position: OverlayPosition.bottom,
+                      builder: (_) => MarkdownPage(assetPath: 'TROUBLESHOOTING.md'),
+                    );
+                  },
+                  leading: const Icon(Icons.help_outline_outlined),
+                  child: Text(context.i18n.instructions),
+                ),
+              ],
+            ),
+            SizedBox(height: 32),
+            Button.primary(
+              child: Text(AppLocalizations.of(context).unlock_markAsUnlocked),
+              onPressed: () {
+                propPrefs.setZwiftClickV2LastUnlock(widget.device.scanResult.deviceId, DateTime.now());
+                closeDrawer(context);
+              },
+            ),
+          ] else if (!emulator.isConnected.value) ...[
+            Text(AppLocalizations.of(context).unlock_openZwift).li,
+            Text(AppLocalizations.of(context).unlock_connectToBikecontrol).li,
+            SizedBox(height: 32),
+            Text(AppLocalizations.of(context).unlock_bikecontrolAndZwiftNetwork).small,
+          ] else if (emulator.alreadyUnlocked.value) ...[
+            Text(AppLocalizations.of(context).unlock_yourZwiftClickMightBeUnlockedAlready),
+            SizedBox(height: 8),
+            Text(AppLocalizations.of(context).unlock_confirmByPressingAButtonOnYourDevice).small,
+          ] else if (!emulator.isUnlocked.value)
+            Text(AppLocalizations.of(context).unlock_waitingForZwift)
+          else
+            Text('Zwift Click is unlocked! You can now close this page.'),
+          SizedBox(height: 32),
+          if (!_showManualSteps && !_isInTrialPhase) ...[
+            if (emulator.waiting.value && _secondsRemaining >= 0)
+              Center(child: CircularProgressIndicator(value: 1 - (_secondsRemaining / 60), size: 20))
+            else if (emulator.alreadyUnlocked.value)
+              Center(child: Icon(Icons.lock_clock))
+            else
+              SmallProgressIndicator(),
+            SizedBox(height: 20),
+          ],
+          if (!emulator.isUnlocked.value && !_showManualSteps) ...[
+            if (!_isInTrialPhase) ...[
+              SizedBox(height: 32),
+              Center(child: Text(AppLocalizations.of(context).unlock_notWorking).small),
+            ],
+            SizedBox(height: 6),
+            Center(
+              child: Button.secondary(
+                onPressed: () {
+                  setState(() {
+                    _showManualSteps = !_showManualSteps;
+                  });
+                },
+                child: Text(AppLocalizations.of(context).unlock_unlockManually),
+              ),
+            ),
+          ],
+          SizedBox(height: 20),
+        ],
+      ),
+    );
+  }
+
+  void _close() {
+    final title = AppLocalizations.of(context).unlock_isnowunlocked(widget.device.toString());
+
+    final subtitle = AppLocalizations.of(context).unlock_youCanNowCloseZwift;
+    core.connection.signalNotification(
+      AlertNotification(LogLevel.LOGLEVEL_INFO, title),
+    );
+
+    core.flutterLocalNotificationsPlugin.show(
+      1339,
+      title,
+      subtitle,
+      NotificationDetails(
+        android: AndroidNotificationDetails('Unlocked', 'Device unlocked notification'),
+        iOS: DarwinNotificationDetails(presentAlert: true),
+      ),
+    );
+    closeDrawer(context);
+  }
+}

lib/utils/core.dart

@@ -5,7 +5,7 @@ import 'package:bike_control/bluetooth/devices/openbikecontrol/obc_mdns_emulator
 import 'package:bike_control/bluetooth/devices/openbikecontrol/protocol_parser.dart';
 import 'package:bike_control/bluetooth/devices/trainer_connection.dart';
 import 'package:bike_control/bluetooth/devices/zwift/ftms_mdns_emulator.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
+import 'package:prop/prop.dart';
 import 'package:bike_control/bluetooth/devices/zwift/zwift_emulator.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/bluetooth/remote_pairing.dart';

lib/utils/iap/iap_service.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
+import 'package:prop/prop.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/main.dart';
 import 'package:bike_control/utils/core.dart';

lib/utils/iap/revenuecat_service.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart' as zp;
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/gen/l10n.dart';
 import 'package:bike_control/main.dart';
@@ -11,6 +10,7 @@ import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:prop/prop.dart' as zp;
 import 'package:purchases_flutter/purchases_flutter.dart';
 import 'package:purchases_ui_flutter/purchases_ui_flutter.dart';
 import 'package:shadcn_flutter/shadcn_flutter.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/buttons.dart

@@ -95,7 +95,7 @@ class ControllerButton {
   }
 
   String get displayName {
-    if (sourceDeviceId == null) {
+    if (sourceDeviceId == null || true) {
       return name;
     }
 

lib/utils/keymap/keymap.dart

@@ -82,21 +82,20 @@ class Keymap {
     }
   }
 
-  ControllerButton getOrAddButton(String name, ControllerButton Function() button) {
+  ControllerButton getOrAddButton(String name, ControllerButton button) {
     final allButtons = keyPairs.expand((kp) => kp.buttons).toSet().toList();
     if (allButtons.none((b) => b.name == name)) {
-      final newButton = button();
       addKeyPair(
         KeyPair(
           touchPosition: Offset.zero,
-          buttons: [newButton],
+          buttons: [button],
           physicalKey: null,
           logicalKey: null,
-          inGameAction: newButton.action,
-          isLongPress: newButton.action?.isLongPress ?? false,
+          inGameAction: button.action,
+          isLongPress: button.action?.isLongPress ?? false,
         ),
       );
-      return newButton;
+      return button;
     } else {
       return allButtons.firstWhere((b) => b.name == name);
     }
@@ -109,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,
         ) {

lib/utils/settings/settings.dart

@@ -11,6 +11,7 @@ import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
 import 'package:path/path.dart' as path;
 import 'package:path_provider_windows/path_provider_windows.dart';
+import 'package:prop/emulators/prefs.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:shared_preferences_windows/shared_preferences_windows.dart';
 import 'package:window_manager/window_manager.dart';
@@ -26,6 +27,7 @@ class Settings {
   Future<String?> init({bool retried = false}) async {
     try {
       prefs = await SharedPreferences.getInstance();
+      propPrefs.initialize(prefs);
       try {
         await NotificationRequirement.setup();
       } catch (error, stack) {

lib/widgets/apps/mywhoosh_link_tile.dart

@@ -1,4 +1,4 @@
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
+import 'package:prop/prop.dart';
 import 'package:bike_control/gen/l10n.dart';
 import 'package:bike_control/main.dart';
 import 'package:bike_control/pages/markdown.dart';

lib/widgets/apps/openbikecontrol_ble_tile.dart

@@ -1,4 +1,4 @@
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
+import 'package:prop/prop.dart';
 import 'package:bike_control/main.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/i18n_extension.dart';

lib/widgets/apps/openbikecontrol_mdns_tile.dart

@@ -1,4 +1,4 @@
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
+import 'package:prop/prop.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/main.dart';
 import 'package:bike_control/utils/core.dart';

lib/widgets/apps/zwift_mdns_tile.dart

@@ -1,4 +1,4 @@
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
+import 'package:prop/prop.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/main.dart';
 import 'package:bike_control/utils/core.dart';

lib/widgets/apps/zwift_tile.dart

@@ -1,10 +1,10 @@
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pbenum.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/main.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/i18n_extension.dart';
 import 'package:bike_control/widgets/ui/connection_method.dart';
 import 'package:flutter/material.dart';
+import 'package:prop/prop.dart';
 
 class ZwiftTile extends StatefulWidget {
   final VoidCallback onUpdate;

lib/widgets/keymap_explanation.dart

@@ -8,6 +8,7 @@ import 'package:bike_control/utils/keymap/apps/custom_app.dart';
 import 'package:bike_control/utils/keymap/keymap.dart';
 import 'package:bike_control/utils/keymap/manager.dart';
 import 'package:bike_control/widgets/ui/button_widget.dart';
+import 'package:bike_control/widgets/ui/colored_title.dart';
 import 'package:bike_control/widgets/ui/toast.dart';
 import 'package:dartx/dartx.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
@@ -74,16 +75,18 @@ class _KeymapExplanationState extends State<KeymapExplanation> {
 
   @override
   Widget build(BuildContext context) {
-    final allAvailableButtons = IterableFlatMap(core.connection.devices).flatMap((d) => d.availableButtons);
-    final availableKeypairs = widget.keymap.keyPairs
-        .whereNot(
-          (keyPair) => keyPair.buttons.filter((b) => allAvailableButtons.contains(b)).isEmpty,
-        )
-        .sortedBy(
-          (k) => k.buttons.first.color != null
-              ? '0${(k.buttons.first.icon?.codePoint ?? 0 * -1)}'
-              : '1${(k.buttons.first.icon?.codePoint ?? 0 * -1)}',
-        );
+    final keyButtonMap = core.connection.devices.associateWith((d) {
+      final allButtons = d.availableButtons;
+      return widget.keymap.keyPairs
+          .whereNot(
+            (keyPair) => keyPair.buttons.filter((b) => allButtons.contains(b)).isEmpty,
+          )
+          .sortedBy(
+            (k) => k.buttons.first.color != null
+                ? '0${(k.buttons.first.icon?.codePoint ?? 0 * -1)}'
+                : '1${(k.buttons.first.icon?.codePoint ?? 0 * -1)}',
+          );
+    });
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.stretch,
@@ -95,75 +98,79 @@ class _KeymapExplanationState extends State<KeymapExplanation> {
             style: TextStyle(fontSize: 12),
           ).muted,
 
-        for (final keyPair in availableKeypairs) ...[
-          Button.card(
-            style: ButtonStyle.card().withBackgroundColor(color: Theme.of(context).colorScheme.background),
-            onPressed: () async {
-              if (core.actionHandler.supportedApp is! CustomApp) {
-                final currentProfile = core.actionHandler.supportedApp!.name;
-                final newName = await KeymapManager().duplicate(
-                  context,
-                  currentProfile,
-                  skipName: '$currentProfile (Copy)',
-                );
-                if (newName != null && context.mounted) {
-                  buildToast(context, title: context.i18n.createdNewCustomProfile(newName));
-                  final selectedKeyPair = core.actionHandler.supportedApp!.keymap.keyPairs.firstWhere(
-                    (e) => e == keyPair,
+        for (final devicePair in keyButtonMap.entries) ...[
+          SizedBox(height: 12),
+          ColoredTitle(text: devicePair.key.toString()),
+          for (final keyPair in devicePair.value) ...[
+            Button.card(
+              style: ButtonStyle.card().withBackgroundColor(color: Theme.of(context).colorScheme.background),
+              onPressed: () async {
+                if (core.actionHandler.supportedApp is! CustomApp) {
+                  final currentProfile = core.actionHandler.supportedApp!.name;
+                  final newName = await KeymapManager().duplicate(
+                    context,
+                    currentProfile,
+                    skipName: '$currentProfile (Copy)',
                   );
-                  _openKeyPairEditor(selectedKeyPair);
+                  if (newName != null && context.mounted) {
+                    buildToast(context, title: context.i18n.createdNewCustomProfile(newName));
+                    final selectedKeyPair = core.actionHandler.supportedApp!.keymap.keyPairs.firstWhere(
+                      (e) => e == keyPair,
+                    );
+                    _openKeyPairEditor(selectedKeyPair);
+                  }
+                } else {
+                  _openKeyPairEditor(keyPair);
                 }
-              } else {
-                _openKeyPairEditor(keyPair);
-              }
-            },
-            child: Row(
-              children: [
-                Expanded(
-                  child: Basic(
-                    leading: SizedBox(
-                      width: 68,
-                      child: Wrap(
-                        spacing: 8,
-                        runSpacing: 8,
-                        crossAxisAlignment: WrapCrossAlignment.center,
-                        runAlignment: WrapAlignment.center,
-                        children: [
-                          if (core.actionHandler.supportedApp is! CustomApp)
-                            for (final button in keyPair.buttons.filter((b) => allAvailableButtons.contains(b)))
-                              IntrinsicWidth(
-                                child: ButtonWidget(
-                                  button: button,
-                                  big: true,
+              },
+              child: Row(
+                children: [
+                  Expanded(
+                    child: Basic(
+                      leading: SizedBox(
+                        width: 68,
+                        child: Wrap(
+                          spacing: 8,
+                          runSpacing: 8,
+                          crossAxisAlignment: WrapCrossAlignment.center,
+                          runAlignment: WrapAlignment.center,
+                          children: [
+                            if (core.actionHandler.supportedApp is! CustomApp)
+                              for (final button in keyPair.buttons)
+                                IntrinsicWidth(
+                                  child: ButtonWidget(
+                                    button: button,
+                                    big: true,
+                                  ),
+                                )
+                            else
+                              for (final button in keyPair.buttons)
+                                IntrinsicWidth(
+                                  child: ButtonWidget(
+                                    button: button,
+                                    big: true,
+                                  ),
                                 ),
-                              )
-                          else
-                            for (final button in keyPair.buttons)
-                              IntrinsicWidth(
-                                child: ButtonWidget(
-                                  button: button,
-                                  big: true,
-                                ),
-                              ),
-                        ],
+                          ],
+                        ),
                       ),
+                      content: (keyPair.buttons.isNotEmpty && keyPair.hasActiveAction)
+                          ? KeypairExplanation(
+                              keyPair: keyPair,
+                            )
+                          : Text(
+                              core.logic.hasNoConnectionMethod
+                                  ? AppLocalizations.of(context).noConnectionMethodSelected
+                                  : context.i18n.noActionAssigned,
+                              style: TextStyle(height: 1),
+                            ).muted,
                     ),
-                    content: (keyPair.buttons.isNotEmpty && keyPair.hasActiveAction)
-                        ? KeypairExplanation(
-                            keyPair: keyPair,
-                          )
-                        : Text(
-                            core.logic.hasNoConnectionMethod
-                                ? AppLocalizations.of(context).noConnectionMethodSelected
-                                : context.i18n.noActionAssigned,
-                            style: TextStyle(height: 1),
-                          ).muted,
                   ),
-                ),
-                Icon(Icons.edit_outlined, size: 26),
-              ],
+                  Icon(Icons.edit_outlined, size: 26),
+                ],
+              ),
             ),
-          ),
+          ],
         ],
       ],
     );

lib/widgets/pair_widget.dart

@@ -1,10 +1,10 @@
 import 'dart:io';
 
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pbenum.dart' show LogLevel;
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/i18n_extension.dart';
 import 'package:bike_control/widgets/ui/connection_method.dart';
+import 'package:prop/prop.dart' show LogLevel;
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 
 import '../utils/requirements/multi.dart';

lib/widgets/scan.dart

@@ -1,14 +1,12 @@
-import 'dart:io';
-
-import 'package:bike_control/gen/l10n.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/i18n_extension.dart';
-import 'package:bike_control/utils/requirements/platform.dart';
 import 'package:bike_control/widgets/ui/connection_method.dart';
 import 'package:bike_control/widgets/ui/wifi_animation.dart';
 import 'package:flutter/foundation.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 
+import '../utils/requirements/platform.dart';
+
 class ScanWidget extends StatefulWidget {
   const ScanWidget({super.key});
 
@@ -79,37 +77,6 @@ class _ScanWidgetState extends State<ScanWidget> {
                         ],
                       ),
                     SizedBox(),
-                    if (!kIsWeb && (Platform.isMacOS || Platform.isWindows))
-                      ValueListenableBuilder(
-                        valueListenable: core.mediaKeyHandler.isMediaKeyDetectionEnabled,
-                        builder: (context, value, child) {
-                          return Tooltip(
-                            tooltip: (c) => TooltipContainer(
-                              child: Text(context.i18n.mediaKeyDetectionTooltip),
-                            ),
-                            child: Checkbox(
-                              state: value ? CheckboxState.checked : CheckboxState.unchecked,
-                              trailing: Expanded(child: Text(context.i18n.enableMediaKeyDetection)),
-                              onChanged: (change) {
-                                core.mediaKeyHandler.isMediaKeyDetectionEnabled.value = change == CheckboxState.checked;
-                              },
-                            ),
-                          );
-                        },
-                      ),
-                    if (!kIsWeb && (Platform.isAndroid || Platform.isIOS) && !core.settings.getShowOnboarding())
-                      Checkbox(
-                        state: core.settings.getPhoneSteeringEnabled()
-                            ? CheckboxState.checked
-                            : CheckboxState.unchecked,
-                        trailing: Expanded(child: Text(AppLocalizations.of(context).enableSteeringWithPhone)),
-                        onChanged: (change) {
-                          core.settings.setPhoneSteeringEnabled(change == CheckboxState.checked);
-                          core.connection.toggleGyroscopeSteering(change == CheckboxState.checked);
-                          setState(() {});
-                        },
-                      ),
-                    SizedBox(),
                   ],
                 );
               } else {

lib/widgets/testbed.dart

@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:math' as math;
 import 'dart:ui';
 
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
+import 'package:prop/prop.dart';
 import 'package:bike_control/utils/actions/base_actions.dart' as actions;
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/i18n_extension.dart';

lib/widgets/ui/toast.dart

@@ -1,4 +1,4 @@
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
+import 'package:prop/prop.dart';
 import 'package:bike_control/widgets/ui/button_widget.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 

pubspec.lock

@@ -1290,6 +1290,13 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.0.5"
+  prop:
+    dependency: "direct main"
+    description:
+      path: prop
+      relative: true
+    source: path
+    version: "0.0.1"
   protobuf:
     dependency: "direct main"
     description:
@@ -1850,5 +1857,5 @@ packages:
     source: hosted
     version: "0.0.4"
 sdks:
-  dart: ">=3.10.3 <4.0.0"
+  dart: ">=3.10.7 <4.0.0"
   flutter: ">=3.38.4"

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.5.0+84
+version: 4.6.2+91
 
 environment:
   sdk: ^3.9.0
@@ -65,6 +65,8 @@ dependencies:
   package_info_plus: ^9.0.0
   in_app_update: ^4.2.5
   http: ^1.3.0
+  prop:
+    path: prop
   shadcn_flutter:
     git:
       url: https://github.com/sunarya-thito/shadcn_flutter.git

test/zwift.dart

@@ -1,47 +0,0 @@
-import 'dart:typed_data';
-
-import 'package:flutter_test/flutter_test.dart';
-import 'package:bike_control/bluetooth/devices/zwift/ftms_mdns_emulator.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
-
-void main() {
-  group('Zwift Emulation', () {
-    test('compare bytes', () {
-      final devInfo = DevInfoPage(
-        deviceName: 'BikeControl'.codeUnits,
-        deviceUid: '58D15ABB4363'.codeUnits,
-        manufacturerId: 0x01,
-        serialNumber: '0B-58D15ABB4363'.codeUnits,
-        protocolVersion: 515,
-        systemFwVersion: [0, 0, 1, 1],
-        productId: 11,
-        systemHwRevision: 'B.0'.codeUnits,
-        deviceCapabilities: [DevInfoPage_DeviceCapabilities(deviceType: 2, capabilities: 1)],
-      );
-
-      final getResponse = GetResponse(
-        dataObjectId: DO.PAGE_DEV_INFO.value,
-        dataObjectData: devInfo.writeToBuffer(),
-      );
-
-      final serverInfoResponse = Uint8List.fromList([
-        Opcode.GET_RESPONSE.value,
-        ...getResponse.writeToBuffer(),
-      ]);
-      final expected = Uint8List.fromList(
-        hexToBytes(
-          '3C080012460A440883041204000001011A0B42696b65436f6e74726f6c320F30422D3538443135414242343336333A03422E304204080210014801500B5A0C353844313541424234333633',
-        ),
-      );
-
-      final parsed = GetResponse.fromBuffer(expected.sublist(1));
-      //expect(parsed, equals(getResponse));
-
-      final parsedDo = DevInfoPage.fromBuffer(parsed.dataObjectData);
-      expect(parsedDo.writeToBuffer(), equals(devInfo.writeToBuffer()));
-      expect(parsedDo, equals(devInfo));
-
-      //expect(serverInfoResponse, equals(expected));
-    });
-  });
-}