less messages when calibrating

fix action assignment
Update Windows Store version to 4.6.2
2026-02-18 00:17:40 +01:00 · 2026-01-30 18:06:13 +01:00 · 2026-01-30 17:46:58 +01:00 · 2026-01-30 12:29:19 +01:00 · 2026-01-30 10:41:51 +01:00 · 2026-01-29 16:22:46 +01:00
425 changed files with 28652 additions and 16104 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,15 +28,11 @@ on:
        required: false
        default: true
        type: boolean
-      build_web:
-        description: 'Build for Web'
-        required: false
-        default: true
-        type: boolean

 env:
  SHOREBIRD_TOKEN: ${{ secrets.SHOREBIRD_TOKEN }}
-  FLUTTER_VERSION: 3.35.5
+  FLUTTER_VERSION_MAC: 3.41.0-0.0.pre
+  FLUTTER_VERSION: 3.38.7

 jobs:
  build:
@@ -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,17 +96,41 @@ 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 maCOS
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'beta'
+          flutter-version: ${{ env.FLUTTER_VERSION_MAC }}
+
+      - name: Generate translation files
+        run: |
+          flutter pub global activate intl_utils;
+          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: "-- --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
@@ -121,29 +144,7 @@ jobs:
        with:
          flutter-version: ${{ env.FLUTTER_VERSION }}
          platform: android
-          args: "--artifact=apk"
-
-      - name: Set Up Flutter
-        if: inputs.build_web
-        uses: subosito/flutter-action@v2
-        with:
-          channel: 'stable'
-          flutter-version: ${{ env.FLUTTER_VERSION }}
-
-      - name: Build Web
-        if: inputs.build_web
-        run: flutter build web --release --base-href "/swiftcontrol/"
-
-      - name: Upload static files as artifact
-        if: inputs.build_web
-        id: deployment
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: build/web
-
-      - name: Web Deploy
-        if: inputs.build_web
-        uses: actions/deploy-pages@v4
+          args: "-- --obfuscate --split-debug-info=symbols --dart-define=REVENUECAT_API_KEY_ANDROID=${{ secrets.REVENUECAT_API_KEY_ANDROID }}"

      - name: Extract latest changelog
        id: changelog
@@ -152,13 +153,19 @@ jobs:
          mkdir -p whatsnew
          ./scripts/get_latest_changelog.sh | head -c 500 > whatsnew/whatsnew-en-US

+      - name: Generate release body
+        if: inputs.build_github
+        run: |
+          chmod +x scripts/generate_release_body.sh
+          ./scripts/generate_release_body.sh > /tmp/release_body.md
+
      - name: 🚀 Shorebird Release iOS
        if: inputs.build_ios
        uses: shorebirdtech/shorebird-release@v1
        with:
          flutter-version: ${{ env.FLUTTER_VERSION }}
          platform: ios
-          args: "--export-options-plist ios/ExportOptions.plist"
+          args: "--export-options-plist ios/ExportOptions.plist -- --dart-define=VERIFYING_SHARED_SECRET=${{ secrets.VERIFYING_SHARED_SECRET }} --dart-define=REVENUECAT_API_KEY_IOS=${{ secrets.REVENUECAT_API_KEY_IOS }}"

      - name: Prepare App Store authentication key
        if: inputs.build_ios || inputs.build_mac
@@ -176,7 +183,7 @@ jobs:
          serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
          packageName: de.jonasbark.swiftcontrol
          releaseFiles: build/app/outputs/bundle/release/app-release.aab
-          track: production
+          track: ${{ github.ref == 'refs/heads/main' && 'production' || 'alpha' }}
          whatsNewDirectory: whatsnew

      - name: Upload to macOS App Store
@@ -185,8 +192,8 @@ jobs:
          APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
          APPSTORE_API_ISSUER_ID: ${{ secrets.APPSTORE_API_ISSUER_ID }}
        run: |
-          productbuild --component "build/macos/Build/Products/Release/SwiftControl.app" /Applications "SwiftControl.pkg" --sign "3rd Party Mac Developer Installer: JONAS TASSILO BARK (UZRHKPVWN9)";    
-          xcrun altool --upload-app -f SwiftControl.pkg -t osx --apiKey "$APPSTORE_API_KEY" --apiIssuer "$APPSTORE_API_ISSUER_ID"; 
+          productbuild --component "build/macos/Build/Products/Release/BikeControl.app" /Applications "BikeControl.pkg" --sign "3rd Party Mac Developer Installer: JONAS TASSILO BARK (UZRHKPVWN9)";    
+          xcrun altool --upload-app -f BikeControl.pkg -t osx --apiKey "$APPSTORE_API_KEY" --apiIssuer "$APPSTORE_API_ISSUER_ID"; 

      - name: Upload to iOS App Store
        if: inputs.build_ios
@@ -196,41 +203,6 @@ jobs:
        run: |
          xcrun altool --upload-app -f build/ios/ipa/swift_play.ipa -t ios --apiKey "$APPSTORE_API_KEY" --apiIssuer "$APPSTORE_API_ISSUER_ID";

-      - name: Handle Android archives
-        if: inputs.build_android && inputs.build_github
-        run: |
-          cp build/app/outputs/flutter-apk/app-release.apk build/app/outputs/flutter-apk/SwiftControl.android.apk
-
-      - name: Code Signing of macOS app
-        if: inputs.build_mac && inputs.build_github
-        run: /usr/bin/codesign --deep --force -s "$DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY" --entitlements ../../../../../macos/Runner/Release.entitlements --options runtime SwiftControl.app -v
-        working-directory: build/macos/Build/Products/Release
-        env:
-          DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY: ${{ secrets.DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY }}
-
-      - name: Handle macOS archives
-        if: inputs.build_mac && inputs.build_github
-        run: |
-          cd build/macos/Build/Products/Release/
-          zip -r SwiftControl.macos.zip SwiftControl.app/
-
-      - name: Upload Android Artifacts
-        if: inputs.build_android && inputs.build_github
-        uses: actions/upload-artifact@v4
-        with:
-          overwrite: true
-          name: Releases
-          path: |
-            build/app/outputs/flutter-apk/SwiftControl.android.apk
-
-      - name: Upload macOS Artifacts
-        if: inputs.build_mac && inputs.build_github
-        uses: actions/upload-artifact@v4
-        with:
-          overwrite: true
-          name: Releases
-          path: |
-            build/macos/Build/Products/Release/SwiftControl.macos.zip

        #10 Extract Version
      - name: Extract version from pubspec.yaml
@@ -240,39 +212,68 @@ 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
        uses: ncipollo/release-action@v1
        with:
-          artifacts: "build/app/outputs/flutter-apk/SwiftControl.android.apk,build/macos/Build/Products/Release/SwiftControl.macos.zip"
+          artifacts: "build/app/outputs/flutter-apk/BikeControl.android.apk,build/macos/Build/Products/Release/BikeControl.macos.zip"
          allowUpdates: true
          prerelease: true
-          bodyFile: scripts/RELEASE_NOTES.md
+          bodyFile: /tmp/release_body.md
          tag: v${{ env.VERSION }}
          token: ${{ secrets.TOKEN }}

  windows:
-    needs: build
    if: inputs.build_windows
    name: Build & Release on Windows
-    runs-on: windows-latest
+    runs-on: windows-2025

    steps:
      #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
+        run: |
+          $version = Select-String '^version: ' pubspec.yaml | ForEach-Object {
+            ($_ -split ' ')[1].Trim()
+          }
+          echo "VERSION=$version" >> $env:GITHUB_ENV

      - name: 🐦 Setup Shorebird
        uses: shorebirdtech/setup-shorebird@v1
        with:
          cache: true

+      - name: Set Up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+
+      - name: Generate translation files
+        run: |
+          flutter pub global activate intl_utils;
+          flutter pub global run intl_utils:generate;
+
      - name: 🚀 Shorebird Release Windows
        uses: shorebirdtech/shorebird-release@v1
        with:
          flutter-version: ${{ env.FLUTTER_VERSION }}
          platform: windows
+          args: "-- --obfuscate --split-debug-info=symbols-win"

      - name: Zip directory (Windows)
        shell: pwsh
@@ -296,7 +297,7 @@ jobs:
              Write-Warning "$dll not found in $source"
            }
          }
-          Compress-Archive -Path "build/windows/x64/runner/Release/*" -DestinationPath "build/windows/x64/runner/Release/SwiftControl.windows.zip"
+          Compress-Archive -Path "build/windows/x64/runner/Release/*" -DestinationPath "build/windows/x64/runner/Release/bike_control.windows.zip"

      - uses: microsoft/setup-msstore-cli@v1
        if: false
@@ -305,12 +306,6 @@ jobs:
        if: false
        run: msstore reconfigure --tenantId $ --clientId $ --clientSecret $ --sellerId $

-      - name: Set Up Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: 'stable'
-          flutter-version: ${{ env.FLUTTER_VERSION }}
-
      - name: Create MSIX package
        run: dart run msix:create

@@ -318,35 +313,11 @@ jobs:
        if: false
        run: msstore publish -v "build/windows/x64/runner/Release/"

-      - name: Rename swift_control.msix to SwiftControl.windows.msix
-        shell: pwsh
-        run: |
-          Rename-Item -Path "build/windows/x64/runner/Release/swift_control.msix" -NewName "SwiftControl.windows.msix"
-
      - name: Upload Artifacts
        uses: actions/upload-artifact@v4
        with:
          overwrite: true
          name: Releases
          path: |
-            build/windows/x64/runner/Release/SwiftControl.windows.zip
-            build/windows/x64/runner/Release/SwiftControl.windows.msix
-
-      - name: Extract version from pubspec.yaml (Windows)
-        shell: pwsh
-        run: |
-          $version = Select-String '^version: ' pubspec.yaml | ForEach-Object {
-            ($_ -split ' ')[1].Trim()
-          }
-          echo "VERSION=$version" >> $env:GITHUB_ENV
-
-
-      - name: Update Release
-        uses: ncipollo/release-action@v1
-        with:
-          allowUpdates: true
-          artifacts: "build/windows/x64/runner/Release/SwiftControl.windows.zip,build/windows/x64/runner/Release/SwiftControl.windows.msix"
-          bodyFile: scripts/RELEASE_NOTES.md
-          prerelease: true
-          tag: v${{ env.VERSION }}
-          token: ${{ secrets.TOKEN }}
+            build/windows/x64/runner/Release/bike_control.msix
+            symbols-win/
--- a/.github/workflows/patch.yml
+++ b/.github/workflows/patch.yml
@@ -5,7 +5,7 @@ on:

 env:
  SHOREBIRD_TOKEN: ${{ secrets.SHOREBIRD_TOKEN }}
-  FLUTTER_VERSION: 3.35.5
+  FLUTTER_VERSION: 3.38.5

 jobs:
  build:
@@ -21,12 +21,26 @@ 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
        with:
          cache: true

+      - name: Set Up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+
+      - name: Generate translation files
+        run: |
+          flutter pub global activate intl_utils;
+          flutter pub global run intl_utils:generate;
+
      - name: Install certificates
        env:
          DEVELOPER_ID_APPLICATION_P12_BASE64_MAC: ${{ secrets.DEVELOPER_ID_APPLICATION_P12_BASE64_MAC }}
@@ -75,62 +89,68 @@ jobs:
          echo "${{ secrets.KEYSTORE_PROPERTIES }}" > android/keystore.properties;

      - name: 🚀 Shorebird Patch macOS
+        if: false # patch doesn't work: https://github.com/jonasbark/swiftcontrol/issues/143
        uses: shorebirdtech/shorebird-patch@v1
        with:
          platform: macos
          release-version: latest
-          args: '--allow-asset-diffs --allow-native-diffs'
+          args: '--allow-asset-diffs --allow-native-diffs -- --dart-define=VERIFYING_SHARED_SECRET=${{ secrets.VERIFYING_SHARED_SECRET }} --dart-define=REVENUECAT_API_KEY_IOS=${{ secrets.REVENUECAT_API_KEY_IOS }}'

      - name: 🚀 Shorebird Patch Android
        uses: shorebirdtech/shorebird-patch@v1
        with:
          platform: android
          release-version: latest
-          args: '--allow-asset-diffs --allow-native-diffs'
+          args: '--allow-asset-diffs --allow-native-diffs -- --dart-define=REVENUECAT_API_KEY_ANDROID=${{ secrets.REVENUECAT_API_KEY_ANDROID }}'

      - name: 🚀 Shorebird Patch iOS
        uses: shorebirdtech/shorebird-patch@v1
        with:
          platform: ios
          release-version: latest
-          args: '--allow-asset-diffs --allow-native-diffs'
-
-      - name: Set Up Flutter
-        uses: subosito/flutter-action@v2
-        with:
-          channel: 'stable'
-          flutter-version: ${{ env.FLUTTER_VERSION }}
+          args: '--allow-asset-diffs --allow-native-diffs -- --dart-define=VERIFYING_SHARED_SECRET=${{ secrets.VERIFYING_SHARED_SECRET }} --dart-define=REVENUECAT_API_KEY_IOS=${{ secrets.REVENUECAT_API_KEY_IOS }}'

      # shorebird struggles with the app from GitHub
      - name: Build macOS
+        if: false
        run: flutter build macos --release;

      - name: Sign macOS build
+        if: false
        env:
          DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY: ${{ secrets.DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY }}
        run: |
          version=$(grep '^version: ' pubspec.yaml | cut -d ' ' -f 2 | tr -d '\r');
          echo "VERSION=$version" >> $GITHUB_ENV;
          cd build/macos/Build/Products/Release/;
-          /usr/bin/codesign --deep --force -s "$DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY" --entitlements ../../../../../macos/Runner/Release.entitlements --options runtime SwiftControl.app -v;
-          zip -r SwiftControl.macos.zip SwiftControl.app/;
+          /usr/bin/codesign --deep --force -s "$DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY" --entitlements ../../../../../macos/Runner/Release.entitlements --options runtime BikeControl.app -v;
+          zip -r BikeControl.macos.zip BikeControl.app/;

      #9 Upload Artifacts
      - name: Upload Artifacts
+        if: false
        uses: actions/upload-artifact@v4
        with:
          overwrite: true
          name: Releases
          path: |
-            build/macos/Build/Products/Release/SwiftControl.macos.zip
+            build/macos/Build/Products/Release/BikeControl.macos.zip
+
+      - name: Generate release body
+        if: false
+        run: |
+          chmod +x scripts/generate_release_body.sh
+          ./scripts/generate_release_body.sh > /tmp/release_body.md

      # add artifact to release
      - name: Create Release
+        if: false
        uses: ncipollo/release-action@v1
        with:
          allowUpdates: true
-          artifacts: "build/macos/Build/Products/Release/SwiftControl.macos.zip"
-          bodyFile: scripts/RELEASE_NOTES.md
+          artifacts: "build/macos/Build/Products/Release/BikeControl.macos.zip"
+          bodyFile: /tmp/release_body.md
+          prerelease: true
          tag: v${{ env.VERSION }}
          token: ${{ secrets.TOKEN }}

@@ -142,19 +162,26 @@ jobs:
      #1 Checkout Repository
      - name: Checkout Repository
        uses: actions/checkout@v3
-
-        #2 Setup Java
-      - name: Set Up Java
-        uses: actions/setup-java@v3.12.0
        with:
-          distribution: 'oracle'
-          java-version: '17'
+          submodules: recursive
+          token: ${{ secrets.PAT_TOKEN }}

      - name: 🐦 Setup Shorebird
        uses: shorebirdtech/setup-shorebird@v1
        with:
          cache: true

+      - name: Set Up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+
+      - name: Generate translation files
+        run: |
+          flutter pub global activate intl_utils;
+          flutter pub global run intl_utils:generate;
+
      - name: 🚀 Shorebird Patch Windows
        uses: shorebirdtech/shorebird-patch@v1
        with:
--- a/.github/workflows/web.yml
+++ b/.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
@@ -34,6 +38,12 @@ jobs:
        with:
          channel: 'stable'

+      - name: Generate translation files
+
+        run: |
+          flutter pub global activate intl_utils;
+          flutter pub global run intl_utils:generate;
+
        #4 Install Dependencies
      - name: Install Dependencies
        run: flutter pub get
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@
 .history
 .svn/
 .swiftpm/
+debug/
 migrate_working_dir/

 android/keystore.properties
@@ -40,10 +41,15 @@ app.*.symbols

 # Obfuscation related
 app.*.map.json
+localazy.json

 # Android Studio will place build artifacts here
 /android/app/debug
 /android/app/profile
 /android/app/release

+lib/gen/
+
 service-account.json
+.env
+lib/generated
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "prop"]
+	path = prop
+	url = git@github.com:OpenBikeControl/prop.git
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,7 +5,8 @@
    {
      "name": "swiftcontrol",
      "request": "launch",
-      "type": "dart"
+      "type": "dart",
+      "program": "lib/main.dart"
    },
    {
      "name": "swiftcontrol (profile mode)",
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,128 @@
+### 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**:
+- Android: simulate additional actions for local connection method (Left, Down, Right, Up, Select, Back, Home, Recent Apps)
+  - control your phone with your controller
+  - control UI within the trainer app (if supported)
+- BikeControl now supports individual mapping when you use more than one Cycplus BC2 and ThinkRider VS200 controller
+- Windows & macOS: allow configuration of volume keys on Bluetooth HID devices
+
+### 4.4.0 (16-01-2026)
+
+**Features**:
+- Support for Thinkrider VS200
+
+**Fixes**:
+- Android: Local connection method allows passing keyboard events to the trainer app
+- macOS: Compatibility with macOS Tahoe
+- Windows: send keyboard events to the correct window when using multiple monitors or when another app is focused
+- Windows: fix media key detection
+
+### 4.3.0 (07-01-2026)
+
+**Features**:
+- Onboarding for new users
+- support controlling music & volume for Windows, macOS and Android
+- App is now available in Italian (thanks to Connect_Thanks2613)
+
+**Fixes**:
+- Vibration setting now available for Zwift Ride devices
+
+### 4.2.0 (20-12-2025)
+
+BikeControl now offers a free trial period of 5 days for all features, so you can test everything before deciding to purchase a license. Please contact the support if you experience any issues!
+
+**Features**:
+- support for SRAM AXS/eTap
+  - only single or double click is supported (no individual button mapping possible, yet)
+- use your phone/tablet for steering by attaching your device on your handlebar!
+- App is now available in Polish (thanks to Wandrocek)
+
+**Fixes**:
+- You will now be notified when a connection to your controller is lost
+- improved UI of the Keymap customization screen
+
+### 4.1.0 (16-12-2025)
+
+**Features**:
+- control your trainer manually without requiring a controller - just like a Companion app
+- support for Wahoo KICKR HEADWIND: control the fan via your controller 
+
+**Fixes**:
+- Gamepads: handle analog values correctly on Windows
+- MyWhoosh: updated default keymap to use the new A+D keys for steering 
+
+### 4.0.0 (07-12-2025)
+
+- a brand-new design
+  - Accessibility Permission is now optional on Android
+- Zwift is now fully supported on all operating systems
+    - you can choose between network based control or bluetooth based control
+- MyWhoosh can now also be controlled with BikeControl running on the same iPad / iPhone
+- Translations available in German and French
+- support for Wahoo KICKR BIKE PRO
+- support for the OpenBikeControl protocol for supported Trainer apps
+  - this enables seamless and official integration, independent of the operating system
+  - learn more at https://openbikecontrol.org
+
+### 3.6.0 (23-11-2025)
+
+SwiftControl is now called BikeControl!
+
+**Features:**
+- show a list of predefined keymaps for the selected trainer app when using a custom keymap
+- status icons so it's clear what's missing
+
+**Fixes:**
+- Update Rouvy keymap to support virtual shifting in their latest version 
+
+### 3.5.0 (16-11-2025)
+**New Features:**
+- Dark mode support
+- Cycplus BC2 support (thanks @schneewoehner)
+- Ignored devices now persist across app restarts - remove them from ignored devices via the menu
+
+**Fixes:**
+- resolve issues during app start
+
+### 3.4.0 (08-11-2025)
+**New Features:**
+- Support for Shimano Di2
+- Support Keyboard shortcuts with modifier keys (Ctrl, Alt, Shift, ...)
+- Support cheap BLE HID remotes 
+- add Keymap for Rouvy, supporting the new keyboard shortcuts for virtual shifting
+
+**Fixes:**
+- fix detection of Elite Square Sterzo devices
+- recognize cheap Bluetooth device clicks also when BikeControl is in the background
+
+### 3.3.0 (31-10-2025)
+
+**New Features:**
+- Support for Elite Sterzo (thanks @michidk)
+- Support for Gamepads
+- Support for cheap bluetooth remotes (such as [these](https://www.amazon.com/s?k=bluetooth+remote))
+- you can now customize the Keymap right from the Customize section
+- show signal strength of connected devices (thanks @michidk)
+- Android and Windows only: simulate bluetooth controllers
+  - enables gamepad and bluetooth remotes support for Zwift, Rouvy and Biketerra
+
+**Fixes:**
+- fix firmware version display for Zwift Click V2 devices
+- fix touch position on some Android devices
+- Wahoo Kickr Bike Shift can now be connected
+- update default keymap for TrainingPeaks
+
 ### 3.2.0 (2025-10-22)
 - a brand-new way of controlling MyWhoosh:
  - device pairing no longer required as mouse emulation is no longer needed  
-  - SwiftControl can now stay in the background
+  - BikeControl can now stay in the background
  - more devices can be controlled
  - do more, such as define Emotes, Camera angles and steering

@@ -11,16 +132,16 @@
 - support for Wahook Kickr Bike Shift (thanks @MattW2)
 - initial support for Elite Square Smart Frame
 - reconnects to your device automatically when connection is lost
- SwiftControl now warns you if your device firmware is outdated
- SwiftControl is now available in Microsoft Store: https://apps.microsoft.com/detail/9NP42GS03Z26
+- BikeControl now warns you if your device firmware is outdated
+- BikeControl is now available in Microsoft Store: https://apps.microsoft.com/detail/9NP42GS03Z26

 ### 3.0.3 (2025-10-12)
- SwiftControl now supports iOS!
-  - Note that you can't run SwiftControl and your trainer app on the same iPhone due to iOS limitations but...:
- You can now use SwiftControl as "remote control" for other devices, such as an iPad. Example scenario:
-    - your phone (Android/iOS) runs SwiftControl and connects to your Click devices
-    - your iPad or other tablet runs e.g. MyWhoosh (does not need to have SwiftControl installed)
-    - after pairing SwiftControl to your iPad / tablet via Bluetooth your phone will send the button presses to your iPad / tablet
+- BikeControl now supports iOS!
+  - Note that you can't run BikeControl and your trainer app on the same iPhone due to iOS limitations but...:
+- You can now use BikeControl as "remote control" for other devices, such as an iPad. Example scenario:
+    - your phone (Android/iOS) runs BikeControl and connects to your Click devices
+    - your iPad or other tablet runs e.g. MyWhoosh (does not need to have BikeControl installed)
+    - after pairing BikeControl to your iPad / tablet via Bluetooth your phone will send the button presses to your iPad / tablet
 - Ride: analog paddles are now supported thanks to contributor @jmoro
 - you can now zoom in and out in the Keymap customization screen

@@ -40,8 +161,8 @@

 ### 2.5.0 (2025-09-25)
 - Improve usability
- SwiftControl is now available via the Play Store: https://play.google.com/store/apps/details?id=de.jonasbark.swiftcontrol
-  - SwiftControl will continue to be available to download for free on GitHub
+- BikeControl is now available via the Play Store: https://play.google.com/store/apps/details?id=de.jonasbark.swiftcontrol
+  - BikeControl will continue to be available to download for free on GitHub
  - contact me if you already donated and I'll get a voucher for you :)

 ### 2.4.0+1 (2025-09-17)
--- a/INSTRUCTIONS_ANDROID.md
+++ b/INSTRUCTIONS_ANDROID.md
@@ -1 +0,0 @@
-Instructions will be added soon
--- a/INSTRUCTIONS_IOS.md
+++ b/INSTRUCTIONS_IOS.md
@@ -1 +1 @@
-Instructions will be added soon
+Moved to [INSTRUCTIONS_MYWHOOSH_LINK.md](INSTRUCTIONS_MYWHOOSH_LINK.md)
--- a/INSTRUCTIONS_LOCAL.md
+++ b/INSTRUCTIONS_LOCAL.md
@@ -0,0 +1,17 @@
+## What is the Local connection method?
+* 
+The Local connection method works by directly controlling the target trainer app on the same device by simulating user input (taps, keyboard inputs). This method does not require any network connection or additional hardware, making it the simplest and most straightforward way to connect to the trainer app.
+
+There are predefined keymaps (touch positions or keyboard shortcuts) for popular trainer apps, allowing users to easily set up and start using the Local connection method without needing to configure anything manually. You can configure these keymaps in the Configuration tab. Note though that supported keyboard keys depend on the trainer app.
+
+## When to use the Local connection method?
+* 
+The Local connection method is ideal for users who:
+  - Are running the trainer app on the same device as the controller app (e.g., both apps on a smartphone or tablet).
+  - Do not want to deal with network configurations or potential connectivity issues.
+
+## Limitations of the Local connection method
+* 
+While the Local connection method is easy to set up and use, it has some limitations:
+  - It may not work well with trainer apps that have complex user interfaces or require precise timing.
+  - It is limited to the device on which both the controller and trainer apps are running, meaning it cannot be used for remote control scenarios.
--- a/INSTRUCTIONS_MACOS.md
+++ b/INSTRUCTIONS_MACOS.md
@@ -1 +0,0 @@
-Instructions will be added soon
--- a/INSTRUCTIONS_MYWHOOSH_LINK.md
+++ b/INSTRUCTIONS_MYWHOOSH_LINK.md
@@ -0,0 +1,38 @@
+## Instructions for using the MyWhoosh "Link" connection method
+*
+1) launch MyWhoosh on the device of your choice
+2) make sure the "MyWhoosh Link" app is not active at the same time as BikeControl
+3) open BikeControl, follow the on-screen instructions
+
+
+Here's a video with a few explanations. Note it uses an older version, but the idea is the same.
+
+[![BikeControl Instruction for iOS](https://img.youtube.com/vi/p8sgQhuufeI/0.jpg)](https://www.youtube.com/watch?v=p8sgQhuufeI)
+[https://www.youtube.com/watch?v=p8sgQhuufeI](https://www.youtube.com/watch?v=p8sgQhuufeI)
+
+## MyWhoosh "Link" method never connects
+*
+This is a network/local-discovery problem. BikeControl needs the same kind of local network access as MyWhoosh Link.
+
+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 (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:
+  - “AP isolation / client isolation”
+- Try moving both devices to the same band:
+  - Prefer **2.4 GHz** (often more reliable for local discovery than mixed/steering)
+- Temporarily disable:
+  - VPNs
+  - iCloud Private Relay (if enabled)
+  - “Limit IP Address Tracking” (iOS Wi‑Fi option)
+- iOS Wi‑Fi settings for that network:
+  - Turn off **Private Wi‑Fi Address**
+  - Turn off **Limit IP Address Tracking**
+- Mesh networks: may work, but if it doesn’t, test with a simple router or phone hotspot.
+
+Official MyWhoosh troubleshooting links:
+- https://mywhoosh.com/troubleshoot/
+- https://www.facebook.com/groups/mywhoosh/posts/1323791068858873/
--- a/INSTRUCTIONS_REMOTE_CONTROL.md
+++ b/INSTRUCTIONS_REMOTE_CONTROL.md
@@ -0,0 +1,13 @@
+## Remote control is not working - nothing happens
+*
+- Try to unpair it from your phone / computer Bluetooth settings, then re-pair it.
+- Try restarting the pairing process in BikeControl
+- try restarting Bluetooth on your phone and on the device you want to control
+- If your other device is an iOS device, go to Settings > Accessibility > Touch > AssistiveTouch > Pointer Devices > Devices and pair your device. Make sure AssistiveTouch is enabled.
+- it is very important that both devices (e.g. iPhone and iPad) receive the "pairing dialog" after initial connection. If you miss it, unpair and try again. It may take a few seconds for the dialog to appear. Afterwards you may need to click on "Reconnect" in BikeControl / restart BikeControl.
+
+## Remote control only clicks on a single coordinate on my iPad
+*
+iOS seems to be buggy here - try this in the iOS settings:
+AssistiveTouch settings > Pointer Devices > Devices > Connected Devices > iPhone (or BikeControl iOS) > Button 1
+switch the setting to None, then back to Single-Tap and it should work again
--- a/INSTRUCTIONS_ROUVY.md
+++ b/INSTRUCTIONS_ROUVY.md
@@ -0,0 +1,4 @@
+## Local Connection method
+*
+The local connection method (avalable on Android, Windows and macOS) allows BikeControl to directly control Rouvy either using touch or keyboard keys. This way you don't need to select any "Controllers" at all in Rouvy. 
+Make sure the "Virtual Shifting Controls" are enabled: https://support.rouvy.com/hc/en-us/articles/32452137189393-Virtual-Shifting#h_01K9SWGWYMAVQV108SQ9KWQAKC
--- a/INSTRUCTIONS_WINDOWS.md
+++ b/INSTRUCTIONS_WINDOWS.md
@@ -1 +0,0 @@
-Instructions will be added soon
--- a/INSTRUCTIONS_ZWIFT.md
+++ b/INSTRUCTIONS_ZWIFT.md
--- a/README.md
+++ b/README.md
@@ -1,24 +1,21 @@
-# SwiftControl
+# BikeControl (formerly SwiftControl)

-<img src="logo.png" alt="SwiftControl Logo"/>
+<img src="logo.png" alt="BikeControl Logo"/>

 ## Description

-With SwiftControl you can **control your favorite trainer app** using your Zwift Click, Zwift Ride or Zwift Play devices. Here's what you can do with it, depending on your configuration:
+With BikeControl you can **control your favorite trainer app** using your Zwift Click, Zwift Ride, Zwift Play, Shimano Di2, or other similar devices. Here's what you can do with it, depending on your configuration:
 - Virtual Gear shifting
- Steering / turning
+- Steering / navigation
 - adjust workout intensity
 - control music on your device
- more? If you can do it via keyboard, mouse or touch, you can do it with SwiftControl
+- more? If you can do it via keyboard, mouse, or touch, you can do it with BikeControl
+
+[![Youtube Video](https://github.com/user-attachments/assets/14a45ca1-e31b-4fbd-8d03-95aa60470405)](https://youtu.be/0r3LO5lFlyc)


-https://github.com/user-attachments/assets/1f81b674-1628-4763-ad66-5f3ed7a3f159
-
-
-
-
-## Downloads
-Check the compatibility matrix below!
+## Download
+Best follow our landing page and the "Get Started" button: [bikecontrol.app](https://bikecontrol.app/) to understand on which platform you want to run BikeControl. A testing period is available, allowing you to try out the full functionality of BikeControl:

 <a href="https://play.google.com/store/apps/details?id=de.jonasbark.swiftcontrol"><img width="270" height="80" alt="GetItOnGooglePlay_Badge_Web_color_English" src="https://github.com/user-attachments/assets/a059d5a1-2efb-4f65-8117-ef6a99823b21" /></a>

@@ -30,61 +27,76 @@ Check the compatibility matrix below!

 ## Supported Apps
 - MyWhoosh
- TrainingPeaks Virtual / indieVelo
- Biketerra.com (they do offer native integration already - check it out)
- Rouvy (most Zwift devices are already supported by Rouvy)
- any other! You can add custom mapping and adjust touch points or keyboard shortcuts to your liking
+- Zwift
+- TrainingPeaks Virtual
+- Biketerra.com
+- Rouvy
+- [OpenBikeControl](https://openbikecontrol.org) compatible apps
+- any other!
+  - You can add custom mapping and adjust touch points or keyboard shortcuts to your liking

 ## Supported Devices
 - Zwift Click
 - Zwift Click v2 (mostly, see issue #68)
 - Zwift Ride
 - Zwift Play
+- Shimano Di2
+  - Configure your levers to use D-Fly channels with Shimano E-Tube app
+- SRAM AXS/eTap
+  - Configure your levers not to do any action in the "SRAM AXS" app
+  - only single or double click is supported (no individual button mapping possible, yet)
 - Wahoo Kickr Bike Shift
+- Wahoo Kickr Bike Pro
+- CYCPLUS BC2 Virtual Shifter
+- Thinkrider VS200 Virtual Shifter (beta)
+- Elite Sterzo Smart (for steering support)
 - Elite Square Smart Frame (beta)
+- Your Phone!
+  - Mount your phone on the handlebar to detect e.g. steering
+  - Available on Android and iOS
+- Gamepads
+- Keyboard input
+  - like a Companion App
+  - some trainers do not support keyboard input for all functions - now they do!
+  - useful when remapping keys from other devices using e.g. AutoHotkey
+- Cheap Bluetooth buttons such as [these](https://www.amazon.com/s?k=bluetooth+remote) (beta)
+  - BLE HID devices and classic Bluetooth HID devices are supported
+  - works out of the box on Android
+  - on Windows, iOS and macOS requires BikeControl to act as media player
+- We're working on creating an affordable alternative based on an open standard, supported by all major trainer apps
+  - register your interest [here](https://openbikecontrol.org/#HARDWARE)

-Support for other devices can be added - check the issues tab here on GithUb. 
+Support for other devices can be added; check the issues tab here on GitHub.
+
+## Supported Accessories
+- Wahoo KICKR HEADWIND (beta)
+    - control fan speed using your controller

 ## Supported Platforms

-Follow this compatibility matrix. It all depends on where you want to run your trainer app (e.g. MyWhoosh on):
+Follow the "Get Started" button over at [bikecontrol.app](https://bikecontrol.app) to understand on which platform you want to run BikeControl.
+You can even try it out in your [Browser](https://jonasbark.github.io/swiftcontrol/), if it supports Bluetooth connections. No controlling possible, though.

-| Run Trainer app (MyWhoosh, ...) on: | Possible | Link                                                                                                                                                                                                                                                        | Information                                                                                                                                                                                                                                                                                                                                                                                                                            |
-|-------------------------------------------------------------|----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Android                                                     | ✅        | <a href="https://play.google.com/store/apps/details?id=de.jonasbark.swiftcontrol"><img width="270" height="80" alt="GetItOnGooglePlay_Badge_Web_color_English" src="https://github.com/user-attachments/assets/a059d5a1-2efb-4f65-8117-ef6a99823b21" /></a> |                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| iPad                                | ✅        | <a href="https://apps.apple.com/us/app/swiftcontrol/id6753721284?platform=iphone"><img width="270" height="80" alt="App Store" src="https://github.com/user-attachments/assets/c23f977a-48f6-4951-811e-ae530dbfa014" /></a>                                 | You will need to use SwiftControl as a "remote" to control the trainer app on your iPad. Typically you would use an iPhone or an Android phone for that.                                                                                                                                                                                                                                                                               |
-| Windows                                                     | ✅        | <a href="https://apps.microsoft.com/detail/9NP42GS03Z26"><img width="270" alt="Microsoft Store" src="https://github.com/user-attachments/assets/7a8a3cd6-ec26-4678-a850-732eedd27c48" /></a>                                                                                                                                                                       | - Windows may flag the app as virus. It likely does so because the app controls the mouse and keyboard.<br>- Bluetooth connection unstable? You may need to use an [external Bluetooth adapter](https://github.com/jonasbark/swiftcontrol/issues/14#issuecomment-3193839509).<br>- Make sure your Zwift device is not paired with Windows Bluetooth settings: [more information](https://github.com/jonasbark/swiftcontrol/issues/70). |
-| macOS                                                       | ✅        | <a href="https://apps.apple.com/us/app/swiftcontrol/id6753721284?platform=mac"><img width="270" height="80" alt="Mac App Store" src="https://github.com/user-attachments/assets/b3552436-409c-43b0-ba7d-b6a72ae30ff1" /></a>                                |                                                                                                                                                                                                                                                                                                                                                                                                                                        |
-| iPhone                                                      | (✅)        |  <a href="https://apps.apple.com/us/app/swiftcontrol/id6753721284?platform=iphone"><img width="270" height="80" alt="App Store" src="https://github.com/user-attachments/assets/c23f977a-48f6-4951-811e-ae530dbfa014" /></a>                                                                                                                                                                                                                                                            | Note that you can't run SwiftControl and your trainer app on the same iPhone due to iOS limitations, but you could use the Link method on another device to control MyWhoosh (and only  MyWhoosh) on an iPhone.                                                                                                                                                                                                                        |
-| Apple TV | (✅)      | | Unconfirmed: only MyWhoosh using the Link method is supported                                                                                                                                                                                                                                                                                                                                                                          |
-
-
-For testing purposes you can also run it on [Web](https://jonasbark.github.io/swiftcontrol/) but this is just a tech demo - you won't be able to control other apps.
-
-## Troubleshooting
+## Help
 Check the troubleshooting guide [here](TROUBLESHOOTING.md).

 ## How does it work?
-The app connects to your Controller devices (such as Zwift ones) automatically. It does not connect to your trainer itself.
-
- **Android**: SwiftControl uses the AccessibilityService API to simulate touch gestures on specific parts of your screen to trigger actions in training apps. The service monitors which training app window is currently active to ensure gestures are sent to the correct app.
- **iOS**: use SwiftControl as "remote control" for other devices, such as an iPad. Example scenario:
-  - your phone (Android/iOS) runs SwiftControl and connects to your Controller devices
-  - your iPad or other tablet runs e.g. MyWhoosh (does not need to have SwiftControl installed)
-  - if you want to use MyWhoosh you can use the Link method to directly connect to MyWhoosh
-  - for other trainer apps you need to pair SwiftControl to your iPad / tablet via Bluetooth and your phone will send the button presses to your iPad / tablet
- **macOS** / **Windows** a keyboard or mouse click is used to trigger the action. 
-  - there are predefined Keymaps for MyWhoosh, indieVelo / Training Peaks, and others
-  - you can also create your own Keymaps for any other app
-  - you can also use the mouse to click on a certain part of the screen, or use keyboard shortcuts
-</details>
-
-## Alternatives
- [qdomyos-zwift](https://www.qzfitness.com/) directly controls the trainer (as opposed to controlling the trainer app). This can be useful if your trainer app does not support virtual shifting.
+The app connects to your Controller devices (such as Zwift ones) automatically. BikeControl uses different methods of connecting to the trainer app, depending on the trainer app and operating system:
+- Connect to the trainer app on the same device or on another device using Network
+    - available on Android, iOS, iPadOS, macOS, Windows
+    - supported by e.g. MyWhoosh, Rouvy and Zwift
+- Connect to the trainer app on another device by simulating a Bluetooth device
+  - available on Android, iOS, iPadOS, macOS, Windows
+  - supported by e.g. Rouvy and Zwift
+- Directly control the trainer app via Accessibility features (simulating touch and keyboard input)
+  - available on Android, macOS, Windows
+  - supported by all trainer apps
+- Connect to the supported trainer app using the [OpenBikeControl](https://openbikecontrol.org) protocol
+  - available on Android, iOS, iPadOS, macOS, Windows

 ## Donate
 Please consider donating to support the development of this app :)

 - [via PayPal](https://paypal.me/boni)
- [via Credit Card, Google Pay, Apple Pay, etc (USD)](https://donate.stripe.com/8x24gzc5c4ZE3VJdt36J201)
- [via Credit Card, Google Pay, Apple Pay, etc (EUR)](https://donate.stripe.com/9B6aEX0muajY8bZ1Kl6J200)
+- [via Credit Card, Google Pay, Apple Pay, etc. (USD)](https://donate.stripe.com/8x24gzc5c4ZE3VJdt36J201)
+- [via Credit Card, Google Pay, Apple Pay, etc. (EUR)](https://donate.stripe.com/9B6aEX0muajY8bZ1Kl6J200)
--- a/TROUBLESHOOTING.md
+++ b/TROUBLESHOOTING.md
@@ -1,50 +1,38 @@
-## Click device cannot be found
+## Click / Ride device cannot be found
+*
+This means BikeControl does NOT see the device via Bluetooth.
+- Put the controller into pairing mode (LED should blink)
+- Ensure the controller is NOT connected to another app/device (e.g. Zwift)
+- Update controller firmware in Zwift Companion, if available
+- Reboot Bluetooth / reboot phone/PC
+
+## Click / Ride device does not send any data
+*
 You may need to update the firmware in Zwift Companion app.

-## Click device does not send any data
-You may need to update the firmware in Zwift Companion app.
+## My Click v2 disconnects after a minute or buttons do not work
+*

-## My Click v2 disconnects after a minute
-Check [this](https://github.com/jonasbark/swiftcontrol/issues/68) discussion.
-
-To make your Click V2 work best you should connect it in the Zwift app once each day.
-If you don't do that SwiftControl will need to reconnect every minute.
+To make your Click V2 work best you should connect it in the Zwift app once before a workout session.
+If you don't do that BikeControl will need to reconnect every minute.

 1. Open Zwift app (not the Companion)
-2. Log in (subscription not required) and open the device connection screen
-3. Connect your Trainer, then connect the Click V2
-4. Close the Zwift app again and connect again in SwiftControl
+2. Log in (subscription not required) → device connection screen
+3. Connect trainer, then connect Click v2
+4. Keep it connected for ~10–30 seconds
+5. Close Zwift completely, then connect in BikeControl
+
+Details/updates: https://github.com/jonasbark/swiftcontrol/issues/68

 ## Android: Connection works, buttons work but nothing happens in MyWhoosh and similar
- especially for Redmi and other chinese Android devices please follow the instructions on https://dontkillmyapp.com/:
-  - disable battery optimization for SwiftControl
-  - enable auto start of SwiftControl
-  - grant accessibility permission for SwiftControl
- see https://github.com/jonasbark/swiftcontrol/issues/38 for more details
+*
+- especially for Redmi and other chinese Android devices please follow the instructions on [https://dontkillmyapp.com/](https://dontkillmyapp.com/):
+  - disable battery optimization for BikeControl
+  - enable auto start of BikeControl
+  - grant accessibility permission for BikeControl
+- see [https://github.com/jonasbark/swiftcontrol/issues/38](https://github.com/OpenBikeControl/bikecontrol/issues/38) for more details

-## Remote control is not working - nothing happens
- Try to unpair it from your phone / computer Bluetooth settings, then re-pair it.
- Try restarting the pairing process in SwiftControl
- try restarting Bluetooth on your phone and on the device you want to control
- If your other device is an iOS device, go to Settings > Accessibility > Touch > AssistiveTouch > Pointer Devices > Devices and pair your device. Make sure AssistiveTouch is enabled.
- it is very important that both devices (e.g. iPhone and iPad) receive the "pairing dialog" after initial connection. If you miss it, unpair and try again. It may take a few seconds for the dialog to appear. Afterwards you may need to click on "Reconnect" in SwiftControl / restart SwiftControl.
-
-## Remote control only clicks on a single coordinate on my iPad
-iOS seems to be buggy here - try this in the iOS settings:
-AssistiveTouch settings > Pointer Devices > Devices > Connected Devices > iPhone (or SwiftControl iOS) > Button 1 
-switch the setting to None, then back to Single-Tap and it should work again
-
-## SwiftControl crashes on Windows when searching for the device 
-You're probably running into [this](https://github.com/jonasbark/swiftcontrol/issues/70) issue. Disconnect your controller device (e.g. Zwift Play) from Windows Bluetooth settings.
-
-## Link requirement for MyWhoosh stuck at "Waiting for MyWhoosh"
-The same network restrictions apply for SwiftControl as it applies to MyWhoosh Link app. Please verify with the MyWhoosh Link app if connection is possible at all.
-Here are some instructions that can help:
-https://mywhoosh.com/troubleshoot/
-https://www.facebook.com/groups/mywhoosh/posts/1323791068858873/
-In essence:
- your two devices (phone, tablet) need to be on the same WiFi network
- on iOS you have to turn off "Private Wi-Fi Address" in the WiFi settings
- Limit IP Address Tracking may need to be disabled
- mesh networks may not work

+## My Clicks do not get recognized in MyWhoosh, but I am connected / use local control
+*
+Make sure you've enabled Virtual Shifting in MyWhoosh's settings
--- a/WINDOWS_STORE_VERSION.txt
+++ b/WINDOWS_STORE_VERSION.txt
@@ -1 +1 @@
-3.1.1
+4.6.2
--- a/accessibility/android/src/main/kotlin/de/jonasbark/accessibility/AccessibilityApi.kt
+++ b/accessibility/android/src/main/kotlin/de/jonasbark/accessibility/AccessibilityApi.kt
@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v25.2.0), do not edit directly.
+// Autogenerated from Pigeon (v25.5.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")

@@ -12,25 +12,57 @@ import io.flutter.plugin.common.StandardMethodCodec
 import io.flutter.plugin.common.StandardMessageCodec
 import java.io.ByteArrayOutputStream
 import java.nio.ByteBuffer
+private object AccessibilityApiPigeonUtils {

-private fun wrapResult(result: Any?): List<Any?> {
-  return listOf(result)
-}
-
-private fun wrapError(exception: Throwable): List<Any?> {
-  return if (exception is FlutterError) {
-    listOf(
-      exception.code,
-      exception.message,
-      exception.details
-    )
-  } else {
-    listOf(
-      exception.javaClass.simpleName,
-      exception.toString(),
-      "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception)
-    )
+  fun wrapResult(result: Any?): List<Any?> {
+    return listOf(result)
  }
+
+  fun wrapError(exception: Throwable): List<Any?> {
+    return if (exception is FlutterError) {
+      listOf(
+        exception.code,
+        exception.message,
+        exception.details
+      )
+    } else {
+      listOf(
+        exception.javaClass.simpleName,
+        exception.toString(),
+        "Cause: " + exception.cause + ", Stacktrace: " + Log.getStackTraceString(exception)
+      )
+    }
+  }
+  fun deepEquals(a: Any?, b: Any?): Boolean {
+    if (a is ByteArray && b is ByteArray) {
+        return a.contentEquals(b)
+    }
+    if (a is IntArray && b is IntArray) {
+        return a.contentEquals(b)
+    }
+    if (a is LongArray && b is LongArray) {
+        return a.contentEquals(b)
+    }
+    if (a is DoubleArray && b is DoubleArray) {
+        return a.contentEquals(b)
+    }
+    if (a is Array<*> && b is Array<*>) {
+      return a.size == b.size &&
+          a.indices.all{ deepEquals(a[it], b[it]) }
+    }
+    if (a is List<*> && b is List<*>) {
+      return a.size == b.size &&
+          a.indices.all{ deepEquals(a[it], b[it]) }
+    }
+    if (a is Map<*, *> && b is Map<*, *>) {
+      return a.size == b.size && a.all {
+          (b as Map<Any?, Any?>).containsKey(it.key) &&
+          deepEquals(it.value, b[it.key])
+      }
+    }
+    return a == b
+  }
+      
 }

 /**
@@ -58,6 +90,23 @@ enum class MediaAction(val raw: Int) {
  }
 }

+enum class GlobalAction(val raw: Int) {
+  BACK(0),
+  DPAD_CENTER(1),
+  DOWN(2),
+  RIGHT(3),
+  UP(4),
+  LEFT(5),
+  HOME(6),
+  RECENTS(7);
+
+  companion object {
+    fun ofRaw(raw: Int): GlobalAction? {
+      return values().firstOrNull { it.raw == raw }
+    }
+  }
+}
+
 /** Generated class from Pigeon that represents data sent in messages. */
 data class WindowEvent (
  val packageName: String,
@@ -93,12 +142,44 @@ data class WindowEvent (
    if (this === other) {
      return true
    }
-    return packageName == other.packageName
-    && top == other.top
-    && bottom == other.bottom
-    && right == other.right
-    && left == other.left
+    return AccessibilityApiPigeonUtils.deepEquals(toList(), other.toList())  }
+
+  override fun hashCode(): Int = toList().hashCode()
+}
+
+/** Generated class from Pigeon that represents data sent in messages. */
+data class AKeyEvent (
+  val source: String,
+  val hidKey: String,
+  val keyDown: Boolean,
+  val keyUp: Boolean
+)
+ {
+  companion object {
+    fun fromList(pigeonVar_list: List<Any?>): AKeyEvent {
+      val source = pigeonVar_list[0] as String
+      val hidKey = pigeonVar_list[1] as String
+      val keyDown = pigeonVar_list[2] as Boolean
+      val keyUp = pigeonVar_list[3] as Boolean
+      return AKeyEvent(source, hidKey, keyDown, keyUp)
+    }
  }
+  fun toList(): List<Any?> {
+    return listOf(
+      source,
+      hidKey,
+      keyDown,
+      keyUp,
+    )
+  }
+  override fun equals(other: Any?): Boolean {
+    if (other !is AKeyEvent) {
+      return false
+    }
+    if (this === other) {
+      return true
+    }
+    return AccessibilityApiPigeonUtils.deepEquals(toList(), other.toList())  }

  override fun hashCode(): Int = toList().hashCode()
 }
@@ -111,10 +192,20 @@ private open class AccessibilityApiPigeonCodec : StandardMessageCodec() {
        }
      }
      130.toByte() -> {
+        return (readValue(buffer) as Long?)?.let {
+          GlobalAction.ofRaw(it.toInt())
+        }
+      }
+      131.toByte() -> {
        return (readValue(buffer) as? List<Any?>)?.let {
          WindowEvent.fromList(it)
        }
      }
+      132.toByte() -> {
+        return (readValue(buffer) as? List<Any?>)?.let {
+          AKeyEvent.fromList(it)
+        }
+      }
      else -> super.readValueOfType(type, buffer)
    }
  }
@@ -124,8 +215,16 @@ private open class AccessibilityApiPigeonCodec : StandardMessageCodec() {
        stream.write(129)
        writeValue(stream, value.raw)
      }
-      is WindowEvent -> {
+      is GlobalAction -> {
        stream.write(130)
+        writeValue(stream, value.raw)
+      }
+      is WindowEvent -> {
+        stream.write(131)
+        writeValue(stream, value.toList())
+      }
+      is AKeyEvent -> {
+        stream.write(132)
        writeValue(stream, value.toList())
      }
      else -> super.writeValue(stream, value)
@@ -140,7 +239,11 @@ interface Accessibility {
  fun hasPermission(): Boolean
  fun openPermissions()
  fun performTouch(x: Double, y: Double, isKeyDown: Boolean, isKeyUp: Boolean)
+  fun performGlobalAction(action: GlobalAction)
  fun controlMedia(action: MediaAction)
+  fun isRunning(): Boolean
+  fun ignoreHidDevices()
+  fun setHandledKeys(keys: List<String>)

  companion object {
    /** The codec used by Accessibility. */
@@ -158,7 +261,7 @@ interface Accessibility {
            val wrapped: List<Any?> = try {
              listOf(api.hasPermission())
            } catch (exception: Throwable) {
-              wrapError(exception)
+              AccessibilityApiPigeonUtils.wrapError(exception)
            }
            reply.reply(wrapped)
          }
@@ -174,7 +277,7 @@ interface Accessibility {
              api.openPermissions()
              listOf(null)
            } catch (exception: Throwable) {
-              wrapError(exception)
+              AccessibilityApiPigeonUtils.wrapError(exception)
            }
            reply.reply(wrapped)
          }
@@ -195,7 +298,25 @@ interface Accessibility {
              api.performTouch(xArg, yArg, isKeyDownArg, isKeyUpArg)
              listOf(null)
            } catch (exception: Throwable) {
-              wrapError(exception)
+              AccessibilityApiPigeonUtils.wrapError(exception)
+            }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.accessibility.Accessibility.performGlobalAction$separatedMessageChannelSuffix", codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val actionArg = args[0] as GlobalAction
+            val wrapped: List<Any?> = try {
+              api.performGlobalAction(actionArg)
+              listOf(null)
+            } catch (exception: Throwable) {
+              AccessibilityApiPigeonUtils.wrapError(exception)
            }
            reply.reply(wrapped)
          }
@@ -213,7 +334,56 @@ interface Accessibility {
              api.controlMedia(actionArg)
              listOf(null)
            } catch (exception: Throwable) {
-              wrapError(exception)
+              AccessibilityApiPigeonUtils.wrapError(exception)
+            }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.accessibility.Accessibility.isRunning$separatedMessageChannelSuffix", codec)
+        if (api != null) {
+          channel.setMessageHandler { _, reply ->
+            val wrapped: List<Any?> = try {
+              listOf(api.isRunning())
+            } catch (exception: Throwable) {
+              AccessibilityApiPigeonUtils.wrapError(exception)
+            }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.accessibility.Accessibility.ignoreHidDevices$separatedMessageChannelSuffix", codec)
+        if (api != null) {
+          channel.setMessageHandler { _, reply ->
+            val wrapped: List<Any?> = try {
+              api.ignoreHidDevices()
+              listOf(null)
+            } catch (exception: Throwable) {
+              AccessibilityApiPigeonUtils.wrapError(exception)
+            }
+            reply.reply(wrapped)
+          }
+        } else {
+          channel.setMessageHandler(null)
+        }
+      }
+      run {
+        val channel = BasicMessageChannel<Any?>(binaryMessenger, "dev.flutter.pigeon.accessibility.Accessibility.setHandledKeys$separatedMessageChannelSuffix", codec)
+        if (api != null) {
+          channel.setMessageHandler { message, reply ->
+            val args = message as List<Any?>
+            val keysArg = args[0] as List<String>
+            val wrapped: List<Any?> = try {
+              api.setHandledKeys(keysArg)
+              listOf(null)
+            } catch (exception: Throwable) {
+              AccessibilityApiPigeonUtils.wrapError(exception)
            }
            reply.reply(wrapped)
          }
@@ -274,3 +444,16 @@ abstract class StreamEventsStreamHandler : AccessibilityApiPigeonEventChannelWra
  }
 }
      
+abstract class HidKeyPressedStreamHandler : AccessibilityApiPigeonEventChannelWrapper<AKeyEvent> {
+  companion object {
+    fun register(messenger: BinaryMessenger, streamHandler: HidKeyPressedStreamHandler, instanceName: String = "") {
+      var channelName: String = "dev.flutter.pigeon.accessibility.EventChannelMethods.hidKeyPressed"
+      if (instanceName.isNotEmpty()) {
+        channelName += ".$instanceName"
+      }
+      val internalStreamHandler = AccessibilityApiPigeonStreamHandler<AKeyEvent>(streamHandler)
+      EventChannel(messenger, channelName, AccessibilityApiPigeonMethodCodec).setStreamHandler(internalStreamHandler)
+    }
+  }
+}
+      
--- a/accessibility/android/src/main/kotlin/de/jonasbark/accessibility/AccessibilityPlugin.kt
+++ b/accessibility/android/src/main/kotlin/de/jonasbark/accessibility/AccessibilityPlugin.kt
@@ -1,6 +1,9 @@
 package de.jonasbark.accessibility

+import AKeyEvent
 import Accessibility
+import GlobalAction
+import HidKeyPressedStreamHandler
 import MediaAction
 import PigeonEventSink
 import StreamEventsStreamHandler
@@ -10,6 +13,7 @@ import android.content.Intent
 import android.graphics.Rect
 import android.os.Bundle
 import android.provider.Settings
+import android.view.KeyEvent
 import androidx.core.content.ContextCompat.startActivity
 import io.flutter.embedding.engine.plugins.FlutterPlugin
 import io.flutter.plugin.common.MethodChannel
@@ -23,17 +27,21 @@ class AccessibilityPlugin: FlutterPlugin, Accessibility {
  /// when the Flutter Engine is detached from the Activity
  private lateinit var channel : MethodChannel
  private lateinit var context: Context
-  private lateinit var eventHandler: EventListener
+  private lateinit var windowEventHandler: WindowEventListener
+  private lateinit var hidEventHandler: HidEventListener

  override fun onAttachedToEngine(flutterPluginBinding: FlutterPlugin.FlutterPluginBinding) {
    channel = MethodChannel(flutterPluginBinding.binaryMessenger, "accessibility")

-    eventHandler = EventListener()
+    windowEventHandler = WindowEventListener()
+    hidEventHandler = HidEventListener()

    context = flutterPluginBinding.applicationContext
    Accessibility.setUp(flutterPluginBinding.binaryMessenger, this)
-    StreamEventsStreamHandler.register(flutterPluginBinding.binaryMessenger, eventHandler)
-    Observable.fromService = eventHandler
+    StreamEventsStreamHandler.register(flutterPluginBinding.binaryMessenger, windowEventHandler)
+    HidKeyPressedStreamHandler.register(flutterPluginBinding.binaryMessenger, hidEventHandler)
+    Observable.fromServiceWindow = windowEventHandler
+    Observable.fromServiceKeys = hidEventHandler
  }

  override fun onDetachedFromEngine(binding: FlutterPlugin.FlutterPluginBinding) {
@@ -45,6 +53,10 @@ class AccessibilityPlugin: FlutterPlugin, Accessibility {
    return enabledServices != null && enabledServices.contains(context.packageName)
  }

+  override fun isRunning(): Boolean {
+    return Observable.toService != null
+  }
+
  override fun openPermissions() {
    startActivity(context, Intent(Settings.ACTION_ACCESSIBILITY_SETTINGS).apply {
      flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
@@ -55,16 +67,20 @@ class AccessibilityPlugin: FlutterPlugin, Accessibility {
    Observable.toService?.performTouch(x = x, y = y, isKeyUp = isKeyUp, isKeyDown = isKeyDown) ?: error("Service not running")
  }

+  override fun performGlobalAction(action: GlobalAction) {
+    Observable.toService?.performGlobalAction(action) ?: error("Service not running")
+  }
+
  override fun controlMedia(action: MediaAction) {
    val audioService = context.getSystemService(Context.AUDIO_SERVICE) as android.media.AudioManager
    when (action) {
      MediaAction.PLAY_PAUSE -> {
-          audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_DOWN, android.view.KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE))
-          audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_UP, android.view.KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE))
+          audioService.dispatchMediaKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE))
+          audioService.dispatchMediaKeyEvent(KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE))
      }
      MediaAction.NEXT -> {
-          audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_DOWN, android.view.KeyEvent.KEYCODE_MEDIA_NEXT))
-          audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_UP, android.view.KeyEvent.KEYCODE_MEDIA_NEXT))
+          audioService.dispatchMediaKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_NEXT))
+          audioService.dispatchMediaKeyEvent(KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_MEDIA_NEXT))
      }
      MediaAction.VOLUME_DOWN -> {
          audioService.adjustVolume(android.media.AudioManager.ADJUST_LOWER, android.media.AudioManager.FLAG_SHOW_UI)
@@ -75,16 +91,25 @@ class AccessibilityPlugin: FlutterPlugin, Accessibility {
    }
  }

+  override fun ignoreHidDevices() {
+    Observable.ignoreHidDevices = true
+  }
+
+  override fun setHandledKeys(keys: List<String>) {
+    // Clear and update the concurrent set
+    Observable.handledKeys = keys.toSet()
+  }
+
 }

-class EventListener : StreamEventsStreamHandler(), Receiver {
+class WindowEventListener : StreamEventsStreamHandler(), Receiver {
  private var eventSink: PigeonEventSink<WindowEvent>? = null

  override fun onListen(p0: Any?, sink: PigeonEventSink<WindowEvent>) {
    eventSink = sink
  }

-  fun onEventsDone() {
+  override fun onCancel(p0: Any?) {
    eventSink?.endOfStream()
    eventSink = null
  }
@@ -93,4 +118,34 @@ class EventListener : StreamEventsStreamHandler(), Receiver {
    eventSink?.success(WindowEvent(packageName = packageName, right = window.right.toLong(), left = window.left.toLong(), bottom = window.bottom.toLong(), top = window.top.toLong()))
  }

+  override fun onKeyEvent(event: KeyEvent) {
+
+  }
+
+}
+
+
+class HidEventListener : HidKeyPressedStreamHandler(), Receiver {
+
+  private var keyEventSink: PigeonEventSink<AKeyEvent>? = null
+
+  override fun onListen(p0: Any?, sink: PigeonEventSink<AKeyEvent>) {
+    keyEventSink = sink
+  }
+
+  override fun onChange(packageName: String, window: Rect) {
+
+  }
+
+  override fun onKeyEvent(event: KeyEvent) {
+    val keyString = KeyEvent.keyCodeToString(event.keyCode)
+    keyEventSink?.success(
+      AKeyEvent(
+        hidKey = keyString,
+        source = event.device.name,
+        keyUp = event.action == KeyEvent.ACTION_UP,
+        keyDown = event.action == KeyEvent.ACTION_DOWN
+      )
+    )
+  }
 }
--- a/accessibility/android/src/main/kotlin/de/jonasbark/accessibility/AccessibilityService.kt
+++ b/accessibility/android/src/main/kotlin/de/jonasbark/accessibility/AccessibilityService.kt
@@ -3,13 +3,19 @@ package de.jonasbark.accessibility
 import android.accessibilityservice.AccessibilityService
 import android.accessibilityservice.GestureDescription
 import android.accessibilityservice.GestureDescription.StrokeDescription
+import android.accessibilityservice.AccessibilityServiceInfo
+import android.content.Context
 import android.graphics.Path
 import android.graphics.Rect
+import android.media.AudioManager
 import android.os.Build
 import android.util.Log
+import android.view.InputDevice
+import android.view.KeyEvent
 import android.view.ViewConfiguration
 import android.view.accessibility.AccessibilityEvent
 import android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED
+import GlobalAction


 class AccessibilityService : AccessibilityService(), Listener {
@@ -37,7 +43,7 @@ class AccessibilityService : AccessibilityService(), Listener {
        }
        val currentPackageName = event.packageName.toString()
        val windowSize = getWindowSize()
-        Observable.fromService?.onChange(packageName = currentPackageName, window = windowSize)
+        Observable.fromServiceWindow?.onChange(packageName = currentPackageName, window = windowSize)
    }

    private fun getWindowSize(): Rect {
@@ -51,6 +57,61 @@ class AccessibilityService : AccessibilityService(), Listener {
        Log.d("AccessibilityService", "Service Interrupted")
    }

+    override fun onServiceConnected() {
+        super.onServiceConnected()
+        // Request key event filtering so we receive onKeyEvent for hardware/HID media keys
+        try {
+            val info = serviceInfo ?: AccessibilityServiceInfo()
+            info.flags = info.flags or AccessibilityServiceInfo.FLAG_REQUEST_FILTER_KEY_EVENTS
+            // keep other capabilities as defined in XML
+            setServiceInfo(info)
+        } catch (e: Exception) {
+            Log.w("AccessibilityService", "Failed to set service info for key events: ${e.message}")
+        }
+    }
+
+    override fun onKeyEvent(event: KeyEvent): Boolean {
+        val keyString = KeyEvent.keyCodeToString(event.keyCode)
+        // if currently active app is BikeControl => handle it, so keymap can be created
+        if (!Observable.ignoreHidDevices && isBleRemote(event) && (rootInActiveWindow.packageName == "de.jonasbark.swiftcontrol" || Observable.handledKeys.contains(keyString))) {
+            // Handle keys that have a keymap defined
+            Log.d(
+                "AccessibilityService",
+                "onKeyEvent: keyCode=${event.keyCode} action=${event.action} scanCode=${event.scanCode} flags=${event.flags}"
+            )
+
+            // Forward key events to the plugin (Flutter) and swallow them so they don't propagate.
+            Observable.fromServiceKeys?.onKeyEvent(event)
+            // Return true to indicate we've handled the event and it should be swallowed.
+            return true
+        } else {
+            return false
+        }
+    }
+
+    private fun isBleRemote(event: KeyEvent): Boolean {
+        val dev = InputDevice.getDevice(event.deviceId) ?: return false
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            dev.isExternal
+        } else {
+            true
+        }
+    }
+
+    override fun performGlobalAction(action: GlobalAction) {
+        val mappedAction = when (action) {
+            GlobalAction.BACK -> android.accessibilityservice.AccessibilityService.GLOBAL_ACTION_BACK
+            GlobalAction.DPAD_CENTER -> android.accessibilityservice.AccessibilityService.GLOBAL_ACTION_DPAD_CENTER
+            GlobalAction.DOWN -> android.accessibilityservice.AccessibilityService.GLOBAL_ACTION_DPAD_DOWN
+            GlobalAction.RIGHT -> android.accessibilityservice.AccessibilityService.GLOBAL_ACTION_DPAD_RIGHT
+            GlobalAction.UP -> android.accessibilityservice.AccessibilityService.GLOBAL_ACTION_DPAD_UP
+            GlobalAction.LEFT -> android.accessibilityservice.AccessibilityService.GLOBAL_ACTION_DPAD_LEFT
+            GlobalAction.HOME -> android.accessibilityservice.AccessibilityService.GLOBAL_ACTION_HOME
+            GlobalAction.RECENTS -> android.accessibilityservice.AccessibilityService.GLOBAL_ACTION_RECENTS
+        }
+        performGlobalAction(mappedAction)
+    }
+
    override fun performTouch(x: Double, y: Double, isKeyDown: Boolean, isKeyUp: Boolean) {
        val gestureBuilder = GestureDescription.Builder()
        val path = Path()
--- a/accessibility/android/src/main/kotlin/de/jonasbark/accessibility/Listener.kt
+++ b/accessibility/android/src/main/kotlin/de/jonasbark/accessibility/Listener.kt
@@ -1,16 +1,25 @@
 package de.jonasbark.accessibility

 import android.graphics.Rect
+import android.view.KeyEvent
+import GlobalAction
+import java.util.concurrent.ConcurrentHashMap

 object Observable {
    var toService: Listener? = null
-    var fromService: Receiver? = null
+    var fromServiceWindow: Receiver? = null
+    var fromServiceKeys: Receiver? = null
+    var ignoreHidDevices: Boolean = false
+    // Use concurrent set for thread-safe access from AccessibilityService and plugin
+    var handledKeys: Set<String> = ConcurrentHashMap.newKeySet()
 }

 interface Listener {
    fun performTouch(x: Double, y: Double, isKeyDown: Boolean, isKeyUp: Boolean)
+    fun performGlobalAction(action: GlobalAction)
 }

 interface Receiver {
    fun onChange(packageName: String, window: Rect)
+    fun onKeyEvent(event: KeyEvent)
 }
--- a/accessibility/api.dart
+++ b/accessibility/api.dart
@@ -8,11 +8,30 @@ abstract class Accessibility {

  void performTouch(double x, double y, {bool isKeyDown = true, bool isKeyUp = false});

+  void performGlobalAction(GlobalAction action);
+
  void controlMedia(MediaAction action);
+
+  bool isRunning();
+
+  void ignoreHidDevices();
+
+  void setHandledKeys(List<String> keys);
 }

 enum MediaAction { playPause, next, volumeUp, volumeDown }

+enum GlobalAction {
+  back,
+  dpadCenter,
+  down,
+  right,
+  up,
+  left,
+  home,
+  recents,
+}
+
 class WindowEvent {
  final String packageName;
  final int top;
@@ -29,7 +48,17 @@ class WindowEvent {
  });
 }

+class AKeyEvent {
+  final String source;
+  final String hidKey;
+  final bool keyDown;
+  final bool keyUp;
+
+  AKeyEvent({required this.source, required this.hidKey, required this.keyDown, required this.keyUp});
+}
+
@EventChannelApi()
 abstract class EventChannelMethods {
  WindowEvent streamEvents();
+  AKeyEvent hidKeyPressed();
 }
--- a/accessibility/lib/accessibility.dart
+++ b/accessibility/lib/accessibility.dart
@@ -1,4 +1,4 @@
-// Autogenerated from Pigeon (v25.2.0), do not edit directly.
+// Autogenerated from Pigeon (v25.5.0), do not edit directly.
 // See also: https://pub.dev/packages/pigeon
 // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers

@@ -14,6 +14,20 @@ PlatformException _createConnectionError(String channelName) {
    message: 'Unable to establish connection on channel: "$channelName".',
  );
 }
+bool _deepEquals(Object? a, Object? b) {
+  if (a is List && b is List) {
+    return a.length == b.length &&
+        a.indexed
+        .every(((int, dynamic) item) => _deepEquals(item.$2, b[item.$1]));
+  }
+  if (a is Map && b is Map) {
+    return a.length == b.length && a.entries.every((MapEntry<Object?, Object?> entry) =>
+        (b as Map<Object?, Object?>).containsKey(entry.key) &&
+        _deepEquals(entry.value, b[entry.key]));
+  }
+  return a == b;
+}
+

 enum MediaAction {
  playPause,
@@ -22,6 +36,17 @@ enum MediaAction {
  volumeDown,
 }

+enum GlobalAction {
+  back,
+  dpadCenter,
+  down,
+  right,
+  up,
+  left,
+  home,
+  recents,
+}
+
 class WindowEvent {
  WindowEvent({
    required this.packageName,
@@ -74,12 +99,63 @@ class WindowEvent {
    if (identical(this, other)) {
      return true;
    }
-    return 
-      packageName == other.packageName
-      && top == other.top
-      && bottom == other.bottom
-      && right == other.right
-      && left == other.left;
+    return _deepEquals(encode(), other.encode());
+  }
+
+  @override
+  // ignore: avoid_equals_and_hash_code_on_mutable_classes
+  int get hashCode => Object.hashAll(_toList())
+;
+}
+
+class AKeyEvent {
+  AKeyEvent({
+    required this.source,
+    required this.hidKey,
+    required this.keyDown,
+    required this.keyUp,
+  });
+
+  String source;
+
+  String hidKey;
+
+  bool keyDown;
+
+  bool keyUp;
+
+  List<Object?> _toList() {
+    return <Object?>[
+      source,
+      hidKey,
+      keyDown,
+      keyUp,
+    ];
+  }
+
+  Object encode() {
+    return _toList();  }
+
+  static AKeyEvent decode(Object result) {
+    result as List<Object?>;
+    return AKeyEvent(
+      source: result[0]! as String,
+      hidKey: result[1]! as String,
+      keyDown: result[2]! as bool,
+      keyUp: result[3]! as bool,
+    );
+  }
+
+  @override
+  // ignore: avoid_equals_and_hash_code_on_mutable_classes
+  bool operator ==(Object other) {
+    if (other is! AKeyEvent || other.runtimeType != runtimeType) {
+      return false;
+    }
+    if (identical(this, other)) {
+      return true;
+    }
+    return _deepEquals(encode(), other.encode());
  }

  @override
@@ -99,8 +175,14 @@ class _PigeonCodec extends StandardMessageCodec {
    }    else if (value is MediaAction) {
      buffer.putUint8(129);
      writeValue(buffer, value.index);
-    }    else if (value is WindowEvent) {
+    }    else if (value is GlobalAction) {
      buffer.putUint8(130);
+      writeValue(buffer, value.index);
+    }    else if (value is WindowEvent) {
+      buffer.putUint8(131);
+      writeValue(buffer, value.encode());
+    }    else if (value is AKeyEvent) {
+      buffer.putUint8(132);
      writeValue(buffer, value.encode());
    } else {
      super.writeValue(buffer, value);
@@ -114,7 +196,12 @@ class _PigeonCodec extends StandardMessageCodec {
        final int? value = readValue(buffer) as int?;
        return value == null ? null : MediaAction.values[value];
      case 130: 
+        final int? value = readValue(buffer) as int?;
+        return value == null ? null : GlobalAction.values[value];
+      case 131: 
        return WindowEvent.decode(readValue(buffer)!);
+      case 132: 
+        return AKeyEvent.decode(readValue(buffer)!);
      default:
        return super.readValueOfType(type, buffer);
    }
@@ -210,6 +297,29 @@ class Accessibility {
    }
  }

+  Future<void> performGlobalAction(GlobalAction action) async {
+    final String pigeonVar_channelName = 'dev.flutter.pigeon.accessibility.Accessibility.performGlobalAction$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[action]);
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_sendFuture as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return;
+    }
+  }
+
  Future<void> controlMedia(MediaAction action) async {
    final String pigeonVar_channelName = 'dev.flutter.pigeon.accessibility.Accessibility.controlMedia$pigeonVar_messageChannelSuffix';
    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
@@ -232,6 +342,80 @@ class Accessibility {
      return;
    }
  }
+
+  Future<bool> isRunning() async {
+    final String pigeonVar_channelName = 'dev.flutter.pigeon.accessibility.Accessibility.isRunning$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_sendFuture as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else if (pigeonVar_replyList[0] == null) {
+      throw PlatformException(
+        code: 'null-error',
+        message: 'Host platform returned null value for non-null return value.',
+      );
+    } else {
+      return (pigeonVar_replyList[0] as bool?)!;
+    }
+  }
+
+  Future<void> ignoreHidDevices() async {
+    final String pigeonVar_channelName = 'dev.flutter.pigeon.accessibility.Accessibility.ignoreHidDevices$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(null);
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_sendFuture as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return;
+    }
+  }
+
+  Future<void> setHandledKeys(List<String> keys) async {
+    final String pigeonVar_channelName = 'dev.flutter.pigeon.accessibility.Accessibility.setHandledKeys$pigeonVar_messageChannelSuffix';
+    final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
+      pigeonVar_channelName,
+      pigeonChannelCodec,
+      binaryMessenger: pigeonVar_binaryMessenger,
+    );
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[keys]);
+    final List<Object?>? pigeonVar_replyList =
+        await pigeonVar_sendFuture as List<Object?>?;
+    if (pigeonVar_replyList == null) {
+      throw _createConnectionError(pigeonVar_channelName);
+    } else if (pigeonVar_replyList.length > 1) {
+      throw PlatformException(
+        code: pigeonVar_replyList[0]! as String,
+        message: pigeonVar_replyList[1] as String?,
+        details: pigeonVar_replyList[2],
+      );
+    } else {
+      return;
+    }
+  }
 }

 Stream<WindowEvent> streamEvents( {String instanceName = ''}) {
@@ -245,3 +429,14 @@ Stream<WindowEvent> streamEvents( {String instanceName = ''}) {
  });
 }
    
+Stream<AKeyEvent> hidKeyPressed( {String instanceName = ''}) {
+  if (instanceName.isNotEmpty) {
+    instanceName = '.$instanceName';
+  }
+  final EventChannel hidKeyPressedChannel =
+      EventChannel('dev.flutter.pigeon.accessibility.EventChannelMethods.hidKeyPressed$instanceName', pigeonMethodCodec);
+  return hidKeyPressedChannel.receiveBroadcastStream().map((dynamic event) {
+    return event as AKeyEvent;
+  });
+}
+    
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -16,7 +16,7 @@ keystoreProperties.load(FileInputStream(keystorePropertiesFile))
 android {
    namespace = "de.jonasbark.swiftcontrol"
    compileSdk = flutter.compileSdkVersion
-    ndkVersion = "27.0.12077973"
+    ndkVersion = "28.2.13676358"

    compileOptions {
        // Flag to enable support for the new language APIs
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,7 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- The INTERNET permission is required for development. Specifically,
-         the Flutter tool needs it to communicate with the running application
-         to allow setting breakpoints, to provide hot reload, etc.
-    -->
-    <uses-permission android:name="android.permission.INTERNET"/>
-</manifest>
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
    <uses-feature android:name="android.hardware.bluetooth_le" android:required="true" />

    <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />

    <!-- New Bluetooth permissions in Android 12
    https://developer.android.com/about/versions/12/features/bluetooth-permissions -->
@@ -16,6 +17,7 @@
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE"/>

+    <uses-permission android:name="android.permission.BILLING"/>

    <!-- legacy for Android 9 or lower -->
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" android:maxSdkVersion="28" tools:replace="android:maxSdkVersion" />
@@ -25,7 +27,7 @@
    <uses-permission android:name="android.permission.INTERNET" />

    <application
-        android:label="SwiftControl"
+        android:label="BikeControl"
        android:name="${applicationName}"
        android:icon="@mipmap/ic_launcher">
        <activity
--- a/android/app/src/main/kotlin/de/jonasbark/swiftcontrol/MainActivity.kt
+++ b/android/app/src/main/kotlin/de/jonasbark/swiftcontrol/MainActivity.kt
@@ -1,5 +1,46 @@
 package de.jonasbark.swiftcontrol

-import io.flutter.embedding.android.FlutterActivity
+import android.hardware.input.InputManager
+import android.os.Handler
+import android.view.InputDevice
+import android.view.KeyEvent
+import android.view.MotionEvent
+import io.flutter.embedding.android.FlutterFragmentActivity
+import org.flame_engine.gamepads_android.GamepadsCompatibleActivity

-class MainActivity : FlutterActivity()
+class MainActivity: FlutterFragmentActivity(), GamepadsCompatibleActivity {
+    var keyListener: ((KeyEvent) -> Boolean)? = null
+    var motionListener: ((MotionEvent) -> Boolean)? = null
+
+    override fun isGamepadsInputDevice(device: InputDevice): Boolean {
+        return device.sources and InputDevice.SOURCE_GAMEPAD == InputDevice.SOURCE_GAMEPAD
+                || device.sources and InputDevice.SOURCE_JOYSTICK == InputDevice.SOURCE_JOYSTICK
+                // Some bluetooth keyboards are identified as GamePad. Check if it is ALPHABETIC keyboard.
+             //   && device.keyboardType != InputDevice.KEYBOARD_TYPE_ALPHABETIC
+    }
+
+    override fun dispatchGenericMotionEvent(motionEvent: MotionEvent): Boolean {
+        return motionListener?.invoke(motionEvent) ?: false
+    }
+
+    override fun dispatchKeyEvent(keyEvent: KeyEvent): Boolean {
+        if (keyListener?.invoke(keyEvent) == true) {
+            return true
+        }
+        return super.dispatchKeyEvent(keyEvent)
+    }
+
+    override fun registerInputDeviceListener(
+        listener: InputManager.InputDeviceListener, handler: Handler?) {
+        val inputManager = getSystemService(INPUT_SERVICE) as InputManager
+        inputManager.registerInputDeviceListener(listener, null)
+    }
+
+    override fun registerKeyEventHandler(handler: (KeyEvent) -> Boolean) {
+        keyListener = handler
+    }
+
+    override fun registerMotionEventHandler(handler: (MotionEvent) -> Boolean) {
+        motionListener = handler
+    }
+}
--- a/android/app/src/main/res/drawable-hdpi/ic_notification.png
+++ b/android/app/src/main/res/drawable-hdpi/ic_notification.png
--- a/android/app/src/main/res/drawable-mdpi/ic_notification.png
+++ b/android/app/src/main/res/drawable-mdpi/ic_notification.png
--- a/android/app/src/main/res/drawable-xhdpi/ic_notification.png
+++ b/android/app/src/main/res/drawable-xhdpi/ic_notification.png
--- a/android/app/src/main/res/drawable-xxhdpi/ic_notification.png
+++ b/android/app/src/main/res/drawable-xxhdpi/ic_notification.png
--- a/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png
+++ b/android/app/src/main/res/drawable-xxxhdpi/ic_notification.png
--- a/android/app/src/main/res/raw/keep.xml
+++ b/android/app/src/main/res/raw/keep.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:keep="@drawable/*" />
--- a/android/app/src/main/res/xml/accessibility_service_config.xml
+++ b/android/app/src/main/res/xml/accessibility_service_config.xml
@@ -1,8 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
 <accessibility-service
        xmlns:android="http://schemas.android.com/apk/res/android"
        android:accessibilityEventTypes="typeWindowStateChanged|typeViewClicked"
        android:accessibilityFeedbackType="feedbackGeneric"
-        android:accessibilityFlags="flagDefault"
+        android:accessibilityFlags="flagDefault|flagRequestFilterKeyEvents"
        android:canRetrieveWindowContent="true"
+        android:canRequestFilterKeyEvents="true"
        android:canPerformGestures="true"
        android:notificationTimeout="100"/>
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
--- a/android/settings.gradle.kts
+++ b/android/settings.gradle.kts
@@ -18,7 +18,7 @@ pluginManagement {

 plugins {
    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.7.3" apply false
+    id("com.android.application") version "8.11.1" apply false
    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
 }

--- a/icon.png
+++ b/icon.png
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -1,5 +1,6 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '13.0'
+
+platform :ios, '15.0'

 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -7,14 +7,50 @@ PODS:
  - Flutter (1.0.0)
  - flutter_local_notifications (0.0.1):
    - Flutter
+  - flutter_secure_storage_darwin (10.0.0):
+    - Flutter
+    - FlutterMacOS
+  - flutter_volume_controller (0.0.1):
+    - Flutter
+  - gamepads_ios (0.1.1):
+    - Flutter
  - image_picker_ios (0.0.1):
    - Flutter
+  - in_app_purchase_storekit (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - in_app_review (2.0.0):
+    - Flutter
+  - integration_test (0.0.1):
+    - Flutter
+  - ios_receipt (0.0.1):
+    - Flutter
+  - media_key_detector_ios (0.0.1):
+    - Flutter
+  - nsd_ios (0.0.1):
+    - Flutter
  - package_info_plus (0.4.5):
    - Flutter
  - permission_handler_apple (9.3.0):
    - Flutter
+  - purchases_flutter (9.10.6):
+    - Flutter
+    - PurchasesHybridCommon (= 17.27.1)
+  - purchases_ui_flutter (9.10.6):
+    - Flutter
+    - PurchasesHybridCommonUI (= 17.27.1)
+  - PurchasesHybridCommon (17.27.1):
+    - RevenueCat (= 5.54.1)
+  - PurchasesHybridCommonUI (17.27.1):
+    - PurchasesHybridCommon (= 17.27.1)
+    - RevenueCatUI (= 5.54.1)
  - restart_app (0.0.1):
    - Flutter
+  - RevenueCat (5.54.1)
+  - RevenueCatUI (5.54.1):
+    - RevenueCat (= 5.54.1)
+  - sensors_plus (0.0.1):
+    - Flutter
  - shared_preferences_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
@@ -31,15 +67,34 @@ DEPENDENCIES:
  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
  - Flutter (from `Flutter`)
  - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
+  - flutter_secure_storage_darwin (from `.symlinks/plugins/flutter_secure_storage_darwin/darwin`)
+  - flutter_volume_controller (from `.symlinks/plugins/flutter_volume_controller/ios`)
+  - gamepads_ios (from `.symlinks/plugins/gamepads_ios/ios`)
  - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
+  - in_app_purchase_storekit (from `.symlinks/plugins/in_app_purchase_storekit/darwin`)
+  - in_app_review (from `.symlinks/plugins/in_app_review/ios`)
+  - integration_test (from `.symlinks/plugins/integration_test/ios`)
+  - ios_receipt (from `.symlinks/plugins/ios_receipt/ios`)
+  - media_key_detector_ios (from `.symlinks/plugins/media_key_detector_ios/ios`)
+  - nsd_ios (from `.symlinks/plugins/nsd_ios/ios`)
  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
+  - purchases_flutter (from `.symlinks/plugins/purchases_flutter/ios`)
+  - purchases_ui_flutter (from `.symlinks/plugins/purchases_ui_flutter/ios`)
  - restart_app (from `.symlinks/plugins/restart_app/ios`)
+  - sensors_plus (from `.symlinks/plugins/sensors_plus/ios`)
  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
  - universal_ble (from `.symlinks/plugins/universal_ble/darwin`)
  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
  - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)

+SPEC REPOS:
+  trunk:
+    - PurchasesHybridCommon
+    - PurchasesHybridCommonUI
+    - RevenueCat
+    - RevenueCatUI
+
 EXTERNAL SOURCES:
  bluetooth_low_energy_darwin:
    :path: ".symlinks/plugins/bluetooth_low_energy_darwin/darwin"
@@ -49,14 +104,38 @@ EXTERNAL SOURCES:
    :path: Flutter
  flutter_local_notifications:
    :path: ".symlinks/plugins/flutter_local_notifications/ios"
+  flutter_secure_storage_darwin:
+    :path: ".symlinks/plugins/flutter_secure_storage_darwin/darwin"
+  flutter_volume_controller:
+    :path: ".symlinks/plugins/flutter_volume_controller/ios"
+  gamepads_ios:
+    :path: ".symlinks/plugins/gamepads_ios/ios"
  image_picker_ios:
    :path: ".symlinks/plugins/image_picker_ios/ios"
+  in_app_purchase_storekit:
+    :path: ".symlinks/plugins/in_app_purchase_storekit/darwin"
+  in_app_review:
+    :path: ".symlinks/plugins/in_app_review/ios"
+  integration_test:
+    :path: ".symlinks/plugins/integration_test/ios"
+  ios_receipt:
+    :path: ".symlinks/plugins/ios_receipt/ios"
+  media_key_detector_ios:
+    :path: ".symlinks/plugins/media_key_detector_ios/ios"
+  nsd_ios:
+    :path: ".symlinks/plugins/nsd_ios/ios"
  package_info_plus:
    :path: ".symlinks/plugins/package_info_plus/ios"
  permission_handler_apple:
    :path: ".symlinks/plugins/permission_handler_apple/ios"
+  purchases_flutter:
+    :path: ".symlinks/plugins/purchases_flutter/ios"
+  purchases_ui_flutter:
+    :path: ".symlinks/plugins/purchases_ui_flutter/ios"
  restart_app:
    :path: ".symlinks/plugins/restart_app/ios"
+  sensors_plus:
+    :path: ".symlinks/plugins/sensors_plus/ios"
  shared_preferences_foundation:
    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
  universal_ble:
@@ -67,19 +146,35 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/wakelock_plus/ios"

 SPEC CHECKSUMS:
-  bluetooth_low_energy_darwin: 764d8d1ae5abefbcdb839e812b4b25c0061fcf8b
+  bluetooth_low_energy_darwin: 50bc79258e60586e4c4bed5948bd31d925f37fac
  device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342
  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
  flutter_local_notifications: ff50f8405aaa0ccdc7dcfb9022ca192e8ad9688f
-  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
+  flutter_secure_storage_darwin: 557817588b80e60213cbecb573c45c76b788018d
+  flutter_volume_controller: e4d5832f08008180f76e30faf671ffd5a425e529
+  gamepads_ios: 1d2930c7a4450a9a1b57444ebf305a6a6cbeea0b
+  image_picker_ios: 4f2f91b01abdb52842a8e277617df877e40f905b
+  in_app_purchase_storekit: 2342c0a5da86593124d08dd13d920f39a52b273a
+  in_app_review: 436034b18594851a7328d7f1c2ed5ec235b79cfc
+  integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
+  ios_receipt: c2d5b4c36953c377a024992393976214ce6951e6
+  media_key_detector_ios: 7ff9aefdfea00bb7b71e184132381b7d0e7e1269
+  nsd_ios: 8c37babdc6538e3350dbed3a52674d2edde98173
  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
+  purchases_flutter: b3c0792197f69cd7af4c2449b71df6ac6378aace
+  purchases_ui_flutter: caae6d62ea23c6fe964992a28353211cc74b244a
+  PurchasesHybridCommon: 027f03312519c51056457eb2e4f7ee1c91b61b8f
+  PurchasesHybridCommonUI: 48afb5e29204958bff1276b0f7acb8e4b59fe99a
  restart_app: 806659942bf932f6ce51c5372f91ce5e81c8c14a
-  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  RevenueCat: ecbba580fa453b0d4a0475449b904196d74ef678
+  RevenueCatUI: ac7492873928e9e7f297e5e27a7c4f23f9008326
+  sensors_plus: 7229095999f30740798f0eeef5cd120357a8f4f2
+  shared_preferences_foundation: 5086985c1d43c5ba4d5e69a4e8083a389e2909e6
  universal_ble: cf52a7b3fd2e7c14d6d7262e9fdadb72ab6b88a6
-  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  url_launcher_ios: bb13df5870e8c4234ca12609d04010a21be43dfa
  wakelock_plus: 76957ab028e12bfa4e66813c99e46637f367fc7e

-PODFILE CHECKSUM: 3c63482e143d1b91d2d2560aee9fb04ecc74ac7e
+PODFILE CHECKSUM: 7ebd5c9b932b3af79d5c67e3af873118b74e970f

 COCOAPODS: 1.16.2
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -65,6 +65,7 @@
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		DFFDC4B9C4D6EF6A3BDE2E73 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
 		EFDECED99A47773C293F8819 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
+		F0D040E82EEF2560009B19C0 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -152,6 +153,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				F0D040E82EEF2560009B19C0 /* Runner.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -487,12 +489,14 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = UZRHKPVWN9;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -673,12 +677,14 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = UZRHKPVWN9;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -699,12 +705,14 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
 				DEVELOPMENT_TEAM = UZRHKPVWN9;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
--- a/ios/Runner/AppDelegate.swift
+++ b/ios/Runner/AppDelegate.swift
@@ -8,6 +8,8 @@ import UIKit
    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
  ) -> Bool {
    GeneratedPluginRegistrant.register(with: self)
+    UNUserNotificationCenter.current().delegate = self as? UNUserNotificationCenterDelegate
+
    return super.application(application, didFinishLaunchingWithOptions: launchOptions)
  }
 }
--- a/ios/Runner/Base.lproj/Main.storyboard
+++ b/ios/Runner/Base.lproj/Main.storyboard
@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
    <dependencies>
        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <scenes>
        <!--Flutter View Controller-->
@@ -14,13 +16,14 @@
                        <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                    </view>
                </viewController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
            </objects>
+            <point key="canvasLocation" x="-16" y="-40"/>
        </scene>
    </scenes>
 </document>
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>SwiftControl</string>
+	<string>BikeControl</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -24,12 +24,21 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>NSLocalNetworkUsageDescription</key>
-    <string>This app connects to your trainer app on your local network.</string>
 	<key>NSBluetoothAlwaysUsageDescription</key>
-	<string>SwiftControl uses Bluetooth to connect to accessories.</string>
+	<string>BikeControl uses Bluetooth to connect to accessories.</string>
+	<key>NSLocalNetworkUsageDescription</key>
+	<string>This app connects to your trainer app on your local network.</string>
+	<key>NSMotionUsageDescription</key>
+    <string>Access your accelerometer and gyroscope for steering support via your phone.</string>
+    <key>NSBonjourServices</key>
+    <array>
+      <string>_wahoo-fitness-tnp._tcp</string>
+      <string>_openbikecontrol._tcp</string>
+    </array>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>UIBackgroundModes</key>
@@ -37,8 +46,6 @@
 		<string>bluetooth-peripheral</string>
 		<string>bluetooth-central</string>
 	</array>
-	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
--- a/ios/Runner/Runner.entitlements
+++ b/ios/Runner/Runner.entitlements
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>keychain-access-groups</key>
+	<array/>
+</dict>
+</plist>
--- a/ios_receipt/.gitattributes
+++ b/ios_receipt/.gitattributes
@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto
--- a/ios_receipt/.gitignore
+++ b/ios_receipt/.gitignore
@@ -0,0 +1,30 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.buildlog/
+.history
+.svn/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
+/pubspec.lock
+**/doc/api/
+.dart_tool/
+.packages
+build/
--- a/ios_receipt/.metadata
+++ b/ios_receipt/.metadata
@@ -0,0 +1,30 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: "367f9ea16bfae1ca451b9cc27c1366870b187ae2"
+  channel: "stable"
+
+project_type: plugin
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
+      base_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
+    - platform: ios
+      create_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
+      base_revision: 367f9ea16bfae1ca451b9cc27c1366870b187ae2
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'
--- a/ios_receipt/CHANGELOG.md
+++ b/ios_receipt/CHANGELOG.md
@@ -0,0 +1,7 @@
+## 1.1.0
+
+* Migrate to StoreKit2
+
+## 1.0.0
+
+* Implement main method
--- a/ios_receipt/LICENSE
+++ b/ios_receipt/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Dmytro O. Kut'ko
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
--- a/ios_receipt/README.md
+++ b/ios_receipt/README.md
@@ -0,0 +1,32 @@
+# IosReceipt
+
+The IosReceipt package allows you to easily fetch the App Store receipt in your Flutter application on the iOS platform.
+
+## Installation
+
+Add the following dependency to your `pubspec.yaml` file:
+
+```yaml
+dependencies:
+  ios_receipt: ^0.0.1  # Use the latest version of the package
+```
+Then, run flutter pub get to install the package.
+
+## Usage
+Method for get transactions with StoreKit2
+```dart
+final transactions = await IosReceipt.getAllTransactions();
+```
+
+## Based on
+This package is based on the [appStoreReceiptURL](https://developer.apple.com/documentation/foundation/nsbundle/1407276-appstorereceipturl) from the official Apple documentation.
+
+## Note
+- The receipt isn't necessary if you use AppTransaction to validate the app download, or Transaction to validate in-app purchases.
+- If the receipt is invalid or missing in your app, use SKReceiptRefreshRequest to request a new receipt.
+
+## Testing Environments
+Keep in mind that receipts aren't initially present in iOS and iPadOS apps in the sandbox environment and in Xcode. Apps receive a receipt after the tester completes the first in-app purchase.
+
+## License
+This project is licensed under the MIT License.
--- a/ios_receipt/analysis_options.yaml
+++ b/ios_receipt/analysis_options.yaml
@@ -0,0 +1,4 @@
+include: package:flutter_lints/flutter.yaml
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options
--- a/ios_receipt/ios/.gitignore
+++ b/ios_receipt/ios/.gitignore
@@ -0,0 +1,38 @@
+.idea/
+.vagrant/
+.sconsign.dblite
+.svn/
+
+.DS_Store
+*.swp
+profile
+
+DerivedData/
+build/
+GeneratedPluginRegistrant.h
+GeneratedPluginRegistrant.m
+
+.generated/
+
+*.pbxuser
+*.mode1v3
+*.mode2v3
+*.perspectivev3
+
+!default.pbxuser
+!default.mode1v3
+!default.mode2v3
+!default.perspectivev3
+
+xcuserdata
+
+*.moved-aside
+
+*.pyc
+*sync/
+Icon?
+.tags*
+
+/Flutter/Generated.xcconfig
+/Flutter/ephemeral/
+/Flutter/flutter_export_environment.sh
--- a/ios_receipt/ios/Assets/.gitkeep
+++ b/ios_receipt/ios/Assets/.gitkeep
--- a/ios_receipt/ios/Classes/IosReceiptPlugin.swift
+++ b/ios_receipt/ios/Classes/IosReceiptPlugin.swift
@@ -0,0 +1,73 @@
+import Flutter
+import UIKit
+import StoreKit
+
+public class IosReceiptPlugin: NSObject, FlutterPlugin {
+
+    private func getAppleReceipt() -> String? {
+        guard let url = Bundle.main.appStoreReceiptURL,
+              FileManager.default.fileExists(atPath: url.path) else {
+            return nil
+        }
+        let data = try? Data(contentsOf: url, options: .alwaysMapped)
+        return data?.base64EncodedString()
+    }
+
+    private func isSandbox() -> Bool {
+        guard let path = Bundle.main.appStoreReceiptURL?.path else {
+            return false
+        }
+        return path.contains("CoreSimulator") || path.contains("sandboxReceipt")
+    }
+
+    private func getAllTransactions() async -> [[String: Any]] {
+        var list: [[String: Any]] = []
+        if #available(iOS 15.0, *) {
+            for await result in Transaction.all {
+                switch result {
+                case .verified(let tx):
+                    var item: [String: Any] = [
+                        "productId": tx.productID,
+                        "transactionId": String(tx.id),
+                        "originalTransactionId": String(tx.originalID),
+                        "purchaseDate": ISO8601DateFormatter().string(from: tx.purchaseDate)
+                    ]
+                    if let revocationDate = tx.revocationDate {
+                        item["revocationDate"] = ISO8601DateFormatter().string(from: revocationDate)
+                    }
+                    if let reason = tx.revocationReason {
+                        item["revocationReason"] = reason.rawValue
+                    }
+                    if #available(iOS 16.0, *) {
+                        item["jws"] = result.jwsRepresentation
+                    }
+                    list.append(item)
+
+                case .unverified(_, _):
+                    continue
+                }
+            }
+        }
+        return list
+    }
+
+    public static func register(with registrar: FlutterPluginRegistrar) {
+        let channel = FlutterMethodChannel(name: "ios_receipt", binaryMessenger: registrar.messenger())
+        let instance = IosReceiptPlugin()
+        registrar.addMethodCallDelegate(instance, channel: channel)
+    }
+
+    public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+        switch call.method {
+
+        case "getAppleReceipt":
+            result(getAppleReceipt())
+        case "isSandbox":
+            result(isSandbox())
+        case "getAllTransactions":
+            Task { result(await self.getAllTransactions()) }
+        default:
+            result(FlutterMethodNotImplemented)
+        }
+    }
+}
--- a/ios_receipt/ios/ios_receipt.podspec
+++ b/ios_receipt/ios/ios_receipt.podspec
@@ -0,0 +1,23 @@
+#
+# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
+# Run `pod lib lint ios_receipt.podspec` to validate before publishing.
+#
+Pod::Spec.new do |s|
+  s.name             = 'ios_receipt'
+  s.version          = '0.0.1'
+  s.summary          = 'A new Flutter plugin project.'
+  s.description      = <<-DESC
+A new Flutter plugin project.
+                       DESC
+  s.homepage         = 'http://example.com'
+  s.license          = { :file => '../LICENSE' }
+  s.author           = { 'Your Company' => 'email@example.com' }
+  s.source           = { :path => '.' }
+  s.source_files = 'Classes/**/*'
+  s.dependency 'Flutter'
+  s.platform = :ios, '15.0'
+
+  # Flutter.framework does not contain a i386 slice.
+  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
+  s.swift_version = '5.0'
+end
--- a/ios_receipt/lib/ios_receipt.dart
+++ b/ios_receipt/lib/ios_receipt.dart
@@ -0,0 +1,22 @@
+import 'package:ios_receipt/models/transaction.dart';
+
+import 'ios_receipt_platform_interface.dart';
+
+class IosReceipt {
+  static Future<String?> getAppleReceipt() {
+    return IosReceiptPlatform.instance.getAppleReceipt();
+  }
+
+  static Future<bool> isSandbox() {
+    return IosReceiptPlatform.instance.isSandbox();
+  }
+
+  static Future<List<Transaction>> getAllTransactions() async {
+    final list = await IosReceiptPlatform.instance.getAllTransactions();
+    final result = <Transaction>[];
+    for (var data in list) {
+      result.add(Transaction.fromMap(data));
+    }
+    return result..sort((a, b) => a.purchaseDate.compareTo(b.purchaseDate));
+  }
+}
--- a/ios_receipt/lib/ios_receipt_method_channel.dart
+++ b/ios_receipt/lib/ios_receipt_method_channel.dart
@@ -0,0 +1,29 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
+
+import 'ios_receipt_platform_interface.dart';
+
+/// An implementation of [IosReceiptPlatform] that uses method channels.
+class MethodChannelIosReceipt extends IosReceiptPlatform {
+  /// The method channel used to interact with the native platform.
+  @visibleForTesting
+  final methodChannel = const MethodChannel('ios_receipt');
+
+  @override
+  Future<String?> getAppleReceipt() async {
+    final version = await methodChannel.invokeMethod<String>('getAppleReceipt');
+    return version;
+  }
+
+  @override
+  Future<List<Map<String, dynamic>>> getAllTransactions() async {
+    final list = await methodChannel.invokeMethod('getAllTransactions');
+    return (list as List).map((e) => Map<String, dynamic>.from(e)).toList();
+  }
+
+  @override
+  Future<bool> isSandbox() async {
+    final isSandbox = await methodChannel.invokeMethod<bool>('isSandbox');
+    return isSandbox ?? false;
+  }
+}
--- a/ios_receipt/lib/ios_receipt_platform_interface.dart
+++ b/ios_receipt/lib/ios_receipt_platform_interface.dart
@@ -0,0 +1,37 @@
+import 'package:plugin_platform_interface/plugin_platform_interface.dart';
+
+import 'ios_receipt_method_channel.dart';
+
+abstract class IosReceiptPlatform extends PlatformInterface {
+  /// Constructs a IosReceiptPlatform.
+  IosReceiptPlatform() : super(token: _token);
+
+  static final Object _token = Object();
+
+  static IosReceiptPlatform _instance = MethodChannelIosReceipt();
+
+  /// The default instance of [IosReceiptPlatform] to use.
+  ///
+  /// Defaults to [MethodChannelIosReceipt].
+  static IosReceiptPlatform get instance => _instance;
+
+  /// Platform-specific implementations should set this with their own
+  /// platform-specific class that extends [IosReceiptPlatform] when
+  /// they register themselves.
+  static set instance(IosReceiptPlatform instance) {
+    PlatformInterface.verifyToken(instance, _token);
+    _instance = instance;
+  }
+
+  Future<String?> getAppleReceipt() {
+    throw UnimplementedError('platformVersion() has not been implemented.');
+  }
+
+  Future<List<Map<String, dynamic>>> getAllTransactions() {
+    throw UnimplementedError('getAllTransactions() has not been implemented.');
+  }
+
+  Future<bool> isSandbox() async {
+    throw UnimplementedError('isSandbox() has not been implemented.');
+  }
+}
--- a/ios_receipt/lib/models/transaction.dart
+++ b/ios_receipt/lib/models/transaction.dart
@@ -0,0 +1,41 @@
+class Transaction {
+  const Transaction({
+    required this.jws,
+    required this.productId,
+    required this.transactionId,
+    required this.purchaseDate,
+    required this.originalTransactionId,
+  });
+
+  final String? jws;
+  final String productId;
+  final String transactionId;
+  final DateTime purchaseDate;
+  final String originalTransactionId;
+
+  @override
+  bool operator ==(covariant Transaction other) {
+    if (identical(this, other)) return true;
+    return other.jws == jws &&
+        other.productId == productId &&
+        other.transactionId == transactionId &&
+        other.purchaseDate == purchaseDate &&
+        other.originalTransactionId == originalTransactionId;
+  }
+
+  @override
+  int get hashCode =>
+      jws.hashCode ^
+      productId.hashCode ^
+      transactionId.hashCode ^
+      purchaseDate.hashCode ^
+      originalTransactionId.hashCode;
+
+  factory Transaction.fromMap(Map<String, dynamic> map) => Transaction(
+        jws: map['jws'] as String?,
+        productId: map['productId'] as String,
+        transactionId: map['transactionId'] as String,
+        purchaseDate: DateTime.parse(map['purchaseDate'] as String),
+        originalTransactionId: map['originalTransactionId'] as String,
+      );
+}
--- a/ios_receipt/macos/.gitignore
+++ b/ios_receipt/macos/.gitignore
@@ -0,0 +1,38 @@
+.idea/
+.vagrant/
+.sconsign.dblite
+.svn/
+
+.DS_Store
+*.swp
+profile
+
+DerivedData/
+build/
+GeneratedPluginRegistrant.h
+GeneratedPluginRegistrant.m
+
+.generated/
+
+*.pbxuser
+*.mode1v3
+*.mode2v3
+*.perspectivev3
+
+!default.pbxuser
+!default.mode1v3
+!default.mode2v3
+!default.perspectivev3
+
+xcuserdata
+
+*.moved-aside
+
+*.pyc
+*sync/
+Icon?
+.tags*
+
+/Flutter/Generated.xcconfig
+/Flutter/ephemeral/
+/Flutter/flutter_export_environment.sh
--- a/ios_receipt/macos/Assets/.gitkeep
+++ b/ios_receipt/macos/Assets/.gitkeep
--- a/ios_receipt/macos/Classes/IosReceiptPlugin.swift
+++ b/ios_receipt/macos/Classes/IosReceiptPlugin.swift
@@ -0,0 +1,73 @@
+
+import FlutterMacOS
+import StoreKit
+
+public class IosReceiptPlugin: NSObject, FlutterPlugin {
+
+    private func isSandbox() -> Bool {
+        guard let path = Bundle.main.appStoreReceiptURL?.path else {
+            return false
+        }
+        return path.contains("CoreSimulator") || path.contains("sandboxReceipt")
+    }
+
+    private func getAppleReceipt() -> String? {
+        guard let url = Bundle.main.appStoreReceiptURL,
+              FileManager.default.fileExists(atPath: url.path) else {
+            return nil
+        }
+        let data = try? Data(contentsOf: url, options: .alwaysMapped)
+        return data?.base64EncodedString()
+    }
+
+    private func getAllTransactions() async -> [[String: Any]] {
+        var list: [[String: Any]] = []
+        if #available(iOS 15.0, *) {
+            for await result in Transaction.all {
+                switch result {
+                case .verified(let tx):
+                    var item: [String: Any] = [
+                        "productId": tx.productID,
+                        "transactionId": String(tx.id),
+                        "originalTransactionId": String(tx.originalID),
+                        "purchaseDate": ISO8601DateFormatter().string(from: tx.purchaseDate)
+                    ]
+                    if let revocationDate = tx.revocationDate {
+                        item["revocationDate"] = ISO8601DateFormatter().string(from: revocationDate)
+                    }
+                    if let reason = tx.revocationReason {
+                        item["revocationReason"] = reason.rawValue
+                    }
+                    if #available(iOS 16.0, *) {
+                        item["jws"] = result.jwsRepresentation
+                    }
+                    list.append(item)
+
+                case .unverified(_, _):
+                    continue
+                }
+            }
+        }
+        return list
+    }
+
+    public static func register(with registrar: FlutterPluginRegistrar) {
+        let channel = FlutterMethodChannel(name: "ios_receipt", binaryMessenger: registrar.messenger)
+        let instance = IosReceiptPlugin()
+        registrar.addMethodCallDelegate(instance, channel: channel)
+    }
+
+    public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+        switch call.method {
+
+        case "getAppleReceipt":
+            result(getAppleReceipt())
+        case "isSandbox":
+            result(isSandbox())
+        case "getAllTransactions":
+            Task { result(await self.getAllTransactions()) }
+        default:
+            result(FlutterMethodNotImplemented)
+        }
+    }
+}
--- a/ios_receipt/macos/ios_receipt.podspec
+++ b/ios_receipt/macos/ios_receipt.podspec
@@ -0,0 +1,23 @@
+#
+# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
+# Run `pod lib lint ios_receipt.podspec` to validate before publishing.
+#
+Pod::Spec.new do |s|
+  s.name             = 'ios_receipt'
+  s.version          = '0.0.1'
+  s.summary          = 'A new Flutter plugin project.'
+  s.description      = <<-DESC
+A new Flutter plugin project.
+                       DESC
+  s.homepage         = 'http://example.com'
+  s.license          = { :file => '../LICENSE' }
+  s.author           = { 'Your Company' => 'email@example.com' }
+  s.source           = { :path => '.' }
+  s.source_files = 'Classes/**/*'
+  s.dependency 'FlutterMacOS'
+  s.platform = :osx, '12.00'
+
+  # Flutter.framework does not contain a i386 slice.
+  s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' }
+  s.swift_version = '5.0'
+end
--- a/ios_receipt/pubspec.yaml
+++ b/ios_receipt/pubspec.yaml
@@ -0,0 +1,26 @@
+name: ios_receipt
+description: The IosReceipt package allows you to easily fetch the App Store receipt in your Flutter application on the iOS platform.
+version: 1.1.0
+homepage: https://github.com/DimaKutko/ios_receipt
+
+environment:
+  sdk: ">=3.8.0 <4.0.0"
+  flutter: ">=3.32.0"
+
+dependencies:
+  flutter:
+    sdk: flutter
+  plugin_platform_interface: ^2.1.8
+
+dev_dependencies:
+  flutter_test:
+    sdk: flutter
+  flutter_lints: ^6.0.0
+
+flutter:
+  plugin:
+    platforms:
+      ios:
+        pluginClass: IosReceiptPlugin
+      macos:
+        pluginClass: IosReceiptPlugin
--- a/keypress_simulator/packages/keypress_simulator/lib/src/keypress_simulator.dart
+++ b/keypress_simulator/packages/keypress_simulator/lib/src/keypress_simulator.dart
@@ -38,6 +38,11 @@ class KeyPressSimulator {
    return _platform.simulateKeyPress(key: key, modifiers: modifiers, keyDown: false);
  }

+  /// Simulate media key press.
+  Future<void> simulateMediaKey(PhysicalKeyboardKey mediaKey) {
+    return _platform.simulateMediaKey(mediaKey);
+  }
+
  @Deprecated('Please use simulateKeyDown & simulateKeyUp methods.')
  Future<void> simulateCtrlCKeyPress() async {
    const key = PhysicalKeyboardKey.keyC;
--- a/keypress_simulator/packages/keypress_simulator_macos/macos/Classes/KeypressSimulatorMacosPlugin.swift
+++ b/keypress_simulator/packages/keypress_simulator_macos/macos/Classes/KeypressSimulatorMacosPlugin.swift
@@ -22,6 +22,9 @@ public class KeypressSimulatorMacosPlugin: NSObject, FlutterPlugin {
        case "simulateMouseClick":
            simulateMouseClick(call, result: result)
            break
+        case "simulateMediaKey":
+            simulateMediaKey(call, result: result)
+            break
        default:
            result(FlutterMethodNotImplemented)
        }
@@ -114,4 +117,62 @@ public class KeypressSimulatorMacosPlugin: NSObject, FlutterPlugin {
        eventKeyPress!.flags = flags
        return eventKeyPress!
    }
+
+    public func simulateMediaKey(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+        let args:[String: Any] = call.arguments as! [String: Any]
+        let keyIdentifier: String = args["key"] as! String
+
+        // Map string identifier to macOS NX key codes
+        var mediaKeyCode: Int32 = 0
+        switch keyIdentifier {
+        case "playPause":
+            mediaKeyCode = NX_KEYTYPE_PLAY
+        case "stop":
+            // macOS doesn't have a dedicated stop key in its media control API.
+            // Following macOS conventions, we map stop to play/pause which toggles playback.
+            // This matches the behavior of the physical media keys on Mac keyboards.
+            mediaKeyCode = NX_KEYTYPE_PLAY
+        case "next":
+            mediaKeyCode = NX_KEYTYPE_FAST
+        case "previous":
+            mediaKeyCode = NX_KEYTYPE_REWIND
+        case "volumeUp":
+            mediaKeyCode = NX_KEYTYPE_SOUND_UP
+        case "volumeDown":
+            mediaKeyCode = NX_KEYTYPE_SOUND_DOWN
+        default:
+            result(FlutterError(code: "UNSUPPORTED_KEY", message: "Unsupported media key identifier", details: nil))
+            return
+        }
+
+        // Create and post the media key event (key down)
+        let eventDown = NSEvent.otherEvent(
+            with: .systemDefined,
+            location: NSPoint.zero,
+            modifierFlags: NSEvent.ModifierFlags(rawValue: 0xa00),
+            timestamp: 0,
+            windowNumber: 0,
+            context: nil,
+            subtype: 8,
+            data1: Int((mediaKeyCode << 16) | (0xa << 8)),
+            data2: -1
+        )
+        eventDown?.cgEvent?.post(tap: .cghidEventTap)
+
+        // Create and post the media key event (key up)
+        let eventUp = NSEvent.otherEvent(
+            with: .systemDefined,
+            location: NSPoint.zero,
+            modifierFlags: NSEvent.ModifierFlags(rawValue: 0xb00),
+            timestamp: 0,
+            windowNumber: 0,
+            context: nil,
+            subtype: 8,
+            data1: Int((mediaKeyCode << 16) | (0xb << 8)),
+            data2: -1
+        )
+        eventUp?.cgEvent?.post(tap: .cghidEventTap)
+
+        result(true)
+    }
 }
--- a/keypress_simulator/packages/keypress_simulator_platform_interface/lib/src/keypress_simulator_method_channel.dart
+++ b/keypress_simulator/packages/keypress_simulator_platform_interface/lib/src/keypress_simulator_method_channel.dart
@@ -61,4 +61,27 @@ class MethodChannelKeyPressSimulator extends KeyPressSimulatorPlatform {
    };
    await methodChannel.invokeMethod('simulateMouseClick', arguments);
  }
+
+  @override
+  Future<void> simulateMediaKey(PhysicalKeyboardKey mediaKey) async {
+    // Map PhysicalKeyboardKey to string identifier since keyCode is null for media keys
+    final keyMap = {
+      PhysicalKeyboardKey.mediaPlayPause: 'playPause',
+      PhysicalKeyboardKey.mediaStop: 'stop',
+      PhysicalKeyboardKey.mediaTrackNext: 'next',
+      PhysicalKeyboardKey.mediaTrackPrevious: 'previous',
+      PhysicalKeyboardKey.audioVolumeUp: 'volumeUp',
+      PhysicalKeyboardKey.audioVolumeDown: 'volumeDown',
+    };
+
+    final keyIdentifier = keyMap[mediaKey];
+    if (keyIdentifier == null) {
+      throw UnsupportedError('Unsupported media key: $mediaKey');
+    }
+
+    final Map<String, Object?> arguments = {
+      'key': keyIdentifier,
+    };
+    await methodChannel.invokeMethod('simulateMediaKey', arguments);
+  }
 }
--- a/keypress_simulator/packages/keypress_simulator_platform_interface/lib/src/keypress_simulator_platform_interface.dart
+++ b/keypress_simulator/packages/keypress_simulator_platform_interface/lib/src/keypress_simulator_platform_interface.dart
@@ -42,6 +42,10 @@ abstract class KeyPressSimulatorPlatform extends PlatformInterface {
  }

  Future<void> simulateMouseClick(Offset position, {required bool keyDown}) {
-    throw UnimplementedError('simulateKeyPress() has not been implemented.');
+    throw UnimplementedError('simulateMouseClick() has not been implemented.');
+  }
+
+  Future<void> simulateMediaKey(PhysicalKeyboardKey mediaKey) {
+    throw UnimplementedError('simulateMediaKey() has not been implemented.');
  }
 }
--- a/keypress_simulator/packages/keypress_simulator_windows/windows/keypress_simulator_windows_plugin.cpp
+++ b/keypress_simulator/packages/keypress_simulator_windows/windows/keypress_simulator_windows_plugin.cpp
@@ -1,17 +1,20 @@
 #include "keypress_simulator_windows_plugin.h"

 // This must be included before many other Windows headers.
-#include <windows.h>
+#include <flutter_windows.h>
 #include <psapi.h>
 #include <string.h>
-#include <flutter_windows.h>
+#include <windows.h>

 #include <flutter/method_channel.h>
 #include <flutter/plugin_registrar_windows.h>
 #include <flutter/standard_method_codec.h>

+#include <algorithm>
 #include <memory>
 #include <sstream>
+#include <unordered_map>
+#include <vector>

 using flutter::EncodableList;
 using flutter::EncodableMap;
@@ -27,7 +30,8 @@ struct FindWindowData {
 };

 BOOL CALLBACK EnumWindowsCallback(HWND hwnd, LPARAM lParam);
-HWND FindTargetWindow(const std::string& processName, const std::string& windowTitle);
+HWND FindTargetWindow(const std::string& processName,
+                      const std::string& windowTitle);

 // static
 void KeypressSimulatorWindowsPlugin::RegisterWithRegistrar(
@@ -68,40 +72,144 @@ void KeypressSimulatorWindowsPlugin::SimulateKeyPress(
  }

  // List of compatible training apps to look for
-  std::vector<std::string> compatibleApps = {
-    "MyWhooshHD.exe",
-    "indieVelo.exe",
-    "biketerra.exe"
-  };
+  std::vector<std::string> compatibleApps = {"MyWhooshHD.exe", "MyWhoosh.exe",
+                                             "indieVelo.exe", "biketerra.exe",
+                                             "Rouvy.exe"};

-  // Try to find and focus a compatible app
+  // Try to find and focus (or directly target) a compatible app
+  std::string foundProcessName;
+  bool supportsBackgroundInput = true;
  HWND targetWindow = NULL;
  for (const std::string& processName : compatibleApps) {
    targetWindow = FindTargetWindow(processName, "");
    if (targetWindow != NULL) {
-      // Only focus the window if it's not already in the foreground
-      if (GetForegroundWindow() != targetWindow) {
+      foundProcessName = processName;
+      if (!supportsBackgroundInput && GetForegroundWindow() != targetWindow) {
        SetForegroundWindow(targetWindow);
-        Sleep(50); // Brief delay to ensure window is focused
+        Sleep(50);  // Brief delay to ensure window is focused
      }
      break;
    }
  }

+  // If we found a target window that supports background input and it's not
+  // focused, send messages directly
+  auto postKeyMessage = [](HWND hwnd, UINT vkCode, bool down) {
+    const WORD scanCode =
+        static_cast<WORD>(MapVirtualKey(vkCode, MAPVK_VK_TO_VSC));
+    // Build lParam with repeat count 1 and scan code; set transition states for
+    // key up
+    LPARAM lParam = 1 | (static_cast<LPARAM>(scanCode) << 16);
+    if (vkCode == VK_LEFT || vkCode == VK_RIGHT || vkCode == VK_UP ||
+        vkCode == VK_DOWN || vkCode == VK_INSERT || vkCode == VK_DELETE ||
+        vkCode == VK_HOME || vkCode == VK_END || vkCode == VK_PRIOR ||
+        vkCode == VK_NEXT) {
+      lParam |= (1 << 24);  // extended key
+    }
+    if (!down) {
+      lParam |= (1 << 30);  // previous key state
+      lParam |= (1 << 31);  // transition state
+    }
+    PostMessage(hwnd, down ? WM_KEYDOWN : WM_KEYUP, vkCode, lParam);
+  };
+
+  auto sendKeyToWindow = [&postKeyMessage](HWND hwnd,
+                                           const std::vector<std::string>& mods,
+                                           UINT keyCode, bool down) {
+    auto handleModifier = [&postKeyMessage, hwnd](UINT vk, bool press) {
+      postKeyMessage(hwnd, vk, press);
+    };
+
+    if (down) {
+      for (const std::string& modifier : mods) {
+        if (modifier == "shiftModifier") {
+          handleModifier(VK_SHIFT, true);
+        } else if (modifier == "controlModifier") {
+          handleModifier(VK_CONTROL, true);
+        } else if (modifier == "altModifier") {
+          handleModifier(VK_MENU, true);
+        } else if (modifier == "metaModifier") {
+          handleModifier(VK_LWIN, true);
+        }
+      }
+      postKeyMessage(hwnd, keyCode, true);
+    } else {
+      postKeyMessage(hwnd, keyCode, false);
+      // release modifiers
+      for (const std::string& modifier : mods) {
+        if (modifier == "shiftModifier") {
+          handleModifier(VK_SHIFT, false);
+        } else if (modifier == "controlModifier") {
+          handleModifier(VK_CONTROL, false);
+        } else if (modifier == "altModifier") {
+          handleModifier(VK_MENU, false);
+        } else if (modifier == "metaModifier") {
+          handleModifier(VK_LWIN, false);
+        }
+      }
+    }
+  };
+
+  if (targetWindow != NULL && !foundProcessName.empty() &&
+      supportsBackgroundInput && GetForegroundWindow() != targetWindow) {
+    sendKeyToWindow(targetWindow, modifiers, keyCode, keyDown);
+    result->Success(flutter::EncodableValue(true));
+    return;
+  }
+
+  // Helper function to send modifier key events
+  auto sendModifierKey = [](UINT vkCode, bool down) {
+    WORD sc = (WORD)MapVirtualKey(vkCode, MAPVK_VK_TO_VSC);
+    INPUT in = {0};
+    in.type = INPUT_KEYBOARD;
+    in.ki.wVk = 0;
+    in.ki.wScan = sc;
+    in.ki.dwFlags = KEYEVENTF_SCANCODE | (down ? 0 : KEYEVENTF_KEYUP);
+    SendInput(1, &in, sizeof(INPUT));
+  };
+
+  // Helper function to process modifiers
+  auto processModifiers = [&sendModifierKey](
+                              const std::vector<std::string>& mods, bool down) {
+    for (const std::string& modifier : mods) {
+      if (modifier == "shiftModifier") {
+        sendModifierKey(VK_SHIFT, down);
+      } else if (modifier == "controlModifier") {
+        sendModifierKey(VK_CONTROL, down);
+      } else if (modifier == "altModifier") {
+        sendModifierKey(VK_MENU, down);
+      } else if (modifier == "metaModifier") {
+        sendModifierKey(VK_LWIN, down);
+      }
+    }
+  };
+
+  // Press modifier keys first (if keyDown)
+  if (keyDown) {
+    processModifiers(modifiers, true);
+  }
+
+  // Send the main key
  WORD sc = (WORD)MapVirtualKey(keyCode, MAPVK_VK_TO_VSC);

  INPUT in = {0};
  in.type = INPUT_KEYBOARD;
-  in.ki.wVk = 0;                 // when using SCANCODE, set VK=0
+  in.ki.wVk = 0;  // when using SCANCODE, set VK=0
  in.ki.wScan = sc;
  in.ki.dwFlags = KEYEVENTF_SCANCODE | (keyDown ? 0 : KEYEVENTF_KEYUP);
-  if (keyCode == VK_LEFT || keyCode == VK_RIGHT || keyCode == VK_UP || keyCode == VK_DOWN ||
-    keyCode == VK_INSERT || keyCode == VK_DELETE || keyCode == VK_HOME || keyCode == VK_END ||
-    keyCode == VK_PRIOR || keyCode == VK_NEXT) {
+  if (keyCode == VK_LEFT || keyCode == VK_RIGHT || keyCode == VK_UP ||
+      keyCode == VK_DOWN || keyCode == VK_INSERT || keyCode == VK_DELETE ||
+      keyCode == VK_HOME || keyCode == VK_END || keyCode == VK_PRIOR ||
+      keyCode == VK_NEXT) {
    in.ki.dwFlags |= KEYEVENTF_EXTENDEDKEY;
  }
  SendInput(1, &in, sizeof(INPUT));

+  // Release modifier keys (if keyUp)
+  if (!keyDown) {
+    processModifiers(modifiers, false);
+  }
+
  /*BYTE byteValue = static_cast<BYTE>(keyCode);
  keybd_event(byteValue, 0x45, keyDown ? 0 : KEYEVENTF_KEYUP, 0);*/

@@ -111,7 +219,6 @@ void KeypressSimulatorWindowsPlugin::SimulateKeyPress(
 void KeypressSimulatorWindowsPlugin::SimulateMouseClick(
    const flutter::MethodCall<flutter::EncodableValue>& method_call,
    std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result) {
-
  const EncodableMap& args = std::get<EncodableMap>(*method_call.arguments());
  double x = 0;
  double y = 0;
@@ -119,12 +226,12 @@ void KeypressSimulatorWindowsPlugin::SimulateMouseClick(
  bool keyDown = std::get<bool>(args.at(EncodableValue("keyDown")));
  auto it_x = args.find(EncodableValue("x"));
  if (it_x != args.end() && std::holds_alternative<double>(it_x->second)) {
-      x = std::get<double>(it_x->second);
+    x = std::get<double>(it_x->second);
  }

  auto it_y = args.find(EncodableValue("y"));
  if (it_y != args.end() && std::holds_alternative<double>(it_y->second)) {
-      y = std::get<double>(it_y->second);
+    y = std::get<double>(it_y->second);
  }

  // Get the monitor containing the target point and its DPI
@@ -132,7 +239,7 @@ void KeypressSimulatorWindowsPlugin::SimulateMouseClick(
  HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST);
  UINT dpi = FlutterDesktopGetDpiForMonitor(monitor);
  double scale_factor = dpi / 96.0;
-  
+
  // Scale the coordinates according to the DPI scaling
  int scaled_x = static_cast<int>(x * scale_factor);
  int scaled_y = static_cast<int>(y * scale_factor);
@@ -145,14 +252,14 @@ void KeypressSimulatorWindowsPlugin::SimulateMouseClick(
  input.type = INPUT_MOUSE;

  if (keyDown) {
-      // Mouse left button down
-      input.mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
-      SendInput(1, &input, sizeof(INPUT));
+    // Mouse left button down
+    input.mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
+    SendInput(1, &input, sizeof(INPUT));

  } else {
-      // Mouse left button up
-      input.mi.dwFlags = MOUSEEVENTF_LEFTUP;
-      SendInput(1, &input, sizeof(INPUT));
+    // Mouse left button up
+    input.mi.dwFlags = MOUSEEVENTF_LEFTUP;
+    SendInput(1, &input, sizeof(INPUT));
  }

  result->Success(flutter::EncodableValue(true));
@@ -163,7 +270,7 @@ BOOL CALLBACK EnumWindowsCallback(HWND hwnd, LPARAM lParam) {

  // Check if window is visible and not minimized
  if (!IsWindowVisible(hwnd) || IsIconic(hwnd)) {
-    return TRUE; // Continue enumeration
+    return TRUE;  // Continue enumeration
  }

  // Get window title
@@ -173,7 +280,8 @@ BOOL CALLBACK EnumWindowsCallback(HWND hwnd, LPARAM lParam) {
  // Get process name
  DWORD processId;
  GetWindowThreadProcessId(hwnd, &processId);
-  HANDLE hProcess = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, processId);
+  HANDLE hProcess =
+      OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, processId);
  char processName[MAX_PATH];
  if (hProcess) {
    DWORD size = sizeof(processName);
@@ -181,7 +289,7 @@ BOOL CALLBACK EnumWindowsCallback(HWND hwnd, LPARAM lParam) {
      // Extract just the filename from the full path
      char* filename = strrchr(processName, '\\');
      if (filename) {
-        filename++; // Skip the backslash
+        filename++;  // Skip the backslash
      } else {
        filename = processName;
      }
@@ -190,7 +298,7 @@ BOOL CALLBACK EnumWindowsCallback(HWND hwnd, LPARAM lParam) {
      if (!data->targetProcessName.empty() &&
          _stricmp(filename, data->targetProcessName.c_str()) == 0) {
        data->foundWindow = hwnd;
-        return FALSE; // Stop enumeration
+        return FALSE;  // Stop enumeration
      }
    }
    CloseHandle(hProcess);
@@ -200,13 +308,14 @@ BOOL CALLBACK EnumWindowsCallback(HWND hwnd, LPARAM lParam) {
  if (!data->targetWindowTitle.empty() &&
      _stricmp(windowTitle, data->targetWindowTitle.c_str()) == 0) {
    data->foundWindow = hwnd;
-    return FALSE; // Stop enumeration
+    return FALSE;  // Stop enumeration
  }

-  return TRUE; // Continue enumeration
+  return TRUE;  // Continue enumeration
 }

-HWND FindTargetWindow(const std::string& processName, const std::string& windowTitle) {
+HWND FindTargetWindow(const std::string& processName,
+                      const std::string& windowTitle) {
  FindWindowData data;
  data.targetProcessName = processName;
  data.targetWindowTitle = windowTitle;
@@ -216,7 +325,45 @@ HWND FindTargetWindow(const std::string& processName, const std::string& windowT
  return data.foundWindow;
 }

+void KeypressSimulatorWindowsPlugin::SimulateMediaKey(
+    const flutter::MethodCall<flutter::EncodableValue>& method_call,
+    std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result) {
+  const EncodableMap& args = std::get<EncodableMap>(*method_call.arguments());
+  std::string keyIdentifier =
+      std::get<std::string>(args.at(EncodableValue("key")));

+  // Map string identifier to Windows virtual key codes
+  static const std::unordered_map<std::string, UINT> keyMap = {
+      {"playPause", VK_MEDIA_PLAY_PAUSE}, {"stop", VK_MEDIA_STOP},
+      {"next", VK_MEDIA_NEXT_TRACK},      {"previous", VK_MEDIA_PREV_TRACK},
+      {"volumeUp", VK_VOLUME_UP},         {"volumeDown", VK_VOLUME_DOWN}};
+
+  auto it = keyMap.find(keyIdentifier);
+  if (it == keyMap.end()) {
+    result->Error("UNSUPPORTED_KEY", "Unsupported media key identifier");
+    return;
+  }
+  UINT vkCode = it->second;
+
+  // Send key down event
+  INPUT inputs[2] = {};
+  inputs[0].type = INPUT_KEYBOARD;
+  inputs[0].ki.wVk = static_cast<WORD>(vkCode);
+  inputs[0].ki.dwFlags = 0;  // Key down
+
+  // Send key up event
+  inputs[1].type = INPUT_KEYBOARD;
+  inputs[1].ki.wVk = static_cast<WORD>(vkCode);
+  inputs[1].ki.dwFlags = KEYEVENTF_KEYUP;
+
+  UINT eventsSent = SendInput(2, inputs, sizeof(INPUT));
+  if (eventsSent != 2) {
+    result->Error("SEND_INPUT_FAILED", "Failed to send media key input events");
+    return;
+  }
+
+  result->Success(flutter::EncodableValue(true));
+}

 void KeypressSimulatorWindowsPlugin::HandleMethodCall(
    const flutter::MethodCall<flutter::EncodableValue>& method_call,
@@ -225,6 +372,8 @@ void KeypressSimulatorWindowsPlugin::HandleMethodCall(
    SimulateKeyPress(method_call, std::move(result));
  } else if (method_call.method_name().compare("simulateMouseClick") == 0) {
    SimulateMouseClick(method_call, std::move(result));
+  } else if (method_call.method_name().compare("simulateMediaKey") == 0) {
+    SimulateMediaKey(method_call, std::move(result));
  } else {
    result->NotImplemented();
  }
--- a/keypress_simulator/packages/keypress_simulator_windows/windows/keypress_simulator_windows_plugin.h
+++ b/keypress_simulator/packages/keypress_simulator_windows/windows/keypress_simulator_windows_plugin.h
@@ -30,7 +30,9 @@ class KeypressSimulatorWindowsPlugin : public flutter::Plugin {
      const flutter::MethodCall<flutter::EncodableValue>& method_call,
      std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result);

-
+  void KeypressSimulatorWindowsPlugin::SimulateMediaKey(
+      const flutter::MethodCall<flutter::EncodableValue>& method_call,
+      std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result);

  // Called when a method is called on this plugin's channel from Dart.
  void HandleMethodCall(
--- a/lib/bluetooth/ble.dart
+++ b/lib/bluetooth/ble.dart
@@ -1,8 +1,7 @@
 class BleUuid {
-  static final DEVICE_INFORMATION_SERVICE_UUID = "0000180a-0000-1000-8000-00805f9b34fb".toLowerCase();
-  static final DEVICE_INFORMATION_CHARACTERISTIC_FIRMWARE_REVISION = "00002a26-0000-1000-8000-00805f9b34fb"
-      .toLowerCase();
+  static const DEVICE_INFORMATION_SERVICE_UUID = "0000180a-0000-1000-8000-00805f9b34fb";
+  static const DEVICE_INFORMATION_CHARACTERISTIC_FIRMWARE_REVISION = "00002a26-0000-1000-8000-00805f9b34fb";

-  static final DEVICE_BATTERY_SERVICE_UUID = "0000180f-0000-1000-8000-00805f9b34fb".toLowerCase();
-  static final DEVICE_INFORMATION_CHARACTERISTIC_BATTERY_LEVEL = "00002a19-0000-1000-8000-00805f9b34fb".toLowerCase();
+  static const DEVICE_BATTERY_SERVICE_UUID = "0000180f-0000-1000-8000-00805f9b34fb";
+  static const DEVICE_INFORMATION_CHARACTERISTIC_BATTERY_LEVEL = "00002A19-0000-1000-8000-00805F9B34FB";
 }
--- a/lib/bluetooth/connection.dart
+++ b/lib/bluetooth/connection.dart
@@ -1,12 +1,21 @@
 import 'dart:async';
 import 'dart:io';

+import 'package:bike_control/bluetooth/devices/bluetooth_device.dart';
+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/gen/l10n.dart';
+import 'package:bike_control/main.dart';
+import 'package:bike_control/utils/core.dart';
+import 'package:bike_control/utils/iap/iap_manager.dart';
+import 'package:bike_control/utils/requirements/android.dart';
 import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
-import 'package:swift_control/main.dart';
-import 'package:swift_control/utils/actions/android.dart';
-import 'package:swift_control/utils/requirements/android.dart';
+import 'package:gamepads/gamepads.dart';
+import 'package:prop/prop.dart';
 import 'package:universal_ble/universal_ble.dart';

 import 'devices/base_device.dart';
@@ -15,6 +24,18 @@ import 'messages/notification.dart';

 class Connection {
  final devices = <BaseDevice>[];
+
+  List<BluetoothDevice> get bluetoothDevices => devices.whereType<BluetoothDevice>().toList();
+  List<GamepadDevice> get gamepadDevices => devices.whereType<GamepadDevice>().toList();
+  List<GyroscopeSteering> get gyroscopeDevices => devices.whereType<GyroscopeSteering>().toList();
+  List<WahooKickrHeadwind> get accessories => devices.whereType<WahooKickrHeadwind>().toList();
+  List<BaseDevice> get controllerDevices => [
+    ...bluetoothDevices.where((d) => d is! WahooKickrHeadwind),
+    ...gamepadDevices,
+    ...gyroscopeDevices,
+    ...devices.whereType<HidDevice>(),
+  ];
+
  var _androidNotificationsSetup = false;

  final _connectionQueue = <BaseDevice>[];
@@ -23,52 +44,130 @@ class Connection {
  final Map<BaseDevice, StreamSubscription<BaseNotification>> _streamSubscriptions = {};
  final StreamController<BaseNotification> _actionStreams = StreamController<BaseNotification>.broadcast();
  Stream<BaseNotification> get actionStream => _actionStreams.stream;
+  List<({DateTime date, String entry})> lastLogEntries = [];

  final Map<BaseDevice, StreamSubscription<bool>> _connectionSubscriptions = {};
  final StreamController<BaseDevice> _connectionStreams = StreamController<BaseDevice>.broadcast();
  Stream<BaseDevice> get connectionStream => _connectionStreams.stream;
+  final StreamController<BluetoothDevice> _rssiConnectionStreams = StreamController<BluetoothDevice>.broadcast();
+  Stream<BluetoothDevice> get rssiConnectionStream => _rssiConnectionStreams.stream;

  final _lastScanResult = <BleDevice>[];
  final ValueNotifier<bool> hasDevices = ValueNotifier(false);
  final ValueNotifier<bool> isScanning = ValueNotifier(false);

+  Timer? _gamePadSearchTimer;
+
  void initialize() {
+    actionStream.listen((log) {
+      lastLogEntries.add((date: DateTime.now(), entry: log.toString()));
+      lastLogEntries = lastLogEntries.takeLast(kIsWeb ? 1000 : 60).toList();
+    });
+
+    if (!kIsWeb && (Platform.isMacOS || Platform.isWindows)) {
+      core.mediaKeyHandler.initialize();
+    }
+
    UniversalBle.onAvailabilityChange = (available) {
-      _actionStreams.add(LogNotification('Bluetooth availability changed: $available'));
-      if (available == AvailabilityState.poweredOn) {
-        performScanning();
+      _actionStreams.add(BluetoothAvailabilityNotification(available == AvailabilityState.poweredOn));
+      if (available == AvailabilityState.poweredOn && !kIsWeb) {
+        core.permissions.getScanRequirements().then((perms) {
+          if (perms.isEmpty) {
+            performScanning();
+          }
+        });
      } else if (available == AvailabilityState.poweredOff) {
-        reset();
+        disconnectAll();
+        stop();
      }
    };
    UniversalBle.onScanResult = (result) {
-      if (_lastScanResult.none((e) => e.deviceId == result.deviceId)) {
+      // Update RSSI for already connected devices
+      final existingDevice = bluetoothDevices.firstOrNullWhere(
+        (e) => e.device.deviceId == result.deviceId,
+      );
+      if (existingDevice != null && existingDevice.rssi != result.rssi) {
+        existingDevice.rssi = result.rssi;
+        _rssiConnectionStreams.add(existingDevice); // Notify UI of update
+      }
+
+      if (_lastScanResult.none((e) => e.deviceId == result.deviceId && e.services.contentEquals(result.services))) {
        _lastScanResult.add(result);
-        final scanResult = BaseDevice.fromScanResult(result);
+
+        if (false) {
+          debugPrint('Scan result: ${result.name} - ${result.deviceId}');
+        }
+
+        final scanResult = BluetoothDevice.fromScanResult(result);

        if (scanResult != null) {
-          _actionStreams.add(LogNotification('Found new device: ${scanResult.runtimeType}'));
-          _addDevices([scanResult]);
+          _actionStreams.add(
+            LogNotification('Found new device: ${kIsWeb ? scanResult.toString() : scanResult.runtimeType}'),
+          );
+          addDevices([scanResult]);
        } else {
          final manufacturerData = result.manufacturerDataList;
          final data = manufacturerData
              .firstOrNullWhere((e) => e.companyId == ZwiftConstants.ZWIFT_MANUFACTURER_ID)
              ?.payload;
-          _actionStreams.add(LogNotification('Found unknown device with identifier: ${data?.firstOrNull}'));
+          if (data != null && kDebugMode) {
+            _actionStreams.add(
+              LogNotification('Found unknown device ${result.name} with identifier: ${data.firstOrNull}'),
+            );
+          }
        }
      }
    };

-    UniversalBle.onValueChange = (deviceId, characteristicUuid, value) {
-      final device = devices.firstOrNullWhere((e) => e.device.deviceId == deviceId);
+    UniversalBle.onValueChange = (deviceId, characteristicUuid, value) async {
+      final device = bluetoothDevices.firstOrNullWhere((e) => e.device.deviceId == deviceId);
      if (device == null) {
        _actionStreams.add(LogNotification('Device not found: $deviceId'));
        UniversalBle.disconnect(deviceId);
        return;
      } else {
-        device.processCharacteristic(characteristicUuid, value);
+        if (kIsWeb) {
+          // on web, log all characteristic changes for debugging
+          _actionStreams.add(
+            LogNotification(
+              'Characteristic update for device ${device.toString()}, char: $characteristicUuid, value: ${bytesToReadableHex(value)}',
+            ),
+          );
+        }
+        try {
+          await device.processCharacteristic(characteristicUuid, value);
+        } catch (e, backtrace) {
+          _actionStreams.add(
+            LogNotification(
+              "Error processing characteristic for device ${device.toString()} and char: $characteristicUuid: $e\n$backtrace",
+            ),
+          );
+          if (kDebugMode) {
+            print(e);
+            print("backtrace: $backtrace");
+          }
+        }
      }
    };
+
+    UniversalBle.onConnectionChange = (String deviceId, bool isConnected, String? error) {
+      final device = bluetoothDevices.firstOrNullWhere((e) => e.device.deviceId == deviceId);
+      if (device != null && !isConnected) {
+        // allow reconnection
+        _lastScanResult.removeWhere((d) => d.deviceId == deviceId);
+      }
+    };
+
+    if (!kIsWeb && !screenshotMode) {
+      core.permissions.getScanRequirements().then((perms) {
+        if (perms.isEmpty) {
+          performScanning();
+        }
+      });
+      if (core.settings.getPhoneSteeringEnabled()) {
+        toggleGyroscopeSteering(true);
+      }
+    }
  }

  Future<void> performScanning() async {
@@ -78,57 +177,124 @@ class Connection {
    isScanning.value = true;
    _actionStreams.add(LogNotification('Scanning for devices...'));

+    if (screenshotMode) {
+      return;
+    }
+
    // does not work on web, may not work on Windows
    if (!kIsWeb && !Platform.isWindows) {
      UniversalBle.getSystemDevices(
-        withServices: BaseDevice.servicesToScan,
+        withServices: BluetoothDevice.servicesToScan,
      ).then((devices) async {
-        final baseDevices = devices.mapNotNull(BaseDevice.fromScanResult).toList();
+        final baseDevices = devices.mapNotNull(BluetoothDevice.fromScanResult).toList();
        if (baseDevices.isNotEmpty) {
-          _addDevices(baseDevices);
+          addDevices(baseDevices);
        }
      });
    }

    await UniversalBle.startScan(
-      scanFilter: ScanFilter(withServices: BaseDevice.servicesToScan),
-      platformConfig: PlatformConfig(web: WebOptions(optionalServices: BaseDevice.servicesToScan)),
+      // allow all to enable Wahoo Kickr Bike Shift detection
+      //scanFilter: kIsWeb ? ScanFilter(withServices: BluetoothDevice.servicesToScan) : null,
+      platformConfig: PlatformConfig(web: WebOptions(optionalServices: BluetoothDevice.servicesToScan)),
    );
+
+    if (!kIsWeb) {
+      _gamePadSearchTimer = Timer.periodic(Duration(seconds: 3), (_) {
+        Gamepads.list().then((list) {
+          final pads = list.map((pad) => GamepadDevice(pad.name.isEmpty ? 'Gamepad' : pad.name, id: pad.id)).toList();
+          addDevices(pads);
+
+          final removedDevices = gamepadDevices.where((device) => list.none((pad) => pad.id == device.id)).toList();
+          for (var device in removedDevices) {
+            devices.remove(device);
+            _streamSubscriptions[device]?.cancel();
+            _streamSubscriptions.remove(device);
+            _connectionSubscriptions[device]?.cancel();
+            _connectionSubscriptions.remove(device);
+            signalChange(device);
+          }
+        });
+      });
+    } else {
+      isScanning.value = false;
+    }
  }

-  void _addDevices(List<BaseDevice> dev) {
-    final newDevices = dev.where((device) => !devices.contains(device)).toList();
-    devices.addAll(newDevices);
+  Future<void> startMyWhooshServer() {
+    return core.whooshLink.startServer().catchError((e) {
+      core.settings.setMyWhooshLinkEnabled(false);
+      _actionStreams.add(LogNotification('Error starting MyWhoosh "Link" server: $e'));
+      _actionStreams.add(
+        AlertNotification(
+          LogLevel.LOGLEVEL_ERROR,
+          'Error starting MyWhoosh "Link" server. Please make sure the "MyWhoosh Link" app is not already running on this device.',
+        ),
+      );
+    });
+  }

+  void addDevices(List<BaseDevice> dev) {
+    final ignoredDevices = core.settings.getIgnoredDevices();
+    final ignoredDeviceIds = ignoredDevices.map((d) => d.id).toSet();
+    final newDevices = dev.where((device) {
+      if (devices.contains(device)) return false;
+
+      // Check if device is in the ignored list
+      if (device is BluetoothDevice) {
+        if (ignoredDeviceIds.contains(device.device.deviceId)) {
+          return false;
+        }
+      }
+
+      return true;
+    }).toList();
+    devices.addAll(newDevices);
    _connectionQueue.addAll(newDevices);
+
    _handleConnectionQueue();

    hasDevices.value = devices.isNotEmpty;
-    if (devices.isNotEmpty && !_androidNotificationsSetup && !kIsWeb && Platform.isAndroid) {
-      _androidNotificationsSetup = true;
-      NotificationRequirement.setup().catchError((e) {
-        _actionStreams.add(LogNotification(e.toString()));
-      });
+  }
+
+  void toggleGyroscopeSteering(bool enable) {
+    final existing = gyroscopeDevices.firstOrNull;
+    if (existing != null && !enable) {
+      // Remove gyroscope steering
+      disconnect(existing, forget: true, persistForget: false);
+    } else if (enable) {
+      // Add gyroscope steering
+      final gyroDevice = GyroscopeSteering();
+      addDevices([gyroDevice]);
    }
  }

  void _handleConnectionQueue() {
    // windows apparently has issues when connecting to multiple devices at once, so don't
-    if (_connectionQueue.isNotEmpty && !_handlingConnectionQueue) {
+    if (_connectionQueue.isNotEmpty && !_handlingConnectionQueue && !screenshotMode) {
      _handlingConnectionQueue = true;
      final device = _connectionQueue.removeAt(0);
-      _actionStreams.add(LogNotification('Connecting to: ${device.device.name ?? device.runtimeType}'));
+      _actionStreams.add(AlertNotification(LogLevel.LOGLEVEL_INFO, 'Connecting to: ${device.toString()}'));
      _connect(device)
          .then((_) {
            _handlingConnectionQueue = false;
-            _actionStreams.add(LogNotification('Connection finished: ${device.device.name ?? device.runtimeType}'));
+            _actionStreams.add(AlertNotification(LogLevel.LOGLEVEL_INFO, 'Connection finished: ${device.toString()}'));
            if (_connectionQueue.isNotEmpty) {
              _handleConnectionQueue();
            }
          })
          .catchError((e) {
+            device.isConnected = false;
            _handlingConnectionQueue = false;
-            _actionStreams.add(LogNotification('Connection failed: ${device.device.name ?? device.runtimeType} - $e'));
+            if (e is TimeoutException) {
+              _actionStreams.add(
+                AlertNotification(LogLevel.LOGLEVEL_WARNING, 'Unable to connect to ${device.toString()}: Timeout'),
+              );
+            } else {
+              _actionStreams.add(
+                AlertNotification(LogLevel.LOGLEVEL_ERROR, 'Connection failed: ${device.toString()} - $e'),
+              );
+            }
            if (_connectionQueue.isNotEmpty) {
              _handleConnectionQueue();
            }
@@ -136,30 +302,49 @@ class Connection {
    }
  }

-  Future<void> _connect(BaseDevice bleDevice) async {
+  Future<void> _connect(BaseDevice device) async {
    try {
-      final actionSubscription = bleDevice.actionStream.listen((data) {
+      final actionSubscription = device.actionStream.listen((data) {
        _actionStreams.add(data);
      });
-      final connectionStateSubscription = UniversalBle.connectionStream(bleDevice.device.deviceId).listen((state) {
-        bleDevice.isConnected = state;
-        _connectionStreams.add(bleDevice);
-        if (!bleDevice.isConnected) {
-          devices.remove(bleDevice);
-          _streamSubscriptions[bleDevice]?.cancel();
-          _streamSubscriptions.remove(bleDevice);
-          _connectionSubscriptions[bleDevice]?.cancel();
-          _connectionSubscriptions.remove(bleDevice);
-          _lastScanResult.clear();
-          // try reconnect
-          performScanning();
-        }
-      });
-      _connectionSubscriptions[bleDevice] = connectionStateSubscription;
+      if (device is BluetoothDevice) {
+        final connectionStateSubscription = device.device.connectionStream.listen((state) {
+          device.isConnected = state;
+          _connectionStreams.add(device);
+          core.flutterLocalNotificationsPlugin.show(
+            1338,
+            '${device.toString()} ${state ? AppLocalizations.current.connected.decapitalize() : AppLocalizations.current.disconnected.decapitalize()}',
+            !state ? AppLocalizations.current.tryingToConnectAgain : null,
+            NotificationDetails(
+              android: AndroidNotificationDetails('Connection', 'Connection Status'),
+              iOS: DarwinNotificationDetails(presentAlert: true, presentSound: false),
+            ),
+          );
+          if (!device.isConnected) {
+            disconnect(device, forget: false, persistForget: false);
+            // try reconnect
+            performScanning();
+          }
+        });
+        _connectionSubscriptions[device] = connectionStateSubscription;
+      }

-      await bleDevice.connect();
+      await device.connect();
+      signalChange(device);

-      _streamSubscriptions[bleDevice] = actionSubscription;
+      IAPManager.instance.setAttributes();
+
+      core.actionHandler.supportedApp?.keymap.addNewButtons(device.availableButtons);
+
+      _streamSubscriptions[device] = actionSubscription;
+
+      if (devices.isNotEmpty && !_androidNotificationsSetup && !kIsWeb && Platform.isAndroid) {
+        _androidNotificationsSetup = true;
+        // start foreground service only when app is in foreground
+        NotificationRequirement.addPersistentNotification().catchError((e) {
+          _actionStreams.add(LogNotification(e.toString()));
+        });
+      }
    } catch (e, backtrace) {
      _actionStreams.add(LogNotification("$e\n$backtrace"));
      if (kDebugMode) {
@@ -170,27 +355,6 @@ class Connection {
    }
  }

-  void reset() {
-    _actionStreams.add(LogNotification('Disconnecting all devices'));
-    if (actionHandler is AndroidActions) {
-      AndroidFlutterLocalNotificationsPlugin().stopForegroundService();
-      _androidNotificationsSetup = false;
-    }
-    UniversalBle.stopScan();
-    isScanning.value = false;
-    for (var device in devices) {
-      _streamSubscriptions[device]?.cancel();
-      _streamSubscriptions.remove(device);
-      _connectionSubscriptions[device]?.cancel();
-      _connectionSubscriptions.remove(device);
-      UniversalBle.disconnect(device.device.deviceId);
-      signalChange(device);
-    }
-    _lastScanResult.clear();
-    hasDevices.value = false;
-    devices.clear();
-  }
-
  void signalNotification(BaseNotification notification) {
    _actionStreams.add(notification);
  }
@@ -198,4 +362,69 @@ class Connection {
  void signalChange(BaseDevice baseDevice) {
    _connectionStreams.add(baseDevice);
  }
+
+  Future<void> disconnect(BaseDevice device, {required bool persistForget, required bool forget}) async {
+    if (device.isConnected) {
+      await device.disconnect();
+    }
+
+    if (device is BluetoothDevice) {
+      if (persistForget) {
+        // Add device to ignored list when forgetting
+        await core.settings.addIgnoredDevice(device.device.deviceId, device.toString());
+        _actionStreams.add(LogNotification('Device ignored: ${device.toString()}'));
+      }
+      if (!forget) {
+        // allow reconnection
+        _lastScanResult.removeWhere((d) => d.deviceId == device.device.deviceId);
+      }
+
+      // Clean up subscriptions and scan results for reconnection
+      _streamSubscriptions[device]?.cancel();
+      _streamSubscriptions.remove(device);
+      _connectionSubscriptions[device]?.cancel();
+      _connectionSubscriptions.remove(device);
+
+      // Remove device from the list
+      devices.remove(device);
+      hasDevices.value = devices.isNotEmpty;
+    } else if (device is GyroscopeSteering) {
+      // Clean up subscriptions
+      _streamSubscriptions[device]?.cancel();
+      _streamSubscriptions.remove(device);
+      _connectionSubscriptions[device]?.cancel();
+      _connectionSubscriptions.remove(device);
+
+      // Remove device from the list
+      devices.remove(device);
+      hasDevices.value = devices.isNotEmpty;
+    }
+
+    signalChange(device);
+  }
+
+  Future<void> disconnectAll() async {
+    _actionStreams.add(LogNotification('Disconnecting all devices'));
+    for (var device in bluetoothDevices) {
+      _streamSubscriptions[device]?.cancel();
+      _streamSubscriptions.remove(device);
+      _connectionSubscriptions[device]?.cancel();
+      _connectionSubscriptions.remove(device);
+      device.disconnect();
+      signalChange(device);
+      devices.remove(device);
+    }
+    _gamePadSearchTimer?.cancel();
+    _lastScanResult.clear();
+    hasDevices.value = false;
+  }
+
+  Future<void> stop() async {
+    final isBtEnabled = (await UniversalBle.getBluetoothAvailabilityState()) == AvailabilityState.poweredOn;
+    if (isBtEnabled) {
+      UniversalBle.stopScan();
+    }
+    isScanning.value = false;
+    _androidNotificationsSetup = false;
+  }
 }
--- a/lib/bluetooth/devices/base_device.dart
+++ b/lib/bluetooth/devices/base_device.dart
@@ -1,159 +1,99 @@
 import 'dart:async';

+import 'package:bike_control/bluetooth/devices/zwift/constants.dart';
+import 'package:bike_control/gen/l10n.dart';
+import 'package:bike_control/main.dart';
+import 'package:bike_control/utils/actions/desktop.dart';
+import 'package:bike_control/utils/core.dart';
+import 'package:bike_control/utils/iap/iap_manager.dart';
+import 'package:bike_control/utils/keymap/apps/custom_app.dart';
+import 'package:bike_control/utils/keymap/manager.dart';
 import 'package:dartx/dartx.dart';
-import 'package:flutter/foundation.dart';
-import 'package:swift_control/bluetooth/devices/wahoo/wahoo_kickr_bike_shift.dart';
-import 'package:swift_control/bluetooth/devices/zwift/constants.dart';
-import 'package:swift_control/bluetooth/devices/zwift/zwift_click.dart';
-import 'package:swift_control/bluetooth/devices/zwift/zwift_clickv2.dart';
-import 'package:swift_control/bluetooth/devices/zwift/zwift_play.dart';
-import 'package:swift_control/bluetooth/devices/zwift/zwift_ride.dart';
-import 'package:swift_control/main.dart';
-import 'package:swift_control/utils/actions/desktop.dart';
-import 'package:universal_ble/universal_ble.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';
-import 'elite/elite_square.dart';
-import 'elite/elite_sterzo.dart';

 abstract class BaseDevice {
-  final BleDevice scanResult;
+  final String? _name;
  final bool isBeta;
+  final String uniqueId;
  final List<ControllerButton> availableButtons;

-  BaseDevice(this.scanResult, {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) {
+      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);
+    }
+  }

  bool isConnected = false;
-  int? batteryLevel;
-  String? firmwareVersion;

  Timer? _longPressTimer;
  Set<ControllerButton> _previouslyPressedButtons = <ControllerButton>{};

-  static List<String> servicesToScan = [
-    ZwiftConstants.ZWIFT_CUSTOM_SERVICE_UUID,
-    ZwiftConstants.ZWIFT_RIDE_CUSTOM_SERVICE_UUID,
-    SquareConstants.SERVICE_UUID,
-    WahooKickrBikeShiftConstants.SERVICE_UUID,
-    SterzoConstants.SERVICE_UUID,
-  ];
-
-  static BaseDevice? fromScanResult(BleDevice scanResult) {
-    // Use the name first as the "System Devices" and Web (android sometimes Windows) don't have manufacturer data
-    BaseDevice? device;
-    if (kIsWeb) {
-      device = switch (scanResult.name) {
-        'Zwift Ride' => ZwiftRide(scanResult),
-        'Zwift Play' => ZwiftPlay(scanResult),
-        'Zwift Click' => ZwiftClickV2(scanResult),
-        'SQUARE' => EliteSquare(scanResult),
-        _ => null,
-      };
-
-      if (scanResult.name != null && scanResult.name!.toUpperCase().startsWith('KICKR BIKE SHIFT')) {
-        device = WahooKickrBikeShift(scanResult);
-      }
-      
-      if (scanResult.name != null && scanResult.name!.toUpperCase().startsWith('STERZO')) {
-        device = EliteSterzo(scanResult);
-      }
-    } else {
-      device = switch (scanResult.name) {
-        //'Zwift Ride' => ZwiftRide(scanResult), special case for Zwift Ride: we must only connect to the left controller
-        // https://www.makinolo.com/blog/2024/07/26/zwift-ride-protocol/
-        'Zwift Play' => ZwiftPlay(scanResult),
-        //'Zwift Click' => ZwiftClick(scanResult), special case for Zwift Click v2: we must only connect to the left controller
-        _ => null,
-      };
-      
-      if (scanResult.name != null && scanResult.name!.toUpperCase().startsWith('STERZO')) {
-        device = EliteSterzo(scanResult);
-      }
-    }
-
-    if (device != null) {
-      return device;
-    } else if (scanResult.services.containsAny([
-      ZwiftConstants.ZWIFT_CUSTOM_SERVICE_UUID,
-      ZwiftConstants.ZWIFT_RIDE_CUSTOM_SERVICE_UUID,
-    ])) {
-      // otherwise use the manufacturer data to identify the device
-      final manufacturerData = scanResult.manufacturerDataList;
-      final data = manufacturerData
-          .firstOrNullWhere((e) => e.companyId == ZwiftConstants.ZWIFT_MANUFACTURER_ID)
-          ?.payload;
-
-      if (data == null || data.isEmpty) {
-        return null;
-      }
-
-      final type = ZwiftDeviceType.fromManufacturerData(data.first);
-      return switch (type) {
-        ZwiftDeviceType.click => ZwiftClick(scanResult),
-        ZwiftDeviceType.playRight => ZwiftPlay(scanResult),
-        ZwiftDeviceType.playLeft => ZwiftPlay(scanResult),
-        ZwiftDeviceType.rideLeft => ZwiftRide(scanResult),
-        //DeviceType.rideRight => ZwiftRide(scanResult), // see comment above
-        ZwiftDeviceType.clickV2Left => ZwiftClickV2(scanResult),
-        //DeviceType.clickV2Right => ZwiftClickV2(scanResult), // see comment above
-        _ => null,
-      };
-    } else if (scanResult.services.contains(SquareConstants.SERVICE_UUID)) {
-      return EliteSquare(scanResult);
-    } else if (scanResult.services.contains(SterzoConstants.SERVICE_UUID)) {
-      return EliteSterzo(scanResult);
-    } else if (scanResult.services.contains(WahooKickrBikeShiftConstants.SERVICE_UUID)) {
-      if (scanResult.name != null && !scanResult.name!.toUpperCase().contains('KICKR BIKE SHIFT')) {
-        return WahooKickrBikeShift(scanResult);
-      } else if (kIsWeb && scanResult.name == null) {
-        // some devices don't broadcast the name, so we must rely on the service UUID
-        return WahooKickrBikeShift(scanResult);
-      } else {
-        return null;
-      }
-    } else {
-      return null;
-    }
-  }
+  String get name => _name ?? runtimeType.toString();

  @override
  bool operator ==(Object other) =>
      identical(this, other) ||
-      other is BaseDevice && runtimeType == other.runtimeType && scanResult == other.scanResult;
+      other is BaseDevice && runtimeType == other.runtimeType && toString() == other.toString();

  @override
-  int get hashCode => scanResult.hashCode;
+  int get hashCode => name.hashCode;

  @override
-  String toString() {
-    return runtimeType.toString();
-  }
+  String toString() => name;

-  BleDevice get device => scanResult;
  final StreamController<BaseNotification> actionStreamInternal = StreamController<BaseNotification>.broadcast();

  Stream<BaseNotification> get actionStream => actionStreamInternal.stream;

-  Future<void> connect() async {
-    actionStream.listen((message) {
-      print("Received message: $message");
-    });
+  Future<void> connect();

-    await UniversalBle.connect(device.deviceId);
-
-    if (!kIsWeb) {
-      await UniversalBle.requestMtu(device.deviceId, 517);
+  Future<void> handleButtonsClickedWithoutLongPressSupport(List<ControllerButton> clickedButtons) async {
+    await handleButtonsClicked(clickedButtons, longPress: true);
+    if (clickedButtons.length == 1) {
+      final keyPair = core.actionHandler.supportedApp?.keymap.getKeyPair(clickedButtons.single);
+      if (keyPair != null && (keyPair.isLongPress || keyPair.inGameAction?.isLongPress == true)) {
+        // simulate release after click
+        _longPressTimer?.cancel();
+        await Future.delayed(const Duration(milliseconds: 800));
+        await handleButtonsClicked([], longPress: true);
+      } else {
+        await handleButtonsClicked([], longPress: true);
+      }
+    } else {
+      await handleButtonsClicked([]);
    }
-
-    final services = await UniversalBle.discoverServices(device.deviceId);
-    await handleServices(services);
  }

-  Future<void> handleServices(List<BleService> services);
-  Future<void> processCharacteristic(String characteristic, Uint8List bytes);
+  Future<void> handleButtonsClicked(List<ControllerButton>? buttonsClicked, {bool longPress = false}) async {
+    try {
+      await _handleButtonsClickedInternal(buttonsClicked, longPress: longPress);
+    } catch (e, st) {
+      actionStreamInternal.add(
+        LogNotification('Error handling button clicks: $e\n$st'),
+      );
+    }
+  }

-  Future<void> handleButtonsClicked(List<ControllerButton>? buttonsClicked) async {
+  Future<void> _handleButtonsClickedInternal(List<ControllerButton>? buttonsClicked, {required bool longPress}) async {
    if (buttonsClicked == null) {
      // ignore, no changes
    } else if (buttonsClicked.isEmpty) {
@@ -163,8 +103,9 @@ abstract class BaseDevice {
      // Handle release events for long press keys
      final buttonsReleased = _previouslyPressedButtons.toList();
      final isLongPress =
+          longPress ||
          buttonsReleased.singleOrNull != null &&
-          actionHandler.supportedApp?.keymap.getKeyPair(buttonsReleased.single)?.isLongPress == true;
+              core.actionHandler.supportedApp?.keymap.getKeyPair(buttonsReleased.single)?.isLongPress == true;
      if (buttonsReleased.isNotEmpty && isLongPress) {
        await performRelease(buttonsReleased);
      }
@@ -175,19 +116,21 @@ abstract class BaseDevice {
      // Handle release events for buttons that are no longer pressed
      final buttonsReleased = _previouslyPressedButtons.difference(buttonsClicked.toSet()).toList();
      final wasLongPress =
+          longPress ||
          buttonsReleased.singleOrNull != null &&
-          actionHandler.supportedApp?.keymap.getKeyPair(buttonsReleased.single)?.isLongPress == true;
+              core.actionHandler.supportedApp?.keymap.getKeyPair(buttonsReleased.single)?.isLongPress == true;
      if (buttonsReleased.isNotEmpty && wasLongPress) {
        await performRelease(buttonsReleased);
      }

      final isLongPress =
+          longPress ||
          buttonsClicked.singleOrNull != null &&
-          actionHandler.supportedApp?.keymap.getKeyPair(buttonsClicked.single)?.isLongPress == true;
+              core.actionHandler.supportedApp?.keymap.getKeyPair(buttonsClicked.single)?.isLongPress == true;

      if (!isLongPress &&
-          !(buttonsClicked.singleOrNull == ControllerButton.onOffLeft ||
-              buttonsClicked.singleOrNull == ControllerButton.onOffRight)) {
+          !(buttonsClicked.singleOrNull == ZwiftButtons.onOffLeft ||
+              buttonsClicked.singleOrNull == ZwiftButtons.onOffRight)) {
        // we don't want to trigger the long press timer for the on/off buttons, also not when it's a long press key
        _longPressTimer?.cancel();
        _longPressTimer = Timer.periodic(const Duration(milliseconds: 350), (timer) async {
@@ -205,39 +148,117 @@ abstract class BaseDevice {
    }
  }

+  String _getCommandLimitMessage() {
+    return AppLocalizations.current.dailyCommandLimitReachedNotification;
+  }
+
+  String _getCommandLimitTitle() {
+    return AppLocalizations.current
+        .dailyLimitReached(IAPManager.dailyCommandLimit, IAPManager.dailyCommandLimit)
+        .replaceAll(
+          '${IAPManager.dailyCommandLimit}/${IAPManager.dailyCommandLimit}',
+          IAPManager.dailyCommandLimit.toString(),
+        )
+        .replaceAll(
+          '${IAPManager.dailyCommandLimit} / ${IAPManager.dailyCommandLimit}',
+          IAPManager.dailyCommandLimit.toString(),
+        );
+  }
+
  Future<void> performDown(List<ControllerButton> buttonsClicked) async {
    for (final action in buttonsClicked) {
+      // Check IAP status before executing command
+      if (!IAPManager.instance.canExecuteCommand) {
+        //actionStreamInternal.add(AlertNotification(LogLevel.LOGLEVEL_ERROR, _getCommandLimitMessage()));
+        continue;
+      }
+
      // For repeated actions, don't trigger key down/up events (useful for long press)
-      actionStreamInternal.add(
-        LogNotification(await actionHandler.performAction(action, isKeyDown: true, isKeyUp: false)),
-      );
+      final result = await core.actionHandler.performAction(action, isKeyDown: true, isKeyUp: false);
+
+      actionStreamInternal.add(ActionNotification(result));
    }
  }

  Future<void> performClick(List<ControllerButton> buttonsClicked) async {
    for (final action in buttonsClicked) {
-      actionStreamInternal.add(
-        LogNotification(await actionHandler.performAction(action, isKeyDown: true, isKeyUp: true)),
-      );
+      // Check IAP status before executing command
+      if (!IAPManager.instance.canExecuteCommand) {
+        _showCommandLimitAlert();
+        continue;
+      }
+
+      final result = await core.actionHandler.performAction(action, isKeyDown: true, isKeyUp: true);
+      actionStreamInternal.add(ActionNotification(result));
    }
  }

  Future<void> performRelease(List<ControllerButton> buttonsReleased) async {
    for (final action in buttonsReleased) {
-      actionStreamInternal.add(
-        LogNotification(await actionHandler.performAction(action, isKeyDown: false, isKeyUp: true)),
-      );
+      // Check IAP status before executing command
+      if (!IAPManager.instance.canExecuteCommand) {
+        _showCommandLimitAlert();
+        continue;
+      }
+
+      final result = await core.actionHandler.performAction(action, isKeyDown: false, isKeyUp: true);
+      actionStreamInternal.add(LogNotification(result.message));
    }
  }

  Future<void> disconnect() async {
    _longPressTimer?.cancel();
    // Release any held keys in long press mode
-    if (actionHandler is DesktopActions) {
-      await (actionHandler as DesktopActions).releaseAllHeldKeys(_previouslyPressedButtons.toList());
+    if (core.actionHandler is DesktopActions) {
+      await (core.actionHandler as DesktopActions).releaseAllHeldKeys(_previouslyPressedButtons.toList());
    }
    _previouslyPressedButtons.clear();
-    await UniversalBle.disconnect(device.deviceId);
    isConnected = false;
  }
+
+  Widget showInformation(BuildContext context);
+
+  ControllerButton getOrAddButton(String key, ControllerButton Function() creator) {
+    if (core.actionHandler.supportedApp == null) {
+      return creator();
+    }
+    if (core.actionHandler.supportedApp is! CustomApp) {
+      final currentProfile = core.actionHandler.supportedApp!.name;
+      // should we display this to the user?
+      KeymapManager().duplicateSync(currentProfile, '$currentProfile (Copy)');
+    }
+    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);
+      core.settings.setKeyMap(core.actionHandler.supportedApp!);
+    }
+    return button;
+  }
+
+  void _showCommandLimitAlert() {
+    actionStreamInternal.add(
+      AlertNotification(
+        LogLevel.LOGLEVEL_ERROR,
+        _getCommandLimitMessage(),
+        buttonTitle: AppLocalizations.current.purchase,
+        onTap: () {
+          IAPManager.instance.purchaseFullVersion(navigatorKey.currentContext!);
+        },
+      ),
+    );
+    core.flutterLocalNotificationsPlugin.show(
+      1337,
+      _getCommandLimitTitle(),
+      _getCommandLimitMessage(),
+      NotificationDetails(
+        android: AndroidNotificationDetails('Limit', 'Limit reached'),
+        iOS: DarwinNotificationDetails(presentAlert: true),
+      ),
+    );
+  }
 }
--- a/lib/bluetooth/devices/bluetooth_device.dart
+++ b/lib/bluetooth/devices/bluetooth_device.dart
@@ -0,0 +1,385 @@
+import 'dart:async';
+
+import 'package:bike_control/bluetooth/ble.dart';
+import 'package:bike_control/bluetooth/devices/base_device.dart';
+import 'package:bike_control/bluetooth/devices/openbikecontrol/openbikecontrol_device.dart';
+import 'package:bike_control/bluetooth/devices/shimano/shimano_di2.dart';
+import 'package:bike_control/bluetooth/devices/sram/sram_axs.dart';
+import 'package:bike_control/bluetooth/devices/wahoo/wahoo_kickr_bike_pro.dart';
+import 'package:bike_control/bluetooth/devices/wahoo/wahoo_kickr_bike_shift.dart';
+import 'package:bike_control/bluetooth/devices/wahoo/wahoo_kickr_headwind.dart';
+import 'package:bike_control/bluetooth/devices/zwift/constants.dart';
+import 'package:bike_control/bluetooth/devices/zwift/zwift_click.dart';
+import 'package:bike_control/bluetooth/devices/zwift/zwift_clickv2.dart';
+import 'package:bike_control/bluetooth/devices/zwift/zwift_device.dart';
+import 'package:bike_control/bluetooth/devices/zwift/zwift_play.dart';
+import 'package:bike_control/bluetooth/devices/zwift/zwift_ride.dart';
+import 'package:bike_control/main.dart';
+import 'package:bike_control/pages/device.dart';
+import 'package:bike_control/utils/core.dart';
+import 'package:bike_control/utils/i18n_extension.dart';
+import 'package:bike_control/utils/keymap/buttons.dart';
+import 'package:bike_control/widgets/ui/beta_pill.dart';
+import 'package:bike_control/widgets/ui/device_info.dart';
+import 'package:bike_control/widgets/ui/loading_widget.dart';
+import 'package:bike_control/widgets/ui/small_progress_indicator.dart';
+import 'package:bike_control/widgets/ui/toast.dart';
+import 'package:dartx/dartx.dart';
+import 'package:flutter/foundation.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:universal_ble/universal_ble.dart';
+
+import 'cycplus/cycplus_bc2.dart';
+import 'elite/elite_square.dart';
+import 'elite/elite_sterzo.dart';
+import 'thinkrider/thinkrider_vs200.dart';
+
+abstract class BluetoothDevice extends BaseDevice {
+  final BleDevice scanResult;
+
+  BluetoothDevice(
+    this.scanResult, {
+    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;
+  }
+
+  int? batteryLevel;
+  String? firmwareVersion;
+  int? rssi;
+
+  static List<String> servicesToScan = [
+    ZwiftConstants.ZWIFT_CUSTOM_SERVICE_UUID,
+    ZwiftConstants.ZWIFT_RIDE_CUSTOM_SERVICE_UUID,
+    SquareConstants.SERVICE_UUID,
+    WahooKickrBikeShiftConstants.SERVICE_UUID,
+    WahooKickrHeadwindConstants.SERVICE_UUID,
+    SterzoConstants.SERVICE_UUID,
+    CycplusBc2Constants.SERVICE_UUID,
+    ShimanoDi2Constants.SERVICE_UUID,
+    ShimanoDi2Constants.SERVICE_UUID_ALTERNATIVE,
+    OpenBikeControlConstants.SERVICE_UUID,
+    ThinkRiderVs200Constants.SERVICE_UUID,
+  ];
+
+  static final List<String> _ignoredNames = ['ASSIOMA', 'QUARQ', 'POWERCRANK'];
+
+  static BluetoothDevice? fromScanResult(BleDevice scanResult) {
+    // skip devices with ignored names
+    if (scanResult.name != null &&
+        _ignoredNames.any((ignoredName) => scanResult.name!.toUpperCase().startsWith(ignoredName))) {
+      return null;
+    }
+
+    // Use the name first as the "System Devices" and Web (android sometimes Windows) don't have manufacturer data
+    BluetoothDevice? device;
+    if (kIsWeb) {
+      device = switch (scanResult.name) {
+        'Zwift Ride' => ZwiftRide(scanResult),
+        'Zwift Play' => ZwiftPlay(scanResult, deviceType: ZwiftDeviceType.playLeft),
+        'Zwift Click' => ZwiftClickV2(scanResult),
+        'SQUARE' => EliteSquare(scanResult),
+        'OpenBike' => OpenBikeControlDevice(scanResult),
+        null => null,
+        _ when scanResult.name!.toUpperCase().startsWith('HEADWIND') => WahooKickrHeadwind(scanResult),
+        _ when scanResult.name!.toUpperCase().startsWith('STERZO') => EliteSterzo(scanResult),
+        _ when scanResult.name!.toUpperCase().startsWith('KICKR BIKE SHIFT') => WahooKickrBikeShift(scanResult),
+        _ when scanResult.name!.toUpperCase().startsWith('KICKR BIKE PRO') => WahooKickrBikePro(scanResult),
+        _ when scanResult.name!.toUpperCase().startsWith('CYCPLUS') && scanResult.name!.toUpperCase().contains('BC2') =>
+          CycplusBc2(scanResult),
+        _ when scanResult.name!.toUpperCase().startsWith('THINK VS') => ThinkRiderVs200(scanResult),
+        _ when scanResult.name!.toUpperCase().startsWith('RDR') => ShimanoDi2(scanResult),
+        _ when scanResult.name!.toUpperCase().startsWith('SRAM') => SramAxs(scanResult),
+        _ => null,
+      };
+    } else {
+      device = switch (scanResult.name) {
+        null => null,
+        //'Zwift Ride' => ZwiftRide(scanResult), special case for Zwift Ride: we must only connect to the left controller
+        // https://www.makinolo.com/blog/2024/07/26/zwift-ride-protocol/
+        //'Zwift Play' => ZwiftPlay(scanResult),
+        //'Zwift Click' => ZwiftClick(scanResult), special case for Zwift Click v2: we must only connect to the left controller
+        _ when scanResult.name!.toUpperCase().startsWith('HEADWIND') => WahooKickrHeadwind(scanResult),
+        _ when scanResult.name!.toUpperCase().startsWith('SQUARE') => EliteSquare(scanResult),
+        _ when scanResult.name!.toUpperCase().startsWith('STERZO') => EliteSterzo(scanResult),
+        _ when scanResult.name!.toUpperCase().contains('KICKR BIKE SHIFT') => WahooKickrBikeShift(scanResult),
+        _ when scanResult.name!.toUpperCase().startsWith('KICKR BIKE PRO') => WahooKickrBikePro(scanResult),
+        _ when scanResult.name!.toUpperCase().startsWith('CYCPLUS') && scanResult.name!.toUpperCase().contains('BC2') =>
+          CycplusBc2(scanResult),
+        _ when scanResult.name!.toUpperCase().startsWith('THINK VS') => ThinkRiderVs200(scanResult),
+        //_ when scanResult.services.contains(CycplusBc2Constants.SERVICE_UUID.toLowerCase()) => CycplusBc2(scanResult),
+        _ when scanResult.services.contains(ShimanoDi2Constants.SERVICE_UUID.toLowerCase()) => ShimanoDi2(scanResult),
+        _ when scanResult.services.contains(ShimanoDi2Constants.SERVICE_UUID_ALTERNATIVE.toLowerCase()) => ShimanoDi2(
+          scanResult,
+        ),
+        _ when scanResult.services.contains(SramAxsConstants.SERVICE_UUID.toLowerCase()) => SramAxs(
+          scanResult,
+        ),
+        _ when scanResult.services.contains(OpenBikeControlConstants.SERVICE_UUID.toLowerCase()) =>
+          OpenBikeControlDevice(scanResult),
+        _ when scanResult.services.contains(WahooKickrHeadwindConstants.SERVICE_UUID.toLowerCase()) =>
+          WahooKickrHeadwind(scanResult),
+        // otherwise the service UUIDs will be used
+        _ => null,
+      };
+    }
+
+    if (device != null) {
+      return device;
+    } else if (scanResult.services.containsAny([
+      ZwiftConstants.ZWIFT_CUSTOM_SERVICE_UUID.toLowerCase(),
+      ZwiftConstants.ZWIFT_RIDE_CUSTOM_SERVICE_UUID.toLowerCase(),
+    ])) {
+      // otherwise use the manufacturer data to identify the device
+      final manufacturerData = scanResult.manufacturerDataList;
+      final data = manufacturerData
+          .firstOrNullWhere((e) => e.companyId == ZwiftConstants.ZWIFT_MANUFACTURER_ID)
+          ?.payload;
+
+      if (data == null || data.isEmpty) {
+      } else {
+        final type = ZwiftDeviceType.fromManufacturerData(data.first);
+        device = switch (type) {
+          ZwiftDeviceType.click => ZwiftClick(scanResult),
+          ZwiftDeviceType.playRight => ZwiftPlay(scanResult, deviceType: type!),
+          ZwiftDeviceType.playLeft => ZwiftPlay(scanResult, deviceType: type!),
+          ZwiftDeviceType.rideLeft => ZwiftRide(scanResult),
+          //DeviceType.rideRight => ZwiftRide(scanResult), // see comment above
+          ZwiftDeviceType.clickV2Left => ZwiftClickV2(scanResult),
+          //DeviceType.clickV2Right => ZwiftClickV2(scanResult), // see comment above
+          _ => null,
+        };
+      }
+    }
+
+    if (scanResult.name == 'Zwift Ride' &&
+        device == null &&
+        core.connection.controllerDevices.none((d) => d is ZwiftRide)) {
+      // Fallback for Zwift Ride if nothing else matched => old firmware
+      if (navigatorKey.currentContext?.mounted ?? false) {
+        buildToast(
+          navigatorKey.currentContext!,
+          title: 'You may need to update your Zwift Ride firmware.',
+          duration: Duration(seconds: 6),
+        );
+      }
+    }
+    return device;
+  }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is BluetoothDevice && runtimeType == other.runtimeType && scanResult.deviceId == other.scanResult.deviceId;
+
+  @override
+  int get hashCode => scanResult.deviceId.hashCode;
+
+  BleDevice get device => scanResult;
+
+  @override
+  Future<void> connect() async {
+    try {
+      await UniversalBle.connect(device.deviceId);
+    } catch (e) {
+      isConnected = false;
+      rethrow;
+    }
+
+    if (!kIsWeb) {
+      await UniversalBle.requestMtu(device.deviceId, 517);
+    }
+
+    final services = await UniversalBle.discoverServices(device.deviceId);
+    final deviceInformationService = services.firstOrNullWhere(
+      (service) => service.uuid == BleUuid.DEVICE_INFORMATION_SERVICE_UUID.toLowerCase(),
+    );
+    final firmwareCharacteristic = deviceInformationService?.characteristics.firstOrNullWhere(
+      (c) => c.uuid == BleUuid.DEVICE_INFORMATION_CHARACTERISTIC_FIRMWARE_REVISION.toLowerCase(),
+    );
+    if (firmwareCharacteristic != null) {
+      final firmwareData = await UniversalBle.read(
+        device.deviceId,
+        deviceInformationService!.uuid,
+        firmwareCharacteristic.uuid,
+      );
+      firmwareVersion = String.fromCharCodes(firmwareData);
+
+      core.connection.signalChange(this);
+    }
+
+    final batteryService = services.firstOrNullWhere(
+      (service) => service.uuid == BleUuid.DEVICE_BATTERY_SERVICE_UUID.toLowerCase(),
+    );
+
+    final batteryCharacteristic = batteryService?.characteristics.firstOrNullWhere(
+      (c) => c.uuid == BleUuid.DEVICE_INFORMATION_CHARACTERISTIC_BATTERY_LEVEL.toLowerCase(),
+    );
+    if (batteryCharacteristic != null) {
+      final batteryData = await UniversalBle.read(
+        device.deviceId,
+        batteryService!.uuid,
+        batteryCharacteristic.uuid,
+      );
+      if (batteryData.isNotEmpty) {
+        batteryLevel = batteryData.first;
+        core.connection.signalChange(this);
+      }
+    }
+
+    await handleServices(services);
+  }
+
+  Future<void> handleServices(List<BleService> services);
+  Future<void> processCharacteristic(String characteristic, Uint8List bytes);
+
+  @override
+  Future<void> disconnect() async {
+    await UniversalBle.disconnect(device.deviceId);
+    super.disconnect();
+  }
+
+  @override
+  Widget showInformation(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Row(
+          spacing: 8,
+          children: [
+            Text(
+              toString().screenshot ?? runtimeType.toString(),
+              style: TextStyle(fontWeight: FontWeight.bold),
+            ),
+            if (isBeta) BetaPill(),
+            Expanded(child: SizedBox()),
+            Builder(
+              builder: (context) {
+                return LoadingWidget(
+                  futureCallback: () async {
+                    final completer = showDropdown<bool>(
+                      context: context,
+                      builder: (c) => DropdownMenu(
+                        children: [
+                          MenuButton(
+                            child: Text('Disconnect and Forget for this session'),
+                            onPressed: (context) {
+                              closeOverlay(context, false);
+                            },
+                          ),
+                          MenuButton(
+                            child: Text('Disconnect and Forget'),
+                            onPressed: (context) {
+                              closeOverlay(context, true);
+                            },
+                          ),
+                        ],
+                      ),
+                    );
+
+                    final persist = await completer.future;
+                    if (persist != null) {
+                      await core.connection.disconnect(this, forget: true, persistForget: persist);
+                    }
+                  },
+                  renderChild: (isLoading, tap) => IconButton(
+                    variance: ButtonVariance.muted,
+                    icon: isLoading ? SmallProgressIndicator() : Icon(Icons.clear),
+                    onPressed: tap,
+                  ),
+                );
+              },
+            ),
+          ],
+        ),
+        Wrap(
+          spacing: 12,
+          runSpacing: 12,
+          children: [
+            DeviceInfo(
+              title: context.i18n.connection,
+              icon: switch (isConnected) {
+                true => Icons.bluetooth_connected_outlined,
+                false => Icons.bluetooth_disabled_outlined,
+              },
+              value: isConnected ? context.i18n.connected : context.i18n.disconnected,
+            ),
+
+            if (batteryLevel != null)
+              DeviceInfo(
+                title: context.i18n.battery,
+                icon: switch (batteryLevel!) {
+                  >= 80 => Icons.battery_full,
+                  >= 60 => Icons.battery_6_bar,
+                  >= 50 => Icons.battery_5_bar,
+                  >= 25 => Icons.battery_4_bar,
+                  >= 10 => Icons.battery_2_bar,
+                  _ => Icons.battery_alert,
+                },
+                value: '$batteryLevel%',
+              ),
+            if (firmwareVersion != null)
+              DeviceInfo(
+                title: context.i18n.firmware,
+                icon: this is ZwiftDevice && firmwareVersion != (this as ZwiftDevice).latestFirmwareVersion
+                    ? Icons.warning
+                    : Icons.text_fields_sharp,
+                value: firmwareVersion!,
+                additionalInfo: (this is ZwiftDevice && firmwareVersion != (this as ZwiftDevice).latestFirmwareVersion)
+                    ? Text(
+                        ' (${context.i18n.latestVersion((this as ZwiftDevice).latestFirmwareVersion)})',
+                        style: TextStyle(color: Theme.of(context).colorScheme.destructive, fontSize: 12),
+                      )
+                    : null,
+              ),
+
+            if (rssi != null)
+              StreamBuilder(
+                stream: core.connection.rssiConnectionStream
+                    .where((device) => device == this)
+                    .map((event) => event.rssi),
+                builder: (context, rssiValue) {
+                  return DeviceInfo(
+                    title: context.i18n.signal,
+                    icon: switch (rssiValue.data ?? rssi!) {
+                      >= -50 => Icons.signal_cellular_4_bar,
+                      >= -60 => Icons.signal_cellular_alt_2_bar,
+                      >= -70 => Icons.signal_cellular_alt_1_bar,
+                      _ => Icons.signal_cellular_alt,
+                    },
+                    value: '$rssi dBm',
+                  );
+                },
+              ),
+          ],
+        ),
+      ],
+    );
+  }
+
+  void debugSubscribeToAll(List<BleService> services) {
+    for (final service in services) {
+      for (final characteristic in service.characteristics) {
+        if (characteristic.properties.contains(CharacteristicProperty.indicate)) {
+          debugPrint('Subscribing to indications for ${service.uuid} / ${characteristic.uuid}');
+          UniversalBle.subscribeIndications(device.deviceId, service.uuid, characteristic.uuid);
+        }
+        if (characteristic.properties.contains(CharacteristicProperty.notify)) {
+          debugPrint('Subscribing to notifications for ${service.uuid} / ${characteristic.uuid}');
+          UniversalBle.subscribeNotifications(device.deviceId, service.uuid, characteristic.uuid);
+        }
+      }
+    }
+  }
+}
--- a/lib/bluetooth/devices/cycplus/cycplus_bc2.dart
+++ b/lib/bluetooth/devices/cycplus/cycplus_bc2.dart
@@ -0,0 +1,129 @@
+import 'dart:typed_data';
+
+import 'package:flutter/material.dart';
+import 'package:bike_control/bluetooth/messages/notification.dart';
+import 'package:bike_control/utils/keymap/buttons.dart';
+import 'package:universal_ble/universal_ble.dart';
+
+import '../bluetooth_device.dart';
+
+class CycplusBc2 extends BluetoothDevice {
+  CycplusBc2(super.scanResult)
+    : super(
+        availableButtons: CycplusBc2Buttons.values,
+        allowMultiple: true,
+      );
+
+  @override
+  Future<void> handleServices(List<BleService> services) async {
+    final service = services.firstWhere(
+      (e) => e.uuid.toLowerCase() == CycplusBc2Constants.SERVICE_UUID.toLowerCase(),
+      orElse: () => throw Exception('Service not found: ${CycplusBc2Constants.SERVICE_UUID}'),
+    );
+    final characteristic = service.characteristics.firstWhere(
+      (e) => e.uuid.toLowerCase() == CycplusBc2Constants.TX_CHARACTERISTIC_UUID.toLowerCase(),
+      orElse: () => throw Exception('Characteristic not found: ${CycplusBc2Constants.TX_CHARACTERISTIC_UUID}'),
+    );
+
+    await UniversalBle.subscribeNotifications(device.deviceId, service.uuid, characteristic.uuid);
+  }
+
+  // Track last state for index 6 and 7
+  int _lastStateIndex6 = 0x00;
+  int _lastStateIndex7 = 0x00;
+
+  @override
+  Future<void> processCharacteristic(String characteristic, Uint8List bytes) {
+    if (characteristic.toLowerCase() == CycplusBc2Constants.TX_CHARACTERISTIC_UUID.toLowerCase()) {
+      if (bytes.length > 7) {
+        final buttonsToPress = <ControllerButton>[];
+
+        // Process index 6 (shift up)
+        final currentByte6 = bytes[6];
+        if (_shouldTriggerShift(currentByte6, _lastStateIndex6)) {
+          buttonsToPress.add(availableButtons[0]);
+          _lastStateIndex6 = 0x00; // Reset after successful press
+        } else {
+          _updateState(currentByte6, (val) => _lastStateIndex6 = val);
+        }
+
+        // Process index 7 (shift down)
+        final currentByte7 = bytes[7];
+        if (_shouldTriggerShift(currentByte7, _lastStateIndex7)) {
+          buttonsToPress.add(availableButtons[1]);
+          _lastStateIndex7 = 0x00; // Reset after successful press
+        } else {
+          _updateState(currentByte7, (val) => _lastStateIndex7 = val);
+        }
+
+        handleButtonsClicked(buttonsToPress);
+      } else {
+        actionStreamInternal.add(
+          LogNotification(
+            'CYCPLUS BC2 received unexpected packet: ${bytes.map((e) => e.toRadixString(16).padLeft(2, '0')).join()}',
+          ),
+        );
+        handleButtonsClicked([]);
+      }
+    }
+    return Future.value();
+  }
+
+  // Check if we should trigger a shift based on current and last state
+  bool _shouldTriggerShift(int currentByte, int lastByte) {
+    const pressedValues = {0x01, 0x02, 0x03};
+
+    // State change from one pressed value to another different pressed value
+    // This is the ONLY time we trigger a shift
+    if (pressedValues.contains(currentByte) && pressedValues.contains(lastByte) && currentByte != lastByte) {
+      return true;
+    }
+
+    return false;
+  }
+
+  // Update state tracking
+  void _updateState(int currentByte, void Function(int) setState) {
+    const pressedValues = {0x01, 0x02, 0x03};
+    const releaseValue = 0x00;
+
+    // Button released: current is 0x00 and last was pressed
+    if (currentByte == releaseValue) {
+      setState(releaseValue);
+    }
+    // Lock the new pressed state
+    else if (pressedValues.contains(currentByte)) {
+      setState(currentByte);
+    }
+  }
+}
+
+class CycplusBc2Constants {
+  // Nordic UART Service (NUS) - commonly used by CYCPLUS BC2
+  static const String SERVICE_UUID = "6e400001-b5a3-f393-e0a9-e50e24dcca9e";
+
+  // TX Characteristic - device sends data to app
+  static const String TX_CHARACTERISTIC_UUID = "6e400003-b5a3-f393-e0a9-e50e24dcca9e";
+
+  // RX Characteristic - app sends data to device (not used for button reading)
+  static const String RX_CHARACTERISTIC_UUID = "6e400002-b5a3-f393-e0a9-e50e24dcca9e";
+}
+
+class CycplusBc2Buttons {
+  static const ControllerButton shiftUp = ControllerButton(
+    'shiftUp',
+    action: InGameAction.shiftUp,
+    icon: Icons.add,
+  );
+
+  static const ControllerButton shiftDown = ControllerButton(
+    'shiftDown',
+    action: InGameAction.shiftDown,
+    icon: Icons.remove,
+  );
+
+  static const List<ControllerButton> values = [
+    shiftUp,
+    shiftDown,
+  ];
+}
--- a/lib/bluetooth/devices/elite/elite_square.dart
+++ b/lib/bluetooth/devices/elite/elite_square.dart
@@ -1,16 +1,15 @@
-import 'dart:typed_data';
-
 import 'package:dartx/dartx.dart';
-import 'package:swift_control/bluetooth/devices/base_device.dart';
-import 'package:swift_control/utils/keymap/buttons.dart';
+import 'package:flutter/foundation.dart';
+import 'package:bike_control/utils/keymap/buttons.dart';
 import 'package:universal_ble/universal_ble.dart';

 import '../../messages/notification.dart';
+import '../bluetooth_device.dart';

-class EliteSquare extends BaseDevice {
+class EliteSquare extends BluetoothDevice {
  EliteSquare(super.scanResult)
    : super(
-        availableButtons: SquareConstants.BUTTON_MAPPING.values.toList(),
+        availableButtons: EliteSquareButtons.values.toList(),
        isBeta: true,
      );

@@ -37,19 +36,19 @@ class EliteSquare extends BaseDevice {
    if (characteristic == SquareConstants.CHARACTERISTIC_UUID) {
      final fullValue = _bytesToHex(bytes);
      final currentValue = _extractButtonCode(fullValue);
-      actionStreamInternal.add(LogNotification('Received $fullValue - vs $currentValue (last: $_lastValue)'));
+      if (kDebugMode) {
+        actionStreamInternal.add(LogNotification('Received $fullValue - vs $currentValue (last: $_lastValue)'));
+      }

      if (_lastValue != null) {
-        final currentRelevantPart = fullValue.length >= 19
-            ? fullValue.substring(6, fullValue.length - 13)
-            : fullValue.substring(6);
-        final lastRelevantPart = _lastValue!.length >= 19
-            ? _lastValue!.substring(6, _lastValue!.length - 13)
-            : _lastValue!.substring(6);
+        final currentRelevantPart = fullValue.length >= 14 ? fullValue.substring(6, 14) : fullValue.substring(6);
+        final lastRelevantPart = _lastValue!.length >= 14 ? _lastValue!.substring(6, 14) : _lastValue!.substring(6);

        if (currentRelevantPart != lastRelevantPart) {
          final buttonClicked = SquareConstants.BUTTON_MAPPING[currentValue];
-          actionStreamInternal.add(LogNotification('Button pressed: $buttonClicked'));
+          if (kDebugMode) {
+            actionStreamInternal.add(LogNotification('Button pressed: $buttonClicked'));
+          }
          handleButtonsClicked([
            if (buttonClicked != null) buttonClicked,
          ]);
@@ -83,25 +82,74 @@ class SquareConstants {

  // Button mapping https://images.bike24.com/i/mb/c7/36/d9/elite-square-smart-frame-indoor-bike-3-1724305.jpg
  static const Map<String, ControllerButton> BUTTON_MAPPING = {
-    "00000200": ControllerButton.navigationUp, //"Up",
-    "00000100": ControllerButton.navigationLeft, //"Left",
-    "00000800": ControllerButton.navigationDown, // "Down",
-    "00000400": ControllerButton.navigationRight, //"Right",
-    "00002000": ControllerButton.powerUpLeft, //"X",
-    "00001000": ControllerButton.sideButtonLeft, // "Square",
-    "00008000": ControllerButton.campagnoloLeft, // "Left Campagnolo",
-    "00004000": ControllerButton.onOffLeft, //"Left brake",
-    "00000002": ControllerButton.shiftDownLeft, //"Left shift 1",
-    "00000001": ControllerButton.paddleLeft, // "Left shift 2",
-    "02000000": ControllerButton.y, // "Y",
-    "01000000": ControllerButton.a, //"A",
-    "08000000": ControllerButton.b, // "B",
-    "04000000": ControllerButton.z, // "Z",
-    "20000000": ControllerButton.powerUpRight, // "Circle",
-    "10000000": ControllerButton.sideButtonRight, //"Triangle",
-    "80000000": ControllerButton.campagnoloRight, // "Right Campagnolo",
-    "40000000": ControllerButton.onOffRight, //"Right brake",
-    "00020000": ControllerButton.sideButtonRight, //"Right shift 1",
-    "00010000": ControllerButton.paddleRight, //"Right shift 2",
+    "00000200": EliteSquareButtons.up, //"Up",
+    "00000100": EliteSquareButtons.left, //"Left",
+    "00000800": EliteSquareButtons.down, // "Down",
+    "00000400": EliteSquareButtons.right, //"Right",
+    "00002000": EliteSquareButtons.x, //"X",
+    "00001000": EliteSquareButtons.square, // "Square",
+    "00008000": EliteSquareButtons.campagnoloLeft, // "Left Campagnolo",
+    "00004000": EliteSquareButtons.leftBrake, //"Left brake",
+    "00000002": EliteSquareButtons.leftShift1, //"Left shift 1",
+    "00000001": EliteSquareButtons.leftShift2, // "Left shift 2",
+    "02000000": EliteSquareButtons.y, // "Y",
+    "01000000": EliteSquareButtons.a, //"A",
+    "08000000": EliteSquareButtons.b, // "B",
+    "04000000": EliteSquareButtons.z, // "Z",
+    "20000000": EliteSquareButtons.circle, // "Circle",
+    "10000000": EliteSquareButtons.triangle, //"Triangle",
+    "80000000": EliteSquareButtons.campagnoloRight, // "Right Campagnolo",
+    "40000000": EliteSquareButtons.rightBrake, //"Right brake",
+    "00020000": EliteSquareButtons.rightShift1, //"Right shift 1",
+    "00010000": EliteSquareButtons.rightShift2, //"Right shift 2",
  };
 }
+
+class EliteSquareButtons {
+  static const ControllerButton up = ControllerButton('eliteSquareUp', action: null);
+  static const ControllerButton left = ControllerButton('eliteSquareLeft', action: InGameAction.navigateLeft);
+  static const ControllerButton down = ControllerButton('eliteSquareDown', action: null);
+  static const ControllerButton right = ControllerButton('eliteSquareRight', action: InGameAction.navigateRight);
+  static const ControllerButton x = ControllerButton('eliteSquareX', action: null);
+  static const ControllerButton square = ControllerButton('eliteSquareSquare', action: null);
+  static const ControllerButton campagnoloLeft = ControllerButton('eliteSquareCampagnoloLeft', action: null);
+  static const ControllerButton leftBrake = ControllerButton('eliteSquareLeftBrake', action: null);
+  static const ControllerButton leftShift1 = ControllerButton('eliteSquareLeftShift1', action: InGameAction.shiftUp);
+  static const ControllerButton leftShift2 = ControllerButton('eliteSquareLeftShift2', action: InGameAction.shiftDown);
+  static const ControllerButton y = ControllerButton('y', action: null);
+  static const ControllerButton a = ControllerButton('a', action: null);
+  static const ControllerButton b = ControllerButton('b', action: null);
+  static const ControllerButton z = ControllerButton('z', action: null);
+  static const ControllerButton circle = ControllerButton('eliteSquareCircle', action: null);
+  static const ControllerButton triangle = ControllerButton('eliteSquareTriangle', action: null);
+  static const ControllerButton campagnoloRight = ControllerButton('eliteSquareCampagnoloRight', action: null);
+  static const ControllerButton rightBrake = ControllerButton('eliteSquareRightBrake', action: null);
+  static const ControllerButton rightShift1 = ControllerButton('eliteSquareRightShift1', action: InGameAction.shiftUp);
+  static const ControllerButton rightShift2 = ControllerButton(
+    'eliteSquareRightShift2',
+    action: InGameAction.shiftDown,
+  );
+
+  static const List<ControllerButton> values = [
+    up,
+    left,
+    down,
+    right,
+    x,
+    square,
+    campagnoloLeft,
+    leftBrake,
+    leftShift1,
+    leftShift2,
+    y,
+    a,
+    b,
+    z,
+    circle,
+    triangle,
+    campagnoloRight,
+    rightBrake,
+    rightShift1,
+    rightShift2,
+  ];
+}
--- a/lib/bluetooth/devices/elite/elite_sterzo.dart
+++ b/lib/bluetooth/devices/elite/elite_sterzo.dart
@@ -1,24 +1,18 @@
+import 'dart:async';
 import 'dart:convert';

 import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
 import 'package:http/http.dart' as http;
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:swift_control/bluetooth/devices/base_device.dart';
-import 'package:swift_control/utils/keymap/buttons.dart';
+import 'package:bike_control/bluetooth/devices/bluetooth_device.dart';
+import 'package:bike_control/utils/keymap/buttons.dart';
 import 'package:universal_ble/universal_ble.dart';

 import '../../messages/notification.dart';

-class EliteSterzo extends BaseDevice {
-  EliteSterzo(super.scanResult)
-    : super(
-        availableButtons: [
-          ControllerButton.navigationLeft,
-          ControllerButton.navigationRight,
-        ],
-        isBeta: true,
-      );
+class EliteSterzo extends BluetoothDevice {
+  EliteSterzo(super.scanResult) : super(availableButtons: SterzoButtons.values);

  double _lastAngle = 0.0;
  int? _latestChallenge;
@@ -26,6 +20,18 @@ class EliteSterzo extends BaseDevice {
  static Uint8List? _challengeCodesData;
  static bool _isLoadingChallenges = false;

+  // Calibration state
+  final List<double> _calibrationSamples = [];
+  double _calibrationOffset = 0.0;
+  bool _isCalibrated = false;
+
+  // Last rounded angle for logging optimization
+  int? _lastRoundedAngle;
+
+  // Debounce timer for PWM-like keypress behavior
+  Timer? _keypressTimer;
+  bool _isProcessingKeypresses = false;
+
  @override
  Future<void> handleServices(List<BleService> services) async {
    final service = services.firstOrNullWhere(
@@ -53,7 +59,7 @@ class EliteSterzo extends BaseDevice {
    }

    // Subscribe to challenge code indications
-    await UniversalBle.subscribeNotifications(
+    await UniversalBle.subscribeIndications(
      device.deviceId,
      service.uuid,
      challengeChar.uuid,
@@ -222,32 +228,91 @@ class EliteSterzo extends BaseDevice {
  void _handleSteeringMeasurement(Uint8List bytes) {
    if (bytes.length >= 4) {
      // Steering angle is a 32-bit float (little-endian)
-      final angle = ByteData.sublistView(bytes).getFloat32(0, Endian.little);
+      final rawAngle = ByteData.sublistView(bytes).getFloat32(0, Endian.little);

-      actionStreamInternal.add(LogNotification('Steering angle: ${angle.toStringAsFixed(1)}°'));
-
-      // Determine steering direction based on angle threshold
-      final button = _getSteeringButton(angle);
-
-      if (button != null) {
-        handleButtonsClicked([button]);
-      } else if (_getSteeringButton(_lastAngle) != null) {
-        // Release button if we were steering but now we're centered
-        handleButtonsClicked([]);
+      // Ignore NaN readings during initial connection
+      if (rawAngle.isNaN) {
+        return;
      }

-      _lastAngle = angle;
+      // Handle calibration: collect initial samples to compute offset
+      if (!_isCalibrated) {
+        _calibrationSamples.add(rawAngle);
+        if (_calibrationSamples.length >= SterzoConstants.CALIBRATION_SAMPLE_COUNT) {
+          // Compute average offset from collected samples
+          _calibrationOffset = _calibrationSamples.reduce((a, b) => a + b) / _calibrationSamples.length;
+          _isCalibrated = true;
+          actionStreamInternal.add(
+            LogNotification('Elite Sterzo: Calibration complete, offset: ${_calibrationOffset.toStringAsFixed(2)}°'),
+          );
+        }
+        return; // Don't process steering during calibration
+      }
+
+      // Apply calibration offset
+      final calibratedAngle = rawAngle - _calibrationOffset;
+
+      // Round to whole degrees to reduce noise
+      final roundedAngle = calibratedAngle.round();
+
+      // Only log and process steering when rounded value changes to reduce verbosity
+      if (_lastRoundedAngle != roundedAngle) {
+        actionStreamInternal.add(LogNotification('Steering angle: $roundedAngle°'));
+        _lastRoundedAngle = roundedAngle;
+
+        // Apply PWM-like steering behavior only when angle changes
+        _applyPWMSteering(roundedAngle);
+      }
+
+      _lastAngle = calibratedAngle;
    }
  }

-  ControllerButton? _getSteeringButton(double angle) {
-    // Use a threshold to avoid jitter around center
-    if (angle < -SterzoConstants.STEERING_THRESHOLD) {
-      return ControllerButton.navigationLeft;
-    } else if (angle > SterzoConstants.STEERING_THRESHOLD) {
-      return ControllerButton.navigationRight;
+  /// Applies PWM-like steering behavior with repeated keypresses proportional to angle magnitude
+  void _applyPWMSteering(int roundedAngle) {
+    // Cancel any pending keypress timer
+    _keypressTimer?.cancel();
+
+    // Determine if we're steering
+    if (roundedAngle.abs() > SterzoConstants.STEERING_THRESHOLD) {
+      // Determine direction
+      final button = roundedAngle > 0 ? SterzoButtons.rightSteer : SterzoButtons.leftSteer;
+
+      // Calculate number of keypress levels based on angle magnitude
+      final levels = _calculateKeypressLevels(roundedAngle.abs());
+
+      // Only trigger new keypresses when rounded angle changes to avoid overlap
+      // The check for _lastRoundedAngle change is already done in _handleSteeringMeasurement
+      // so we know this is a new angle value
+      _scheduleRepeatedKeypresses(button, levels);
+    } else {
+      // Center position - release any held buttons
+      handleButtonsClicked([]);
    }
-    return null;
+  }
+
+  /// Calculates the number of keypress levels based on angle magnitude
+  int _calculateKeypressLevels(int absAngle) {
+    final levels = (absAngle / SterzoConstants.LEVEL_DEGREE_STEP).floor();
+    return levels.clamp(1, SterzoConstants.MAX_LEVELS);
+  }
+
+  /// Schedules repeated keypresses to simulate PWM behavior
+  Future<void> _scheduleRepeatedKeypresses(ControllerButton button, int levels) async {
+    // Don't overlap keypress sequences
+    if (_isProcessingKeypresses) {
+      return;
+    }
+
+    _isProcessingKeypresses = true;
+
+    // Send keypresses in sequence with delays between them
+    for (int i = 0; i < levels; i++) {
+      await Future.delayed(Duration(milliseconds: SterzoConstants.KEY_REPEAT_INTERVAL_MS));
+      handleButtonsClicked([button]);
+    }
+
+    _isProcessingKeypresses = false;
  }

  List<int> _getChallengeResponse(int challenge) {
@@ -264,6 +329,12 @@ class EliteSterzo extends BaseDevice {
    // Fallback for out of range challenges
    return [0x96, 0x96];
  }
+
+  @override
+  Future<void> disconnect() async {
+    _keypressTimer?.cancel();
+    await super.disconnect();
+  }
 }

 class SterzoConstants {
@@ -278,7 +349,7 @@ class SterzoConstants {
  static const String SERVICE_UUID = "347b0001-7635-408b-8918-8ff3949ce592";

  // Steering angle threshold in degrees to trigger steering action
-  static const double STEERING_THRESHOLD = 5.0;
+  static const double STEERING_THRESHOLD = 10.0;

  static const int RECONNECT_DELAY = 5; // seconds between reconnection attempts

@@ -288,4 +359,32 @@ class SterzoConstants {

  // Cache key for SharedPreferences
  static const String CACHE_KEY = 'elite_sterzo_challenge_codes';
+
+  // Calibration settings
+  // Number of initial valid samples to collect for calibration offset
+  static const int CALIBRATION_SAMPLE_COUNT = 10;
+
+  // PWM-like steering behavior constants
+  // Degrees per level for repeated keypress behavior
+  static const double LEVEL_DEGREE_STEP = 10.0;
+  // Maximum number of keypress levels
+  static const int MAX_LEVELS = 5;
+  // Interval between repeated keypresses in milliseconds
+  static const int KEY_REPEAT_INTERVAL_MS = 40;
+}
+
+class SterzoButtons {
+  static final ControllerButton leftSteer = ControllerButton(
+    'leftSteer',
+    action: InGameAction.steerLeft,
+  );
+  static final ControllerButton rightSteer = ControllerButton(
+    'rightSteer',
+    action: InGameAction.steerRight,
+  );
+
+  static List<ControllerButton> get values => [
+    leftSteer,
+    rightSteer,
+  ];
 }
--- a/lib/bluetooth/devices/gamepad/gamepad_device.dart
+++ b/lib/bluetooth/devices/gamepad/gamepad_device.dart
@@ -0,0 +1,91 @@
+import 'dart:io';
+
+import 'package:bike_control/bluetooth/devices/base_device.dart';
+import 'package:bike_control/bluetooth/messages/notification.dart';
+import 'package:bike_control/pages/device.dart';
+import 'package:bike_control/utils/core.dart';
+import 'package:bike_control/utils/keymap/buttons.dart';
+import 'package:bike_control/widgets/ui/beta_pill.dart';
+import 'package:bike_control/widgets/ui/warning.dart';
+import 'package:dartx/dartx.dart';
+import 'package:gamepads/gamepads.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart';
+
+class GamepadDevice extends BaseDevice {
+  final String id;
+
+  GamepadDevice(super.name, {required this.id}) : super(availableButtons: [], uniqueId: id);
+
+  List<ControllerButton> _lastButtonsClicked = [];
+
+  @override
+  Future<void> connect() async {
+    Gamepads.eventsByGamepad(id).listen((event) async {
+      actionStreamInternal.add(LogNotification('Gamepad event: ${event.key} value ${event.value} type ${event.type}'));
+
+      final int normalizedValue = switch (event.value) {
+        > 1.0 => 1,
+        < -1.0 => -1,
+        _ => event.value.toInt(),
+      };
+
+      final buttonKey = event.type == KeyType.analog ? '${event.key}_$normalizedValue' : event.key;
+      ControllerButton button = getOrAddButton(
+        buttonKey,
+        () => ControllerButton(buttonKey, sourceDeviceId: id),
+      );
+
+      switch (event.type) {
+        case KeyType.analog:
+          final releasedValue = Platform.isWindows ? 1 : 0;
+
+          if (event.value.round().abs() != releasedValue) {
+            final buttonsClicked = [button];
+            if (_lastButtonsClicked.contentEquals(buttonsClicked) == false) {
+              handleButtonsClicked(buttonsClicked);
+            }
+            _lastButtonsClicked = buttonsClicked;
+          } else {
+            _lastButtonsClicked = [];
+            handleButtonsClicked([]);
+          }
+        case KeyType.button:
+          final buttonsClicked = event.value.toInt() != 1 ? [button] : <ControllerButton>[];
+          if (_lastButtonsClicked.contentEquals(buttonsClicked) == false) {
+            handleButtonsClicked(buttonsClicked);
+          }
+          _lastButtonsClicked = buttonsClicked;
+      }
+    });
+  }
+
+  @override
+  Widget showInformation(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 8.0),
+      child: Column(
+        spacing: 8,
+        children: [
+          Row(
+            spacing: 8,
+            children: [
+              Text(
+                toString().screenshot,
+                style: TextStyle(fontWeight: FontWeight.bold),
+              ),
+              if (isBeta) BetaPill(),
+            ],
+          ),
+          if (Platform.isAndroid && !core.settings.getLocalEnabled())
+            Warning(
+              children: [
+                Text(
+                  'For it to work properly, even when BikeControl is in the background, you need to enable the local connection method in the next tab.',
+                ).small,
+              ],
+            ),
+        ],
+      ),
+    );
+  }
+}
--- a/lib/bluetooth/devices/gyroscope/gyroscope_steering.dart
+++ b/lib/bluetooth/devices/gyroscope/gyroscope_steering.dart
@@ -0,0 +1,313 @@
+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/messages/notification.dart';
+import 'package:bike_control/pages/device.dart';
+import 'package:bike_control/utils/core.dart';
+import 'package:bike_control/utils/keymap/buttons.dart';
+import 'package:bike_control/widgets/ui/beta_pill.dart';
+import 'package:bike_control/widgets/ui/device_info.dart';
+import 'package:bike_control/widgets/ui/small_progress_indicator.dart';
+import 'package:flutter/foundation.dart';
+import 'package:sensors_plus/sensors_plus.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart';
+
+/// Gyroscope and Accelerometer based steering device
+/// Detects handlebar movement when the phone is mounted on the handlebar
+class GyroscopeSteering extends BaseDevice {
+  GyroscopeSteering()
+    : super(
+        'Phone Steering',
+        availableButtons: GyroscopeSteeringButtons.values,
+        isBeta: true,
+        uniqueId: 'gyroscope_steering_device',
+        buttonPrefix: 'gyro',
+      );
+
+  StreamSubscription<GyroscopeEvent>? _gyroscopeSubscription;
+  StreamSubscription<AccelerometerEvent>? _accelerometerSubscription;
+
+  // Calibration state
+  final SteeringEstimator _estimator = SteeringEstimator();
+  bool _isCalibrated = false;
+  ControllerButton? _lastSteeringButton;
+
+  // Accelerometer raw data
+  bool _hasAccelData = false;
+
+  // Time tracking for integration
+  DateTime? _lastGyroUpdate;
+
+  // Last rounded angle for change detection
+  int? _lastRoundedAngle;
+
+  // Debounce timer for PWM-like keypress behavior
+  Timer? _keypressTimer;
+  bool _isProcessingKeypresses = false;
+
+  // Configuration (can be made customizable later)
+  static const double STEERING_THRESHOLD = 5.0; // degrees
+  static const double LEVEL_DEGREE_STEP = 10.0; // degrees per level
+  static const int MAX_LEVELS = 5;
+  static const int KEY_REPEAT_INTERVAL_MS = 40;
+  static const double COMPLEMENTARY_FILTER_ALPHA = 0.98; // Weight for gyroscope
+  static const double LOW_PASS_FILTER_ALPHA = 0.9; // Smoothing factor
+
+  @override
+  Future<void> connect() async {
+    if (isConnected) {
+      return;
+    }
+
+    try {
+      // Start listening to sensors
+      _gyroscopeSubscription = gyroscopeEventStream().listen(
+        _handleGyroscopeEvent,
+        onError: (error) {
+          actionStreamInternal.add(LogNotification('Gyroscope error: $error'));
+        },
+      );
+
+      _accelerometerSubscription = accelerometerEventStream().listen(
+        _handleAccelerometerEvent,
+        onError: (error) {
+          actionStreamInternal.add(LogNotification('Accelerometer error: $error'));
+        },
+      );
+
+      isConnected = true;
+      actionStreamInternal.add(LogNotification('Gyroscope Steering: Connected - Calibrating...'));
+
+      // Reset calibration/estimator
+      _isCalibrated = false;
+      _hasAccelData = false;
+      _estimator.reset();
+      _lastGyroUpdate = null;
+      _lastRoundedAngle = null;
+      _lastSteeringButton = null;
+    } catch (e) {
+      actionStreamInternal.add(LogNotification('Failed to connect Gyroscope Steering: $e'));
+      isConnected = false;
+      rethrow;
+    }
+  }
+
+  void _handleGyroscopeEvent(GyroscopeEvent event) {
+    final now = DateTime.now();
+
+    if (!_hasAccelData) {
+      _lastGyroUpdate = now;
+      return;
+    }
+
+    final dt = _lastGyroUpdate != null ? (now.difference(_lastGyroUpdate!).inMicroseconds / 1000000.0) : 0.0;
+    _lastGyroUpdate = now;
+
+    if (dt <= 0 || dt >= 1.0) {
+      return;
+    }
+
+    // iOS drift fix:
+    // - integrate bias-corrected gyro z (yaw) into an estimator
+    // - learn bias while the device is still
+    final angleDeg = _estimator.updateGyro(wz: event.z, dt: dt);
+
+    if (!_isCalibrated) {
+      // Consider calibration complete once we have a bit of stillness and sensor data.
+      // This gives the bias estimator time to settle.
+      if (_estimator.stillTimeSec >= 0.6) {
+        _estimator.calibrate(seedBiasZRadPerSec: _estimator.biasZRadPerSec);
+        _isCalibrated = true;
+        /*actionStreamInternal.add(
+          AlertNotification(LogLevel.LOGLEVEL_INFO, 'Calibration complete.'),
+        );*/
+      }
+      return;
+    }
+
+    _processSteeringAngle(angleDeg);
+  }
+
+  void _handleAccelerometerEvent(AccelerometerEvent event) {
+    _hasAccelData = true;
+    _estimator.updateAccel(x: event.x, y: event.y, z: event.z);
+  }
+
+  void _processSteeringAngle(double steeringAngleDeg) {
+    final roundedAngle = steeringAngleDeg.round();
+
+    if (_lastRoundedAngle != roundedAngle) {
+      if (kDebugMode) {
+        actionStreamInternal.add(
+          LogNotification(
+            'Steering angle: $roundedAngle° (biasZ=${_estimator.biasZRadPerSec.toStringAsFixed(4)} rad/s)',
+          ),
+        );
+      }
+      _lastRoundedAngle = roundedAngle;
+      _applyPWMSteering(roundedAngle);
+    }
+  }
+
+  /// Applies PWM-like steering behavior with repeated keypresses proportional to angle magnitude
+  void _applyPWMSteering(int roundedAngle) {
+    // Cancel any pending keypress timer
+    _keypressTimer?.cancel();
+
+    // Determine if we're steering
+    if (roundedAngle.abs() > core.settings.getPhoneSteeringThreshold()) {
+      // Determine direction
+      final button = roundedAngle < 0 ? GyroscopeSteeringButtons.rightSteer : GyroscopeSteeringButtons.leftSteer;
+
+      if (_lastSteeringButton != button) {
+        // New steering direction - reset any previous state
+        _lastSteeringButton = button;
+      } else {
+        return;
+      }
+
+      handleButtonsClicked([button]);
+    } else {
+      _lastSteeringButton = null;
+      // Center position - release any held buttons
+      handleButtonsClicked([]);
+    }
+  }
+
+  @override
+  Future<void> disconnect() async {
+    await _gyroscopeSubscription?.cancel();
+    await _accelerometerSubscription?.cancel();
+    _gyroscopeSubscription = null;
+    _accelerometerSubscription = null;
+    _keypressTimer?.cancel();
+    isConnected = false;
+    _isCalibrated = false;
+    _hasAccelData = false;
+    _estimator.reset();
+    actionStreamInternal.add(LogNotification('Gyroscope Steering: Disconnected'));
+  }
+
+  @override
+  Widget showInformation(BuildContext context) {
+    return StatefulBuilder(
+      builder: (c, setState) => Column(
+        mainAxisAlignment: MainAxisAlignment.start,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        spacing: 12,
+        children: [
+          Row(
+            spacing: 12,
+            children: [
+              Text(
+                toString().screenshot,
+                style: TextStyle(fontWeight: FontWeight.bold),
+              ),
+              if (isBeta) BetaPill(),
+            ],
+          ),
+          Wrap(
+            spacing: 12,
+            runSpacing: 12,
+            children: [
+              DeviceInfo(
+                title: 'Calibration',
+                icon: BootstrapIcons.wrenchAdjustable,
+                value: _isCalibrated ? 'Complete' : 'In Progress',
+              ),
+              DeviceInfo(
+                title: 'Steering Angle',
+                icon: RadixIcons.angle,
+                value: _isCalibrated ? '${_estimator.angleDeg.toStringAsFixed(2)}°' : 'Calibrating...',
+              ),
+              if (kDebugMode)
+                DeviceInfo(
+                  title: 'Gyro Bias',
+                  icon: BootstrapIcons.speedometer,
+                  value: '${_estimator.biasZRadPerSec.toStringAsFixed(4)} rad/s',
+                ),
+            ],
+          ),
+          Row(
+            spacing: 8,
+            children: [
+              PrimaryButton(
+                size: ButtonSize.small,
+                leading: !_isCalibrated ? SmallProgressIndicator() : null,
+                onPressed: !_isCalibrated
+                    ? null
+                    : () {
+                        // Reset calibration
+                        _isCalibrated = false;
+                        _hasAccelData = false;
+                        _estimator.reset();
+                        _lastGyroUpdate = null;
+                        _lastRoundedAngle = null;
+                        _lastSteeringButton = null;
+                        setState(() {});
+                      },
+                child: Text(_isCalibrated ? 'Calibrate' : 'Calibrating...'),
+              ),
+              Builder(
+                builder: (context) {
+                  return PrimaryButton(
+                    size: ButtonSize.small,
+                    trailing: Container(
+                      padding: EdgeInsets.symmetric(horizontal: 4),
+                      decoration: BoxDecoration(
+                        color: Theme.of(context).colorScheme.destructive,
+                        borderRadius: BorderRadius.circular(4),
+                      ),
+                      child: Text('${core.settings.getPhoneSteeringThreshold().toInt()}°'),
+                    ),
+                    onPressed: () {
+                      final values = [for (var i = 3; i <= 12; i += 1) i];
+                      showDropdown(
+                        context: context,
+                        builder: (b) => DropdownMenu(
+                          children: values
+                              .map(
+                                (v) => MenuButton(
+                                  child: Text('$v°'),
+                                  onPressed: (c) {
+                                    core.settings.setPhoneSteeringThreshold(v);
+                                    setState(() {});
+                                  },
+                                ),
+                              )
+                              .toList(),
+                        ),
+                      );
+                    },
+                    child: Text('Trigger Threshold:'),
+                  );
+                },
+              ),
+            ],
+          ),
+          if (!_isCalibrated)
+            Text(
+              'Calibrating the sensors now. Attach your phone/tablet on your handlebar and keep it still for a second.',
+            ).xSmall,
+        ],
+      ),
+    );
+  }
+}
+
+class GyroscopeSteeringButtons {
+  static final ControllerButton leftSteer = ControllerButton(
+    'gyroLeftSteer',
+    action: InGameAction.steerLeft,
+  );
+  static final ControllerButton rightSteer = ControllerButton(
+    'gyroRightSteer',
+    action: InGameAction.steerRight,
+  );
+
+  static List<ControllerButton> get values => [
+    leftSteer,
+    rightSteer,
+  ];
+}
--- a/lib/bluetooth/devices/gyroscope/steering_estimator.dart
+++ b/lib/bluetooth/devices/gyroscope/steering_estimator.dart
@@ -0,0 +1,200 @@
+import 'dart:math';
+
+/// Pure-Dart steering estimator for phone-on-handlebar steering.
+///
+/// Design goals:
+/// - Avoid long-term drift on platforms like iOS by continuously estimating
+///   and subtracting gyro bias.
+/// - Keep it testable (no Flutter/sensors dependencies).
+///
+/// NOTE: This is not a full AHRS. It uses bias-corrected integration and
+/// a "stillness" detector to learn gyro bias and optionally auto-recenter.
+class SteeringEstimator {
+  SteeringEstimator({
+    this.biasLearningRate = 0.02,
+    this.gyroStillThresholdRadPerSec = 0.03,
+    this.accelStillThresholdMS2 = 0.6,
+    this.minStillTimeForBiasSec = 0.35,
+    this.biasLearningDeadbandDeg = 3.0,
+    this.minStillTimeForRecenterSec = double.infinity,
+    this.recenterHalfLifeSec = 0.7,
+    this.recenterDeadbandDeg = 2.0,
+    this.maxAngleAbsDeg = 60,
+    this.lowPassAlpha = 0.9,
+
+    // Responsiveness / smoothing tuning.
+    // When steering changes quickly we reduce smoothing, but keep more
+    // smoothing when stable to avoid jitter.
+    this.lowPassAlphaStable = 0.9,
+    this.lowPassAlphaMoving = 0.55,
+    this.motionAngleRateDegPerSecForMinAlpha = 90.0,
+
+    // Cap dt to avoid "freezing" the estimator on occasional long frames.
+    this.maxDtSec = 0.05,
+  });
+
+  // Tunables
+  final double biasLearningRate;
+  final double gyroStillThresholdRadPerSec;
+  final double accelStillThresholdMS2;
+  final double minStillTimeForBiasSec;
+  final double biasLearningDeadbandDeg;
+  final double minStillTimeForRecenterSec;
+  final double recenterHalfLifeSec;
+  final double recenterDeadbandDeg;
+  final double maxAngleAbsDeg;
+
+  /// Backwards-compatible, kept as-is.
+  ///
+  /// If you set `lowPassAlpha = 0.0`, filtering is disabled.
+  final double lowPassAlpha;
+
+  /// Smoothing used when the angle is stable.
+  ///
+  /// Default mirrors the original behavior (`0.9`).
+  final double lowPassAlphaStable;
+
+  /// Smoothing used when the angle is changing quickly.
+  ///
+  /// Lower alpha => faster response.
+  final double lowPassAlphaMoving;
+
+  /// Angle rate (deg/s) at which we reach `lowPassAlphaMoving`.
+  final double motionAngleRateDegPerSecForMinAlpha;
+
+  /// Maximum timestep used for integration/bias learning.
+  final double maxDtSec;
+
+  // State
+  double _accelX = 0, _accelY = 0, _accelZ = 0;
+  bool _hasAccel = false;
+
+  double _biasZ = 0.0; // rad/s
+  double _yawDeg = 0.0;
+  double _filteredYawDeg = 0.0;
+
+  double _stillTimeSec = 0.0;
+
+  /// Resets the estimator state.
+  void reset() {
+    _biasZ = 0.0;
+    _yawDeg = 0.0;
+    _filteredYawDeg = 0.0;
+    _stillTimeSec = 0.0;
+    _hasAccel = false;
+    _accelX = _accelY = _accelZ = 0;
+  }
+
+  /// One-time calibration: assume device is held still and centered.
+  ///
+  /// This resets yaw and also seeds the bias to the current z gyro rate.
+  void calibrate({double? seedBiasZRadPerSec}) {
+    _yawDeg = 0.0;
+    _filteredYawDeg = 0.0;
+    _stillTimeSec = 0.0;
+    if (seedBiasZRadPerSec != null) {
+      _biasZ = seedBiasZRadPerSec;
+    }
+  }
+
+  void updateAccel({required double x, required double y, required double z}) {
+    _accelX = x;
+    _accelY = y;
+    _accelZ = z;
+    _hasAccel = true;
+  }
+
+  /// Update with gyro z-rate (rad/s) and dt (seconds).
+  ///
+  /// Returns the current filtered steering angle in degrees.
+  double updateGyro({required double wz, required double dt}) {
+    if (dt <= 0) {
+      return angleDeg;
+    }
+
+    // If dt spikes (app paused/jank), cap it instead of bailing out.
+    // This keeps the estimator responsive and avoids "stuck" output.
+    final usedDt = dt > maxDtSec ? maxDtSec : dt;
+
+    final still = _isStill(wz);
+    if (still) {
+      _stillTimeSec += usedDt;
+
+      // Learn gyro bias only when we're still AND near our calibrated center.
+      // Otherwise, if the user holds a steady steering angle, wz≈0 and we'd
+      // incorrectly move bias towards 0 and cause the angle to be wrong when
+      // they return to center.
+      final nearCenter = _yawDeg.abs() <= biasLearningDeadbandDeg;
+      if (nearCenter && _stillTimeSec >= minStillTimeForBiasSec) {
+        // Exponential moving average towards the observed rate.
+        _biasZ = (1.0 - biasLearningRate) * _biasZ + biasLearningRate * wz;
+      }
+
+      // IMPORTANT: only auto-recenter when we're already close to center.
+      // Users may hold a constant steering angle for several seconds.
+      final canRecenter = _stillTimeSec >= minStillTimeForRecenterSec && _yawDeg.abs() <= recenterDeadbandDeg;
+      if (canRecenter) {
+        _applyRecenter(usedDt);
+      }
+    } else {
+      _stillTimeSec = 0.0;
+    }
+
+    final correctedWz = wz - _biasZ;
+    _yawDeg += correctedWz * usedDt * (180.0 / pi);
+
+    // Clamp to avoid runaway if something goes wrong.
+    _yawDeg = _yawDeg.clamp(-maxAngleAbsDeg, maxAngleAbsDeg).toDouble();
+
+    // Low-pass filter for noise smoothing.
+    //
+    // Make it adaptive: when the angle is changing fast, we reduce smoothing
+    // (more responsive). When stable, we keep stronger smoothing.
+    //
+    // If user forces lowPassAlpha=0.0 (existing tests do), we keep behavior
+    // equivalent (no filtering).
+    if (lowPassAlpha <= 0.0) {
+      _filteredYawDeg = _yawDeg;
+    } else {
+      final stableAlpha = ((lowPassAlphaStable.isFinite ? lowPassAlphaStable : lowPassAlpha)).clamp(0.0, 0.999);
+      final movingAlpha = lowPassAlphaMoving.clamp(0.0, stableAlpha);
+
+      // Use a rate estimate derived from the filtered-vs-raw divergence.
+      final rateDegPerSec = ((_yawDeg - _filteredYawDeg).abs()) / usedDt;
+      final t = (rateDegPerSec / motionAngleRateDegPerSecForMinAlpha).clamp(0.0, 1.0);
+
+      final alpha = stableAlpha + (movingAlpha - stableAlpha) * t;
+      _filteredYawDeg = alpha * _filteredYawDeg + (1 - alpha) * _yawDeg;
+    }
+
+    return angleDeg;
+  }
+
+  double get angleDeg => _filteredYawDeg;
+
+  double get biasZRadPerSec => _biasZ;
+
+  double get stillTimeSec => _stillTimeSec;
+
+  bool _isStill(double wz) {
+    // If we don't have accel yet, be conservative: don't learn bias.
+    if (!_hasAccel) return false;
+
+    final gyroOk = wz.abs() < gyroStillThresholdRadPerSec;
+
+    // Check accel magnitude close to gravity (device not being bumped).
+    final aMag = sqrt(_accelX * _accelX + _accelY * _accelY + _accelZ * _accelZ);
+    const g = 9.80665;
+    final accelOk = (aMag - g).abs() < accelStillThresholdMS2;
+
+    return gyroOk && accelOk;
+  }
+
+  void _applyRecenter(double dt) {
+    // Exponential decay towards 0 with given half-life.
+    // decay = 0.5^(dt/halfLife)
+    if (recenterHalfLifeSec <= 0) return;
+    final decay = pow(0.5, dt / recenterHalfLifeSec).toDouble();
+    _yawDeg *= decay;
+  }
+}
--- a/lib/bluetooth/devices/hid/hid_device.dart
+++ b/lib/bluetooth/devices/hid/hid_device.dart
@@ -0,0 +1,53 @@
+import 'dart:io';
+
+import 'package:bike_control/bluetooth/devices/base_device.dart';
+import 'package:bike_control/utils/actions/android.dart';
+import 'package:bike_control/utils/core.dart';
+import 'package:bike_control/widgets/ui/warning.dart';
+import 'package:flutter/material.dart' show PopupMenuButton, PopupMenuItem;
+import 'package:shadcn_flutter/shadcn_flutter.dart';
+
+class HidDevice extends BaseDevice {
+  HidDevice(super.name) : super(availableButtons: [], uniqueId: name!);
+
+  @override
+  Future<void> connect() {
+    return Future.value(null);
+  }
+
+  @override
+  Widget showInformation(BuildContext context) {
+    return Column(
+      children: [
+        Row(
+          children: [
+            Expanded(child: Text(toString()).bold),
+            PopupMenuButton(
+              itemBuilder: (c) => [
+                PopupMenuItem(
+                  child: Text('Ignore'),
+                  onTap: () {
+                    core.connection.disconnect(this, forget: true, persistForget: true);
+                    if (core.actionHandler is AndroidActions) {
+                      (core.actionHandler as AndroidActions).ignoreHidDevices();
+                    } else if (core.mediaKeyHandler.isMediaKeyDetectionEnabled.value) {
+                      core.mediaKeyHandler.isMediaKeyDetectionEnabled.value = false;
+                    }
+                  },
+                ),
+              ],
+            ),
+          ],
+        ),
+        if (Platform.isAndroid && !core.settings.getLocalEnabled())
+          Warning(
+            children: [
+              Text(
+                'For it to work properly, even when BikeControl is in the background, you need to enable the local connection method in the next tab.',
+              ).small,
+            ],
+          ),
+      ],
+    );
+  }
+}
--- a/lib/bluetooth/devices/mywhoosh/link.dart
+++ b/lib/bluetooth/devices/mywhoosh/link.dart
@@ -0,0 +1,178 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:bike_control/bluetooth/devices/trainer_connection.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';
+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:bike_control/utils/requirements/multi.dart';
+import 'package:flutter/foundation.dart';
+
+class WhooshLink extends TrainerConnection {
+  Socket? _socket;
+  ServerSocket? _server;
+
+  static const String connectionTitle = 'MyWhoosh Link';
+
+  WhooshLink()
+    : super(
+        title: connectionTitle,
+        supportedActions: [
+          InGameAction.shiftUp,
+          InGameAction.shiftDown,
+          InGameAction.cameraAngle,
+          InGameAction.emote,
+          InGameAction.uturn,
+          InGameAction.steerLeft,
+          InGameAction.steerRight,
+        ],
+      );
+
+  void stopServer() async {
+    await _socket?.close();
+    await _server?.close();
+    isConnected.value = false;
+    isStarted.value = false;
+    if (kDebugMode) {
+      print('Server stopped.');
+    }
+  }
+
+  Future<void> startServer() async {
+    isStarted.value = true;
+    try {
+      // Create and bind server socket
+      _server = await ServerSocket.bind(
+        InternetAddress.anyIPv6,
+        21587,
+        shared: true,
+        v6Only: false,
+      );
+    } catch (e) {
+      if (kDebugMode) {
+        print('Failed to start server: $e');
+      }
+      isConnected.value = false;
+      isStarted.value = false;
+      rethrow;
+    }
+    if (kDebugMode) {
+      print('Server started on port ${_server!.port}');
+    }
+
+    // Accept connection
+    _server!.listen(
+      (Socket socket) {
+        _socket = socket;
+        core.connection.signalNotification(
+          AlertNotification(LogLevel.LOGLEVEL_INFO, AppLocalizations.current.myWhooshLinkConnected),
+        );
+        isConnected.value = true;
+        if (kDebugMode) {
+          print('Client connected: ${socket.remoteAddress.address}:${socket.remotePort}');
+        }
+
+        // Listen for data from the client
+        socket.listen(
+          (List<int> data) {
+            try {
+              if (kDebugMode) {
+                // TODO we could check if virtual shifting is enabled
+                final message = utf8.decode(data);
+                print('Received message: $message');
+              }
+            } catch (_) {}
+          },
+          onDone: () {
+            print('Client disconnected: $socket');
+            isConnected.value = false;
+            core.connection.signalNotification(
+              AlertNotification(LogLevel.LOGLEVEL_WARNING, 'MyWhoosh Link disconnected'),
+            );
+          },
+        );
+      },
+    );
+  }
+
+  @override
+  Future<ActionResult> sendAction(KeyPair keyPair, {required bool isKeyDown, required bool isKeyUp}) async {
+    final jsonObject = switch (keyPair.inGameAction) {
+      InGameAction.shiftUp => {
+        'MessageType': 'Controls',
+        'InGameControls': {
+          'GearShifting': '1',
+        },
+      },
+      InGameAction.shiftDown => {
+        'MessageType': 'Controls',
+        'InGameControls': {
+          'GearShifting': '-1',
+        },
+      },
+      InGameAction.cameraAngle => {
+        'MessageType': 'Controls',
+        'InGameControls': {
+          'CameraAngle': '${keyPair.inGameActionValue}',
+        },
+      },
+      InGameAction.emote => {
+        'MessageType': 'Controls',
+        'InGameControls': {
+          'Emote': '${keyPair.inGameActionValue}',
+        },
+      },
+      InGameAction.uturn => {
+        'MessageType': 'Controls',
+        'InGameControls': {
+          'UTurn': 'true',
+        },
+      },
+      InGameAction.steerLeft => {
+        'MessageType': 'Controls',
+        'InGameControls': {
+          'Steering': isKeyDown ? '-1' : '0',
+        },
+      },
+      InGameAction.steerRight => {
+        'MessageType': 'Controls',
+        'InGameControls': {
+          'Steering': isKeyDown ? '1' : '0',
+        },
+      },
+      InGameAction.increaseResistance => null,
+      InGameAction.decreaseResistance => null,
+      InGameAction.navigateLeft => null,
+      InGameAction.navigateRight => null,
+      InGameAction.toggleUi => null,
+      _ => null,
+    };
+
+    final supportsIsKeyUpActions = [
+      InGameAction.steerLeft,
+      InGameAction.steerRight,
+    ];
+    if (jsonObject != null && !isKeyDown && !supportsIsKeyUpActions.contains(keyPair.inGameAction)) {
+      return Ignored('No Action sent on key down for action: ${keyPair.inGameAction}');
+    } else if (jsonObject != null) {
+      final jsonString = jsonEncode(jsonObject);
+      _socket?.writeln(jsonString);
+      return Success('Sent action to MyWhoosh: ${keyPair.inGameAction} ${keyPair.inGameActionValue ?? ''}');
+    } else {
+      return NotHandled('No action available for button: ${keyPair.inGameAction}');
+    }
+  }
+
+  bool isCompatible(Target target) {
+    return kIsWeb
+        ? false
+        : switch (target) {
+            Target.thisDevice => !Platform.isWindows,
+            _ => true,
+          };
+  }
+}
--- a/lib/bluetooth/devices/openbikecontrol/obc_ble_emulator.dart
+++ b/lib/bluetooth/devices/openbikecontrol/obc_ble_emulator.dart
@@ -0,0 +1,273 @@
+import 'dart:io';
+
+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/messages/notification.dart' show AlertNotification, LogNotification;
+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: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();
+  final ValueNotifier<AppInfo?> connectedApp = ValueNotifier<AppInfo?>(null);
+  bool _isServiceAdded = false;
+  bool _isSubscribedToEvents = false;
+  Central? _central;
+
+  late GATTCharacteristic _buttonCharacteristic;
+
+  static const String connectionTitle = 'OpenBikeControl BLE Emulator';
+
+  OpenBikeControlBluetoothEmulator()
+    : super(
+        title: connectionTitle,
+        supportedActions: InGameAction.values,
+      );
+
+  Future<void> startServer() async {
+    isStarted.value = true;
+
+    _peripheralManager.stateChanged.forEach((state) {
+      print('Peripheral manager state: ${state.state}');
+    });
+
+    if (!kIsWeb && Platform.isAndroid) {
+      _peripheralManager.connectionStateChanged.forEach((state) {
+        print('Peripheral connection state: ${state.state} of ${state.central.uuid}');
+        if (state.state == ConnectionState.connected) {
+        } else if (state.state == ConnectionState.disconnected) {
+          if (connectedApp.value != null) {
+            core.connection.signalNotification(
+              AlertNotification(LogLevel.LOGLEVEL_INFO, 'Disconnected from app: ${connectedApp.value?.appId}'),
+            );
+          }
+          isConnected.value = false;
+          connectedApp.value = null;
+          _central = null;
+        }
+      });
+    }
+
+    while (_peripheralManager.state != BluetoothLowEnergyState.poweredOn && core.settings.getObpBleEnabled()) {
+      print('Waiting for peripheral manager to be powered on...');
+      await Future.delayed(Duration(seconds: 1));
+    }
+
+    _buttonCharacteristic = GATTCharacteristic.mutable(
+      uuid: UUID.fromString(OpenBikeControlConstants.BUTTON_STATE_CHARACTERISTIC_UUID),
+      descriptors: [],
+      properties: [
+        GATTCharacteristicProperty.notify,
+      ],
+      permissions: [],
+    );
+
+    if (!_isServiceAdded) {
+      await Future.delayed(Duration(seconds: 1));
+
+      if (!_isSubscribedToEvents) {
+        _isSubscribedToEvents = true;
+        _peripheralManager.characteristicReadRequested.forEach((eventArgs) async {
+          print('Read request for characteristic: ${eventArgs.characteristic.uuid}');
+
+          switch (eventArgs.characteristic.uuid.toString().toUpperCase()) {
+            case BleUuid.DEVICE_INFORMATION_CHARACTERISTIC_BATTERY_LEVEL:
+              await _peripheralManager.respondReadRequestWithValue(
+                eventArgs.request,
+                value: Uint8List.fromList([100]),
+              );
+              return;
+            default:
+              print('Unhandled read request for characteristic: ${eventArgs.characteristic.uuid}');
+          }
+
+          final request = eventArgs.request;
+          final trimmedValue = Uint8List.fromList([]);
+          await _peripheralManager.respondReadRequestWithValue(
+            request,
+            value: trimmedValue,
+          );
+          // You can respond to read requests here if needed
+        });
+
+        _peripheralManager.characteristicNotifyStateChanged.forEach((char) {
+          _central = char.central;
+          print(
+            'Notify state changed for characteristic: ${char.characteristic.uuid}: ${char.state}',
+          );
+        });
+        _peripheralManager.characteristicWriteRequested.forEach((eventArgs) async {
+          final characteristic = eventArgs.characteristic;
+          final request = eventArgs.request;
+          final value = request.value;
+          print(
+            'Write request for characteristic: ${characteristic.uuid}',
+          );
+
+          switch (eventArgs.characteristic.uuid.toString().toLowerCase()) {
+            case OpenBikeControlConstants.APPINFO_CHARACTERISTIC_UUID:
+              try {
+                final appInfo = OpenBikeProtocolParser.parseAppInfo(value);
+                isConnected.value = true;
+                connectedApp.value = appInfo;
+                supportedActions = appInfo.supportedButtons.mapNotNull((b) => b.action).toList();
+                core.connection.signalNotification(
+                  AlertNotification(LogLevel.LOGLEVEL_INFO, 'Connected to app: ${appInfo.appId}'),
+                );
+                core.connection.signalNotification(LogNotification('Parsed App Info: $appInfo'));
+              } catch (e) {
+                core.connection.signalNotification(LogNotification('Error parsing App Info ${bytesToHex(value)}: $e'));
+              }
+              break;
+            default:
+              print('Unhandled write request for characteristic: ${eventArgs.characteristic.uuid}');
+          }
+
+          await _peripheralManager.respondWriteRequest(request);
+        });
+      }
+
+      if (!Platform.isWindows) {
+        // Device Information
+        await _peripheralManager.addService(
+          GATTService(
+            uuid: UUID.fromString('180A'),
+            isPrimary: true,
+            characteristics: [
+              GATTCharacteristic.immutable(
+                uuid: UUID.fromString('2A29'),
+                value: Uint8List.fromList('BikeControl'.codeUnits),
+                descriptors: [],
+              ),
+              GATTCharacteristic.immutable(
+                uuid: UUID.fromString('2A25'),
+                value: Uint8List.fromList('1337'.codeUnits),
+                descriptors: [],
+              ),
+              GATTCharacteristic.immutable(
+                uuid: UUID.fromString('2A27'),
+                value: Uint8List.fromList('1.0'.codeUnits),
+                descriptors: [],
+              ),
+              GATTCharacteristic.immutable(
+                uuid: UUID.fromString('2A26'),
+                value: Uint8List.fromList((packageInfoValue?.version ?? '1.0.0').codeUnits),
+                descriptors: [],
+              ),
+            ],
+            includedServices: [],
+          ),
+        );
+      }
+      // Battery Service
+      await _peripheralManager.addService(
+        GATTService(
+          uuid: UUID.fromString('180F'),
+          isPrimary: true,
+          characteristics: [
+            GATTCharacteristic.mutable(
+              uuid: UUID.fromString('2A19'),
+              descriptors: [],
+              properties: [
+                GATTCharacteristicProperty.read,
+                GATTCharacteristicProperty.notify,
+              ],
+              permissions: [
+                GATTCharacteristicPermission.read,
+              ],
+            ),
+          ],
+          includedServices: [],
+        ),
+      );
+
+      // Unknown Service
+      await _peripheralManager.addService(
+        GATTService(
+          uuid: UUID.fromString(OpenBikeControlConstants.SERVICE_UUID),
+          isPrimary: true,
+          characteristics: [
+            _buttonCharacteristic,
+            GATTCharacteristic.mutable(
+              uuid: UUID.fromString(OpenBikeControlConstants.APPINFO_CHARACTERISTIC_UUID),
+              descriptors: [],
+              properties: [
+                GATTCharacteristicProperty.writeWithoutResponse,
+                GATTCharacteristicProperty.write,
+              ],
+              permissions: [
+                GATTCharacteristicPermission.read,
+                GATTCharacteristicPermission.write,
+              ],
+            ),
+          ],
+          includedServices: [],
+        ),
+      );
+      _isServiceAdded = true;
+    }
+
+    final advertisement = Advertisement(
+      name: 'BikeControl',
+      serviceUUIDs: [UUID.fromString(OpenBikeControlConstants.SERVICE_UUID)],
+    );
+    print('Starting advertising with OpenBikeControl service...');
+
+    await _peripheralManager.startAdvertising(advertisement);
+  }
+
+  Future<void> stopServer() async {
+    if (kDebugMode) {
+      print('Stopping OpenBikeControl BLE server...');
+    }
+    await _peripheralManager.stopAdvertising();
+    isStarted.value = false;
+    isConnected.value = false;
+    connectedApp.value = null;
+  }
+
+  @override
+  Future<ActionResult> sendAction(KeyPair keyPair, {required bool isKeyDown, required bool isKeyUp}) async {
+    final inGameAction = keyPair.inGameAction;
+
+    final mappedButtons = connectedApp.value!.supportedButtons.filter(
+      (supportedButton) => supportedButton.action == inGameAction,
+    );
+
+    if (inGameAction == null) {
+      return Error('Invalid in-game action for key pair: $keyPair');
+    } else if (_central == null) {
+      return Error('No central connected');
+    } else if (connectedApp.value == null) {
+      return Error('No app info received from central');
+    } else if (mappedButtons.isEmpty) {
+      return NotHandled('App does not support all buttons for action: ${inGameAction.title}');
+    }
+
+    if (isKeyDown && isKeyUp) {
+      final responseDataDown = OpenBikeProtocolParser.encodeButtonState(
+        mappedButtons.map((b) => ButtonState(b, 1)).toList(),
+      );
+      await _peripheralManager.notifyCharacteristic(_central!, _buttonCharacteristic, value: responseDataDown);
+      final responseDataUp = OpenBikeProtocolParser.encodeButtonState(
+        mappedButtons.map((b) => ButtonState(b, 0)).toList(),
+      );
+      await _peripheralManager.notifyCharacteristic(_central!, _buttonCharacteristic, value: responseDataUp);
+    } else {
+      final responseData = OpenBikeProtocolParser.encodeButtonState(
+        mappedButtons.map((b) => ButtonState(b, isKeyDown ? 1 : 0)).toList(),
+      );
+      await _peripheralManager.notifyCharacteristic(_central!, _buttonCharacteristic, value: responseData);
+    }
+
+    return Success('Buttons ${inGameAction.title} sent');
+  }
+}
--- a/lib/bluetooth/devices/openbikecontrol/obc_mdns_emulator.dart
+++ b/lib/bluetooth/devices/openbikecontrol/obc_mdns_emulator.dart
@@ -0,0 +1,210 @@
+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/messages/notification.dart';
+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';
+
+class OpenBikeControlMdnsEmulator extends TrainerConnection {
+  ServerSocket? _server;
+  Registration? _mdnsRegistration;
+
+  static const String connectionTitle = 'OpenBikeControl mDNS Emulator';
+
+  final ValueNotifier<AppInfo?> connectedApp = ValueNotifier(null);
+
+  Socket? _socket;
+
+  OpenBikeControlMdnsEmulator()
+    : super(
+        title: connectionTitle,
+        supportedActions: InGameAction.values,
+      );
+
+  Future<void> startServer() async {
+    print('Starting mDNS server...');
+    isStarted.value = true;
+
+    // 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);
+
+    try {
+      // Create service
+      _mdnsRegistration = await register(
+        Service(
+          name: 'BikeControl',
+          type: '_openbikecontrol._tcp',
+          port: 36867,
+          //hostName: 'KICKR BIKE SHIFT B84D.local',
+          addresses: [localIP],
+          txt: {
+            'version': Uint8List.fromList([0x01]),
+            'id': Uint8List.fromList('1337'.codeUnits),
+            'name': Uint8List.fromList('BikeControl'.codeUnits),
+            'service-uuids': Uint8List.fromList(OpenBikeControlConstants.SERVICE_UUID.codeUnits),
+            'manufacturer': Uint8List.fromList('OpenBikeControl'.codeUnits),
+            'model': Uint8List.fromList('BikeControl app'.codeUnits),
+          },
+        ),
+      );
+      print('Service: ${_mdnsRegistration!.id} at ${localIP.address}:$_mdnsRegistration');
+      print('Server started - advertising service!');
+    } catch (e, s) {
+      core.connection.signalNotification(AlertNotification(LogLevel.LOGLEVEL_ERROR, 'Failed to start mDNS server: $e'));
+      rethrow;
+    }
+  }
+
+  Future<void> stopServer() async {
+    if (kDebugMode) {
+      print('Stopping OpenBikeControl mDNS server...');
+    }
+    if (_mdnsRegistration != null) {
+      unregister(_mdnsRegistration!);
+      _mdnsRegistration = null;
+    }
+    isStarted.value = false;
+    isConnected.value = false;
+    connectedApp.value = null;
+    _socket?.destroy();
+    _socket = null;
+  }
+
+  Future<void> _createTcpServer() async {
+    try {
+      _server = await ServerSocket.bind(
+        InternetAddress.anyIPv6,
+        36867,
+        shared: true,
+        v6Only: false,
+      );
+    } catch (e) {
+      core.connection.signalNotification(AlertNotification(LogLevel.LOGLEVEL_ERROR, 'Failed to start server: $e'));
+      rethrow;
+    }
+    if (kDebugMode) {
+      print('Server started on port ${_server!.port}');
+    }
+
+    // Accept connection
+    _server!.listen(
+      (Socket socket) {
+        _socket = socket;
+
+        if (kDebugMode) {
+          print('Client connected: ${socket.remoteAddress.address}:${socket.remotePort}');
+        }
+
+        // Listen for data from the client
+        socket.listen(
+          (List<int> data) {
+            if (kDebugMode) {
+              print('Received message: ${bytesToHex(data)}');
+            }
+            final messageType = data[0];
+            switch (messageType) {
+              case OpenBikeProtocolParser.MSG_TYPE_APP_INFO:
+                try {
+                  final appInfo = OpenBikeProtocolParser.parseAppInfo(Uint8List.fromList(data));
+                  isConnected.value = true;
+                  connectedApp.value = appInfo;
+
+                  supportedActions = appInfo.supportedButtons.mapNotNull((b) => b.action).toList();
+                  core.connection.signalNotification(
+                    AlertNotification(LogLevel.LOGLEVEL_INFO, 'Connected to app: ${appInfo.appId}'),
+                  );
+                } catch (e) {
+                  core.connection.signalNotification(LogNotification('Failed to parse app info: $e'));
+                }
+                break;
+              default:
+                print('Unknown message type: $messageType');
+            }
+          },
+          onDone: () {
+            core.connection.signalNotification(
+              AlertNotification(LogLevel.LOGLEVEL_INFO, 'Disconnected from app: ${connectedApp.value?.appId}'),
+            );
+            isConnected.value = false;
+            connectedApp.value = null;
+            _socket = null;
+          },
+        );
+      },
+    );
+  }
+
+  @override
+  Future<ActionResult> sendAction(KeyPair keyPair, {required bool isKeyDown, required bool isKeyUp}) async {
+    final inGameAction = keyPair.inGameAction;
+
+    final mappedButtons = connectedApp.value!.supportedButtons.filter(
+      (supportedButton) => supportedButton.action == inGameAction,
+    );
+
+    if (inGameAction == null) {
+      return Error('Invalid in-game action for key pair: $keyPair');
+    } else if (_socket == null) {
+      print('No client connected, cannot send button press');
+      return Error('No client connected');
+    } else if (connectedApp.value == null) {
+      return Error('No app info received from central');
+    } else if (mappedButtons.isEmpty) {
+      return NotHandled('App does not support: ${inGameAction.title}');
+    }
+
+    if (isKeyDown && isKeyUp) {
+      final responseDataDown = OpenBikeProtocolParser.encodeButtonState(
+        mappedButtons.map((b) => ButtonState(b, 1)).toList(),
+      );
+      _write(_socket!, responseDataDown);
+      final responseDataUp = OpenBikeProtocolParser.encodeButtonState(
+        mappedButtons.map((b) => ButtonState(b, 0)).toList(),
+      );
+      _write(_socket!, responseDataUp);
+    } else {
+      final responseData = OpenBikeProtocolParser.encodeButtonState(
+        mappedButtons.map((b) => ButtonState(b, isKeyDown ? 1 : 0)).toList(),
+      );
+      _write(_socket!, responseData);
+    }
+
+    return Success('Sent ${inGameAction.title} button press');
+  }
+
+  void _write(Socket socket, List<int> responseData) {
+    debugPrint('Sending response: ${bytesToHex(responseData)}');
+    socket.add(responseData);
+  }
+}
--- a/lib/bluetooth/devices/openbikecontrol/openbikecontrol_device.dart
+++ b/lib/bluetooth/devices/openbikecontrol/openbikecontrol_device.dart
@@ -0,0 +1,80 @@
+import 'dart:typed_data';
+
+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';
+
+import '../bluetooth_device.dart';
+import 'protocol_parser.dart';
+
+class OpenBikeControlDevice extends BluetoothDevice {
+  OpenBikeControlDevice(super.scanResult)
+    : super(
+        availableButtons: OpenBikeProtocolParser.BUTTON_NAMES.values.toList(),
+      );
+
+  @override
+  Future<void> handleServices(List<BleService> services) async {
+    final service = services.firstWhere(
+      (e) => e.uuid.toLowerCase() == OpenBikeControlConstants.SERVICE_UUID.toLowerCase(),
+      orElse: () => throw Exception('Service not found: ${OpenBikeControlConstants.SERVICE_UUID}'),
+    );
+
+    final characteristic = service.characteristics.firstWhere(
+      (e) => e.uuid.toLowerCase() == OpenBikeControlConstants.BUTTON_STATE_CHARACTERISTIC_UUID.toLowerCase(),
+      orElse: () =>
+          throw Exception('Characteristic not found: ${OpenBikeControlConstants.BUTTON_STATE_CHARACTERISTIC_UUID}'),
+    );
+
+    await UniversalBle.subscribeNotifications(device.deviceId, service.uuid, characteristic.uuid);
+
+    final appInfoCharacteristic = service.characteristics.firstWhere(
+      (e) => e.uuid.toLowerCase() == OpenBikeControlConstants.APPINFO_CHARACTERISTIC_UUID.toLowerCase(),
+      orElse: () =>
+          throw Exception('Characteristic not found: ${OpenBikeControlConstants.APPINFO_CHARACTERISTIC_UUID}'),
+    );
+
+    await UniversalBle.write(
+      device.deviceId,
+      service.uuid,
+      appInfoCharacteristic.uuid,
+      OpenBikeProtocolParser.encodeAppInfo(
+        appId: 'BikeControl',
+        appVersion: packageInfoValue!.version,
+        supportedButtons: OpenBikeProtocolParser.BUTTON_NAMES.values.toList(),
+      ),
+    );
+  }
+
+  @override
+  Future<void> processCharacteristic(String characteristic, Uint8List bytes) async {
+    final charLower = characteristic.toLowerCase();
+
+    if (charLower == OpenBikeControlConstants.BUTTON_STATE_CHARACTERISTIC_UUID.toLowerCase()) {
+      try {
+        final parsed = OpenBikeProtocolParser.parseButtonState(bytes);
+
+        final buttonsToPress = parsed.where((e) => e.state == 1).map((e) => e.button).toList();
+
+        await handleButtonsClicked(buttonsToPress);
+      } catch (e) {
+        actionStreamInternal.add(AlertNotification(LogLevel.LOGLEVEL_WARNING, 'Error parsing OpenBike message: $e'));
+      }
+    }
+  }
+}
+
+class OpenBikeControlConstants {
+  // OpenBikeControl BLE service and characteristic UUIDs (see BLE.md)
+  static const String SERVICE_UUID = 'd273f680-d548-419d-b9d1-fa0472345229';
+
+  // Button State Characteristic (Notify)
+  static const String BUTTON_STATE_CHARACTERISTIC_UUID = 'd273f681-d548-419d-b9d1-fa0472345229';
+
+  // Haptic Feedback Characteristic (Write)
+  static const String HAPTIC_CHARACTERISTIC_UUID = 'd273f682-d548-419d-b9d1-fa0472345229';
+
+  // App Info Characteristic (Write)
+  static const String APPINFO_CHARACTERISTIC_UUID = 'd273f683-d548-419d-b9d1-fa0472345229';
+}
--- a/lib/bluetooth/devices/openbikecontrol/protocol_parser.dart
+++ b/lib/bluetooth/devices/openbikecontrol/protocol_parser.dart
@@ -0,0 +1,308 @@
+// OpenBikeControl Protocol Parser (Dart)
+
+// This file is a translation of the Python `protocol_parser.py` example into Dart.
+// It provides simple encoding/decoding utilities for the OpenBikeControl message
+// types used in the Python example. This is intentionally a small, focused
+// module that mirrors the original Python API.
+
+import 'dart:convert';
+import 'dart:typed_data';
+
+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;
+  final Uint8List? raw;
+  ProtocolParseException(this.message, [this.raw]);
+
+  @override
+  String toString() => 'ProtocolParseException: $message${raw != null ? ' raw=${bytesToReadableHex(raw!)}' : ''}';
+}
+
+class OpenBikeProtocolParser {
+  // Button ID to name mapping (based on PROTOCOL.md in Python example)
+  static const Map<int, ControllerButton> BUTTON_NAMES = {
+    // Gear Shifting (0x01-0x0F)
+    0x01: ControllerButton('Shift Up', identifier: 0x01, action: InGameAction.shiftUp),
+    0x02: ControllerButton('Shift Down', identifier: 0x02, action: InGameAction.shiftDown),
+    0x03: ControllerButton('Gear Set', identifier: 0x03),
+    // Navigation (0x10-0x1F)
+    0x10: ControllerButton('Up', identifier: 0x10, action: InGameAction.up),
+    0x11: ControllerButton('Down', identifier: 0x11, action: InGameAction.down),
+    0x12: ControllerButton('Left/Look Left', identifier: 0x12, action: InGameAction.navigateLeft),
+    0x13: ControllerButton('Right/Look Right', identifier: 0x13, action: InGameAction.navigateRight),
+    0x14: ControllerButton('Select/Confirm', identifier: 0x14, action: InGameAction.select),
+    0x15: ControllerButton('Back/Cancel', identifier: 0x15, action: InGameAction.back),
+    0x16: ControllerButton('Menu', identifier: 0x16, action: InGameAction.menu),
+    0x17: ControllerButton('Home', identifier: 0x17, action: InGameAction.home),
+    0x18: ControllerButton('Steer Left', identifier: 0x18, action: InGameAction.steerLeft),
+    0x19: ControllerButton('Steer Right', identifier: 0x19, action: InGameAction.steerRight),
+    // Social/Emotes (0x20-0x2F)
+    0x20: ControllerButton('Emote', identifier: 0x20, action: InGameAction.emote),
+    0x21: ControllerButton('Push to Talk', identifier: 0x21),
+    // Training Controls (0x30-0x3F)
+    0x30: ControllerButton('ERG Up', identifier: 0x30, action: InGameAction.increaseResistance),
+    0x31: ControllerButton('ERG Down', identifier: 0x31, action: InGameAction.decreaseResistance),
+    0x32: ControllerButton('Skip Interval', identifier: 0x32),
+    0x33: ControllerButton('Pause', identifier: 0x33),
+    0x34: ControllerButton('Resume', identifier: 0x34),
+    0x35: ControllerButton('Lap', identifier: 0x35),
+    // View Controls (0x40-0x4F)
+    0x40: ControllerButton('Camera Angle', identifier: 0x40, action: InGameAction.cameraAngle),
+    0x41: ControllerButton('Camera 1', identifier: 0x41, action: InGameAction.cameraAngle),
+    0x42: ControllerButton('Camera 2', identifier: 0x42, action: InGameAction.cameraAngle),
+    0x43: ControllerButton('Camera 3', identifier: 0x43, action: InGameAction.cameraAngle),
+    0x44: ControllerButton('HUD Toggle', identifier: 0x44, action: InGameAction.toggleUi),
+    0x45: ControllerButton('Map Toggle', identifier: 0x45),
+    // Power-ups (0x50-0x5F)
+    0x50: ControllerButton('Power-up 1', identifier: 0x50, action: InGameAction.usePowerUp),
+    0x51: ControllerButton('Power-up 2', identifier: 0x51, action: InGameAction.usePowerUp),
+    0x52: ControllerButton('Power-up 3', identifier: 0x52, action: InGameAction.usePowerUp),
+  };
+
+  // Haptic feedback patterns
+  static const Map<String, int> HAPTIC_PATTERNS = {
+    'none': 0x00,
+    'short': 0x01,
+    'double': 0x02,
+    'triple': 0x03,
+    'long': 0x04,
+    'success': 0x05,
+    'warning': 0x06,
+    'error': 0x07,
+  };
+
+  // Message types (for TCP/mDNS protocol)
+  static const int MSG_TYPE_BUTTON_STATE = 0x01;
+  static const int MSG_TYPE_DEVICE_STATUS = 0x02;
+  static const int MSG_TYPE_HAPTIC_FEEDBACK = 0x03;
+  static const int MSG_TYPE_APP_INFO = 0x04;
+
+  /// Parse button state data from binary format.
+  /// Data format: [Message_Type, Button_ID_1, State_1, Button_ID_2, State_2, ...]
+  static List<ButtonState> parseButtonState(Uint8List data) {
+    final buttons = <ButtonState>[];
+
+    if (data.isEmpty) return buttons;
+
+    if (data[0] != MSG_TYPE_BUTTON_STATE) return buttons;
+
+    for (var i = 1; i < data.length; i += 2) {
+      if (i + 1 < data.length) {
+        final buttonId = data[i];
+        final state = data[i + 1];
+        if (BUTTON_NAMES[buttonId] != null) {
+          buttons.add(ButtonState(BUTTON_NAMES[buttonId]!, state));
+        } else {
+          throw ProtocolParseException('Unknown button ID: 0x${buttonId.toRadixString(16).padLeft(2, '0')}', data);
+        }
+      }
+    }
+
+    return buttons;
+  }
+
+  static Uint8List encodeButtonState(List<ButtonState> buttons) {
+    final bytes = BytesBuilder();
+    bytes.addByte(MSG_TYPE_BUTTON_STATE);
+    for (final b in buttons) {
+      bytes.addByte(b.button.identifier!);
+      bytes.addByte(b.state);
+    }
+    return bytes.toBytes();
+  }
+
+  static DeviceStatus parseDeviceStatus(Uint8List data) {
+    if (data.length < 3) {
+      throw ProtocolParseException('Device status message too short', data);
+    }
+    if (data[0] != MSG_TYPE_DEVICE_STATUS) {
+      throw ProtocolParseException('Invalid message type: ${data[0]}, expected $MSG_TYPE_DEVICE_STATUS', data);
+    }
+    final battery = data[1] == 0xFF ? null : data[1];
+    final connected = data[2] == 0x01;
+    return DeviceStatus(battery: battery, connected: connected);
+  }
+
+  static Uint8List encodeDeviceStatus({int? battery, bool connected = true}) {
+    final batteryByte = battery == null ? 0xFF : (battery & 0xFF);
+    final connectedByte = connected ? 0x01 : 0x00;
+    return Uint8List.fromList([MSG_TYPE_DEVICE_STATUS, batteryByte, connectedByte]);
+  }
+
+  static Uint8List encodeHapticFeedback({String pattern = 'short', int duration = 0, int intensity = 0}) {
+    final patternByte = HAPTIC_PATTERNS[pattern] ?? HAPTIC_PATTERNS['short']!;
+    final bytes = Uint8List(4);
+    bytes[0] = MSG_TYPE_HAPTIC_FEEDBACK;
+    bytes[1] = patternByte;
+    bytes[2] = duration & 0xFF;
+    bytes[3] = intensity & 0xFF;
+    return bytes;
+  }
+
+  static HapticFeedbackMessage parseHapticFeedback(Uint8List data) {
+    if (data.length < 4) {
+      throw ProtocolParseException('Haptic feedback message too short', data);
+    }
+    if (data[0] != MSG_TYPE_HAPTIC_FEEDBACK) {
+      throw ProtocolParseException('Invalid message type: ${data[0]}', data);
+    }
+    final patternByte = data[1];
+    final duration = data[2];
+    final intensity = data[3];
+    String patternName = 'unknown';
+    HAPTIC_PATTERNS.forEach((name, value) {
+      if (value == patternByte) patternName = name;
+    });
+
+    return HapticFeedbackMessage(
+      pattern: patternName,
+      patternByte: patternByte,
+      duration: duration,
+      intensity: intensity,
+    );
+  }
+
+  static Uint8List encodeAppInfo({
+    required String appId,
+    required String appVersion,
+    required List<ControllerButton> supportedButtons,
+  }) {
+    final appIdBytes = utf8.encode(appId).take(32).toList();
+    final appVersionBytes = utf8.encode(appVersion).take(32).toList();
+
+    final builder = BytesBuilder();
+    builder.addByte(MSG_TYPE_APP_INFO);
+    builder.addByte(0x01); // Version
+    builder.addByte(appIdBytes.length);
+    builder.add(appIdBytes);
+    builder.addByte(appVersionBytes.length);
+    builder.add(appVersionBytes);
+    builder.addByte(supportedButtons.length);
+    builder.add(supportedButtons.map((e) => e.identifier!).toList());
+
+    return builder.toBytes();
+  }
+
+  static AppInfo parseAppInfo(Uint8List data) {
+    if (data.isEmpty || data[0] != MSG_TYPE_APP_INFO) {
+      throw ProtocolParseException('Invalid message type', data);
+    }
+
+    var idx = 1;
+    if (data.length < idx + 3) {
+      throw ProtocolParseException('App info message too short', data);
+    }
+
+    final version = data[idx];
+    idx += 1;
+    if (version != 0x01) {
+      throw ProtocolParseException('Unsupported app info version: $version', data);
+    }
+
+    if (idx >= data.length) throw ProtocolParseException('Missing app ID length', data);
+    final appIdLen = data[idx];
+    idx += 1;
+    if (idx + appIdLen > data.length) throw ProtocolParseException('App ID length exceeds buffer', data);
+    final appId = utf8.decode(data.sublist(idx, idx + appIdLen));
+    idx += appIdLen;
+
+    if (idx >= data.length) throw ProtocolParseException('Missing app version length', data);
+    final appVersionLen = data[idx];
+    idx += 1;
+    if (idx + appVersionLen > data.length) throw ProtocolParseException('App version length exceeds buffer', data);
+    final appVersion = utf8.decode(data.sublist(idx, idx + appVersionLen));
+    idx += appVersionLen;
+
+    if (idx >= data.length) throw ProtocolParseException('Missing button count', data);
+    final buttonCount = data[idx];
+    idx += 1;
+    if (idx + buttonCount > data.length) throw ProtocolParseException('Button count exceeds buffer', data);
+    final buttonIds = data.sublist(idx, idx + buttonCount).toList();
+
+    final controllerButtons = buttonIds.mapNotNull((id) => BUTTON_NAMES[id]).toList();
+
+    return AppInfo(
+      appId: appId,
+      appVersion: appVersion,
+      supportedButtons: controllerButtons,
+      supportedActions: controllerButtons.mapNotNull((b) => b.action).toList(),
+    );
+  }
+}
+
+class AppInfo {
+  final String appId;
+  final String appVersion;
+  final List<ControllerButton> supportedButtons;
+  final List<InGameAction> supportedActions;
+
+  AppInfo({
+    required this.appId,
+    required this.appVersion,
+    required this.supportedButtons,
+    required this.supportedActions,
+  });
+
+  @override
+  String toString() =>
+      'AppInfo(appId: $appId, appVersion: $appVersion, supportedButtons: $supportedButtons, supportedActions: $supportedActions)';
+}
+
+/// DeviceStatus message representation
+class DeviceStatus {
+  final int? battery; // 0-100, null if 0xFF
+  final bool connected;
+
+  DeviceStatus({required this.battery, required this.connected});
+
+  @override
+  String toString() => 'DeviceStatus(battery: ${battery ?? 'unknown'}, connected: $connected)';
+}
+
+class ButtonState {
+  /// Represents a single button id/state pair.class ButtonState {
+  final ControllerButton button;
+  final int state; // 0=released,1=pressed,2-255=analog
+
+  const ButtonState(this.button, this.state);
+
+  @override
+  String toString() => formatButtonState(button, state);
+
+  String formatButtonState(ControllerButton button, int state) {
+    final buttonName = button.name;
+
+    String stateStr;
+    if (state == 0) {
+      stateStr = 'RELEASED';
+    } else if (state == 1) {
+      stateStr = 'PRESSED';
+    } else {
+      final percentage = ((state - 2) / (255 - 2) * 100).round();
+      stateStr = 'ANALOG $percentage%';
+    }
+
+    return '$buttonName: $stateStr';
+  }
+}
+
+/// Haptic feedback representation
+class HapticFeedbackMessage {
+  final String pattern;
+  final int patternByte;
+  final int duration; // in 10ms units
+  final int intensity; // 0-255
+
+  HapticFeedbackMessage({
+    required this.pattern,
+    required this.patternByte,
+    required this.duration,
+    required this.intensity,
+  });
+
+  @override
+  String toString() => 'HapticFeedback(pattern: $pattern, duration: $duration, intensity: $intensity)';
+}
--- a/lib/bluetooth/devices/shimano/shimano_di2.dart
+++ b/lib/bluetooth/devices/shimano/shimano_di2.dart
@@ -0,0 +1,101 @@
+import 'dart:typed_data';
+
+import 'package:bike_control/utils/core.dart';
+import 'package:bike_control/utils/keymap/apps/custom_app.dart';
+import 'package:bike_control/utils/keymap/buttons.dart';
+import 'package:dartx/dartx.dart';
+import 'package:flutter/material.dart';
+import 'package:universal_ble/universal_ble.dart';
+
+import '../bluetooth_device.dart';
+
+class ShimanoDi2 extends BluetoothDevice {
+  ShimanoDi2(super.scanResult) : super(availableButtons: [], buttonPrefix: 'D-Fly Channel ');
+
+  @override
+  Future<void> handleServices(List<BleService> services) async {
+    final service = services.firstWhere(
+      (e) => e.uuid.toLowerCase() == ShimanoDi2Constants.SERVICE_UUID.toLowerCase(),
+      orElse: () => throw Exception('Service not found: ${ShimanoDi2Constants.SERVICE_UUID}'),
+    );
+    final characteristic = service.characteristics.firstWhere(
+      (e) => e.uuid.toLowerCase() == ShimanoDi2Constants.D_FLY_CHANNEL_UUID.toLowerCase(),
+      orElse: () => throw Exception('Characteristic not found: ${ShimanoDi2Constants.D_FLY_CHANNEL_UUID}'),
+    );
+
+    await UniversalBle.subscribeIndications(device.deviceId, service.uuid, characteristic.uuid);
+  }
+
+  final _lastButtons = <int, int>{};
+  bool _isInitialized = false;
+
+  @override
+  Future<void> processCharacteristic(String characteristic, Uint8List bytes) async {
+    if (characteristic.toLowerCase() == ShimanoDi2Constants.D_FLY_CHANNEL_UUID) {
+      final channels = bytes.sublist(1);
+
+      // On first data reception, just initialize the state without triggering buttons
+      if (!_isInitialized) {
+        channels.forEachIndexed((int value, int index) {
+          final readableIndex = index + 1;
+          _lastButtons[index] = value;
+
+          getOrAddButton(
+            'D-Fly Channel $readableIndex',
+            () => ControllerButton('D-Fly Channel $readableIndex', sourceDeviceId: device.deviceId),
+          );
+        });
+        _isInitialized = true;
+        return Future.value();
+      }
+
+      final clickedButtons = <ControllerButton>[];
+
+      channels.forEachIndexed((int value, int index) {
+        final didChange = _lastButtons[index] != value;
+        _lastButtons[index] = value;
+
+        final readableIndex = index + 1;
+
+        final button = getOrAddButton(
+          'D-Fly Channel $readableIndex',
+          () => ControllerButton('D-Fly Channel $readableIndex', sourceDeviceId: device.deviceId),
+        );
+        if (didChange) {
+          clickedButtons.add(button);
+        }
+      });
+
+      if (clickedButtons.isNotEmpty) {
+        await handleButtonsClickedWithoutLongPressSupport(clickedButtons);
+      }
+    }
+    return Future.value();
+  }
+
+  @override
+  Widget showInformation(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        super.showInformation(context),
+        Text(
+          'Make sure to set your Di2 buttons to D-Fly channels in the Shimano E-TUBE app.',
+          style: TextStyle(fontSize: 12, color: Colors.grey),
+        ),
+        if (core.actionHandler.supportedApp is! CustomApp)
+          Text(
+            'Use a custom keymap to support ${scanResult.name}',
+            style: TextStyle(fontSize: 12, color: Colors.grey),
+          ),
+      ],
+    );
+  }
+}
+
+class ShimanoDi2Constants {
+  static const String SERVICE_UUID = "000018ef-5348-494d-414e-4f5f424c4500";
+  static const String SERVICE_UUID_ALTERNATIVE = "000018ff-5348-494d-414e-4f5f424c4500";
+
+  static const String D_FLY_CHANNEL_UUID = "00002ac2-5348-494d-414e-4f5f424c4500";
+}
--- a/lib/bluetooth/devices/sram/sram_axs.dart
+++ b/lib/bluetooth/devices/sram/sram_axs.dart
@@ -0,0 +1,172 @@
+import 'dart:async';
+
+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';
+
+import '../bluetooth_device.dart';
+
+class SramAxs extends BluetoothDevice {
+  SramAxs(super.scanResult) : super(availableButtons: [], isBeta: true);
+
+  Timer? _singleClickTimer;
+  int _tapCount = 0;
+
+  @override
+  Future<void> disconnect() async {
+    _singleClickTimer?.cancel();
+    _singleClickTimer = null;
+    _tapCount = 0;
+    await super.disconnect();
+  }
+
+  @override
+  Future<void> handleServices(List<BleService> services) async {
+    final service = services.firstWhere(
+      (e) => e.uuid.toLowerCase() == SramAxsConstants.SERVICE_UUID_RELEVANT.toLowerCase(),
+      orElse: () => throw Exception('Service not found: ${SramAxsConstants.SERVICE_UUID_RELEVANT}'),
+    );
+    final characteristic = service.characteristics.firstWhere(
+      (e) => e.uuid.toLowerCase() == SramAxsConstants.TRIGGER_UUID.toLowerCase(),
+      orElse: () => throw Exception('Characteristic not found: ${SramAxsConstants.TRIGGER_UUID}'),
+    );
+
+    await UniversalBle.subscribeNotifications(device.deviceId, service.uuid, characteristic.uuid);
+
+    // add both buttons
+    _singleClickButton();
+    _doubleClickButton();
+  }
+
+  ControllerButton _singleClickButton() => getOrAddButton(
+    'SRAM Tap',
+    () => ControllerButton('SRAM Tap', action: InGameAction.shiftUp, sourceDeviceId: device.deviceId),
+  );
+
+  ControllerButton _doubleClickButton() => getOrAddButton(
+    'SRAM Double Tap',
+    () => ControllerButton('SRAM Double Tap', action: InGameAction.shiftDown, sourceDeviceId: device.deviceId),
+  );
+
+  void _emitClick(ControllerButton button) {
+    // Use the common pipeline so long-press handling and app action execution stays consistent.
+    handleButtonsClickedWithoutLongPressSupport([button]);
+  }
+
+  void _registerTap() {
+    final windowMs = core.settings.getSramAxsDoubleClickWindowMs();
+
+    _tapCount++;
+
+    // First tap: start a timer. If no second tap arrives in time => single click.
+    if (_tapCount == 1) {
+      _singleClickTimer?.cancel();
+      _singleClickTimer = Timer(Duration(milliseconds: windowMs), () {
+        if (_tapCount == 1) {
+          _emitClick(_singleClickButton());
+        }
+        _tapCount = 0;
+      });
+      return;
+    }
+
+    // Second tap within window: double click.
+    if (_tapCount == 2) {
+      _singleClickTimer?.cancel();
+      _singleClickTimer = null;
+      _emitClick(_doubleClickButton());
+      _tapCount = 0;
+      return;
+    }
+
+    // If we get more than two taps fast, treat as a double click and restart counting.
+    _singleClickTimer?.cancel();
+    _singleClickTimer = null;
+    _emitClick(_doubleClickButton());
+    _tapCount = 0;
+  }
+
+  @override
+  Future<void> processCharacteristic(String characteristic, Uint8List bytes) async {
+    if (kDebugMode) {
+      debugPrint('SramAxs: Received data on characteristic $characteristic: ${bytesToHex(bytes)}');
+    }
+
+    if (characteristic.toLowerCase() == SramAxsConstants.TRIGGER_UUID.toLowerCase()) {
+      // At the moment we can only detect "some button pressed". We therefore interpret each
+      // notification as a tap and provide two logical buttons (single & double click).
+      _registerTap();
+    }
+
+    return Future.value();
+  }
+
+  @override
+  Widget showInformation(BuildContext context) {
+    final windowMs = core.settings.getSramAxsDoubleClickWindowMs();
+
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      spacing: 12,
+      children: [
+        super.showInformation(context),
+        Text(
+          "Don't forget to turn off the function of the button you want to use in the SRAM AXS app!\n"
+          "Unfortunately, at the moment it's not possible to determine which physical button was pressed on your SRAM AXS device. Let us know if you have a contact at SRAM who can help :)\n\n"
+          'So the app exposes two logical buttons:\n'
+          '• SRAM Tap, assigned to Shift Up\n'
+          '• SRAM Double Tap, assigned to Shift Down\n\n'
+          'You can assign an action to each in the app settings.',
+        ).xSmall,
+        Builder(
+          builder: (context) {
+            return PrimaryButton(
+              size: ButtonSize.small,
+              trailing: Container(
+                padding: const EdgeInsets.symmetric(horizontal: 4),
+                decoration: BoxDecoration(
+                  color: Theme.of(context).colorScheme.primary,
+                  borderRadius: BorderRadius.circular(4),
+                ),
+                child: Text('${windowMs}ms'),
+              ),
+              onPressed: () {
+                final values = [
+                  for (var v = 150; v <= 600; v += 50) v,
+                ];
+                showDropdown(
+                  context: context,
+                  builder: (b) => DropdownMenu(
+                    children: values
+                        .map(
+                          (v) => MenuButton(
+                            child: Text('${v}ms'),
+                            onPressed: (c) async {
+                              await core.settings.setSramAxsDoubleClickWindowMs(v);
+                              // Force rebuild to show new value.
+                              (context as Element).markNeedsBuild();
+                            },
+                          ),
+                        )
+                        .toList(),
+                  ),
+                );
+              },
+              child: const Text('Double-click window:'),
+            );
+          },
+        ),
+      ],
+    );
+  }
+}
+
+class SramAxsConstants {
+  static const String SERVICE_UUID = "0000fe51-0000-1000-8000-00805f9b34fb";
+  static const String SERVICE_UUID_RELEVANT = "d9050053-90aa-4c7c-b036-1e01fb8eb7ee";
+
+  static const String TRIGGER_UUID = "d9050054-90aa-4c7c-b036-1e01fb8eb7ee";
+}
--- a/lib/bluetooth/devices/thinkrider/thinkrider_vs200.dart
+++ b/lib/bluetooth/devices/thinkrider/thinkrider_vs200.dart
@@ -0,0 +1,90 @@
+import 'dart:typed_data';
+
+import 'package:flutter/material.dart';
+import 'package:bike_control/bluetooth/messages/notification.dart';
+import 'package:bike_control/utils/keymap/buttons.dart';
+import 'package:universal_ble/universal_ble.dart';
+
+import '../bluetooth_device.dart';
+
+class ThinkRiderVs200 extends BluetoothDevice {
+  ThinkRiderVs200(super.scanResult)
+    : super(
+        availableButtons: ThinkRiderVs200Buttons.values,
+        isBeta: true,
+        allowMultiple: true,
+      );
+
+  @override
+  Future<void> handleServices(List<BleService> services) async {
+    // Only subscribe to service 0xFEA0
+    final service = services.firstWhere(
+      (e) => e.uuid.toLowerCase() == ThinkRiderVs200Constants.SERVICE_UUID.toLowerCase(),
+      orElse: () => throw Exception('Service not found: ${ThinkRiderVs200Constants.SERVICE_UUID}'),
+    );
+    final characteristic = service.characteristics.firstWhere(
+      (e) => e.uuid.toLowerCase() == ThinkRiderVs200Constants.CHARACTERISTIC_UUID.toLowerCase(),
+      orElse: () => throw Exception('Characteristic not found: ${ThinkRiderVs200Constants.CHARACTERISTIC_UUID}'),
+    );
+
+    await UniversalBle.subscribeNotifications(device.deviceId, service.uuid, characteristic.uuid);
+  }
+
+  @override
+  Future<void> processCharacteristic(String characteristic, Uint8List bytes) {
+    if (characteristic.toLowerCase() == ThinkRiderVs200Constants.CHARACTERISTIC_UUID.toLowerCase()) {
+      final hexValue = _bytesToHex(bytes).toLowerCase();
+
+      // Log all received values while in beta
+      if (isBeta) {
+        actionStreamInternal.add(LogNotification('VS200 received: $hexValue'));
+      }
+
+      // Check for specific byte patterns
+      if (hexValue == ThinkRiderVs200Constants.SHIFT_UP_PATTERN) {
+        // Plus button pressed
+        actionStreamInternal.add(LogNotification('Shift Up detected: $hexValue'));
+        handleButtonsClickedWithoutLongPressSupport([availableButtons[0]]);
+      } else if (hexValue == ThinkRiderVs200Constants.SHIFT_DOWN_PATTERN) {
+        // Minus button pressed
+        actionStreamInternal.add(LogNotification('Shift Down detected: $hexValue'));
+        handleButtonsClickedWithoutLongPressSupport([availableButtons[1]]);
+      }
+    }
+
+    return Future.value();
+  }
+
+  String _bytesToHex(List<int> bytes) {
+    return bytes.map((byte) => byte.toRadixString(16).padLeft(2, '0')).join();
+  }
+}
+
+class ThinkRiderVs200Constants {
+  // Service and characteristic UUIDs based on the nRF Connect screenshot
+  static const String SERVICE_UUID = "0000fea0-0000-1000-8000-00805f9b34fb";
+  static const String CHARACTERISTIC_UUID = "0000fea1-0000-1000-8000-00805f9b34fb";
+
+  // Byte patterns for button detection
+  static const String SHIFT_UP_PATTERN = "f3050301fc";
+  static const String SHIFT_DOWN_PATTERN = "f3050300fb";
+}
+
+class ThinkRiderVs200Buttons {
+  static const ControllerButton shiftUp = ControllerButton(
+    'shiftUp',
+    action: InGameAction.shiftUp,
+    icon: Icons.add,
+  );
+
+  static const ControllerButton shiftDown = ControllerButton(
+    'shiftDown',
+    action: InGameAction.shiftDown,
+    icon: Icons.remove,
+  );
+
+  static const List<ControllerButton> values = [
+    shiftUp,
+    shiftDown,
+  ];
+}
--- a/lib/bluetooth/devices/trainer_connection.dart
+++ b/lib/bluetooth/devices/trainer_connection.dart
@@ -0,0 +1,16 @@
+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:flutter/foundation.dart';
+
+abstract class TrainerConnection {
+  final String title;
+  List<InGameAction> supportedActions;
+
+  final ValueNotifier<bool> isStarted = ValueNotifier(false);
+  final ValueNotifier<bool> isConnected = ValueNotifier(false);
+
+  TrainerConnection({required this.title, required this.supportedActions});
+
+  Future<ActionResult> sendAction(KeyPair keyPair, {required bool isKeyDown, required bool isKeyUp});
+}
--- a/lib/bluetooth/devices/wahoo/wahoo_kickr_bike_pro.dart
+++ b/lib/bluetooth/devices/wahoo/wahoo_kickr_bike_pro.dart
@@ -0,0 +1,10 @@
+import 'package:bike_control/bluetooth/devices/zwift/zwift_ride.dart';
+
+import '../zwift/constants.dart';
+
+class WahooKickrBikePro extends ZwiftRide {
+  WahooKickrBikePro(super.scanResult) : super();
+
+  @override
+  String get customServiceId => ZwiftConstants.ZWIFT_CUSTOM_SERVICE_UUID;
+}
--- a/lib/bluetooth/devices/wahoo/wahoo_kickr_bike_shift.dart
+++ b/lib/bluetooth/devices/wahoo/wahoo_kickr_bike_shift.dart
@@ -1,11 +1,13 @@
 import 'dart:collection';
 import 'dart:typed_data';

-import 'package:swift_control/bluetooth/devices/base_device.dart';
-import 'package:swift_control/utils/keymap/buttons.dart';
+import 'package:flutter/material.dart';
+import 'package:bike_control/utils/keymap/buttons.dart';
 import 'package:universal_ble/universal_ble.dart';

-class WahooKickrBikeShift extends BaseDevice {
+import '../bluetooth_device.dart';
+
+class WahooKickrBikeShift extends BluetoothDevice {
  WahooKickrBikeShift(super.scanResult)
    : super(
        availableButtons: WahooKickrBikeShiftConstants.prefixToButton.values.toList(),
@@ -111,17 +113,75 @@ class WahooKickrBikeShiftConstants {

  // https://support.wahoofitness.com/hc/en-us/articles/22259367275410-Shifter-and-button-configuration-for-KICKR-BIKE-1-2
  static const Map<String, ControllerButton> prefixToButton = {
-    '0001': ControllerButton.powerUpRight, //'Right Up',
-    '8000': ControllerButton.sideButtonRight, //'Right Down',
-    '0008': ControllerButton.navigationRight, //'Right Steer',
-    '0200': ControllerButton.powerUpLeft, // 'Left Up',
-    '0400': ControllerButton.sideButtonLeft, //'Left Down',
-    '2000': ControllerButton.navigationLeft, //'Left Steer',
-    '0004': ControllerButton.shiftUpRight, // 'Right Shift Up',
-    '0002': ControllerButton.shiftDownRight, // 'Right Shift Down',
-    '1000': ControllerButton.shiftUpLeft, //'Left Shift Up',
-    '0800': ControllerButton.shiftDownLeft, //'Left Shift Down',
-    '4000': ControllerButton.paddleRight, //'Right Brake',
-    '0100': ControllerButton.paddleLeft, //'Left Brake',
+    '0001': WahooKickrShiftButtons.rightUp, //'Right Up',
+    '8000': WahooKickrShiftButtons.rightDown, //'Right Down',
+    '0008': WahooKickrShiftButtons.rightSteer, //'Right Steer',
+    '0200': WahooKickrShiftButtons.leftUp, // 'Left Up',
+    '0400': WahooKickrShiftButtons.leftDown, //'Left Down',
+    '2000': WahooKickrShiftButtons.leftSteer, //'Left Steer',
+    '0004': WahooKickrShiftButtons.shiftUpRight, // 'Right Shift Up',
+    '0002': WahooKickrShiftButtons.shiftDownRight, // 'Right Shift Down',
+    '1000': WahooKickrShiftButtons.shiftUpLeft, //'Left Shift Up',
+    '0800': WahooKickrShiftButtons.shiftDownLeft, //'Left Shift Down',
+    '4000': WahooKickrShiftButtons.rightBrake, //'Right Brake',
+    '0100': WahooKickrShiftButtons.leftBrake, //'Left Brake',
  };
 }
+
+class WahooKickrShiftButtons {
+  static const ControllerButton leftSteer = ControllerButton(
+    'leftSteer',
+    action: InGameAction.navigateLeft,
+    icon: Icons.keyboard_arrow_left,
+    color: Colors.black,
+  );
+  static const ControllerButton rightSteer = ControllerButton(
+    'rightSteer',
+    action: InGameAction.navigateRight,
+    icon: Icons.keyboard_arrow_right,
+    color: Colors.black,
+  );
+  static const ControllerButton leftDown = ControllerButton('leftDown', action: InGameAction.shiftDown);
+  static const ControllerButton leftBrake = ControllerButton('leftBrake', action: InGameAction.shiftDown);
+
+  static const ControllerButton shiftUpLeft = ControllerButton(
+    'shiftUpLeft',
+    action: InGameAction.shiftDown,
+    icon: Icons.remove,
+    color: Colors.black,
+  );
+  static const ControllerButton shiftDownLeft = ControllerButton(
+    'shiftDownLeft',
+    action: InGameAction.shiftDown,
+    icon: Icons.remove,
+    color: Colors.black,
+  );
+  static const ControllerButton leftUp = ControllerButton('leftUp', action: InGameAction.shiftDown);
+
+  static const ControllerButton rightDown = ControllerButton('rightDown', action: InGameAction.shiftUp);
+  static const ControllerButton rightBrake = ControllerButton('rightBrake', action: InGameAction.shiftUp);
+
+  static const ControllerButton shiftUpRight = ControllerButton(
+    'shiftUpRight',
+    action: InGameAction.shiftUp,
+    icon: Icons.add,
+    color: Colors.black,
+  );
+  static const ControllerButton shiftDownRight = ControllerButton('shiftDownRight', action: InGameAction.shiftUp);
+  static const ControllerButton rightUp = ControllerButton('rightUp', action: InGameAction.shiftUp);
+
+  static const List<ControllerButton> values = [
+    leftSteer,
+    rightSteer,
+    leftDown,
+    leftBrake,
+    shiftUpLeft,
+    shiftDownLeft,
+    leftUp,
+    rightDown,
+    rightBrake,
+    shiftUpRight,
+    shiftDownRight,
+    rightUp,
+  ];
+}
--- a/lib/bluetooth/devices/wahoo/wahoo_kickr_headwind.dart
+++ b/lib/bluetooth/devices/wahoo/wahoo_kickr_headwind.dart
@@ -0,0 +1,154 @@
+import 'dart:typed_data';
+
+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';
+
+class WahooKickrHeadwind extends BluetoothDevice {
+  // Current mode state
+  HeadwindMode _currentMode = HeadwindMode.unknown;
+  int _currentSpeed = 0;
+
+  WahooKickrHeadwind(super.scanResult)
+    : super(
+        availableButtons: const [],
+        isBeta: true,
+      );
+
+  @override
+  Future<void> handleServices(List<BleService> services) async {
+    final service = services.firstWhere(
+      (e) => e.uuid == WahooKickrHeadwindConstants.SERVICE_UUID.toLowerCase(),
+      orElse: () => throw Exception('Service not found: ${WahooKickrHeadwindConstants.SERVICE_UUID}'),
+    );
+    final characteristic = service.characteristics.firstWhere(
+      (e) => e.uuid == WahooKickrHeadwindConstants.CHARACTERISTIC_UUID.toLowerCase(),
+      orElse: () => throw Exception('Characteristic not found: ${WahooKickrHeadwindConstants.CHARACTERISTIC_UUID}'),
+    );
+
+    // Subscribe to notifications for status updates
+    await UniversalBle.subscribeNotifications(device.deviceId, service.uuid, characteristic.uuid);
+  }
+
+  @override
+  Future<void> processCharacteristic(String characteristic, Uint8List bytes) {
+    // Analyze the received bytes to determine current state
+    actionStreamInternal.add(LogNotification('Received ${bytesToHex(bytes)} from Headwind $characteristic'));
+    if (bytes.length >= 4 && bytes[0] == 0xFD && bytes[1] == 0x01) {
+      final mode = bytes[3];
+      final speed = bytes[2];
+
+      switch (mode) {
+        case 0x02:
+          _currentMode = HeadwindMode.heartRate;
+          break;
+        case 0x03:
+          _currentMode = HeadwindMode.speed;
+          break;
+        case 0x01:
+          _currentMode = HeadwindMode.off;
+          break;
+        case 0x04:
+          _currentMode = HeadwindMode.manual;
+          _currentSpeed = speed;
+          break;
+      }
+    }
+    return Future.value();
+  }
+
+  Future<void> setSpeed(int speedPercent) async {
+    // Validate against the allowed speed values
+    const allowedSpeeds = [0, 25, 50, 75, 100];
+    if (!allowedSpeeds.contains(speedPercent)) {
+      throw ArgumentError('Speed must be one of: ${allowedSpeeds.join(", ")}');
+    }
+
+    final service = WahooKickrHeadwindConstants.SERVICE_UUID.toLowerCase();
+    final characteristic = WahooKickrHeadwindConstants.CHARACTERISTIC_UUID.toLowerCase();
+
+    // Check if manual mode is enabled, if not enable it first
+    if (_currentMode != HeadwindMode.manual) {
+      final manualModeData = Uint8List.fromList([0x04, 0x04]);
+      await UniversalBle.write(
+        device.deviceId,
+        service,
+        characteristic,
+        manualModeData,
+        withoutResponse: true,
+      );
+      _currentMode = HeadwindMode.manual;
+    }
+
+    // Command format: [0x02, speed_value]
+    // Speed value: 0x00 to 0x64 (0-100 in hex)
+    final data = Uint8List.fromList([0x02, speedPercent]);
+
+    await UniversalBle.write(
+      device.deviceId,
+      service,
+      characteristic,
+      data,
+      withoutResponse: true,
+    );
+    _currentSpeed = speedPercent;
+  }
+
+  Future<void> setHeartRateMode() async {
+    final service = WahooKickrHeadwindConstants.SERVICE_UUID.toLowerCase();
+    final characteristic = WahooKickrHeadwindConstants.CHARACTERISTIC_UUID.toLowerCase();
+
+    // Command format: [0x04, 0x02] for HR mode
+    final data = Uint8List.fromList([0x04, 0x02]);
+
+    await UniversalBle.write(
+      device.deviceId,
+      service,
+      characteristic,
+      data,
+      withoutResponse: true,
+    );
+    _currentMode = HeadwindMode.heartRate;
+  }
+
+  Future<ActionResult> handleKeypair(KeyPair keyPair, {required bool isKeyDown}) async {
+    if (!isKeyDown) {
+      return NotHandled('');
+    }
+
+    try {
+      if (keyPair.inGameAction == InGameAction.headwindSpeed) {
+        final speed = keyPair.inGameActionValue ?? 0;
+        await setSpeed(speed);
+        return Success('Headwind speed set to $speed%');
+      } else if (keyPair.inGameAction == InGameAction.headwindHeartRateMode) {
+        await setHeartRateMode();
+        return Success('Headwind set to Heart Rate mode');
+      }
+    } catch (e) {
+      return Error('Failed to control Headwind: $e');
+    }
+
+    return NotHandled('');
+  }
+}
+
+class WahooKickrHeadwindConstants {
+  // Wahoo KICKR Headwind service and characteristic UUIDs
+  // These are standard Wahoo fitness equipment UUIDs
+  static const String SERVICE_UUID = "A026EE0C-0A7D-4AB3-97FA-F1500F9FEB8B";
+  static const String CHARACTERISTIC_UUID = "A026E038-0A7D-4AB3-97FA-F1500F9FEB8B";
+}
+
+enum HeadwindMode {
+  unknown,
+  heartRate, // HR mode (0x02)
+  speed, // Speed mode (0x03)
+  off, // OFF mode (0x01)
+  manual, // Manual speed mode (0x04)
+}
--- a/lib/bluetooth/devices/zwift/constants.dart
+++ b/lib/bluetooth/devices/zwift/constants.dart
@@ -1,11 +1,15 @@
 import 'dart:typed_data';

+import 'package:bike_control/utils/keymap/buttons.dart';
+import 'package:flutter/material.dart';
+
 class ZwiftConstants {
-  static final ZWIFT_CUSTOM_SERVICE_UUID = "00000001-19CA-4651-86E5-FA29DCDD09D1".toLowerCase();
-  static final ZWIFT_RIDE_CUSTOM_SERVICE_UUID = "0000fc82-0000-1000-8000-00805f9b34fb".toLowerCase();
-  static final ZWIFT_ASYNC_CHARACTERISTIC_UUID = "00000002-19CA-4651-86E5-FA29DCDD09D1".toLowerCase();
-  static final ZWIFT_SYNC_RX_CHARACTERISTIC_UUID = "00000003-19CA-4651-86E5-FA29DCDD09D1".toLowerCase();
-  static final ZWIFT_SYNC_TX_CHARACTERISTIC_UUID = "00000004-19CA-4651-86E5-FA29DCDD09D1".toLowerCase();
+  static const ZWIFT_CUSTOM_SERVICE_UUID = "00000001-19CA-4651-86E5-FA29DCDD09D1";
+  static const ZWIFT_RIDE_CUSTOM_SERVICE_UUID = "0000fc82-0000-1000-8000-00805f9b34fb";
+  static const ZWIFT_RIDE_CUSTOM_SERVICE_UUID_SHORT = "fc82";
+  static const ZWIFT_ASYNC_CHARACTERISTIC_UUID = "00000002-19CA-4651-86E5-FA29DCDD09D1";
+  static const ZWIFT_SYNC_RX_CHARACTERISTIC_UUID = "00000003-19CA-4651-86E5-FA29DCDD09D1";
+  static const ZWIFT_SYNC_TX_CHARACTERISTIC_UUID = "00000004-19CA-4651-86E5-FA29DCDD09D1";

  static const ZWIFT_MANUFACTURER_ID = 2378; // Zwift, Inc => 0x094A

@@ -29,51 +33,21 @@ class ZwiftConstants {
  static final VIBRATE_PATTERN = Uint8List.fromList([0x12, 0x12, 0x08, 0x0A, 0x06, 0x08, 0x02, 0x10, 0x00, 0x18]);

  // these don't actually seem to matter, its just the header has to be 7 bytes RIDEON + 2
-  static final REQUEST_START = Uint8List.fromList([0, 9]); //byteArrayOf(1, 2)
-  static final RESPONSE_START_CLICK = Uint8List.fromList([1, 3]); // from device
-  static final RESPONSE_START_PLAY = Uint8List.fromList([1, 4]); // from device
+  static final REQUEST_START = Uint8List.fromList([0x00, 0x09]); //byteArrayOf(1, 2)
+  static final RESPONSE_START_CLICK = Uint8List.fromList([0x01, 0x03]); // from device
+  static final RESPONSE_START_PLAY = Uint8List.fromList([0x01, 0x04]); // from device
  static final RESPONSE_START_CLICK_V2 = Uint8List.fromList([0x02, 0x03]); // from device
-  static final RESPONSE_STOPPED_CLICK_V2 = Uint8List.fromList([
-    0xff,
-    0x05,
-    0x00,
-    0xea,
-    0x05,
-    0x19,
-    0x0a,
-    0x0c,
-    0x35,
-    0x38,
-    0x44,
-    0x31,
-    0x35,
-    0x41,
-    0x42,
-    0x42,
-    0x34,
-    0x33,
-    0x36,
-    0x33,
-    0x10,
-    0x01,
-    0x18,
-    0x84,
-    0x07,
-    0x20,
-    0x08,
-    0x28,
-    0x09,
-    0x30,
-  ]); // from device
+  static final RESPONSE_STOPPED_CLICK_V2_VARIANT_1 = Uint8List.fromList([0xff, 0x05, 0x00, 0xea, 0x05]); // from device
+  static final RESPONSE_STOPPED_CLICK_V2_VARIANT_2 = Uint8List.fromList([0xff, 0x05, 0x00, 0xfa, 0x05]); // from device

  // Message types received from device
  static const CONTROLLER_NOTIFICATION_MESSAGE_TYPE = 07;
-  static const EMPTY_MESSAGE_TYPE = 21;
+  static const EMPTY_MESSAGE_TYPE = 21; // 0x15
  static const BATTERY_LEVEL_TYPE = 25;
  static const UNKNOWN_CLICKV2_TYPE = 0x3C;

  // not figured out the protobuf type this really is, the content is just two varints.
-  static const int CLICK_NOTIFICATION_MESSAGE_TYPE = 55;
+  static const int CLICK_NOTIFICATION_MESSAGE_TYPE = 55; // 0x37
  static const int PLAY_NOTIFICATION_MESSAGE_TYPE = 7;
  static const int RIDE_NOTIFICATION_MESSAGE_TYPE = 35; // 0x23

@@ -81,6 +55,98 @@ class ZwiftConstants {
  static const DISCONNECT_MESSAGE_TYPE = 0xFE;
 }

+class ZwiftButtons {
+  // left controller
+  static const ControllerButton navigationUp = ControllerButton(
+    'navigationUp',
+    action: InGameAction.up,
+    icon: Icons.keyboard_arrow_up,
+    color: Colors.black,
+  );
+  static const ControllerButton navigationDown = ControllerButton(
+    'navigationDown',
+    action: InGameAction.down,
+    icon: Icons.keyboard_arrow_down,
+    color: Colors.black,
+  );
+  static const ControllerButton navigationLeft = ControllerButton(
+    'navigationLeft',
+    action: InGameAction.steerLeft,
+    icon: Icons.keyboard_arrow_left,
+    color: Colors.black,
+  );
+  static const ControllerButton navigationRight = ControllerButton(
+    'navigationRight',
+    action: InGameAction.steerRight,
+    icon: Icons.keyboard_arrow_right,
+    color: Colors.black,
+  );
+  static const ControllerButton onOffLeft = ControllerButton('onOffLeft', action: InGameAction.toggleUi);
+  static const ControllerButton sideButtonLeft = ControllerButton('sideButtonLeft', action: InGameAction.shiftDown);
+  static const ControllerButton paddleLeft = ControllerButton('paddleLeft', action: InGameAction.shiftDown);
+
+  // zwift ride only
+  static const ControllerButton shiftUpLeft = ControllerButton(
+    'shiftUpLeft',
+    action: InGameAction.shiftDown,
+    icon: Icons.remove,
+    color: Colors.black,
+  );
+  static const ControllerButton shiftDownLeft = ControllerButton(
+    'shiftDownLeft',
+    action: InGameAction.shiftDown,
+  );
+  static const ControllerButton powerUpLeft = ControllerButton('powerUpLeft', action: InGameAction.shiftDown);
+
+  // right controller
+  static const ControllerButton a = ControllerButton('a', action: InGameAction.select, color: Colors.lightGreen);
+  static const ControllerButton b = ControllerButton('b', action: InGameAction.back, color: Colors.pinkAccent);
+  static const ControllerButton z = ControllerButton(
+    'z',
+    action: InGameAction.rideOnBomb,
+    color: Colors.deepOrangeAccent,
+  );
+  static const ControllerButton y = ControllerButton('y', action: InGameAction.menu, color: Colors.lightBlue);
+  static const ControllerButton onOffRight = ControllerButton('onOffRight', action: InGameAction.toggleUi);
+  static const ControllerButton sideButtonRight = ControllerButton('sideButtonRight', action: InGameAction.shiftUp);
+  static const ControllerButton paddleRight = ControllerButton('paddleRight', action: InGameAction.shiftUp);
+
+  // zwift ride only
+  static const ControllerButton shiftUpRight = ControllerButton(
+    'shiftUpRight',
+    action: InGameAction.shiftUp,
+    icon: Icons.add,
+    color: Colors.black,
+  );
+  static const ControllerButton shiftDownRight = ControllerButton('shiftDownRight', action: InGameAction.shiftUp);
+  static const ControllerButton powerUpRight = ControllerButton('powerUpRight', action: InGameAction.shiftUp);
+
+  static List<ControllerButton> get values => [
+    // left
+    navigationUp,
+    navigationDown,
+    navigationLeft,
+    navigationRight,
+    onOffLeft,
+    sideButtonLeft,
+    paddleLeft,
+    shiftUpLeft,
+    shiftDownLeft,
+    powerUpLeft,
+    // right
+    a,
+    b,
+    z,
+    y,
+    onOffRight,
+    sideButtonRight,
+    paddleRight,
+    shiftUpRight,
+    shiftDownRight,
+    powerUpRight,
+  ];
+}
+
 enum ZwiftDeviceType {
  click,
  clickV2Right,
--- a/lib/bluetooth/devices/zwift/ftms_mdns_emulator.dart
+++ b/lib/bluetooth/devices/zwift/ftms_mdns_emulator.dart
@@ -0,0 +1,120 @@
+import 'package:bike_control/bluetooth/devices/trainer_connection.dart';
+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';
+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:flutter/foundation.dart';
+import 'package:prop/prop.dart' hide RideButtonMask;
+
+class FtmsMdnsEmulator extends TrainerConnection {
+  static const String connectionTitle = 'Zwift Network Emulator';
+
+  late final ClickEmulator clickEmulator = ClickEmulator();
+  var lastMessageId = 0;
+
+  FtmsMdnsEmulator()
+    : super(
+        title: connectionTitle,
+        supportedActions: [
+          InGameAction.shiftUp,
+          InGameAction.shiftDown,
+          InGameAction.uturn,
+          InGameAction.steerLeft,
+          InGameAction.steerRight,
+          InGameAction.openActionBar,
+          InGameAction.usePowerUp,
+          InGameAction.select,
+          InGameAction.back,
+          InGameAction.rideOnBomb,
+        ],
+      ) {
+    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),
+        );
+      } else {
+        core.connection.signalNotification(
+          AlertNotification(LogLevel.LOGLEVEL_INFO, AppLocalizations.current.disconnected),
+        );
+      }
+    });
+  }
+
+  Future<void> startServer() async {
+    return clickEmulator.startServer();
+  }
+
+  void stop() {
+    clickEmulator.stop();
+  }
+
+  @override
+  Future<ActionResult> sendAction(KeyPair keyPair, {required bool isKeyDown, required bool isKeyUp}) async {
+    final button = switch (keyPair.inGameAction) {
+      InGameAction.shiftUp => RideButtonMask.SHFT_UP_R_BTN,
+      InGameAction.shiftDown => RideButtonMask.SHFT_UP_L_BTN,
+      InGameAction.uturn => RideButtonMask.DOWN_BTN,
+      InGameAction.steerLeft => RideButtonMask.LEFT_BTN,
+      InGameAction.steerRight => RideButtonMask.RIGHT_BTN,
+      InGameAction.openActionBar => RideButtonMask.UP_BTN,
+      InGameAction.usePowerUp => RideButtonMask.Y_BTN,
+      InGameAction.select => RideButtonMask.A_BTN,
+      InGameAction.back => RideButtonMask.B_BTN,
+      InGameAction.rideOnBomb => RideButtonMask.Z_BTN,
+      _ => null,
+    };
+
+    if (button == null) {
+      return NotHandled('Action ${keyPair.inGameAction!.name} not supported by Zwift Emulator');
+    }
+
+    if (isKeyDown) {
+      final status = RideKeyPadStatus()
+        ..buttonMap = (~button.mask) & 0xFFFFFFFF
+        ..analogPaddles.clear();
+
+      final bytes = status.writeToBuffer();
+
+      clickEmulator.writeNotification(bytes);
+    }
+
+    if (isKeyUp) {
+      clickEmulator.writeNotification(
+        Uint8List.fromList([0x08, 0xFF, 0xFF, 0xFF, 0xFF, 0x0F]),
+      );
+    }
+    if (kDebugMode) {
+      print('Sent action up $isKeyUp vs down $isKeyDown ${keyPair.inGameAction!.title} to Zwift Emulator');
+    }
+    return Success('Sent action ${isKeyDown ? 'down' : ''} ${isKeyUp ? 'up' : ''}: ${keyPair.inGameAction!.title}');
+  }
+}
+
+class FtmsMdnsConstants {
+  static const DC_RC_REQUEST_COMPLETED_SUCCESSFULLY = 0; // Request completed successfully
+  static const DC_RC_UNKNOWN_MESSAGE_TYPE = 1; // Unknown Message Type
+  static const DC_RC_UNEXPECTED_ERROR = 2; // Unexpected Error
+  static const DC_RC_SERVICE_NOT_FOUND = 3; // Service Not Found
+  static const DC_RC_CHARACTERISTIC_NOT_FOUND = 4; // Characteristic Not Found
+  static const DC_RC_CHARACTERISTIC_OPERATION_NOT_SUPPORTED =
+      5; // Characteristic Operation Not Supported (See Characteristic Properties)
+  static const DC_RC_CHARACTERISTIC_WRITE_FAILED_INVALID_SIZE =
+      6; // Characteristic Write Failed – Invalid characteristic data size
+  static const DC_RC_UNKNOWN_PROTOCOL_VERSION =
+      7; // Unknown Protocol Version – the command contains a protocol version that the device does not recognize
+
+  static const DC_MESSAGE_DISCOVER_SERVICES = 0x01; // Discover Services
+  static const DC_MESSAGE_DISCOVER_CHARACTERISTICS = 0x02; // Discover Characteristics
+  static const DC_MESSAGE_READ_CHARACTERISTIC = 0x03; // Read Characteristic
+  static const DC_MESSAGE_WRITE_CHARACTERISTIC = 0x04; // Write Characteristic
+  static const DC_MESSAGE_ENABLE_CHARACTERISTIC_NOTIFICATIONS = 0x05; // Enable Characteristic Notifications
+  static const DC_MESSAGE_CHARACTERISTIC_NOTIFICATION = 0x06; // Characteristic Notification
+}
--- a/lib/bluetooth/devices/zwift/protocol/zp.pb.dart
+++ b/lib/bluetooth/devices/zwift/protocol/zp.pb.dart
--- a/lib/bluetooth/devices/zwift/protocol/zp.pbenum.dart
+++ b/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');
--- a/lib/bluetooth/devices/zwift/protocol/zp.pbjson.dart
+++ b/lib/bluetooth/devices/zwift/protocol/zp.pbjson.dart
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .1.1
 .6.2