Merge branch 'login' of github.com:OpenBikeControl/bikecontrol into login

# Conflicts:
#	test/thinkrider_vs200_test.dart

.github/workflows/build.yml

@@ -28,15 +28,10 @@ on:
         required: false
         default: true
         type: boolean
-      build_web:
-        description: 'Build for Web'
-        required: false
-        default: false
-        type: boolean
 
 env:
   SHOREBIRD_TOKEN: ${{ secrets.SHOREBIRD_TOKEN }}
-  FLUTTER_VERSION: 3.38.7
+  FLUTTER_VERSION: 3.41.0
 
 jobs:
   build:
@@ -52,6 +47,17 @@ jobs:
       #1 Checkout Repository
       - name: Checkout Repository
         uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          token: ${{ secrets.PAT_TOKEN }}
+
+      - name: rename pubspec_overrides_ci.yaml to pubspec_overrides.yaml
+        run: |
+            if [ -f pubspec_overrides_ci.yaml ]; then
+                mv pubspec_overrides_ci.yaml pubspec_overrides.yaml
+            else 
+                echo "No pubspec_overrides_ci.yaml found, skipping rename."
+            fi
 
       - name: Install certificates
         if: inputs.build_mac || inputs.build_ios
@@ -97,16 +103,17 @@ jobs:
           cp $PP_PATH_MACOS ~/Library/MobileDevice/Provisioning\ Profiles
 
       - name: 🐦 Setup Shorebird
-        if: inputs.build_mac || inputs.build_android || inputs.build_ios || inputs.build_web
+        #if: inputs.build_mac || inputs.build_android || inputs.build_ios
+        if: inputs.build_android || inputs.build_ios
         uses: shorebirdtech/setup-shorebird@v1
         with:
           cache: true
 
-      - name: Set Up Flutter
+      - name: Set Up Flutter maCOS
         uses: subosito/flutter-action@v2
         with:
-          channel: 'beta'
-          #flutter-version: ${{ env.FLUTTER_VERSION }}
+          channel: 'stable'
+          flutter-version: ${{ env.FLUTTER_VERSION }}
 
       - name: Generate translation files
         run: |
@@ -114,12 +121,17 @@ jobs:
           flutter pub global run intl_utils:generate;
 
       - name: 🚀 Shorebird Release macOS
-        if: inputs.build_mac
+        if: inputs.build_mac && false
         uses: shorebirdtech/shorebird-release@v1
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
           platform: macos
-          args: "-- --dart-define=VERIFYING_SHARED_SECRET=${{ secrets.VERIFYING_SHARED_SECRET }} --dart-define=REVENUECAT_API_KEY_IOS=${{ secrets.REVENUECAT_API_KEY_IOS }}"
+          args: "-- --obfuscate --split-debug-info=symbols --dart-define=VERIFYING_SHARED_SECRET=${{ secrets.VERIFYING_SHARED_SECRET }} --dart-define=REVENUECAT_API_KEY_IOS=${{ secrets.REVENUECAT_API_KEY_IOS }}"
+
+      - name: Flutter Release macOS
+        if: inputs.build_mac
+        run:
+          flutter build macos --release --obfuscate --split-debug-info=symbols --dart-define=VERIFYING_SHARED_SECRET=${{ secrets.VERIFYING_SHARED_SECRET }} --dart-define=REVENUECAT_API_KEY_IOS=${{ secrets.REVENUECAT_API_KEY_IOS }}
 
       - name: Decode Keystore
         if: inputs.build_android
@@ -133,7 +145,7 @@ jobs:
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
           platform: android
-          args: "-- --dart-define=REVENUECAT_API_KEY_ANDROID=${{ secrets.REVENUECAT_API_KEY_ANDROID }}"
+          args: "-- --obfuscate --split-debug-info=symbols --dart-define=REVENUECAT_API_KEY_ANDROID=${{ secrets.REVENUECAT_API_KEY_ANDROID }}"
 
       - name: Extract latest changelog
         id: changelog
@@ -201,6 +213,13 @@ jobs:
           version=$(grep '^version: ' pubspec.yaml | cut -d ' ' -f 2 | tr -d '\r')
           echo "VERSION=$version" >> $GITHUB_ENV
 
+      - name: Upload Symbols
+        uses: actions/upload-artifact@v4
+        with:
+          overwrite: true
+          name: Symbols
+          path: symbols/
+
         #13 Create Release
       - name: Create Release
         if: inputs.build_github
@@ -222,6 +241,18 @@ jobs:
       #1 Checkout Repository
       - name: Checkout Repository
         uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          token: ${{ secrets.PAT_TOKEN }}
+
+      - name: rename pubspec_overrides_ci.yaml to pubspec_overrides.yaml
+        shell: pwsh
+        run: |
+            if (Test-Path pubspec_overrides_ci.yaml) {
+                Rename-Item -Path pubspec_overrides_ci.yaml -NewName pubspec_overrides.yaml
+            } else {
+                Write-Output "No pubspec_overrides_ci.yaml found, skipping rename."
+            }
 
       - name: Extract version from pubspec.yaml (Windows)
         shell: pwsh
@@ -239,8 +270,8 @@ jobs:
       - name: Set Up Flutter
         uses: subosito/flutter-action@v2
         with:
-          channel: 'beta'
-          #flutter-version: ${{ env.FLUTTER_VERSION }}
+          channel: 'stable'
+          flutter-version: ${{ env.FLUTTER_VERSION }}
 
       - name: Generate translation files
         run: |
@@ -252,6 +283,7 @@ jobs:
         with:
           flutter-version: ${{ env.FLUTTER_VERSION }}
           platform: windows
+          args: "-- --obfuscate --split-debug-info=symbols-win"
 
       - name: Zip directory (Windows)
         shell: pwsh
@@ -298,3 +330,4 @@ jobs:
           name: Releases
           path: |
             build/windows/x64/runner/Release/bike_control.msix
+            symbols-win/

.github/workflows/patch.yml

@@ -21,6 +21,17 @@ jobs:
       #1 Checkout Repository
       - name: Checkout Repository
         uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          token: ${{ secrets.PAT_TOKEN }}
+
+      - name: rename pubspec_overrides_ci.yaml to pubspec_overrides.yaml
+        run: |
+          if [ -f pubspec_overrides_ci.yaml ]; then
+              mv pubspec_overrides_ci.yaml pubspec_overrides.yaml
+          else 
+              echo "No pubspec_overrides_ci.yaml found, skipping rename."
+          fi
 
       - name: 🐦 Setup Shorebird
         uses: shorebirdtech/setup-shorebird@v1
@@ -86,7 +97,7 @@ 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
+        if: false # patch doesn't work: https://github.com/OpenBikeControl/bikecontrol/issues/143
         uses: shorebirdtech/shorebird-patch@v1
         with:
           platform: macos
@@ -98,7 +109,7 @@ jobs:
         with:
           platform: android
           release-version: latest
-          args: '--allow-asset-diffs --allow-native-diffs -- --dart-define=REVENUECAT_API_KEY_ANDROID=${{ secrets.REVENUECAT_API_KEY_ANDROID }}'
+          args: '--allow-asset-diffs --allow-native-diffs -- --obfuscate --split-debug-info=symbols --dart-define=REVENUECAT_API_KEY_ANDROID=${{ secrets.REVENUECAT_API_KEY_ANDROID }}'
 
       - name: 🚀 Shorebird Patch iOS
         uses: shorebirdtech/shorebird-patch@v1
@@ -107,50 +118,6 @@ jobs:
           release-version: latest
           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 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/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/BikeControl.macos.zip"
-          bodyFile: /tmp/release_body.md
-          prerelease: true
-          tag: v${{ env.VERSION }}
-          token: ${{ secrets.TOKEN }}
-
   windows:
     name: Patch Windows
     runs-on: windows-latest
@@ -159,6 +126,18 @@ jobs:
       #1 Checkout Repository
       - name: Checkout Repository
         uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          token: ${{ secrets.PAT_TOKEN }}
+
+      - name: rename pubspec_overrides_ci.yaml to pubspec_overrides.yaml
+        shell: pwsh
+        run: |
+          if (Test-Path pubspec_overrides_ci.yaml) {
+              Rename-Item -Path pubspec_overrides_ci.yaml -NewName pubspec_overrides.yaml
+          } else {
+              Write-Output "No pubspec_overrides_ci.yaml found, skipping rename."
+          }
 
       - name: 🐦 Setup Shorebird
         uses: shorebirdtech/setup-shorebird@v1
@@ -181,4 +160,4 @@ jobs:
         with:
           platform: windows
           release-version: latest
-          args: '--allow-asset-diffs --allow-native-diffs'
+          args: '--allow-asset-diffs --allow-native-diffs -- --obfuscate --split-debug-info=symbols'

.github/workflows/web.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - web
-      - wahoo_kickr_bike_shift
       - main
     paths:
       - '.github/workflows/web.yml'
@@ -45,7 +44,7 @@ jobs:
         run: flutter pub get
 
       - name: Build Web
-        run: flutter build web --release --base-href "/swiftcontrol/"
+        run: flutter build web --release --base-href "/bikecontrol/"
 
       - name: Upload static files as artifact
         id: deployment

.gitignore

@@ -53,3 +53,4 @@ lib/gen/
 service-account.json
 .env
 lib/generated
+pubspec_overrides.yaml

.gitmodules

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

CHANGELOG.md

@@ -1,3 +1,30 @@
+### 4.8.0 (15-02-2026)
+
+**Features**:
+- Bluetooth media buttons are now supported on iOS
+- Shimano Di2: long press and double clicks are now supported:
+  - perform steering using long presses
+  - gear changes are now reflected properly without losing any button presses
+
+### 4.7.0 (04-02-2026)
+
+**Features**:
+- new connection method: act as Bluetooth Keyboard:
+Your device can now act as Bluetooth keyboard, allowing you to send keyboard shortcuts (e.g. for virtual shifting) directly to your connected device. Especially useful for tablets / iPads.
+- added new keyboard shortcuts for Rouvy (Kudos, Pause workout)
+
+**Fixes**:
+- you can now finally buy the full version on Android :)
+- save "Enable Media Key detection" setting across app restarts
+- UI adjustments and fixes in the controller configuration screen
+- iOS: Remote pairing now works again
+
+### 4.6.0 (28-01-2026)
+
+**Features**:
+- Improve Zwift Click V2 connection and handling
+- Buttons in Configuration are now grouped by device
+
 ### 4.5.0 (22-01-2026)
 
 **Features**:

INSTRUCTIONS_MYWHOOSH_LINK.md

@@ -1,11 +1,12 @@
 ## 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
+1) Launch MyWhoosh on the device of your choice
+2) Only needed once: open the "MyWhoosh Link" app on the same device where you want to use BikeControl. Make sure the Link app is able to connect to MyWhoosh. If it does, close MyWhoosh Link.
+3) Make sure the "MyWhoosh Link" app is not active at the same time as BikeControl
+4) Open BikeControl, enable the Link connection method, and 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.
+Here's a video with a few explanations. Note that 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)
@@ -17,7 +18,7 @@ This is a network/local-discovery problem. BikeControl needs the same kind of lo
 Checklist:
 - Use the MyWhoosh Link app to confirm if "Link" works in general
 - Use MyWhoosh Link app and connect, then close it, then open up BikeControl - this is key for some users
-- Both devices are on the **same Wi‑Fi SSID**
+- Both devices (if you use BikeControl on another device than MyWhoosh) are on the **same Wi‑Fi SSID**
   - Avoid “Guest” networks
   - Avoid “extenders/mesh guest mode” and networks with device isolation
 - If your router has it, disable:

LICENSE

@@ -1,674 +1,97 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+License notice:
+Versions of this project released prior to repository tag gpl3 were licensed
+under GPL-3.0. Those versions remain available under their original
+license. Versions released after that point are licensed under the
+Non-Commercial License.
+
+NON-COMMERCIAL SOFTWARE LICENSE AGREEMENT
+
+Version 1.0
+
+Copyright (c) 2026 OpenBikeControl UG (haftungsbeschränkt).
+All rights reserved.
+
+⸻
+
+1. Definitions
+
+“Software” means the source code, object code, binaries, and associated documentation made available by the Licensor under this License.
+
+“Commercial Use” means any use of the Software, directly or indirectly, that is intended for or results in:
+	•	monetary compensation,
+	•	sale, licensing, or subscription fees,
+	•	advertising or sponsorship revenue,
+	•	inclusion in a product or service that is sold or monetized,
+	•	distribution through paid applications or application marketplaces.
+
+“Licensor” means the copyright holder.
+
+⸻
+
+2. Grant of License
+
+Subject to the terms of this License, the Licensor grants you a non-exclusive, non-transferable, revocable license to:
+	•	use the Software for personal, educational, or internal evaluation purposes only;
+	•	modify the Software for non-commercial purposes;
+	•	redistribute the Software only in source form, free of charge, and only under this same License.
+
+⸻
+
+3. Restrictions
+
+You may not, without prior written permission from the Licensor:
+	•	use the Software for any Commercial Use;
+	•	distribute the Software as part of a paid or monetized product or service;
+	•	distribute the Software via application marketplaces (including but not limited to Apple App Store or Google Play) where the application itself or related services are monetized;
+	•	sublicense, sell, rent, or lease the Software.
+
+⸻
+
+4. Attribution
+
+All copies and derivative works must retain:
+	•	this License text;
+	•	all existing copyright notices.
+
+⸻
+
+5. No Patent License
+
+This License does not grant any patent rights.
+
+⸻
+
+6. Termination
+
+Any violation of this License automatically terminates your rights under this License.
+
+Upon termination, you must cease all use and distribution of the Software.
+
+⸻
+
+7. Disclaimer of Warranty
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND.
+
+⸻
+
+8. Limitation of Liability
+
+IN NO EVENT SHALL THE LICENSOR BE LIABLE FOR ANY DAMAGES ARISING FROM THE USE OF THE SOFTWARE.
+
+⸻
+
+9. Governing Law
+
+This License shall be governed by the laws of [YOUR COUNTRY], excluding conflict-of-law rules.
+
+⸻
+
+10. Commercial Licensing
+
+Commercial use is available under separate commercial license terms.
+Contact: jonas@openbikecontrol.org
+
+⸻
+
+End of License

README.md

@@ -11,10 +11,7 @@ With BikeControl you can **control your favorite trainer app** using your Zwift
 - control music on your device
 - more? If you can do it via keyboard, mouse, or touch, you can do it with BikeControl
 
-
-https://github.com/user-attachments/assets/1f81b674-1628-4763-ad66-5f3ed7a3f159
-
-
+[![Youtube Video](https://github.com/user-attachments/assets/14a45ca1-e31b-4fbd-8d03-95aa60470405)](https://youtu.be/0r3LO5lFlyc)
 
 
 ## Download
@@ -78,7 +75,7 @@ Support for other devices can be added; check the issues tab here on GitHub.
 ## Supported Platforms
 
 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.
+You can even try it out in your [Browser](https://openbikecontrol.github.io/bikecontrol/), if it supports Bluetooth connections. No controlling possible, though.
 
 ## Help
 Check the troubleshooting guide [here](TROUBLESHOOTING.md).

TROUBLESHOOTING.md

@@ -22,7 +22,7 @@ If you don't do that BikeControl will need to reconnect every minute.
 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
+Details/updates: https://github.com/OpenBikeControl/bikecontrol/issues/68
 
 ## Android: Connection works, buttons work but nothing happens in MyWhoosh and similar
 *
@@ -30,7 +30,7 @@ Details/updates: https://github.com/jonasbark/swiftcontrol/issues/68
   - 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
+- see [https://github.com/OpenBikeControl/bikecontrol/issues/38](https://github.com/OpenBikeControl/bikecontrol/issues/38) for more details
 
 
 ## My Clicks do not get recognized in MyWhoosh, but I am connected / use local control

WINDOWS_STORE_VERSION.txt

@@ -1 +1 @@
-4.4.1
+4.7.2

accessibility/android/src/main/kotlin/de/jonasbark/accessibility/AccessibilityService.kt

@@ -73,7 +73,7 @@ class AccessibilityService : AccessibilityService(), Listener {
     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))) {
+        if (!Observable.ignoreHidDevices && isBleRemote(event) && (rootInActiveWindow?.packageName == "de.jonasbark.swiftcontrol" || Observable.handledKeys.contains(keyString))) {
             // Handle keys that have a keymap defined
             Log.d(
                 "AccessibilityService",

android/app/src/main/AndroidManifest.xml

@@ -51,6 +51,13 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <!-- Accepts URIs that begin with YOUR_SCHEME://YOUR_HOST -->
+                <data android:scheme="bikecontrol" />
+            </intent-filter>
         </activity>
 
         <receiver

ios/Flutter/AppFrameworkInfo.plist

@@ -20,7 +20,5 @@
   <string>????</string>
   <key>CFBundleVersion</key>
   <string>1.0</string>
-  <key>MinimumOSVersion</key>
-  <string>13.0</string>
 </dict>
 </plist>

ios/Podfile.lock

@@ -1,4 +1,18 @@
 PODS:
+  - app_links (6.4.1):
+    - Flutter
+  - AppAuth (2.0.0):
+    - AppAuth/Core (= 2.0.0)
+    - AppAuth/ExternalUserAgent (= 2.0.0)
+  - AppAuth/Core (2.0.0)
+  - AppAuth/ExternalUserAgent (2.0.0):
+    - AppAuth/Core
+  - AppCheckCore (11.2.0):
+    - GoogleUtilities/Environment (~> 8.0)
+    - GoogleUtilities/UserDefaults (~> 8.0)
+    - PromisesObjC (~> 2.4)
+  - audio_session (0.0.1):
+    - Flutter
   - bluetooth_low_energy_darwin (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -14,6 +28,33 @@ PODS:
     - Flutter
   - gamepads_ios (0.1.1):
     - Flutter
+  - google_sign_in_ios (0.0.1):
+    - Flutter
+    - FlutterMacOS
+    - GoogleSignIn (~> 9.0)
+    - GTMSessionFetcher (>= 3.4.0)
+  - GoogleSignIn (9.1.0):
+    - AppAuth (~> 2.0)
+    - AppCheckCore (~> 11.0)
+    - GTMAppAuth (~> 5.0)
+    - GTMSessionFetcher/Core (~> 3.3)
+  - GoogleUtilities/Environment (8.1.0):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Logger (8.1.0):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Privacy (8.1.0)
+  - GoogleUtilities/UserDefaults (8.1.0):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
+  - GTMAppAuth (5.0.0):
+    - AppAuth/Core (~> 2.0)
+    - GTMSessionFetcher/Core (< 4.0, >= 3.3)
+  - GTMSessionFetcher (3.5.0):
+    - GTMSessionFetcher/Full (= 3.5.0)
+  - GTMSessionFetcher/Core (3.5.0)
+  - GTMSessionFetcher/Full (3.5.0):
+    - GTMSessionFetcher/Core
   - image_picker_ios (0.0.1):
     - Flutter
   - in_app_purchase_storekit (0.0.1):
@@ -25,6 +66,9 @@ PODS:
     - Flutter
   - ios_receipt (0.0.1):
     - Flutter
+  - just_audio (0.0.1):
+    - Flutter
+    - FlutterMacOS
   - media_key_detector_ios (0.0.1):
     - Flutter
   - nsd_ios (0.0.1):
@@ -33,6 +77,7 @@ PODS:
     - Flutter
   - permission_handler_apple (9.3.0):
     - Flutter
+  - PromisesObjC (2.4.0)
   - purchases_flutter (9.10.6):
     - Flutter
     - PurchasesHybridCommon (= 17.27.1)
@@ -54,6 +99,8 @@ PODS:
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
+  - sign_in_with_apple (0.0.1):
+    - Flutter
   - universal_ble (0.0.1):
     - Flutter
     - FlutterMacOS
@@ -63,6 +110,8 @@ PODS:
     - Flutter
 
 DEPENDENCIES:
+  - app_links (from `.symlinks/plugins/app_links/ios`)
+  - audio_session (from `.symlinks/plugins/audio_session/ios`)
   - bluetooth_low_energy_darwin (from `.symlinks/plugins/bluetooth_low_energy_darwin/darwin`)
   - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - Flutter (from `Flutter`)
@@ -70,11 +119,13 @@ DEPENDENCIES:
   - 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`)
+  - google_sign_in_ios (from `.symlinks/plugins/google_sign_in_ios/darwin`)
   - 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`)
+  - just_audio (from `.symlinks/plugins/just_audio/darwin`)
   - 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`)
@@ -84,18 +135,30 @@ DEPENDENCIES:
   - 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`)
+  - sign_in_with_apple (from `.symlinks/plugins/sign_in_with_apple/ios`)
   - 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:
+    - AppAuth
+    - AppCheckCore
+    - GoogleSignIn
+    - GoogleUtilities
+    - GTMAppAuth
+    - GTMSessionFetcher
+    - PromisesObjC
     - PurchasesHybridCommon
     - PurchasesHybridCommonUI
     - RevenueCat
     - RevenueCatUI
 
 EXTERNAL SOURCES:
+  app_links:
+    :path: ".symlinks/plugins/app_links/ios"
+  audio_session:
+    :path: ".symlinks/plugins/audio_session/ios"
   bluetooth_low_energy_darwin:
     :path: ".symlinks/plugins/bluetooth_low_energy_darwin/darwin"
   device_info_plus:
@@ -110,6 +173,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_volume_controller/ios"
   gamepads_ios:
     :path: ".symlinks/plugins/gamepads_ios/ios"
+  google_sign_in_ios:
+    :path: ".symlinks/plugins/google_sign_in_ios/darwin"
   image_picker_ios:
     :path: ".symlinks/plugins/image_picker_ios/ios"
   in_app_purchase_storekit:
@@ -120,6 +185,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/integration_test/ios"
   ios_receipt:
     :path: ".symlinks/plugins/ios_receipt/ios"
+  just_audio:
+    :path: ".symlinks/plugins/just_audio/darwin"
   media_key_detector_ios:
     :path: ".symlinks/plugins/media_key_detector_ios/ios"
   nsd_ios:
@@ -138,6 +205,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/sensors_plus/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
+  sign_in_with_apple:
+    :path: ".symlinks/plugins/sign_in_with_apple/ios"
   universal_ble:
     :path: ".symlinks/plugins/universal_ble/darwin"
   url_launcher_ios:
@@ -146,6 +215,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/wakelock_plus/ios"
 
 SPEC CHECKSUMS:
+  app_links: 585674be3c6661708e6cd794ab4f39fb9d8356f9
+  AppAuth: 1c1a8afa7e12f2ec3a294d9882dfa5ab7d3cb063
+  AppCheckCore: cc8fd0a3a230ddd401f326489c99990b013f0c4f
+  audio_session: 19e9480dbdd4e5f6c4543826b2e8b0e4ab6145fe
   bluetooth_low_energy_darwin: 50bc79258e60586e4c4bed5948bd31d925f37fac
   device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
@@ -153,15 +226,22 @@ SPEC CHECKSUMS:
   flutter_secure_storage_darwin: 557817588b80e60213cbecb573c45c76b788018d
   flutter_volume_controller: e4d5832f08008180f76e30faf671ffd5a425e529
   gamepads_ios: 1d2930c7a4450a9a1b57444ebf305a6a6cbeea0b
+  google_sign_in_ios: 7336a3372ea93ea56a21e126a0055ffca3723601
+  GoogleSignIn: fcee2257188d5eda57a5e2b6a715550ffff9206d
+  GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
+  GTMAppAuth: 217a876b249c3c585a54fd6f73e6b58c4f5c4238
+  GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
   image_picker_ios: 4f2f91b01abdb52842a8e277617df877e40f905b
   in_app_purchase_storekit: 2342c0a5da86593124d08dd13d920f39a52b273a
   in_app_review: 436034b18594851a7328d7f1c2ed5ec235b79cfc
   integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573
   ios_receipt: c2d5b4c36953c377a024992393976214ce6951e6
+  just_audio: a42c63806f16995daf5b219ae1d679deb76e6a79
   media_key_detector_ios: 7ff9aefdfea00bb7b71e184132381b7d0e7e1269
   nsd_ios: 8c37babdc6538e3350dbed3a52674d2edde98173
   package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
+  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   purchases_flutter: b3c0792197f69cd7af4c2449b71df6ac6378aace
   purchases_ui_flutter: caae6d62ea23c6fe964992a28353211cc74b244a
   PurchasesHybridCommon: 027f03312519c51056457eb2e4f7ee1c91b61b8f
@@ -171,6 +251,7 @@ SPEC CHECKSUMS:
   RevenueCatUI: ac7492873928e9e7f297e5e27a7c4f23f9008326
   sensors_plus: 7229095999f30740798f0eeef5cd120357a8f4f2
   shared_preferences_foundation: 5086985c1d43c5ba4d5e69a4e8083a389e2909e6
+  sign_in_with_apple: f3bf75217ea4c2c8b91823f225d70230119b8440
   universal_ble: cf52a7b3fd2e7c14d6d7262e9fdadb72ab6b88a6
   url_launcher_ios: bb13df5870e8c4234ca12609d04010a21be43dfa
   wakelock_plus: 76957ab028e12bfa4e66813c99e46637f367fc7e

ios/Runner/Info.plist

@@ -22,6 +22,19 @@
 	<string>$(FLUTTER_BUILD_NAME)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleURLTypes</key>
+    <array>
+    	<dict>
+    		<key>CFBundleTypeRole</key>
+    		<string>Editor</string>
+    		<key>CFBundleURLSchemes</key>
+    		<array>
+    			<string>com.googleusercontent.apps.709945926587-0iierajthibf4vhqf85fc7bbpgbdgua2</string>
+    		</array>
+    	</dict>
+    </array>
+	<key>GIDClientID</key>
+    <string>709945926587-0iierajthibf4vhqf85fc7bbpgbdgua2.apps.googleusercontent.com</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
@@ -30,21 +43,22 @@
 	<true/>
 	<key>NSBluetoothAlwaysUsageDescription</key>
 	<string>BikeControl uses Bluetooth to connect to accessories.</string>
+	<key>NSBonjourServices</key>
+	<array>
+		<string>_wahoo-fitness-tnp._tcp</string>
+		<string>_openbikecontrol._tcp</string>
+	</array>
 	<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>
+	<string>Access your accelerometer and gyroscope for steering support via your phone.</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>bluetooth-peripheral</string>
 		<string>bluetooth-central</string>
+		<string>audio</string>
 	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>

ios/Runner/Runner.entitlements

@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.developer.applesignin</key>
+	<array>
+		<string>Default</string>
+	</array>
 	<key>keychain-access-groups</key>
 	<array/>
 </dict>

lib/bluetooth/connection.dart

@@ -6,8 +6,6 @@ import 'package:bike_control/bluetooth/devices/gamepad/gamepad_device.dart';
 import 'package:bike_control/bluetooth/devices/gyroscope/gyroscope_steering.dart';
 import 'package:bike_control/bluetooth/devices/hid/hid_device.dart';
 import 'package:bike_control/bluetooth/devices/wahoo/wahoo_kickr_headwind.dart';
-import 'package:bike_control/bluetooth/devices/zwift/ftms_mdns_emulator.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
 import 'package:bike_control/gen/l10n.dart';
 import 'package:bike_control/main.dart';
 import 'package:bike_control/utils/core.dart';
@@ -17,6 +15,7 @@ import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:gamepads/gamepads.dart';
+import 'package:prop/prop.dart';
 import 'package:universal_ble/universal_ble.dart';
 
 import 'devices/base_device.dart';
@@ -65,8 +64,10 @@ class Connection {
       lastLogEntries = lastLogEntries.takeLast(kIsWeb ? 1000 : 60).toList();
     });
 
-    if (!kIsWeb && (Platform.isMacOS || Platform.isWindows)) {
+    if (!kIsWeb && (Platform.isMacOS || Platform.isWindows || Platform.isIOS)) {
       core.mediaKeyHandler.initialize();
+      // Load saved media key detection state
+      core.mediaKeyHandler.isMediaKeyDetectionEnabled.value = core.settings.getMediaKeyDetectionEnabled();
     }
 
     UniversalBle.onAvailabilityChange = (available) {
@@ -96,25 +97,35 @@ class Connection {
         _lastScanResult.add(result);
 
         if (kDebugMode) {
-          debugPrint('Scan result: ${result.name} - ${result.deviceId}');
+          debugPrint('Scan result: ${result.name} - ${result.deviceId} - Services: ${result.services}');
         }
 
-        final scanResult = BluetoothDevice.fromScanResult(result);
+        try {
+          final scanResult = BluetoothDevice.fromScanResult(result);
 
-        if (scanResult != null) {
-          _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;
-          if (data != null && kDebugMode) {
+          if (scanResult != null) {
             _actionStreams.add(
-              LogNotification('Found unknown device ${result.name} with identifier: ${data.firstOrNull}'),
+              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;
+            if (data != null && kDebugMode) {
+              _actionStreams.add(
+                LogNotification('Found unknown device ${result.name} with identifier: ${data.firstOrNull}'),
+              );
+            }
+          }
+        } catch (e, backtrace) {
+          _actionStreams.add(
+            LogNotification("Error processing scan result for device ${result.deviceId}: $e\n$backtrace"),
+          );
+          if (kDebugMode) {
+            print(e);
+            print("backtrace: $backtrace");
           }
         }
       }

lib/bluetooth/devices/base_device.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:bike_control/bluetooth/devices/zwift/constants.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart' show LogLevel;
 import 'package:bike_control/gen/l10n.dart';
 import 'package:bike_control/main.dart';
 import 'package:bike_control/utils/actions/desktop.dart';
@@ -12,6 +11,7 @@ import 'package:bike_control/utils/keymap/manager.dart';
 import 'package:dartx/dartx.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:prop/prop.dart' show LogLevel;
 
 import '../../utils/keymap/buttons.dart';
 import '../messages/notification.dart';
@@ -19,12 +19,25 @@ import '../messages/notification.dart';
 abstract class BaseDevice {
   final String? _name;
   final bool isBeta;
+  final String uniqueId;
   final List<ControllerButton> availableButtons;
 
-  BaseDevice(this._name, {required this.availableButtons, this.isBeta = false}) {
+  BaseDevice(
+    this._name, {
+    required this.uniqueId,
+    required this.availableButtons,
+    this.isBeta = false,
+    String? buttonPrefix,
+  }) {
     if (availableButtons.isEmpty && core.actionHandler.supportedApp is CustomApp) {
-      // TODO we should verify where the buttons came from
-      final allButtons = core.actionHandler.supportedApp!.keymap.keyPairs.flatMap((e) => e.buttons);
+      final allButtons = core.actionHandler.supportedApp!.keymap.keyPairs
+          .flatMap((e) => e.buttons)
+          .filter(
+            (e) =>
+                e.sourceDeviceId == uniqueId ||
+                (e.sourceDeviceId == null && buttonPrefix != null && e.name.startsWith(buttonPrefix)),
+          )
+          .toSet();
       availableButtons.addAll(allButtons);
     }
   }
@@ -36,6 +49,8 @@ abstract class BaseDevice {
 
   String get name => _name ?? runtimeType.toString();
 
+  String get buttonExplanation => isConnected ? 'Connecting...' : 'Click a button on this device to configure them.';
+
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
@@ -54,18 +69,24 @@ abstract class BaseDevice {
   Future<void> connect();
 
   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
+        // For long press actions: perform down, wait, then release
+        await handleButtonsClicked(clickedButtons, longPress: true);
         _longPressTimer?.cancel();
         await Future.delayed(const Duration(milliseconds: 800));
         await handleButtonsClicked([], longPress: true);
       } else {
-        await handleButtonsClicked([], longPress: true);
+        // For non-long-press actions: perform a single click
+        // First call performs the click action (isKeyDown: true, isKeyUp: true)
+        await handleButtonsClicked(clickedButtons);
+        // Second call cleans up state (clears timer, logs release, clears _previouslyPressedButtons)
+        // but doesn't perform a release action since longPress: false
+        await handleButtonsClicked([]);
       }
     } else {
+      await handleButtonsClicked(clickedButtons);
       await handleButtonsClicked([]);
     }
   }
@@ -214,7 +235,11 @@ abstract class BaseDevice {
       // should we display this to the user?
       KeymapManager().duplicateSync(currentProfile, '$currentProfile (Copy)');
     }
-    final button = core.actionHandler.supportedApp!.keymap.getOrAddButton(key, creator);
+    var createdButton = creator();
+    if (createdButton.sourceDeviceId == null) {
+      createdButton = createdButton.copyWith(sourceDeviceId: uniqueId);
+    }
+    final button = core.actionHandler.supportedApp!.keymap.getOrAddButton(key, createdButton);
 
     if (availableButtons.none((e) => e.name == button.name)) {
       availableButtons.add(button);

lib/bluetooth/devices/bluetooth_device.dart

@@ -3,6 +3,7 @@ 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/proxy/proxy_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';
@@ -14,7 +15,6 @@ 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';
@@ -42,12 +42,15 @@ abstract class BluetoothDevice extends BaseDevice {
     required List<ControllerButton> availableButtons,
     bool allowMultiple = false,
     bool isBeta = false,
+    String? buttonPrefix,
   }) : super(
          scanResult.name,
+         uniqueId: scanResult.deviceId,
          availableButtons: allowMultiple
-             ? availableButtons.map((b) => b.copyWith(sourceDeviceId: scanResult.deviceId)).toList()
-             : availableButtons,
+             ? availableButtons.toList().map((b) => b.copyWith(sourceDeviceId: scanResult.deviceId)).toList()
+             : availableButtons.toList(),
          isBeta: isBeta,
+         buttonPrefix: buttonPrefix,
        ) {
     rssi = scanResult.rssi;
   }
@@ -58,6 +61,7 @@ abstract class BluetoothDevice extends BaseDevice {
 
   static List<String> servicesToScan = [
     ZwiftConstants.ZWIFT_CUSTOM_SERVICE_UUID,
+    ZwiftConstants.ZWIFT_CUSTOM_SERVICE_SHORT_UUID,
     ZwiftConstants.ZWIFT_RIDE_CUSTOM_SERVICE_UUID,
     SquareConstants.SERVICE_UUID,
     WahooKickrBikeShiftConstants.SERVICE_UUID,
@@ -120,6 +124,7 @@ abstract class BluetoothDevice extends BaseDevice {
         _ when scanResult.services.contains(ShimanoDi2Constants.SERVICE_UUID_ALTERNATIVE.toLowerCase()) => ShimanoDi2(
           scanResult,
         ),
+        _ when scanResult.services.containsAny(ProxyDevice.proxyServiceUUIDs) && kDebugMode => ProxyDevice(scanResult),
         _ when scanResult.services.contains(SramAxsConstants.SERVICE_UUID.toLowerCase()) => SramAxs(
           scanResult,
         ),
@@ -127,9 +132,6 @@ abstract class BluetoothDevice extends BaseDevice {
           OpenBikeControlDevice(scanResult),
         _ when scanResult.services.contains(WahooKickrHeadwindConstants.SERVICE_UUID.toLowerCase()) =>
           WahooKickrHeadwind(scanResult),
-        _ when scanResult.services.contains(ThinkRiderVs200Constants.SERVICE_UUID.toLowerCase()) => ThinkRiderVs200(
-          scanResult,
-        ),
         // otherwise the service UUIDs will be used
         _ => null,
       };
@@ -139,6 +141,7 @@ abstract class BluetoothDevice extends BaseDevice {
       return device;
     } else if (scanResult.services.containsAny([
       ZwiftConstants.ZWIFT_CUSTOM_SERVICE_UUID.toLowerCase(),
+      ZwiftConstants.ZWIFT_CUSTOM_SERVICE_SHORT_UUID.toLowerCase(),
       ZwiftConstants.ZWIFT_RIDE_CUSTOM_SERVICE_UUID.toLowerCase(),
     ])) {
       // otherwise use the manufacturer data to identify the device
@@ -167,13 +170,10 @@ abstract class BluetoothDevice extends BaseDevice {
         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),
-        );
-      }
+      buildToast(
+        title: 'You may need to update your Zwift Ride firmware.',
+        duration: Duration(seconds: 6),
+      );
     }
     return device;
   }

lib/bluetooth/devices/gamepad/gamepad_device.dart

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

lib/bluetooth/devices/gyroscope/gyroscope_steering.dart

@@ -1,8 +1,8 @@
 import 'dart:async';
+import 'dart:math';
 
 import 'package:bike_control/bluetooth/devices/base_device.dart';
 import 'package:bike_control/bluetooth/devices/gyroscope/steering_estimator.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/pages/device.dart';
 import 'package:bike_control/utils/core.dart';
@@ -22,10 +22,13 @@ class GyroscopeSteering extends BaseDevice {
         'Phone Steering',
         availableButtons: GyroscopeSteeringButtons.values,
         isBeta: true,
+        uniqueId: 'gyroscope_steering_device',
+        buttonPrefix: 'gyro',
       );
 
   StreamSubscription<GyroscopeEvent>? _gyroscopeSubscription;
   StreamSubscription<AccelerometerEvent>? _accelerometerSubscription;
+  StreamSubscription<MagnetometerEvent>? _magnetometerSubscription;
 
   // Calibration state
   final SteeringEstimator _estimator = SteeringEstimator();
@@ -43,7 +46,17 @@ class GyroscopeSteering extends BaseDevice {
 
   // Debounce timer for PWM-like keypress behavior
   Timer? _keypressTimer;
-  bool _isProcessingKeypresses = false;
+
+  // Magnetometer mode
+  bool _useMagnetometer = false;
+  double? _magnetometerCalibrationHeading;
+  double _currentMagnetometerAngle = 0.0;
+  final List<double> _magnetometerCalibrationSamples = [];
+
+  // Magnetometer filtering state
+  double? _filteredMagX;
+  double? _filteredMagY;
+  static const double _magnetometerFilterAlpha = 0.15; // Lower = more smoothing
 
   // Configuration (can be made customizable later)
   static const double STEERING_THRESHOLD = 5.0; // degrees
@@ -53,14 +66,27 @@ class GyroscopeSteering extends BaseDevice {
   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;
-    }
+  /// Start listening to the appropriate sensors based on the current mode
+  Future<void> _startSensorStreams() async {
+    // Cancel all existing subscriptions first
+    await _gyroscopeSubscription?.cancel();
+    await _accelerometerSubscription?.cancel();
+    await _magnetometerSubscription?.cancel();
+    _gyroscopeSubscription = null;
+    _accelerometerSubscription = null;
+    _magnetometerSubscription = null;
 
-    try {
-      // Start listening to sensors
+    if (_useMagnetometer) {
+      // Magnetometer mode: only listen to magnetometer
+      _magnetometerSubscription = magnetometerEventStream().listen(
+        _handleMagnetometerEvent,
+        onError: (error) {
+          actionStreamInternal.add(LogNotification('Magnetometer error: $error'));
+        },
+      );
+      actionStreamInternal.add(LogNotification('Started magnetometer stream'));
+    } else {
+      // Gyroscope mode: listen to gyroscope and accelerometer
       _gyroscopeSubscription = gyroscopeEventStream().listen(
         _handleGyroscopeEvent,
         onError: (error) {
@@ -74,6 +100,19 @@ class GyroscopeSteering extends BaseDevice {
           actionStreamInternal.add(LogNotification('Accelerometer error: $error'));
         },
       );
+      actionStreamInternal.add(LogNotification('Started gyroscope and accelerometer streams'));
+    }
+  }
+
+  @override
+  Future<void> connect() async {
+    if (isConnected) {
+      return;
+    }
+
+    try {
+      // Start listening to sensors based on current mode
+      await _startSensorStreams();
 
       isConnected = true;
       actionStreamInternal.add(LogNotification('Gyroscope Steering: Connected - Calibrating...'));
@@ -118,9 +157,9 @@ class GyroscopeSteering extends BaseDevice {
       if (_estimator.stillTimeSec >= 0.6) {
         _estimator.calibrate(seedBiasZRadPerSec: _estimator.biasZRadPerSec);
         _isCalibrated = true;
-        actionStreamInternal.add(
+        /*actionStreamInternal.add(
           AlertNotification(LogLevel.LOGLEVEL_INFO, 'Calibration complete.'),
-        );
+        );*/
       }
       return;
     }
@@ -133,6 +172,83 @@ class GyroscopeSteering extends BaseDevice {
     _estimator.updateAccel(x: event.x, y: event.y, z: event.z);
   }
 
+  void _handleMagnetometerEvent(MagnetometerEvent event) {
+    // Magnetometer mode: calculate heading from X and Y components
+    // This is more stable than using a single axis
+
+    // Apply low-pass filter to reduce noise
+    if (_filteredMagX == null || _filteredMagY == null) {
+      // Initialize on first reading
+      _filteredMagX = event.x;
+      _filteredMagY = event.y;
+    } else {
+      // Exponential moving average (low-pass filter)
+      _filteredMagX = _magnetometerFilterAlpha * event.x + (1 - _magnetometerFilterAlpha) * _filteredMagX!;
+      _filteredMagY = _magnetometerFilterAlpha * event.y + (1 - _magnetometerFilterAlpha) * _filteredMagY!;
+    }
+
+    // Calculate heading from filtered X and Y components
+    // atan2(y, x) gives the angle in radians, convert to degrees
+    double heading = atan2(_filteredMagY!, _filteredMagX!) * (180 / pi);
+
+    // Normalize heading to 0-360 range
+    if (heading < 0) heading += 360;
+
+    if (kDebugMode) {
+      print(
+        'Magnetometer - X: ${event.x.toStringAsFixed(2)}, Y: ${event.y.toStringAsFixed(2)}, '
+        'Filtered X: ${_filteredMagX!.toStringAsFixed(2)}, Filtered Y: ${_filteredMagY!.toStringAsFixed(2)}, '
+        'Heading: ${heading.toStringAsFixed(2)}°',
+      );
+    }
+
+    // During calibration, collect heading samples
+    if (!_isCalibrated) {
+      _magnetometerCalibrationSamples.add(heading);
+
+      // After 30 samples (~1 second at typical rates), calculate calibration heading
+      if (_magnetometerCalibrationSamples.length >= 30) {
+        // For heading, we need to handle the circular nature (0° and 360° are the same)
+        // Use circular mean calculation
+        double sumSin = 0, sumCos = 0;
+        for (var h in _magnetometerCalibrationSamples) {
+          final radians = h * (pi / 180);
+          sumSin += sin(radians);
+          sumCos += cos(radians);
+        }
+        final avgSin = sumSin / _magnetometerCalibrationSamples.length;
+        final avgCos = sumCos / _magnetometerCalibrationSamples.length;
+        _magnetometerCalibrationHeading = atan2(avgSin, avgCos) * (180 / pi);
+        if (_magnetometerCalibrationHeading! < 0)
+          _magnetometerCalibrationHeading = _magnetometerCalibrationHeading! + 360;
+
+        _magnetometerCalibrationSamples.clear();
+        _isCalibrated = true;
+        actionStreamInternal.add(
+          LogNotification(
+            'Magnetometer calibration complete. Reference heading: ${_magnetometerCalibrationHeading!.toStringAsFixed(2)}°',
+          ),
+        );
+      }
+      return;
+    }
+
+    // Calculate steering angle relative to calibrated heading
+    // This is the angular difference, accounting for wrap-around
+    double angleDeg = heading - _magnetometerCalibrationHeading!;
+
+    // Normalize to -180 to +180 range
+    if (angleDeg > 180) {
+      angleDeg -= 360;
+    } else if (angleDeg < -180) {
+      angleDeg += 360;
+    }
+
+    _currentMagnetometerAngle = angleDeg;
+
+    _processSteeringAngle(angleDeg);
+  }
+
   void _processSteeringAngle(double steeringAngleDeg) {
     final roundedAngle = steeringAngleDeg.round();
 
@@ -178,13 +294,20 @@ class GyroscopeSteering extends BaseDevice {
   Future<void> disconnect() async {
     await _gyroscopeSubscription?.cancel();
     await _accelerometerSubscription?.cancel();
+    await _magnetometerSubscription?.cancel();
     _gyroscopeSubscription = null;
     _accelerometerSubscription = null;
+    _magnetometerSubscription = null;
     _keypressTimer?.cancel();
     isConnected = false;
     _isCalibrated = false;
     _hasAccelData = false;
     _estimator.reset();
+    _magnetometerCalibrationHeading = null;
+    _magnetometerCalibrationSamples.clear();
+    _currentMagnetometerAngle = 0.0;
+    _filteredMagX = null;
+    _filteredMagY = null;
     actionStreamInternal.add(LogNotification('Gyroscope Steering: Disconnected'));
   }
 
@@ -206,6 +329,38 @@ class GyroscopeSteering extends BaseDevice {
               if (isBeta) BetaPill(),
             ],
           ),
+          // Magnetometer mode toggle
+          Checkbox(
+            trailing: Expanded(child: Text('Use Magnetometer Mode')),
+            state: _useMagnetometer ? CheckboxState.checked : CheckboxState.unchecked,
+            onChanged: (value) async {
+              setState(() {
+                _useMagnetometer = value == CheckboxState.checked;
+                // Reset calibration when switching modes
+                _isCalibrated = false;
+                _hasAccelData = false;
+                _estimator.reset();
+                _lastGyroUpdate = null;
+                _lastRoundedAngle = null;
+                _lastSteeringButton = null;
+                _magnetometerCalibrationHeading = null;
+                _magnetometerCalibrationSamples.clear();
+                _currentMagnetometerAngle = 0.0;
+                _filteredMagX = null;
+                _filteredMagY = null;
+              });
+
+              // Restart sensor streams if device is connected
+              if (isConnected) {
+                await _startSensorStreams();
+                actionStreamInternal.add(
+                  LogNotification(
+                    'Switched to ${_useMagnetometer ? "magnetometer" : "gyroscope + accelerometer"} mode',
+                  ),
+                );
+              }
+            },
+          ),
           Wrap(
             spacing: 12,
             runSpacing: 12,
@@ -218,14 +373,22 @@ class GyroscopeSteering extends BaseDevice {
               DeviceInfo(
                 title: 'Steering Angle',
                 icon: RadixIcons.angle,
-                value: _isCalibrated ? '${_estimator.angleDeg.toStringAsFixed(2)}°' : 'Calibrating...',
+                value: _isCalibrated
+                    ? '${(_useMagnetometer ? _currentMagnetometerAngle : _estimator.angleDeg).toStringAsFixed(2)}°'
+                    : 'Calibrating...',
               ),
-              if (kDebugMode)
+              if (kDebugMode && !_useMagnetometer)
                 DeviceInfo(
                   title: 'Gyro Bias',
                   icon: BootstrapIcons.speedometer,
                   value: '${_estimator.biasZRadPerSec.toStringAsFixed(4)} rad/s',
                 ),
+              if (kDebugMode && _useMagnetometer && _magnetometerCalibrationHeading != null)
+                DeviceInfo(
+                  title: 'Mag Heading',
+                  icon: BootstrapIcons.compass,
+                  value: '${_magnetometerCalibrationHeading!.toStringAsFixed(2)}°',
+                ),
             ],
           ),
           Row(
@@ -239,14 +402,19 @@ class GyroscopeSteering extends BaseDevice {
                     : () {
                         // Reset calibration
                         _isCalibrated = false;
-                        _hasAccelData = false;
-                        _estimator.reset();
-                        _lastGyroUpdate = null;
+                        if (_useMagnetometer) {
+                          _magnetometerCalibrationHeading = null;
+                          _magnetometerCalibrationSamples.clear();
+                          _currentMagnetometerAngle = 0.0;
+                          _filteredMagX = null;
+                          _filteredMagY = null;
+                        } else {
+                          _hasAccelData = false;
+                          _estimator.reset();
+                          _lastGyroUpdate = null;
+                        }
                         _lastRoundedAngle = null;
                         _lastSteeringButton = null;
-                        actionStreamInternal.add(
-                          AlertNotification(LogLevel.LOGLEVEL_INFO, 'Calibrating the sensors now.'),
-                        );
                         setState(() {});
                       },
                 child: Text(_isCalibrated ? 'Calibrate' : 'Calibrating...'),
@@ -290,7 +458,9 @@ class GyroscopeSteering extends BaseDevice {
           ),
           if (!_isCalibrated)
             Text(
-              'Calibrating the sensors now. Attach your phone/tablet on your handlebar and keep it still for a second.',
+              _useMagnetometer
+                  ? 'Calibrating the magnetometer now. Attach your phone/tablet on your handlebar and keep it still for a second.'
+                  : 'Calibrating the sensors now. Attach your phone/tablet on your handlebar and keep it still for a second.',
             ).xSmall,
         ],
       ),

lib/bluetooth/devices/hid/hid_device.dart

@@ -8,7 +8,7 @@ import 'package:flutter/material.dart' show PopupMenuButton, PopupMenuItem;
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 
 class HidDevice extends BaseDevice {
-  HidDevice(super.name) : super(availableButtons: []);
+  HidDevice(super.name) : super(availableButtons: [], uniqueId: name!);
 
   @override
   Future<void> connect() {
@@ -21,7 +21,7 @@ class HidDevice extends BaseDevice {
       children: [
         Row(
           children: [
-            Expanded(child: Text(toString())),
+            Expanded(child: Text(toString()).bold),
             PopupMenuButton(
               itemBuilder: (c) => [
                 PopupMenuItem(
@@ -32,6 +32,7 @@ class HidDevice extends BaseDevice {
                       (core.actionHandler as AndroidActions).ignoreHidDevices();
                     } else if (core.mediaKeyHandler.isMediaKeyDetectionEnabled.value) {
                       core.mediaKeyHandler.isMediaKeyDetectionEnabled.value = false;
+                      core.settings.setMediaKeyDetectionEnabled(false);
                     }
                   },
                 ),

lib/bluetooth/devices/mywhoosh/link.dart

@@ -2,7 +2,6 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:bike_control/bluetooth/devices/trainer_connection.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/gen/l10n.dart';
 import 'package:bike_control/utils/actions/base_actions.dart';
@@ -11,6 +10,7 @@ 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';
+import 'package:prop/prop.dart';
 
 class WhooshLink extends TrainerConnection {
   Socket? _socket;
@@ -66,16 +66,17 @@ class WhooshLink extends TrainerConnection {
 
     // Accept connection
     _server!.listen(
-      (Socket socket) {
+      (Socket socket) async {
+        if (kDebugMode) {
+          print('Client connected: ${socket.remoteAddress.address}:${socket.remotePort}');
+        }
+
+        SharedLogic.keepAlive();
         _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) {
@@ -89,6 +90,8 @@ class WhooshLink extends TrainerConnection {
           },
           onDone: () {
             print('Client disconnected: $socket');
+
+            SharedLogic.stopKeepAlive();
             isConnected.value = false;
             core.connection.signalNotification(
               AlertNotification(LogLevel.LOGLEVEL_WARNING, 'MyWhoosh Link disconnected'),

lib/bluetooth/devices/openbikecontrol/obc_ble_emulator.dart

@@ -4,17 +4,17 @@ import 'package:bike_control/bluetooth/ble.dart';
 import 'package:bike_control/bluetooth/devices/openbikecontrol/openbikecontrol_device.dart';
 import 'package:bike_control/bluetooth/devices/openbikecontrol/protocol_parser.dart';
 import 'package:bike_control/bluetooth/devices/trainer_connection.dart';
-import 'package:bike_control/bluetooth/devices/zwift/ftms_mdns_emulator.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pbenum.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart' show AlertNotification, LogNotification;
 import 'package:bike_control/utils/actions/base_actions.dart';
 import 'package:bike_control/utils/core.dart';
+import 'package:bike_control/utils/keymap/apps/training_peaks.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();
@@ -105,17 +105,28 @@ class OpenBikeControlBluetoothEmulator extends TrainerConnection {
             'Notify state changed for characteristic: ${char.characteristic.uuid}: ${char.state}',
           );
         });
+
+        Uint8List? firstAppInfoMessage;
+
         _peripheralManager.characteristicWriteRequested.forEach((eventArgs) async {
           final characteristic = eventArgs.characteristic;
           final request = eventArgs.request;
-          final value = request.value;
-          print(
-            'Write request for characteristic: ${characteristic.uuid}',
-          );
+          var value = request.value;
+          if (kDebugMode) {
+            print('Write request for characteristic: ${characteristic.uuid}: ${bytesToReadableHex(value)}');
+          }
 
           switch (eventArgs.characteristic.uuid.toString().toLowerCase()) {
             case OpenBikeControlConstants.APPINFO_CHARACTERISTIC_UUID:
               try {
+                if (core.settings.getTrainerApp() is TrainingPeaks) {
+                  if (firstAppInfoMessage == null) {
+                    firstAppInfoMessage = value;
+                    return;
+                  } else {
+                    value = Uint8List.fromList([...firstAppInfoMessage!, ...value]);
+                  }
+                }
                 final appInfo = OpenBikeProtocolParser.parseAppInfo(value);
                 isConnected.value = true;
                 connectedApp.value = appInfo;
@@ -229,6 +240,8 @@ class OpenBikeControlBluetoothEmulator extends TrainerConnection {
     if (kDebugMode) {
       print('Stopping OpenBikeControl BLE server...');
     }
+    await _peripheralManager.removeAllServices();
+    _isServiceAdded = false;
     await _peripheralManager.stopAdvertising();
     isStarted.value = false;
     isConnected.value = false;

lib/bluetooth/devices/openbikecontrol/obc_dircon.dart

@@ -0,0 +1,39 @@
+import 'package:bike_control/bluetooth/devices/openbikecontrol/openbikecontrol_device.dart';
+import 'package:prop/emulators/dircon/dircon.dart';
+import 'package:universal_ble/universal_ble.dart';
+
+abstract class OnMessage {
+  void onMessage(List<int> message);
+}
+
+class ObcDircon extends DirCon {
+  final OnMessage onMessageCallback;
+  ObcDircon({required super.socket, required this.onMessageCallback});
+
+  @override
+  List<BleCharacteristic> getCharacteristics(String serviceUUID) {
+    if (serviceUUID.toLowerCase() == OpenBikeControlConstants.SERVICE_UUID) {
+      return [
+        BleCharacteristic(
+          OpenBikeControlConstants.BUTTON_STATE_CHARACTERISTIC_UUID,
+          [CharacteristicProperty.notify],
+        ),
+        BleCharacteristic(
+          OpenBikeControlConstants.APPINFO_CHARACTERISTIC_UUID,
+          [CharacteristicProperty.writeWithoutResponse, CharacteristicProperty.write],
+        ),
+      ];
+    }
+    return [];
+  }
+
+  @override
+  void processWriteCallback(String characteristicUUID, List<int> characteristicData) {
+    if (characteristicUUID.toLowerCase() == OpenBikeControlConstants.APPINFO_CHARACTERISTIC_UUID) {
+      onMessageCallback.onMessage(characteristicData);
+    }
+  }
+
+  @override
+  List<String> get serviceUUIDs => [OpenBikeControlConstants.SERVICE_UUID];
+}

lib/bluetooth/devices/openbikecontrol/obc_mdns_emulator.dart

@@ -1,20 +1,21 @@
 import 'dart:io';
 
+import 'package:bike_control/bluetooth/devices/openbikecontrol/obc_dircon.dart';
 import 'package:bike_control/bluetooth/devices/openbikecontrol/openbikecontrol_device.dart';
 import 'package:bike_control/bluetooth/devices/openbikecontrol/protocol_parser.dart';
 import 'package:bike_control/bluetooth/devices/trainer_connection.dart';
-import 'package:bike_control/bluetooth/devices/zwift/ftms_mdns_emulator.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/utils/actions/base_actions.dart';
 import 'package:bike_control/utils/core.dart';
+import 'package:bike_control/utils/keymap/apps/supported_app.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 {
+class OpenBikeControlMdnsEmulator extends TrainerConnection implements OnMessage {
   ServerSocket? _server;
   Registration? _mdnsRegistration;
 
@@ -23,6 +24,7 @@ class OpenBikeControlMdnsEmulator extends TrainerConnection {
   final ValueNotifier<AppInfo?> connectedApp = ValueNotifier(null);
 
   Socket? _socket;
+  ObcDircon? _dirCon;
 
   OpenBikeControlMdnsEmulator()
     : super(
@@ -30,6 +32,9 @@ class OpenBikeControlMdnsEmulator extends TrainerConnection {
         supportedActions: InGameAction.values,
       );
 
+  bool get _useDirCon =>
+      core.settings.getTrainerApp()?.supportsOpenBikeProtocol.contains(OpenBikeProtocolSupport.dircon) ?? false;
+
   Future<void> startServer() async {
     print('Starting mDNS server...');
     isStarted.value = true;
@@ -65,18 +70,23 @@ class OpenBikeControlMdnsEmulator extends TrainerConnection {
       _mdnsRegistration = await register(
         Service(
           name: 'BikeControl',
-          type: '_openbikecontrol._tcp',
+          type: _useDirCon ? '_wahoo-fitness-tnp._tcp' : '_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),
-          },
+          txt: _useDirCon
+              ? {
+                  'ble-service-uuids': Uint8List.fromList(OpenBikeControlConstants.SERVICE_UUID.codeUnits),
+                  'mac-address': Uint8List.fromList('00:11:22:33:44:55'.codeUnits),
+                  'serial-number': Uint8List.fromList('1234567890'.codeUnits),
+                }
+              : {
+                  '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');
@@ -105,7 +115,7 @@ class OpenBikeControlMdnsEmulator extends TrainerConnection {
   Future<void> _createTcpServer() async {
     try {
       _server = await ServerSocket.bind(
-        InternetAddress.anyIPv6,
+        InternetAddress.anyIPv4,
         36867,
         shared: true,
         v6Only: false,
@@ -120,40 +130,33 @@ class OpenBikeControlMdnsEmulator extends TrainerConnection {
 
     // Accept connection
     _server!.listen(
-      (Socket socket) {
+      (Socket socket) async {
+        SharedLogic.keepAlive();
         _socket = socket;
 
         if (kDebugMode) {
           print('Client connected: ${socket.remoteAddress.address}:${socket.remotePort}');
         }
 
+        if (_useDirCon) {
+          _dirCon = ObcDircon(socket: socket, onMessageCallback: this);
+        }
+
         // 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');
+            if (_dirCon != null) {
+              _dirCon!.handleIncomingData(data);
+              return;
             }
+            onMessage(data);
           },
           onDone: () {
+            _dirCon = null;
+            SharedLogic.stopKeepAlive();
             core.connection.signalNotification(
               AlertNotification(LogLevel.LOGLEVEL_INFO, 'Disconnected from app: ${connectedApp.value?.appId}'),
             );
@@ -206,6 +209,40 @@ class OpenBikeControlMdnsEmulator extends TrainerConnection {
 
   void _write(Socket socket, List<int> responseData) {
     debugPrint('Sending response: ${bytesToHex(responseData)}');
-    socket.add(responseData);
+    if (_dirCon != null) {
+      _dirCon!.sendCharacteristicNotification(OpenBikeControlConstants.BUTTON_STATE_CHARACTERISTIC_UUID, responseData);
+      return;
+    } else {
+      socket.add(responseData);
+    }
+  }
+
+  @override
+  void onMessage(List<int> message) {
+    if (kDebugMode) {
+      print('Received message from OBC: ${bytesToHex(message)}');
+    }
+    final messageType = message[0];
+    switch (messageType) {
+      case OpenBikeProtocolParser.MSG_TYPE_APP_INFO:
+        try {
+          final appInfo = OpenBikeProtocolParser.parseAppInfo(Uint8List.fromList(message));
+          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;
+      case OpenBikeProtocolParser.MSG_TYPE_HAPTIC_FEEDBACK:
+        // noop
+        break;
+      default:
+        print('Unknown message type: $messageType');
+    }
   }
 }

lib/bluetooth/devices/openbikecontrol/openbikecontrol_device.dart

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

lib/bluetooth/devices/openbikecontrol/protocol_parser.dart

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

lib/bluetooth/devices/proxy/proxy_device.dart

@@ -0,0 +1,66 @@
+import 'dart:typed_data';
+
+import 'package:bike_control/bluetooth/devices/bluetooth_device.dart';
+import 'package:prop/emulators/ftms_emulator.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:universal_ble/universal_ble.dart';
+
+class ProxyDevice extends BluetoothDevice {
+  static final List<String> proxyServiceUUIDs = [
+    '0000180d-0000-1000-8000-00805f9b34fb', // Heart Rate
+    '00001818-0000-1000-8000-00805f9b34fb', // Cycling Power
+    '00001826-0000-1000-8000-00805f9b34fb', // Fitness Machine
+  ];
+
+  final FtmsEmulator emulator = FtmsEmulator();
+
+  ProxyDevice(super.scanResult)
+    : super(
+        availableButtons: const [],
+        isBeta: true,
+      );
+
+  late final List<BleService> services;
+
+  @override
+  Future<void> handleServices(List<BleService> services) async {
+    emulator.setScanResult(scanResult);
+    emulator.handleServices(services);
+
+    emulator.startServer();
+  }
+
+  @override
+  Future<void> processCharacteristic(String characteristic, Uint8List bytes) async {
+    emulator.processCharacteristic(characteristic, bytes);
+  }
+
+  @override
+  Widget showInformation(BuildContext context) {
+    return Column(
+      spacing: 16,
+      mainAxisAlignment: MainAxisAlignment.start,
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        super.showInformation(context),
+        if (!isConnected)
+          Button.primary(
+            style: ButtonStyle.primary(size: ButtonSize.small),
+            onPressed: () {
+              super.connect();
+            },
+            child: Text('Proxy'),
+          ),
+      ],
+    );
+  }
+
+  @override
+  Future<void> connect() async {}
+
+  @override
+  Future<void> disconnect() {
+    emulator.stop();
+    return super.disconnect();
+  }
+}

lib/bluetooth/devices/shimano/shimano_di2.dart

@@ -1,16 +1,16 @@
 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:prop/prop.dart';
 import 'package:universal_ble/universal_ble.dart';
 
 import '../bluetooth_device.dart';
 
 class ShimanoDi2 extends BluetoothDevice {
-  ShimanoDi2(super.scanResult) : super(availableButtons: []);
+  ShimanoDi2(super.scanResult) : super(availableButtons: [], buttonPrefix: 'D-Fly Channel ');
 
   @override
   Future<void> handleServices(List<BleService> services) async {
@@ -26,11 +26,15 @@ class ShimanoDi2 extends BluetoothDevice {
     await UniversalBle.subscribeIndications(device.deviceId, service.uuid, characteristic.uuid);
   }
 
-  final _lastButtons = <int, int>{};
+  final _lastButtons = <int, ({int value, _Di2State type})>{};
   bool _isInitialized = false;
 
+  @override
+  String get buttonExplanation => 'Click a D-Fly button to configure them.';
+
   @override
   Future<void> processCharacteristic(String characteristic, Uint8List bytes) async {
+    Logger.info('Received data from $characteristic: ${bytesToReadableHex(bytes)}');
     if (characteristic.toLowerCase() == ShimanoDi2Constants.D_FLY_CHANNEL_UUID) {
       final channels = bytes.sublist(1);
 
@@ -38,39 +42,72 @@ class ShimanoDi2 extends BluetoothDevice {
       if (!_isInitialized) {
         channels.forEachIndexed((int value, int index) {
           final readableIndex = index + 1;
-          _lastButtons[index] = value;
+          _lastButtons[index] = (value: value, type: _Di2State.released);
 
           getOrAddButton(
             'D-Fly Channel $readableIndex',
-            () => ControllerButton('D-Fly Channel $readableIndex'),
+            () => ControllerButton('D-Fly Channel $readableIndex', sourceDeviceId: device.deviceId),
           );
         });
         _isInitialized = true;
         return Future.value();
       }
 
-      final clickedButtons = <ControllerButton>[];
-
+      var actualChange = false;
       channels.forEachIndexed((int value, int index) {
-        final didChange = _lastButtons[index] != value;
-        _lastButtons[index] = value;
+        final didChange = _lastButtons[index]?.value != value;
 
         final readableIndex = index + 1;
 
-        final button = getOrAddButton(
-          'D-Fly Channel $readableIndex',
-          () => ControllerButton('D-Fly Channel $readableIndex'),
-        );
         if (didChange) {
-          clickedButtons.add(button);
+          if ((value & 0x10) != 0) {
+            if (_lastButtons[index]?.type == _Di2State.longPress || _lastButtons[index]?.type == _Di2State.keep) {
+              // short press is triggered after long press, until it's released later on
+              _lastButtons[index] = (value: value, type: _Di2State.keep);
+              Logger.info('Button $readableIndex still long pressed');
+            } else {
+              _lastButtons[index] = (value: value, type: _Di2State.shortPress);
+              actualChange = true;
+              Logger.info('Button $readableIndex short pressed');
+            }
+          } else if ((value & 0x20) != 0) {
+            _lastButtons[index] = (value: value, type: _Di2State.longPress);
+            actualChange = true;
+            Logger.info('Button $readableIndex long pressed');
+          } else if ((value & 0x40) != 0) {
+            _lastButtons[index] = (value: value, type: _Di2State.doublePress);
+            actualChange = true;
+            Logger.info('Button $readableIndex double pressed');
+          } else {
+            _lastButtons[index] = (value: value, type: _Di2State.released);
+            actualChange = true;
+            Logger.info('Button $readableIndex released');
+          }
         }
       });
 
-      if (clickedButtons.isNotEmpty) {
-        await handleButtonsClickedWithoutLongPressSupport(clickedButtons);
+      if (actualChange) {
+        final buttonsToTrigger = _lastButtons.entries
+            .where((entry) {
+              final type = entry.value.type;
+              return type != _Di2State.released;
+            })
+            .map((entry) => availableButtons.firstWhere((button) => button.name == 'D-Fly Channel ${entry.key + 1}'))
+            .toList();
+
+        Logger.debug('Buttons to trigger: ${buttonsToTrigger.map((b) => b.name).join(', ')}');
+        handleButtonsClicked(buttonsToTrigger);
+
+        final doublePress = _lastButtons.entries
+            .filter((entry) => entry.value.type == _Di2State.doublePress)
+            .map((entry) => availableButtons.firstWhere((button) => button.name == 'D-Fly Channel ${entry.key + 1}'))
+            .toList();
+        if (doublePress.isNotEmpty) {
+          Logger.debug('Buttons to still trigger: ${doublePress.map((b) => b.name).join(', ')}');
+          handleButtonsClicked(doublePress);
+        }
       }
     }
-    return Future.value();
   }
 
   @override
@@ -79,13 +116,9 @@ class ShimanoDi2 extends BluetoothDevice {
       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)
+        if (!core.settings.getShowOnboarding())
           Text(
-            'Use a custom keymap to support ${scanResult.name}',
+            'Make sure to set your Di2 buttons to D-Fly channels in the Shimano E-TUBE app.',
             style: TextStyle(fontSize: 12, color: Colors.grey),
           ),
       ],
@@ -99,3 +132,11 @@ class ShimanoDi2Constants {
 
   static const String D_FLY_CHANNEL_UUID = "00002ac2-5348-494d-414e-4f5f424c4500";
 }
+
+enum _Di2State {
+  shortPress,
+  longPress,
+  keep,
+  doublePress,
+  released,
+}

lib/bluetooth/devices/sram/sram_axs.dart

@@ -1,9 +1,11 @@
 import 'dart:async';
 
-import 'package:bike_control/bluetooth/devices/zwift/ftms_mdns_emulator.dart';
+import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/keymap/buttons.dart';
+import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
+import 'package:prop/prop.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:universal_ble/universal_ble.dart';
 
@@ -25,10 +27,15 @@ class SramAxs extends BluetoothDevice {
 
   @override
   Future<void> handleServices(List<BleService> services) async {
-    final service = services.firstWhere(
+    final service = services.firstOrNullWhere(
       (e) => e.uuid.toLowerCase() == SramAxsConstants.SERVICE_UUID_RELEVANT.toLowerCase(),
-      orElse: () => throw Exception('Service not found: ${SramAxsConstants.SERVICE_UUID_RELEVANT}'),
     );
+
+    if (service == null) {
+      actionStreamInternal.add(LogNotification('SramAxs: Relevant service not found: ${SramAxsConstants.SERVICE_UUID_RELEVANT}'));
+      return;
+    }
+
     final characteristic = service.characteristics.firstWhere(
       (e) => e.uuid.toLowerCase() == SramAxsConstants.TRIGGER_UUID.toLowerCase(),
       orElse: () => throw Exception('Characteristic not found: ${SramAxsConstants.TRIGGER_UUID}'),
@@ -43,12 +50,12 @@ class SramAxs extends BluetoothDevice {
 
   ControllerButton _singleClickButton() => getOrAddButton(
     'SRAM Tap',
-    () => const ControllerButton('SRAM Tap', action: InGameAction.shiftUp),
+    () => ControllerButton('SRAM Tap', action: InGameAction.shiftUp, sourceDeviceId: device.deviceId),
   );
 
   ControllerButton _doubleClickButton() => getOrAddButton(
     'SRAM Double Tap',
-    () => const ControllerButton('SRAM Double Tap', action: InGameAction.shiftDown),
+    () => ControllerButton('SRAM Double Tap', action: InGameAction.shiftDown, sourceDeviceId: device.deviceId),
   );
 
   void _emitClick(ControllerButton button) {

lib/bluetooth/devices/wahoo/wahoo_kickr_headwind.dart

@@ -1,7 +1,5 @@
 import 'dart:typed_data';
 
-import 'package:bike_control/bluetooth/devices/zwift/ftms_mdns_emulator.dart';
-import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/utils/actions/base_actions.dart';
 import 'package:bike_control/utils/keymap/buttons.dart';
 import 'package:bike_control/utils/keymap/keymap.dart';
@@ -38,7 +36,6 @@ class WahooKickrHeadwind extends BluetoothDevice {
   @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];
@@ -83,6 +80,9 @@ class WahooKickrHeadwind extends BluetoothDevice {
         withoutResponse: true,
       );
       _currentMode = HeadwindMode.manual;
+
+      // Small delay to ensure mode change is processed before speed command
+      await Future.delayed(const Duration(milliseconds: 100));
     }
 
     // Command format: [0x02, speed_value]

lib/bluetooth/devices/zwift/constants.dart

@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 
 class ZwiftConstants {
   static const ZWIFT_CUSTOM_SERVICE_UUID = "00000001-19CA-4651-86E5-FA29DCDD09D1";
+  static const ZWIFT_CUSTOM_SERVICE_SHORT_UUID = "0001";
   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";

lib/bluetooth/devices/zwift/ftms_mdns_emulator.dart

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

lib/bluetooth/devices/zwift/zwift_click.dart

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

lib/bluetooth/devices/zwift/zwift_clickv2.dart

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

lib/bluetooth/devices/zwift/zwift_device.dart

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

lib/bluetooth/devices/zwift/zwift_emulator.dart

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

lib/bluetooth/devices/zwift/zwift_play.dart

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

lib/bluetooth/devices/zwift/zwift_ride.dart

@@ -1,14 +1,11 @@
-import 'package:dartx/dartx.dart';
-import 'package:flutter/foundation.dart';
-import 'package:protobuf/protobuf.dart' as $pb;
 import 'package:bike_control/bluetooth/devices/zwift/constants.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp_vendor.pb.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zwift.pb.dart';
 import 'package:bike_control/bluetooth/devices/zwift/zwift_device.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/keymap/buttons.dart';
+import 'package:flutter/foundation.dart';
+import 'package:prop/prop.dart';
+import 'package:protobuf/protobuf.dart' as $pb;
 import 'package:universal_ble/universal_ble.dart';
 
 class ZwiftRide extends ZwiftDevice {
@@ -56,7 +53,7 @@ class ZwiftRide extends ZwiftDevice {
 
     if (kDebugMode) {
       print(
-        '${DateTime.now().toString().split(" ").last} Received $opcode: ${bytes.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')} => ${String.fromCharCodes(bytes)} ',
+        '${DateTime.now().toString().split(" ").last} Received $opcode: ${bytes.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')}',
       );
     }
 
@@ -100,41 +97,12 @@ class ZwiftRide extends ZwiftDevice {
             }
             break;
           case null:
-            final vendorDO = VendorDO.valueOf(response.dataObjectId);
-            if (kDebugMode) {
-              print('VendorDO: $vendorDO');
-            }
-            switch (vendorDO) {
-              case VendorDO.DEVICE_COUNT:
-                // TODO: Handle this case.
-                break;
-              case VendorDO.NO_CLUE:
-                // TODO: Handle this case.
-                break;
-              case VendorDO.PAGE_DEVICE_PAIRING:
-                final page = DevicePairingDataPage.fromBuffer(response.dataObjectData);
-                if (kDebugMode) {
-                  // this should show the right click device
-                  // pairingStatus = 1 => connected and paired, otherwise it can be paired but not connected
-                  print(
-                    'PageDevicePairing: $page => ${page.pairingDevList.map((e) => e.device.reversed.map((d) => d.toRadixString(16).padLeft(2, '0'))).join(', ')}',
-                  );
-                }
-                break;
-              case VendorDO.PAIRED_DEVICE:
-                // TODO: Handle this case.
-                break;
-              case VendorDO.PAIRING_STATUS:
-                break;
-            }
             break;
           default:
             break;
         }
         break;
       case Opcode.VENDOR_MESSAGE:
-        final vendorOpCode = VendorOpcode.valueOf(message.second);
-        print('VendorOpcode: $vendorOpCode');
         break;
       case Opcode.LOG_DATA:
         final logMessage = LogDataNotification.fromBuffer(message);

lib/bluetooth/messages/notification.dart

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

lib/bluetooth/remote_keyboard_pairing.dart

@@ -0,0 +1,418 @@
+import 'dart:io';
+
+import 'package:bike_control/bluetooth/devices/trainer_connection.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/requirements/multi.dart';
+import 'package:bluetooth_low_energy/bluetooth_low_energy.dart';
+import 'package:flutter/foundation.dart';
+import 'package:permission_handler/permission_handler.dart';
+import 'package:prop/prop.dart';
+
+import '../utils/keymap/keymap.dart';
+
+class RemoteKeyboardPairing extends TrainerConnection {
+  bool get isLoading => _isLoading;
+
+  late final _peripheralManager = PeripheralManager();
+  bool _isLoading = false;
+  bool _isServiceAdded = false;
+  bool _isSubscribedToEvents = false;
+
+  Central? _central;
+  GATTCharacteristic? _inputReport;
+
+  static const String connectionTitle = 'Keyboard Remote Control';
+
+  RemoteKeyboardPairing()
+    : super(
+        title: connectionTitle,
+        supportedActions: InGameAction.values,
+      );
+
+  Future<void> reconnect() async {
+    await _peripheralManager.stopAdvertising();
+    await _peripheralManager.removeAllServices();
+    _isServiceAdded = false;
+    startAdvertising().catchError((e) {
+      core.settings.setRemoteControlEnabled(false);
+      core.connection.signalNotification(
+        AlertNotification(LogLevel.LOGLEVEL_WARNING, 'Failed to start Remote Control pairing: $e'),
+      );
+    });
+  }
+
+  Future<void> startAdvertising() async {
+    _isLoading = true;
+    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) {
+          _central = null;
+          isConnected.value = false;
+          core.connection.signalNotification(
+            AlertNotification(LogLevel.LOGLEVEL_INFO, AppLocalizations.current.disconnected),
+          );
+        }
+      });
+
+      final status = await Permission.bluetoothAdvertise.request();
+      if (!status.isGranted) {
+        print('Bluetooth advertise permission not granted');
+        isStarted.value = false;
+        return;
+      }
+    }
+
+    while (_peripheralManager.state != BluetoothLowEnergyState.poweredOn && core.settings.getRemoteControlEnabled()) {
+      print('Waiting for peripheral manager to be powered on...');
+      if (core.settings.getLastTarget() == Target.thisDevice) {
+        return;
+      }
+      await Future.delayed(Duration(seconds: 1));
+    }
+    final inputReport = GATTCharacteristic.mutable(
+      uuid: UUID.fromString('2A4D'),
+      permissions: [GATTCharacteristicPermission.read],
+      properties: [GATTCharacteristicProperty.notify, GATTCharacteristicProperty.read],
+      descriptors: [
+        GATTDescriptor.immutable(
+          // Report Reference: ID=1, Type=Input(1)
+          uuid: UUID.fromString('2908'),
+          value: Uint8List.fromList([0x01, 0x01]),
+        ),
+      ],
+    );
+
+    if (!_isServiceAdded) {
+      await Future.delayed(Duration(seconds: 1));
+
+      final reportMapDataAbsolute = Uint8List.fromList([
+        // Keyboard Report (Report ID 1)
+        0x05, 0x01, // Usage Page (Generic Desktop)
+        0x09, 0x06, // Usage (Keyboard)
+        0xA1, 0x01, // Collection (Application)
+        0x85, 0x01, //   Report ID (1)
+        0x05, 0x07, //   Usage Page (Keyboard/Keypad)
+        0x19, 0xE0, //   Usage Minimum (Left Control)
+        0x29, 0xE7, //   Usage Maximum (Right GUI)
+        0x15, 0x00, //   Logical Minimum (0)
+        0x25, 0x01, //   Logical Maximum (1)
+        0x75, 0x01, //   Report Size (1)
+        0x95, 0x08, //   Report Count (8)
+        0x81, 0x02, //   Input (Data,Var,Abs) - Modifier byte
+        0x95, 0x01, //   Report Count (1)
+        0x75, 0x08, //   Report Size (8)
+        0x81, 0x01, //   Input (Const) - Reserved byte
+        0x95, 0x06, //   Report Count (6)
+        0x75, 0x08, //   Report Size (8)
+        0x15, 0x00, //   Logical Minimum (0)
+        0x25, 0x65, //   Logical Maximum (101)
+        0x05, 0x07, //   Usage Page (Keyboard/Keypad)
+        0x19, 0x00, //   Usage Minimum (0)
+        0x29, 0x65, //   Usage Maximum (101)
+        0x81, 0x00, //   Input (Data,Array) - Key array (6 keys)
+        0xC0, // End Collection
+      ]);
+
+      // 1) Build characteristics
+      final hidInfo = GATTCharacteristic.immutable(
+        uuid: UUID.fromString('2A4A'),
+        value: Uint8List.fromList([0x11, 0x01, 0x00, 0x02]),
+        descriptors: [], // HID v1.11, country=0, flags=2
+      );
+
+      final reportMap = GATTCharacteristic.immutable(
+        uuid: UUID.fromString('2A4B'),
+        //properties: [GATTCharacteristicProperty.read],
+        //permissions: [GATTCharacteristicPermission.read],
+        value: reportMapDataAbsolute,
+        descriptors: [
+          GATTDescriptor.immutable(uuid: UUID.fromString('2908'), value: Uint8List.fromList([0x0, 0x0])),
+        ],
+      );
+
+      final protocolMode = GATTCharacteristic.mutable(
+        uuid: UUID.fromString('2A4E'),
+        properties: [GATTCharacteristicProperty.read, GATTCharacteristicProperty.writeWithoutResponse],
+        permissions: [GATTCharacteristicPermission.read, GATTCharacteristicPermission.write],
+        descriptors: [],
+      );
+
+      final hidControlPoint = GATTCharacteristic.mutable(
+        uuid: UUID.fromString('2A4C'),
+        properties: [GATTCharacteristicProperty.writeWithoutResponse],
+        permissions: [GATTCharacteristicPermission.write],
+        descriptors: [],
+      );
+
+      // 2) HID service
+      final hidService = GATTService(
+        uuid: UUID.fromString(Platform.isIOS ? '1812' : '00001812-0000-1000-8000-00805F9B34FB'),
+        isPrimary: true,
+        characteristics: [
+          hidInfo,
+          reportMap,
+          protocolMode,
+          hidControlPoint,
+          inputReport,
+        ],
+        includedServices: [],
+      );
+
+      if (!_isSubscribedToEvents) {
+        _isSubscribedToEvents = true;
+        _peripheralManager.characteristicReadRequested.forEach((char) {
+          print('Read request for characteristic: ${char}');
+          // You can respond to read requests here if needed
+        });
+
+        _peripheralManager.characteristicNotifyStateChanged.forEach((char) {
+          // Check if this is the input report characteristic (2A4D)
+          if (char.characteristic.uuid == inputReport.uuid) {
+            if (char.state) {
+              _central = char.central;
+              _inputReport = char.characteristic;
+              isConnected.value = true;
+              print('Input report subscribed');
+            } else {
+              _inputReport = null;
+              _central = null;
+              isConnected.value = false;
+              print('Input report unsubscribed');
+            }
+          }
+          print('Notify state changed for characteristic: ${char.characteristic.uuid}: ${char.state}');
+        });
+      }
+      await _peripheralManager.addService(hidService);
+
+      // 3) Optional Battery service
+      await _peripheralManager.addService(
+        GATTService(
+          uuid: UUID.fromString('180F'),
+          isPrimary: true,
+          characteristics: [
+            GATTCharacteristic.immutable(
+              uuid: UUID.fromString('2A19'),
+              value: Uint8List.fromList([100]),
+              descriptors: [],
+            ),
+          ],
+          includedServices: [],
+        ),
+      );
+      _isServiceAdded = true;
+    }
+
+    final advertisement = Advertisement(
+      name:
+          'BikeControl ${Platform.isIOS
+              ? 'iOS'
+              : Platform.isAndroid
+              ? 'Android'
+              : ''}',
+      serviceUUIDs: [UUID.fromString(Platform.isIOS ? '1812' : '00001812-0000-1000-8000-00805F9B34FB')],
+    );
+    print('Starting advertising with Remote service...');
+
+    try {
+      await _peripheralManager.startAdvertising(advertisement);
+    } catch (e) {
+      if (e.toString().contains("Advertising has already started")) {
+        print('Advertising already started, ignoring error');
+        return;
+      } else {
+        rethrow;
+      }
+    }
+    _isLoading = false;
+  }
+
+  Future<void> stopAdvertising() async {
+    await _peripheralManager.removeAllServices();
+    _isServiceAdded = false;
+    await _peripheralManager.stopAdvertising();
+    isStarted.value = false;
+    isConnected.value = false;
+    _isLoading = false;
+  }
+
+  Future<void> notifyCharacteristic(Uint8List value) async {
+    if (_inputReport != null && _central != null) {
+      await _peripheralManager.notifyCharacteristic(_central!, _inputReport!, value: value);
+    }
+  }
+
+  @override
+  Future<ActionResult> sendAction(KeyPair keyPair, {required bool isKeyDown, required bool isKeyUp}) async {
+    if (isKeyDown && isKeyUp) {
+      await sendKeyPress(keyPair);
+      return Success('Key ${keyPair.toString()} press sent');
+    } else if (isKeyDown) {
+      await sendKeyDown(keyPair);
+      return Success('Key ${keyPair.toString()} down sent');
+    } else if (isKeyUp) {
+      await sendKeyUp();
+      return Success('Key ${keyPair.toString()} up sent');
+    }
+    return NotHandled('Illegal combination');
+  }
+
+  /// USB HID Keyboard scan codes for common keys
+  static const Map<String, int> hidKeyCodes = {
+    'a': 0x04,
+    'b': 0x05,
+    'c': 0x06,
+    'd': 0x07,
+    'e': 0x08,
+    'f': 0x09,
+    'g': 0x0A,
+    'h': 0x0B,
+    'i': 0x0C,
+    'j': 0x0D,
+    'k': 0x0E,
+    'l': 0x0F,
+    'm': 0x10,
+    'n': 0x11,
+    'o': 0x12,
+    'p': 0x13,
+    'q': 0x14,
+    'r': 0x15,
+    's': 0x16,
+    't': 0x17,
+    'u': 0x18,
+    'v': 0x19,
+    'w': 0x1A,
+    'x': 0x1B,
+    'y': 0x1C,
+    'z': 0x1D,
+    '1': 0x1E,
+    '2': 0x1F,
+    '3': 0x20,
+    '4': 0x21,
+    '5': 0x22,
+    '6': 0x23,
+    '7': 0x24,
+    '8': 0x25,
+    '9': 0x26,
+    '0': 0x27,
+    'enter': 0x28,
+    'escape': 0x29,
+    'backspace': 0x2A,
+    'tab': 0x2B,
+    'space': 0x2C,
+    'minus': 0x2D,
+    'equals': 0x2E,
+    'leftbracket': 0x2F,
+    'rightbracket': 0x30,
+    'backslash': 0x31,
+    'semicolon': 0x33,
+    'quote': 0x34,
+    'grave': 0x35,
+    'comma': 0x36,
+    'period': 0x37,
+    'slash': 0x38,
+    'capslock': 0x39,
+    'f1': 0x3A,
+    'f2': 0x3B,
+    'f3': 0x3C,
+    'f4': 0x3D,
+    'f5': 0x3E,
+    'f6': 0x3F,
+    'f7': 0x40,
+    'f8': 0x41,
+    'f9': 0x42,
+    'f10': 0x43,
+    'f11': 0x44,
+    'f12': 0x45,
+    'printscreen': 0x46,
+    'scrolllock': 0x47,
+    'pause': 0x48,
+    'insert': 0x49,
+    'home': 0x4A,
+    'pageup': 0x4B,
+    'delete': 0x4C,
+    'end': 0x4D,
+    'pagedown': 0x4E,
+    'right': 0x4F,
+    'left': 0x50,
+    'down': 0x51,
+    'up': 0x52,
+  };
+
+  /// Modifier key bit masks
+  static const int modLeftCtrl = 0x01;
+  static const int modLeftShift = 0x02;
+  static const int modLeftAlt = 0x04;
+  static const int modLeftGui = 0x08;
+  static const int modRightCtrl = 0x10;
+  static const int modRightShift = 0x20;
+  static const int modRightAlt = 0x40;
+  static const int modRightGui = 0x80;
+
+  /// Create a keyboard HID report
+  /// [modifiers] - bit mask for modifier keys (Ctrl, Shift, Alt, GUI)
+  /// [keyCodes] - list of up to 6 key codes to send
+  Uint8List keyboardReport(int modifiers, List<int> keyCodes) {
+    final keys = List<int>.filled(6, 0);
+    for (var i = 0; i < keyCodes.length && i < 6; i++) {
+      keys[i] = keyCodes[i];
+    }
+    // Report format: [modifiers, reserved, key1, key2, key3, key4, key5, key6]
+    return Uint8List.fromList([modifiers, 0x00, ...keys]);
+  }
+
+  /// Send a keyboard key press and release
+  /// [key] - the key name (e.g., 'a', 'enter', 'space', 'f1', 'up', 'down')
+  /// [modifiers] - optional modifier keys (use modLeftCtrl, modLeftShift, etc.)
+  Future<void> sendKeyPress(KeyPair keyPair, {int modifiers = 0}) async {
+    final usbHidUsage = keyPair.physicalKey!.usbHidUsage;
+    final keyCode = usbHidUsage & 0xFF;
+
+    // Send key down
+    final downReport = keyboardReport(modifiers, [keyCode]);
+    if (kDebugMode) {
+      print(
+        'Sending keyboard key down: $keyPair (0x${keyCode.toRadixString(16)}) with modifiers: 0x${modifiers.toRadixString(16)}',
+      );
+    }
+    await notifyCharacteristic(downReport);
+
+    await Future.delayed(Duration(milliseconds: 20));
+
+    // Send key up (empty report)
+    final upReport = keyboardReport(0, []);
+    if (kDebugMode) {
+      print('Sending keyboard key up');
+    }
+    await notifyCharacteristic(upReport);
+
+    await Future.delayed(Duration(milliseconds: 10));
+  }
+
+  /// Send a key down event only (for holding keys)
+  Future<void> sendKeyDown(KeyPair keyPair, {int modifiers = 0}) async {
+    final usbHidUsage = keyPair.physicalKey!.usbHidUsage;
+    final keyCode = usbHidUsage & 0xFF;
+
+    final report = keyboardReport(modifiers, [keyCode]);
+    await notifyCharacteristic(report);
+  }
+
+  /// Send a key up event (release all keys)
+  Future<void> sendKeyUp() async {
+    final report = keyboardReport(0, []);
+    await notifyCharacteristic(report);
+  }
+}

lib/bluetooth/remote_pairing.dart

@@ -1,7 +1,6 @@
 import 'dart:io';
 
 import 'package:bike_control/bluetooth/devices/trainer_connection.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/gen/l10n.dart';
 import 'package:bike_control/utils/actions/base_actions.dart';
@@ -12,6 +11,7 @@ import 'package:bike_control/utils/requirements/multi.dart';
 import 'package:bluetooth_low_energy/bluetooth_low_energy.dart';
 import 'package:flutter/foundation.dart';
 import 'package:permission_handler/permission_handler.dart';
+import 'package:prop/prop.dart';
 
 import '../utils/keymap/keymap.dart';
 
@@ -159,37 +159,6 @@ class RemotePairing extends TrainerConnection {
         descriptors: [],
       );
 
-      // Input report characteristic (notify)
-      final keyboardInputReport = GATTCharacteristic.mutable(
-        uuid: UUID.fromString('2A4D'),
-        permissions: [GATTCharacteristicPermission.read],
-        properties: [GATTCharacteristicProperty.notify, GATTCharacteristicProperty.read],
-        descriptors: [
-          GATTDescriptor.immutable(
-            // Report Reference: ID=1, Type=Input(1)
-            uuid: UUID.fromString('2908'),
-            value: Uint8List.fromList([0x02, 0x01]),
-          ),
-        ],
-      );
-
-      final outputReport = GATTCharacteristic.mutable(
-        uuid: UUID.fromString('2A4D'),
-        permissions: [GATTCharacteristicPermission.read, GATTCharacteristicPermission.write],
-        properties: [
-          GATTCharacteristicProperty.read,
-          GATTCharacteristicProperty.write,
-          GATTCharacteristicProperty.writeWithoutResponse,
-        ],
-        descriptors: [
-          GATTDescriptor.immutable(
-            // Report Reference: ID=1, Type=Input(1)
-            uuid: UUID.fromString('2908'),
-            value: Uint8List.fromList([0x02, 0x02]),
-          ),
-        ],
-      );
-
       // 2) HID service
       final hidService = GATTService(
         uuid: UUID.fromString(Platform.isIOS ? '1812' : '00001812-0000-1000-8000-00805F9B34FB'),
@@ -198,9 +167,7 @@ class RemotePairing extends TrainerConnection {
           hidInfo,
           reportMap,
           protocolMode,
-          outputReport,
           hidControlPoint,
-          keyboardInputReport,
           inputReport,
         ],
         includedServices: [],
@@ -214,18 +181,21 @@ class RemotePairing extends TrainerConnection {
         });
 
         _peripheralManager.characteristicNotifyStateChanged.forEach((char) {
+          // Check if this is the input report characteristic (2A4D)
           if (char.characteristic.uuid == inputReport.uuid) {
             if (char.state) {
-              _inputReport = char.characteristic;
               _central = char.central;
+              _inputReport = char.characteristic;
+              isConnected.value = true;
+              print('Input report subscribed');
             } else {
               _inputReport = null;
               _central = null;
+              isConnected.value = false;
+              print('Input report unsubscribed');
             }
           }
-          print(
-            'Notify state changed for characteristic: ${char.characteristic.uuid} vs ${char.characteristic.uuid == inputReport.uuid}: ${char.state}',
-          );
+          print('Notify state changed for characteristic: ${char.characteristic.uuid}: ${char.state}');
         });
       }
       await _peripheralManager.addService(hidService);
@@ -257,13 +227,24 @@ class RemotePairing extends TrainerConnection {
               : ''}',
       serviceUUIDs: [UUID.fromString(Platform.isIOS ? '1812' : '00001812-0000-1000-8000-00805F9B34FB')],
     );
-    print('Starting advertising with Zwift service...');
+    print('Starting advertising with Remote service...');
 
-    await _peripheralManager.startAdvertising(advertisement);
+    try {
+      await _peripheralManager.startAdvertising(advertisement);
+    } catch (e) {
+      if (e.toString().contains("Advertising has already started")) {
+        print('Advertising already started, ignoring error');
+        return;
+      } else {
+        rethrow;
+      }
+    }
     _isLoading = false;
   }
 
   Future<void> stopAdvertising() async {
+    await _peripheralManager.removeAllServices();
+    _isServiceAdded = false;
     await _peripheralManager.stopAdvertising();
     isStarted.value = false;
     isConnected.value = false;

lib/i10n/intl_de.arb

@@ -11,6 +11,7 @@
   "accessibilityUsageMonitor": "• Die App überwacht, welches Trainings-App-Fenster aktiv ist, um sicherzustellen, dass Gesten an die richtige App gesendet werden.",
   "accessibilityUsageNoData": "• Über diesen Dienst werden keine personenbezogenen Daten abgerufen oder erfasst.",
   "accessories": "Zubehör",
+  "actAsBluetoothKeyboard": "Als Bluetooth-Tastatur fungieren",
   "action": "Aktion",
   "adjustControllerButtons": "Controller-Tasten anpassen",
   "afterDate": "Nach dem {date}",
@@ -36,6 +37,7 @@
   "battery": "Batterie",
   "beforeDate": "Vor dem {date}",
   "bluetoothAdvertiseAccess": "Bluetooth-Zugriff",
+  "bluetoothKeyboardExplanation": "So können Sie Ihr Smartphone als Bluetooth-Tastatur zur Steuerung kompatibler Apps verwenden. Nach der Kopplung können Sie die Tasten Ihres Fahrradcontrollers nutzen, um Tastatureingaben an die App zu senden.",
   "bluetoothTurnedOn": "Bluetooth ist eingeschaltet",
   "browserNotSupported": "Dieser Browser unterstützt kein Web-Bluetooth und die Plattform wird nicht unterstützt :(",
   "button": "Taste.",
@@ -153,9 +155,9 @@
   "enableLocalConnectionMethodFirst": "Aktivieren Sie zuerst die Methode „Lokale Verbindung“.",
   "enableMediaKeyDetection": "Medientastenerkennung aktivieren",
   "enableMywhooshLinkInTheConnectionSettingsFirst": "Aktiviere zuerst MyWhoosh Link in den Verbindungseinstellungen.",
-  "enablePairingProcess": "Kopplungsprozess aktivieren",
+  "enablePairingProcess": "Als Bluetooth-Maus fungieren",
   "enablePermissions": "Berechtigungen aktivieren",
-  "enableSteeringWithPhone": "Sensoren Ihres Telefons aktivieren z.B. zum Lenken",
+  "enableSteeringWithPhone": "Lenkung über Handy-Sensoren aktivieren",
   "enableVibrationFeedback": "Vibrationsfeedback beim Gangwechsel aktivieren",
   "enableZwiftControllerBluetooth": "Zwift Controller aktivieren (Bluetooth)",
   "enableZwiftControllerNetwork": "Zwift Controller aktivieren (Netzwerk)",
@@ -279,7 +281,7 @@
   "openBikeControlAnnouncement": "Tolle Neuigkeiten! {trainerApp} unterstützt das OpenBikeControl-Protokoll für eine bestmögliche Benutzererfahrung.",
   "openBikeControlConnection": " z. B. durch Verwendung einer OpenBikeControl-Verbindung",
   "otherConnectionMethods": "Andere Verbindungsmethoden",
-  "pairingDescription": "Die Kopplung ermöglicht volle Anpassungsmöglichkeiten, funktioniert aber möglicherweise nicht auf allen Geräten.",
+  "pairingDescription": "So können Sie Ihr Smartphone als Bluetooth-Maus zur Steuerung von Apps verwenden. Nach der Kopplung können Sie die Tasten Ihres Fahrradcontrollers nutzen, um Mausbewegungen an die App zu senden.",
   "pairingInstructions": "Gehe auf Deinem {targetName} in die Bluetooth-Einstellungen und suche nach BikeControl oder dem Namen Ihres Geräts. Wenn Du die Fernbedienungsfunktion nutzen möchtest, ist eine Kopplung erforderlich.",
   "@pairingInstructions": {
     "placeholders": {
@@ -413,6 +415,21 @@
   "tryingToConnectAgain": "Verbinde erneut...",
   "unassignAction": "Zuweisung aufheben",
   "unlockFullVersion": "Vollversion freischalten",
+  "unlock_bikecontrolAndZwiftNetwork": "BikeControl und Zwift müssen sich im selben Netzwerk oder auf demselben Gerät befinden. Es kann einige Sekunden dauern, bis sie angezeigt werden.",
+  "unlock_confirmByPressingAButtonOnYourDevice": "Bestätigen Sie durch Drücken einer Taste auf Ihrem Gerät.",
+  "unlock_connectToBikecontrol": "Verbinde dich mit „BikeControl“, z.B. als Stromquelle.",
+  "unlock_deviceIsCurrentlyLocked": "Das Gerät ist derzeit gesperrt.",
+  "unlock_isnowunlocked": "{device} ist jetzt freigeschaltet",
+  "unlock_markAsUnlocked": "Als entsperrt markieren",
+  "unlock_notWorking": "Funktioniert nicht?",
+  "unlock_openZwift": "Öffnen Sie Zwift (nicht die Companion-App) auf diesem oder einem anderen Gerät.",
+  "unlock_unlockManually": "Manuelles Entsperren",
+  "unlock_unlockNow": "Jetzt freischalten",
+  "unlock_unlockedUntilAroundDate": "Entsperrt bis etwa {date}",
+  "unlock_waitingForZwift": "Warten auf die Entsperrung Ihres Geräts durch Zwift...",
+  "unlock_youCanNowCloseZwift": "Zwift kann jetzt geschlossen werden.",
+  "unlock_yourTrialPhaseHasExpired": "Testphase ist abgelaufen. Bitte erwerbe die Vollversion, um die komfortable Entsperrfunktion freizuschalten.",
+  "unlock_yourZwiftClickMightBeUnlockedAlready": "Ihr Zwift Click ist möglicherweise bereits freigeschaltet.",
   "unlockingNotPossible": "Eine Freischaltung ist derzeit noch nicht möglich, daher ist die App vorerst uneingeschränkt nutzbar!",
   "update": "Aktualisieren",
   "useCustomKeymapForButton": "Verwende eine benutzerdefinierte Tastaturbelegung, um die",

lib/i10n/intl_en.arb

@@ -11,6 +11,7 @@
   "accessibilityUsageMonitor": "• The app monitors which training app window is active to ensure gestures are sent to the correct app",
   "accessibilityUsageNoData": "• No personal data is accessed or collected through this service",
   "accessories": "Accessories",
+  "actAsBluetoothKeyboard": "Act as Bluetooth Keyboard",
   "action": "Action",
   "adjustControllerButtons": "Adjust Controller Buttons",
   "afterDate": "After {date}",
@@ -36,6 +37,7 @@
   "battery": "Battery",
   "beforeDate": "Before {date}",
   "bluetoothAdvertiseAccess": "Bluetooth Advertise access",
+  "bluetoothKeyboardExplanation": "This will allow you to use your phone as a Bluetooth keyboard to control compatible apps. Once paired, you can use the buttons on your bike controller to send keyboard inputs to the app.",
   "bluetoothTurnedOn": "Bluetooth turned on",
   "browserNotSupported": "This Browser does not support Web Bluetooth and platform is not supported :(",
   "button": "button.",
@@ -153,9 +155,9 @@
   "enableLocalConnectionMethodFirst": "Enable Local Connection method, first.",
   "enableMediaKeyDetection": "Enable Media Key Detection",
   "enableMywhooshLinkInTheConnectionSettingsFirst": "Enable MyWhoosh Link in the connection settings first.",
-  "enablePairingProcess": "Enable Pairing Process",
+  "enablePairingProcess": "Act as Bluetooth Mouse",
   "enablePermissions": "Enable Permissions",
-  "enableSteeringWithPhone": "Enable Phones' sensors to enable e.g. steering",
+  "enableSteeringWithPhone": "Enable Steering with your phone's sensors",
   "enableVibrationFeedback": "Enable vibration feedback when shifting gears",
   "enableZwiftControllerBluetooth": "Enable Zwift Controller (Bluetooth)",
   "enableZwiftControllerNetwork": "Enable Zwift Controller (Network)",
@@ -279,7 +281,7 @@
   "openBikeControlAnnouncement": "Great news - {trainerApp} supports the OpenBikeControl Protocol, so you'll have the best possible experience!",
   "openBikeControlConnection": " e.g. by using OpenBikeControl connection",
   "otherConnectionMethods": "Other Connection Methods",
-  "pairingDescription": "Pairing allows full customizability, but may not work on all devices.",
+  "pairingDescription": "This will allow you to use your phone as a Bluetooth mouse to control apps. Once paired, you can use the buttons on your bike controller to send mouse inputs to the app.",
   "pairingInstructions": "On your {targetName} go into Bluetooth settings and look for BikeControl or your machines name. Pairing is required if you want to use the remote control feature.",
   "@pairingInstructions": {
     "placeholders": {
@@ -413,6 +415,21 @@
   "tryingToConnectAgain": "Trying to connect again...",
   "unassignAction": "Unassign action",
   "unlockFullVersion": "Unlock Full Version",
+  "unlock_bikecontrolAndZwiftNetwork": "BikeControl and Zwift need to be on the same network or device. It may take a few seconds to appear.",
+  "unlock_confirmByPressingAButtonOnYourDevice": "Confirm by pressing a button on your device.",
+  "unlock_connectToBikecontrol": "Connect to \"BikeControl\" e.g. as Power source",
+  "unlock_deviceIsCurrentlyLocked": "Device is currently locked",
+  "unlock_isnowunlocked": "{device} is now unlocked",
+  "unlock_markAsUnlocked": "Mark as Unlocked",
+  "unlock_notWorking": "Not working?",
+  "unlock_openZwift": "Open Zwift (not the Companion) on this or another device",
+  "unlock_unlockManually": "Unlock manually",
+  "unlock_unlockNow": "Unlock now",
+  "unlock_unlockedUntilAroundDate": "Unlocked until around {date}",
+  "unlock_waitingForZwift": "Waiting for Zwift to unlock your device...",
+  "unlock_youCanNowCloseZwift": "You can now close Zwift and return to BikeControl.",
+  "unlock_yourTrialPhaseHasExpired": "Your trial phase has expired. Please purchase the full version to unlock the comfortable unlocking feature :)",
+  "unlock_yourZwiftClickMightBeUnlockedAlready": "Your Zwift Click might be unlocked already.",
   "unlockingNotPossible": "Unlocking is currently not yet possible, so enjoy unlimited usage for the time being!",
   "update": "Update",
   "useCustomKeymapForButton": "Use a custom keymap to support the",

lib/i10n/intl_fr.arb

@@ -11,6 +11,7 @@
   "accessibilityUsageMonitor": "• L'application surveille quelle fenêtre de l'application d'entraînement est active afin de s'assurer que les gestes sont envoyés à la bonne application.",
   "accessibilityUsageNoData": "• Aucune donnée personnelle n'est consultée ou collectée par le biais de ce service.",
   "accessories": "Accessoires",
+  "actAsBluetoothKeyboard": "Fonctionne comme un clavier Bluetooth",
   "action": "Action",
   "adjustControllerButtons": "Ajuster les boutons de la manette",
   "afterDate": "Après {date}",
@@ -36,6 +37,7 @@
   "battery": "Batterie",
   "beforeDate": "Avant {date}",
   "bluetoothAdvertiseAccess": "Accès à la publicité Bluetooth",
+  "bluetoothKeyboardExplanation": "Vous pourrez ainsi utiliser votre téléphone comme clavier Bluetooth pour contrôler les applications compatibles. Une fois l'appairage effectué, vous pourrez utiliser les boutons de votre contrôleur de vélo pour envoyer des commandes à l'application.",
   "bluetoothTurnedOn": "Bluetooth activé",
   "browserNotSupported": "Ce navigateur ne prend pas en charge Web Bluetooth et la plateforme n'est pas prise en charge :(",
   "button": "bouton.",
@@ -153,9 +155,9 @@
   "enableLocalConnectionMethodFirst": "Activez d'abord le mode de connexion locale.",
   "enableMediaKeyDetection": "Activer la détection des touches multimédias",
   "enableMywhooshLinkInTheConnectionSettingsFirst": "Activez d'abord MyWhoosh Link dans les paramètres de connexion.",
-  "enablePairingProcess": "Activer le processus d'appairage",
+  "enablePairingProcess": "Fonctionne comme une souris Bluetooth",
   "enablePermissions": "Activer les autorisations",
-  "enableSteeringWithPhone": "Activez les capteurs du téléphone pour permettre, par exemple, la direction.",
+  "enableSteeringWithPhone": "Activez la direction avec les capteurs de votre téléphone",
   "enableVibrationFeedback": "Activer le retour haptique par vibration lors du changement de vitesse",
   "enableZwiftControllerBluetooth": "Activer le contrôleur Zwift (Bluetooth)",
   "enableZwiftControllerNetwork": "Activer le contrôleur Zwift (réseau)",
@@ -279,7 +281,7 @@
   "openBikeControlAnnouncement": "Excellente nouvelle! {trainerApp} Il prend en charge le protocole OpenBikeControl, vous bénéficierez donc de la meilleure expérience possible !",
   "openBikeControlConnection": " par exemple en utilisant la connexion OpenBikeControl",
   "otherConnectionMethods": "Autres méthodes de connexion",
-  "pairingDescription": "Le jumelage permet une personnalisation complète, mais peut ne pas fonctionner sur tous les appareils.",
+  "pairingDescription": "Cela vous permettra d'utiliser votre téléphone comme une souris Bluetooth pour contrôler des applications. Une fois l'appairage effectué, vous pourrez utiliser les boutons de votre contrôleur de vélo pour envoyer des commandes de souris à l'application.",
   "pairingInstructions": "Sur votre {targetName}, accédez aux paramètres Bluetooth et recherchez BikeControl ou le nom de votre appareil. L'appairage est nécessaire si vous souhaitez utiliser la fonction de commande à distance.",
   "@pairingInstructions": {
     "placeholders": {
@@ -413,6 +415,21 @@
   "tryingToConnectAgain": "Tentative de reconnexion...",
   "unassignAction": "Action de désaffectation",
   "unlockFullVersion": "Débloquer la version complète",
+  "unlock_bikecontrolAndZwiftNetwork": "BikeControl et Zwift doivent être connectés au même réseau ou appareil. L'affichage peut prendre quelques secondes.",
+  "unlock_confirmByPressingAButtonOnYourDevice": "Confirmez en appuyant sur un bouton de votre appareil.",
+  "unlock_connectToBikecontrol": "Se connecter à « BikeControl », par exemple comme source d'alimentation",
+  "unlock_deviceIsCurrentlyLocked": "L'appareil est actuellement verrouillé.",
+  "unlock_isnowunlocked": "{device} est maintenant déverrouillé",
+  "unlock_markAsUnlocked": "Marquer comme déverrouillé",
+  "unlock_notWorking": "Ça ne fonctionne pas ?",
+  "unlock_openZwift": "Ouvrez Zwift (et non l'application Companion) sur cet appareil ou un autre.",
+  "unlock_unlockManually": "Déverrouiller manuellement",
+  "unlock_unlockNow": "Déverrouiller maintenant",
+  "unlock_unlockedUntilAroundDate": "Déverrouillé jusqu'à environ {date}",
+  "unlock_waitingForZwift": "En attente du déverrouillage de votre appareil par Zwift...",
+  "unlock_youCanNowCloseZwift": "Vous pouvez maintenant fermer Zwift et revenir à BikeControl.",
+  "unlock_yourTrialPhaseHasExpired": "Votre période d'essai est terminée. Veuillez acheter la version complète pour débloquer la fonction de déverrouillage simplifiée :)",
+  "unlock_yourZwiftClickMightBeUnlockedAlready": "Votre Zwift Click est peut-être déjà déverrouillé.",
   "unlockingNotPossible": "Le déverrouillage n'est pas encore possible pour le moment, alors profitez d'une utilisation illimitée pour l'instant !",
   "update": "Mise à jour",
   "useCustomKeymapForButton": "Utilisez une configuration de touches personnalisée pour prendre en charge",

lib/i10n/intl_it.arb

@@ -11,6 +11,7 @@
   "accessibilityUsageMonitor": "• L'applicazione monitora quale finestra dell'app di allenamento è attiva per garantire che i gesti vengano inviati all'app corretta",
   "accessibilityUsageNoData": "• Nessun dato personale viene raccolto o consultato tramite questo servizio",
   "accessories": "Accessori",
+  "actAsBluetoothKeyboard": "Funziona come tastiera Bluetooth",
   "action": "Azione",
   "adjustControllerButtons": "Regola i pulsanti del controller",
   "afterDate": "Dopo il {date}",
@@ -36,6 +37,7 @@
   "battery": "Batteria",
   "beforeDate": "Prima del {date}",
   "bluetoothAdvertiseAccess": "Accesso pubblicitario Bluetooth",
+  "bluetoothKeyboardExplanation": "Questo ti permetterà di usare il tuo telefono come tastiera Bluetooth per controllare le app compatibili. Una volta associato, potrai usare i pulsanti del controller della tua bici per inviare input dalla tastiera all'app.",
   "bluetoothTurnedOn": "Bluetooth attivato",
   "browserNotSupported": "Questo browser non supporta il Web Bluetooth e la piattaforma non è supportata :(",
   "button": "pulsante.",
@@ -153,9 +155,9 @@
   "enableLocalConnectionMethodFirst": "Abilitare prima il metodo di connessione locale.",
   "enableMediaKeyDetection": "Abilita rilevamento tasti multimediali",
   "enableMywhooshLinkInTheConnectionSettingsFirst": "Per prima cosa, abilita MyWhoosh Link nelle impostazioni di connessione.",
-  "enablePairingProcess": "Abilita processo di associazione",
+  "enablePairingProcess": "Funziona come un mouse Bluetooth",
   "enablePermissions": "Abilita autorizzazioni",
-  "enableSteeringWithPhone": "Abilita i sensori dei telefoni per abilitare ad esempio lo sterzo",
+  "enableSteeringWithPhone": "Abilita lo sterzo con i sensori del tuo telefono",
   "enableVibrationFeedback": "Abilita il feedback delle vibrazioni durante il cambio marcia",
   "enableZwiftControllerBluetooth": "Abilita il controller Zwift (Bluetooth)",
   "enableZwiftControllerNetwork": "Abilita Zwift Controller (rete)",
@@ -279,7 +281,7 @@
   "openBikeControlAnnouncement": "Ottime notizie -{trainerApp} supporta il protocollo OpenBikeControl, così avrai la migliore esperienza possibile!",
   "openBikeControlConnection": " ad esempio utilizzando la connessione OpenBikeControl",
   "otherConnectionMethods": "Altri metodi di connessione",
-  "pairingDescription": "L'associazione consente la personalizzazione completa, ma potrebbe non funzionare su tutti i dispositivi.",
+  "pairingDescription": "Questo ti permetterà di usare il tuo telefono come mouse Bluetooth per controllare le app. Una volta associato, potrai usare i pulsanti del controller della tua bici per inviare input del mouse all'app.",
   "pairingInstructions": "Sul tuo{targetName} Accedi alle impostazioni Bluetooth e cerca BikeControl o il nome del tuo dispositivo. L'associazione è necessaria se vuoi utilizzare la funzione di controllo remoto.",
   "@pairingInstructions": {
     "placeholders": {
@@ -413,6 +415,21 @@
   "tryingToConnectAgain": "Sto provando a connettermi di nuovo...",
   "unassignAction": "Annulla assegnazione azione",
   "unlockFullVersion": "Sblocca la versione completa",
+  "unlock_bikecontrolAndZwiftNetwork": "BikeControl e Zwift devono essere sulla stessa rete o sullo stesso dispositivo. Potrebbero essere necessari alcuni secondi per visualizzarli.",
+  "unlock_confirmByPressingAButtonOnYourDevice": "Conferma premendo un pulsante sul tuo dispositivo.",
+  "unlock_connectToBikecontrol": "Connetti a \"BikeControl\" ad esempio come fonte di alimentazione",
+  "unlock_deviceIsCurrentlyLocked": "Il dispositivo è attualmente bloccato",
+  "unlock_isnowunlocked": "{device} è ora sbloccato",
+  "unlock_markAsUnlocked": "Segna come sbloccato",
+  "unlock_notWorking": "Non funziona?",
+  "unlock_openZwift": "Apri Zwift (non il Companion) su questo o un altro dispositivo",
+  "unlock_unlockManually": "Sblocca manualmente",
+  "unlock_unlockNow": "Sblocca ora",
+  "unlock_unlockedUntilAroundDate": "Sbloccato fino a circa {date}",
+  "unlock_waitingForZwift": "In attesa che Zwift sblocchi il tuo dispositivo...",
+  "unlock_youCanNowCloseZwift": "Ora puoi chiudere Zwift e tornare a BikeControl.",
+  "unlock_yourTrialPhaseHasExpired": "La tua fase di prova è scaduta. Acquista la versione completa per sbloccare la comoda funzione di sblocco :)",
+  "unlock_yourZwiftClickMightBeUnlockedAlready": "Il tuo Zwift Click potrebbe essere già sbloccato.",
   "unlockingNotPossible": "Al momento non è ancora possibile sbloccarlo, quindi per il momento goditi un utilizzo illimitato!",
   "update": "Aggiorna",
   "useCustomKeymapForButton": "Utilizzare una mappa dei tasti personalizzata per supportare",

lib/i10n/intl_pl.arb

@@ -11,6 +11,7 @@
   "accessibilityUsageMonitor": "• Aplikacja monitoruje, które okno aplikacji treningowej jest aktywne, aby zapewnić, że gesty są wysyłane do właściwej aplikacji",
   "accessibilityUsageNoData": "• Ta usługa nie uzyskuje dostępu do danych osobowych, ani ich nie gromadzi",
   "accessories": "Akcesoria",
+  "actAsBluetoothKeyboard": "Działa jako klawiatura Bluetooth",
   "action": "Działanie",
   "adjustControllerButtons": "Dostosuj przyciski kontrolera",
   "afterDate": "Po {date}",
@@ -36,6 +37,7 @@
   "battery": "Bateria",
   "beforeDate": "Zanim {date}",
   "bluetoothAdvertiseAccess": "Dostęp do reklamy Bluetooth",
+  "bluetoothKeyboardExplanation": "Umożliwi to używanie telefonu jako klawiatury Bluetooth do sterowania kompatybilnymi aplikacjami. Po sparowaniu możesz używać przycisków na kontrolerze rowerowym do wysyłania poleceń z klawiatury do aplikacji.",
   "bluetoothTurnedOn": "Włączono Bluetooth",
   "browserNotSupported": "Ta przeglądarka nie obsługuje technologii Web Bluetooth i platforma nie jest obsługiwana :(",
   "button": "przycisk.",
@@ -153,9 +155,9 @@
   "enableLocalConnectionMethodFirst": "Najpierw włącz metodę połączenia lokalnego.",
   "enableMediaKeyDetection": "Włącz rozpoznawanie klawiszy multimedialnych",
   "enableMywhooshLinkInTheConnectionSettingsFirst": "Najpierw włącz MyWhoosh Link w ustawieniach połączenia.",
-  "enablePairingProcess": "Włącz proces parowania",
+  "enablePairingProcess": "Działa jako mysz Bluetooth",
   "enablePermissions": "Nadaj uprawnienia",
-  "enableSteeringWithPhone": "Włącz czujniki telefonów, aby umożliwić np. sterowanie",
+  "enableSteeringWithPhone": "Włącz sterowanie za pomocą czujników telefonu",
   "enableVibrationFeedback": "Włącz wibracje podczas zmiany biegów",
   "enableZwiftControllerBluetooth": "Włącz kontroler Zwift (Bluetooth)",
   "enableZwiftControllerNetwork": "Włącz kontroler Zwift (sieć)",
@@ -279,7 +281,7 @@
   "openBikeControlAnnouncement": "Świetna wiadomość - {trainerApp} obsługuje protokół OpenBikeControl, dzięki czemu uzyskasz najlepsze doświadczenia!",
   "openBikeControlConnection": " np. za pomocą połączenia OpenBikeControl",
   "otherConnectionMethods": "Inne metody połączenia",
-  "pairingDescription": "Parowanie umożliwia pełną personalizację, jednak może nie działać na wszystkich urządzeniach.",
+  "pairingDescription": "Umożliwi to używanie telefonu jako myszy Bluetooth do sterowania aplikacjami. Po sparowaniu możesz używać przycisków na kontrolerze rowerowym do wysyłania poleceń myszy do aplikacji.",
   "pairingInstructions": "Przejdź do ustawień Bluetooth na twoim {targetName} i wyszukaj BikeControl lub nazwę swojego urządzenia. Parowanie jest wymagane, jeśli chcesz korzystać z funkcji zdalnego sterowania.",
   "@pairingInstructions": {
     "placeholders": {
@@ -413,6 +415,21 @@
   "tryingToConnectAgain": "Próba ponownego połączenia...",
   "unassignAction": "Anuluj przypisanie akcji",
   "unlockFullVersion": "Odblokuj pełną wersję",
+  "unlock_bikecontrolAndZwiftNetwork": "BikeControl i Zwift muszą być podłączone do tej samej sieci lub urządzenia. Pojawienie się aplikacji może potrwać kilka sekund.",
+  "unlock_confirmByPressingAButtonOnYourDevice": "Potwierdź, naciskając przycisk na swoim urządzeniu.",
+  "unlock_connectToBikecontrol": "Połącz się z „BikeControl”, np. jako źródło zasilania",
+  "unlock_deviceIsCurrentlyLocked": "Urządzenie jest obecnie zablokowane",
+  "unlock_isnowunlocked": "{device} jest teraz odblokowany",
+  "unlock_markAsUnlocked": "Oznacz jako odblokowane",
+  "unlock_notWorking": "Nie działa?",
+  "unlock_openZwift": "Otwórz aplikację Zwift (nie Companion) na tym lub innym urządzeniu",
+  "unlock_unlockManually": "Odblokuj ręcznie",
+  "unlock_unlockNow": "Odblokuj teraz",
+  "unlock_unlockedUntilAroundDate": "Odblokowane do około {date}",
+  "unlock_waitingForZwift": "Czekamy, aż Zwift odblokuje Twoje urządzenie...",
+  "unlock_youCanNowCloseZwift": "Możesz teraz zamknąć aplikację Zwift i wrócić do BikeControl.",
+  "unlock_yourTrialPhaseHasExpired": "Twój okres próbny wygasł. Kup pełną wersję, aby odblokować wygodną funkcję odblokowywania :)",
+  "unlock_yourZwiftClickMightBeUnlockedAlready": "Twoje urządzenie Zwift Click może być już odblokowane.",
   "unlockingNotPossible": "Odblokowanie nie jest obecnie możliwe, więc ciesz się nieograniczonym użytkowaniem!",
   "update": "Aktualizacja",
   "useCustomKeymapForButton": "Użyj niestandardowej mapy klawiszy, aby obsługiwać",

lib/main.dart

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

lib/pages/button_edit.dart

@@ -2,7 +2,6 @@ import 'dart:async';
 
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/gen/l10n.dart';
-import 'package:bike_control/main.dart';
 import 'package:bike_control/pages/touch_area.dart';
 import 'package:bike_control/utils/actions/android.dart';
 import 'package:bike_control/utils/actions/base_actions.dart';
@@ -18,8 +17,10 @@ import 'package:bike_control/widgets/ui/colors.dart';
 import 'package:bike_control/widgets/ui/toast.dart';
 import 'package:bike_control/widgets/ui/warning.dart';
 import 'package:dartx/dartx.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:url_launcher/url_launcher_string.dart';
 
 class ButtonEditPage extends StatefulWidget {
   final Keymap keymap;
@@ -85,13 +86,6 @@ class _ButtonEditPageState extends State<ButtonEditPage> {
 
   @override
   Widget build(BuildContext context) {
-    final trainerApp = core.settings.getTrainerApp();
-
-    final actionsWithInGameAction = trainerApp?.keymap.keyPairs
-        .where((kp) => kp.inGameAction != null)
-        .distinctBy((kp) => kp.inGameAction)
-        .toList();
-
     return IntrinsicWidth(
       child: Scrollbar(
         controller: _scrollController,
@@ -185,119 +179,47 @@ class _ButtonEditPageState extends State<ButtonEditPage> {
                 if (core.logic.showLocalRemoteOptions) ...[
                   SizedBox(height: 8),
                   ColoredTitle(text: 'Local / Remote Setting'),
-                  if (trainerApp != null && trainerApp is! CustomApp && actionsWithInGameAction?.isEmpty != true) ...[
+
+                  if (core.actionHandler.supportedModes.contains(SupportedMode.keyboard) &&
+                      (core.settings.getLocalEnabled() || core.settings.getRemoteKeyboardControlEnabled()))
                     Builder(
-                      builder: (context) => SelectableCard(
-                        icon: null,
-                        title: Text(context.i18n.predefinedAction(trainerApp.name)),
-                        isActive: false,
-                        onPressed: () {
-                          if (!core.settings.getLocalEnabled()) {
-                            buildToast(
-                              navigatorKey.currentContext!,
-                              title: AppLocalizations.of(context).enableLocalConnectionMethodFirst,
-                            );
-                          } else {
-                            showDropdown(
-                              context: context,
-                              builder: (c) => DropdownMenu(
-                                children: actionsWithInGameAction!.map((keyPairAction) {
-                                  return MenuButton(
-                                    leading: keyPairAction.inGameAction?.icon != null
-                                        ? Icon(keyPairAction.inGameAction!.icon)
-                                        : null,
-                                    onPressed: (_) {
-                                      // Copy all properties from the selected predefined action
-                                      if (core.actionHandler.supportedModes.contains(SupportedMode.keyboard)) {
-                                        _keyPair.physicalKey = keyPairAction.physicalKey;
-                                        _keyPair.logicalKey = keyPairAction.logicalKey;
-                                        _keyPair.modifiers = List.of(keyPairAction.modifiers);
-                                      } else {
-                                        _keyPair.physicalKey = null;
-                                        _keyPair.logicalKey = null;
-                                        _keyPair.modifiers = [];
-                                      }
-                                      if (core.actionHandler.supportedModes.contains(SupportedMode.touch)) {
-                                        _keyPair.touchPosition = keyPairAction.touchPosition;
-                                      } else {
-                                        _keyPair.touchPosition = Offset.zero;
-                                      }
-                                      _keyPair.isLongPress = keyPairAction.isLongPress;
-                                      _keyPair.inGameAction = keyPairAction.inGameAction;
-                                      _keyPair.inGameActionValue = keyPairAction.inGameActionValue;
-                                      _keyPair.androidAction = null;
-                                      setState(() {});
-                                    },
-                                    child: Text(keyPairAction.toString()),
-                                  );
-                                }).toList(),
-                              ),
-                            );
-                          }
-                        },
-                      ),
-                    ),
-                  ],
-                  if (core.actionHandler.supportedModes.contains(SupportedMode.keyboard))
-                    SelectableCard(
-                      icon: RadixIcons.keyboard,
-                      title: Text(context.i18n.simulateKeyboardShortcut),
-                      isActive:
-                          _keyPair.physicalKey != null && !_keyPair.isSpecialKey && core.settings.getLocalEnabled(),
-                      value: _keyPair.toString(),
-                      onPressed: () async {
-                        if (!core.settings.getLocalEnabled()) {
-                          buildToast(
-                            navigatorKey.currentContext!,
-                            title: AppLocalizations.of(context).enableLocalConnectionMethodFirst,
-                          );
-                        } else {
-                          await showDialog<void>(
-                            context: context,
-                            barrierDismissible: false, // enable Escape key
-                            builder: (c) => HotKeyListenerDialog(
-                              customApp: core.actionHandler.supportedApp! as CustomApp,
-                              keyPair: _keyPair,
-                            ),
-                          );
-                          _keyPair.androidAction = null;
-                          setState(() {});
-                          widget.onUpdate();
-                        }
+                      builder: (context) {
+                        return SelectableCard(
+                          icon: RadixIcons.keyboard,
+                          title: Text(context.i18n.simulateKeyboardShortcut),
+                          isActive:
+                              _keyPair.physicalKey != null &&
+                              !_keyPair.isSpecialKey &&
+                              (core.settings.getLocalEnabled() || core.settings.getRemoteKeyboardControlEnabled()),
+                          value: _keyPair.toString(),
+                          onPressed: () async {
+                            await _showModeDropdown(context, SupportedMode.keyboard);
+                          },
+                        );
                       },
                     ),
-                  if (core.actionHandler.supportedModes.contains(SupportedMode.touch))
-                    SelectableCard(
-                      title: Text(context.i18n.simulateTouch),
-                      icon: core.actionHandler is AndroidActions ? Icons.touch_app_outlined : BootstrapIcons.mouse,
-                      isActive:
-                          ((core.actionHandler is AndroidActions || _keyPair.physicalKey == null) &&
-                              _keyPair.touchPosition != Offset.zero) &&
-                          core.settings.getLocalEnabled(),
-                      value: _keyPair.toString(),
-                      onPressed: () async {
-                        if (!core.settings.getLocalEnabled()) {
-                          buildToast(
-                            navigatorKey.currentContext!,
-                            title: AppLocalizations.of(context).enableLocalConnectionMethodFirst,
-                          );
-                        } else {
-                          if (_keyPair.touchPosition == Offset.zero) {
-                            _keyPair.touchPosition = Offset(50, 50);
-                          }
-                          _keyPair.physicalKey = null;
-                          _keyPair.logicalKey = null;
-                          _keyPair.androidAction = null;
-                          await Navigator.of(context).push<bool?>(
-                            MaterialPageRoute(
-                              builder: (c) => TouchAreaSetupPage(
-                                keyPair: _keyPair,
-                              ),
-                            ),
-                          );
-                          setState(() {});
-                          widget.onUpdate();
-                        }
+                  if (core.actionHandler.supportedModes.contains(SupportedMode.touch) &&
+                      (core.settings.getLocalEnabled() || core.settings.getRemoteControlEnabled()))
+                    Builder(
+                      builder: (context) {
+                        return SelectableCard(
+                          title: Text(context.i18n.simulateTouch),
+                          icon: core.actionHandler is AndroidActions ? Icons.touch_app_outlined : BootstrapIcons.mouse,
+                          isActive:
+                              ((core.actionHandler is AndroidActions || _keyPair.physicalKey == null) &&
+                                  _keyPair.touchPosition != Offset.zero) &&
+                              (core.settings.getLocalEnabled() || core.settings.getRemoteControlEnabled()),
+                          value: _keyPair.toString(),
+                          trailing: IconButton.secondary(
+                            icon: Icon(Icons.ondemand_video),
+                            onPressed: () {
+                              launchUrlString('https://youtube.com/shorts/SvLOQqu2Dqg?feature=share');
+                            },
+                          ),
+                          onPressed: () async {
+                            await _showModeDropdown(context, SupportedMode.touch);
+                          },
+                        );
                       },
                     ),
 
@@ -308,10 +230,15 @@ class _ButtonEditPageState extends State<ButtonEditPage> {
                         isActive: _keyPair.isSpecialKey && core.settings.getLocalEnabled(),
                         title: Text(context.i18n.simulateMediaKey),
                         value: _keyPair.toString(),
+                        trailing: IconButton.secondary(
+                          icon: Icon(Icons.ondemand_video),
+                          onPressed: () {
+                            launchUrlString('https://youtube.com/shorts/ClY1eTnmAv0?feature=share');
+                          },
+                        ),
                         onPressed: () {
                           if (!core.settings.getLocalEnabled()) {
                             buildToast(
-                              navigatorKey.currentContext!,
                               title: AppLocalizations.of(context).enableLocalConnectionMethodFirst,
                             );
                           } else {
@@ -411,9 +338,15 @@ class _ButtonEditPageState extends State<ButtonEditPage> {
                         isActive: _keyPair.androidAction != null && core.settings.getLocalEnabled(),
                         title: Text(AppLocalizations.of(context).androidSystemAction),
                         value: _keyPair.androidAction?.title,
+                        trailing: IconButton.secondary(
+                          icon: Icon(Icons.ondemand_video),
+                          onPressed: () {
+                            launchUrlString('https://youtube.com/shorts/zqD5ARGIVmE?feature=share');
+                          },
+                        ),
                         onPressed: () {
                           if (!core.settings.getLocalEnabled()) {
-                            buildToast(navigatorKey.currentContext!, title: 'Enable Local Connection method, first.');
+                            buildToast(title: 'Enable Local Connection method, first.');
                           } else {
                             showDropdown(
                               context: context,
@@ -565,6 +498,7 @@ class _ButtonEditPageState extends State<ButtonEditPage> {
                             _keyPair.androidAction = null;
                             _keyPair.inGameAction = action;
                             _keyPair.inGameActionValue = ingame;
+                            _keyPair.isLongPress = _keyPair.isLongPress ? true : action.isLongPress;
                             widget.onUpdate();
                             setState(() {});
                           },
@@ -580,6 +514,7 @@ class _ButtonEditPageState extends State<ButtonEditPage> {
                 _keyPair.androidAction = null;
                 _keyPair.inGameAction = action;
                 _keyPair.inGameActionValue = null;
+                _keyPair.isLongPress = _keyPair.isLongPress ? true : action.isLongPress;
                 widget.onUpdate();
                 setState(() {});
               }
@@ -589,11 +524,133 @@ class _ButtonEditPageState extends State<ButtonEditPage> {
       );
     }).toList();
   }
+
+  Future<void> _showModeDropdown(BuildContext context, SupportedMode supportedMode) async {
+    final trainerApp = core.settings.getTrainerApp();
+
+    final actionsWithInGameAction = trainerApp?.keymap.keyPairs
+        .where(
+          (kp) =>
+              kp.inGameAction != null &&
+              switch (supportedMode) {
+                SupportedMode.keyboard => kp.physicalKey != null,
+                SupportedMode.touch => kp.touchPosition != Offset.zero,
+                SupportedMode.media => kp.isSpecialKey,
+              },
+        )
+        .distinctBy((kp) => kp.inGameAction)
+        .toList();
+
+    final isEnabled =
+        supportedMode == SupportedMode.keyboard &&
+            (core.settings.getLocalEnabled() || core.settings.getRemoteKeyboardControlEnabled()) ||
+        supportedMode == SupportedMode.touch &&
+            (core.settings.getLocalEnabled() || core.settings.getRemoteControlEnabled()) ||
+        supportedMode == SupportedMode.media && core.settings.getLocalEnabled();
+
+    if (!isEnabled) {
+      return buildToast(
+        title: AppLocalizations.of(context).enableLocalConnectionMethodFirst,
+      );
+    } else if (actionsWithInGameAction != null && actionsWithInGameAction.isNotEmpty) {
+      showDropdown(
+        context: context,
+        builder: (c) => DropdownMenu(
+          children: [
+            MenuLabel(child: Text(context.i18n.predefinedAction(trainerApp?.name ?? 'App'))),
+            ...actionsWithInGameAction.map((keyPairAction) {
+              return MenuButton(
+                leading: keyPairAction.inGameAction?.icon != null ? Icon(keyPairAction.inGameAction!.icon) : null,
+                onPressed: (_) {
+                  // Copy all properties from the selected predefined action
+                  if (core.actionHandler.supportedModes.contains(SupportedMode.keyboard)) {
+                    _keyPair.physicalKey = keyPairAction.physicalKey;
+                    _keyPair.logicalKey = keyPairAction.logicalKey;
+                    _keyPair.modifiers = List.of(keyPairAction.modifiers);
+                  } else {
+                    _keyPair.physicalKey = null;
+                    _keyPair.logicalKey = null;
+                    _keyPair.modifiers = [];
+                  }
+                  if (core.actionHandler.supportedModes.contains(SupportedMode.touch)) {
+                    _keyPair.touchPosition = keyPairAction.touchPosition;
+                  } else {
+                    _keyPair.touchPosition = Offset.zero;
+                  }
+                  _keyPair.isLongPress = keyPairAction.isLongPress;
+                  _keyPair.inGameAction = keyPairAction.inGameAction;
+                  _keyPair.inGameActionValue = keyPairAction.inGameActionValue;
+                  _keyPair.androidAction = null;
+                  setState(() {});
+                },
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Text(keyPairAction.inGameAction?.title ?? ''),
+                    Text(switch (supportedMode) {
+                      SupportedMode.keyboard => keyPairAction.logicalKey?.keyLabel ?? 'Not assigned',
+                      SupportedMode.touch =>
+                        'X:${keyPairAction.touchPosition.dx.toInt()}, Y:${keyPairAction.touchPosition.dy.toInt()}',
+                      SupportedMode.media => throw UnimplementedError(),
+                    }).muted.small,
+                  ],
+                ),
+              );
+            }),
+            MenuDivider(),
+            MenuLabel(child: Text('Custom ${supportedMode.name.capitalize()} action')),
+            MenuButton(
+              leading: Icon(Icons.edit_outlined),
+              onPressed: (_) {
+                _editAction(supportedMode);
+              },
+              child: Text('Custom'),
+            ),
+          ],
+        ),
+      );
+    } else {
+      _editAction(supportedMode);
+    }
+  }
+
+  Future<void> _editAction(SupportedMode supportedMode) async {
+    if (supportedMode == SupportedMode.keyboard) {
+      await showDialog<void>(
+        context: context,
+        barrierDismissible: false, // enable Escape key
+        builder: (c) => HotKeyListenerDialog(
+          customApp: core.actionHandler.supportedApp! as CustomApp,
+          keyPair: _keyPair,
+        ),
+      );
+      _keyPair.androidAction = null;
+      setState(() {});
+      widget.onUpdate();
+    } else if (supportedMode == SupportedMode.touch) {
+      if (_keyPair.touchPosition == Offset.zero) {
+        _keyPair.touchPosition = Offset(50, 50);
+      }
+      _keyPair.physicalKey = null;
+      _keyPair.logicalKey = null;
+      _keyPair.androidAction = null;
+      await Navigator.of(context).push<bool?>(
+        MaterialPageRoute(
+          builder: (c) => TouchAreaSetupPage(
+            keyPair: _keyPair,
+          ),
+        ),
+      );
+      setState(() {});
+      widget.onUpdate();
+    }
+  }
 }
 
 class SelectableCard extends StatelessWidget {
   final Widget title;
   final Widget? subtitle;
+  final Widget? trailing;
   final IconData? icon;
   final bool isActive;
   final String? value;
@@ -604,6 +661,7 @@ class SelectableCard extends StatelessWidget {
     required this.title,
     this.icon,
     this.subtitle,
+    this.trailing,
     required this.isActive,
     this.value,
     required this.onPressed,
@@ -648,6 +706,7 @@ class SelectableCard extends StatelessWidget {
               : null,
           title: title,
           subtitle: value != null && isActive ? Text(value!) : subtitle,
+          trailing: trailing,
         ),
       ),
     );

lib/pages/button_simulator.dart

@@ -6,6 +6,7 @@ import 'package:bike_control/bluetooth/devices/openbikecontrol/obc_mdns_emulator
 import 'package:bike_control/bluetooth/devices/trainer_connection.dart';
 import 'package:bike_control/bluetooth/devices/zwift/ftms_mdns_emulator.dart';
 import 'package:bike_control/bluetooth/devices/zwift/zwift_emulator.dart';
+import 'package:bike_control/bluetooth/remote_keyboard_pairing.dart';
 import 'package:bike_control/bluetooth/remote_pairing.dart';
 import 'package:bike_control/main.dart';
 import 'package:bike_control/pages/touch_area.dart';
@@ -22,7 +23,8 @@ import 'package:bike_control/widgets/apps/openbikecontrol_ble_tile.dart';
 import 'package:bike_control/widgets/apps/openbikecontrol_mdns_tile.dart';
 import 'package:bike_control/widgets/apps/zwift_mdns_tile.dart';
 import 'package:bike_control/widgets/apps/zwift_tile.dart';
-import 'package:bike_control/widgets/pair_widget.dart';
+import 'package:bike_control/widgets/keyboard_pair_widget.dart';
+import 'package:bike_control/widgets/mouse_pair_widget.dart';
 import 'package:bike_control/widgets/ui/gradient_text.dart';
 import 'package:bike_control/widgets/ui/toast.dart';
 import 'package:bike_control/widgets/ui/warning.dart';
@@ -172,7 +174,7 @@ class _ButtonSimulatorState extends State<ButtonSimulator> {
     } else {
       _pressedAction = null;
       setState(() {});
-      buildToast(context, title: 'No connected trainer.');
+      buildToast(title: 'No connected trainer.');
     }
 
     return KeyEventResult.ignored;
@@ -232,12 +234,21 @@ class _ButtonSimulatorState extends State<ButtonSimulator> {
                       ),
                       OpenBikeControlMdnsEmulator.connectionTitle => OpenBikeControlMdnsTile(),
                       OpenBikeControlBluetoothEmulator.connectionTitle => OpenBikeControlBluetoothTile(),
-                      RemotePairing.connectionTitle => RemotePairingWidget(),
+                      RemotePairing.connectionTitle => RemoteMousePairingWidget(),
+                      RemoteKeyboardPairing.connectionTitle => RemoteKeyboardPairingWidget(),
                       _ => SizedBox.shrink(),
                     },
                 ...connectedTrainers.map(
                   (connection) {
-                    final supportedActions = connection.supportedActions;
+                    final supportedActions = connection.supportedActions == InGameAction.values
+                        ? core.settings
+                              .getTrainerApp()!
+                              .keymap
+                              .keyPairs
+                              .mapNotNull((k) => k.inGameAction)
+                              .distinct()
+                              .toList()
+                        : connection.supportedActions;
 
                     final actionGroups = {
                       if (supportedActions.contains(InGameAction.shiftUp) &&
@@ -443,7 +454,7 @@ class _ButtonSimulatorState extends State<ButtonSimulator> {
   }) async {
     if (!connection.isConnected.value) {
       if (down) {
-        buildToast(context, title: 'No connected trainer.');
+        buildToast(title: 'No connected trainer.');
       }
 
       return;
@@ -499,7 +510,7 @@ class _ButtonSimulatorState extends State<ButtonSimulator> {
       );
       await IAPManager.instance.incrementCommandCount();
       if (result is! Success) {
-        buildToast(context, title: result.message);
+        buildToast(title: result.message);
       }
     }
   }

lib/pages/device.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 
 import 'package:bike_control/gen/l10n.dart';
 import 'package:bike_control/main.dart';
@@ -10,10 +11,13 @@ import 'package:bike_control/widgets/iap_status_widget.dart';
 import 'package:bike_control/widgets/ignored_devices_dialog.dart';
 import 'package:bike_control/widgets/scan.dart';
 import 'package:bike_control/widgets/ui/colored_title.dart';
+import 'package:flutter/foundation.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
 import '../bluetooth/devices/base_device.dart';
+import '../utils/keymap/buttons.dart';
+import 'button_edit.dart';
 
 class DevicePage extends StatefulWidget {
   final bool isMobile;
@@ -115,7 +119,7 @@ class _DevicePageState extends State<DevicePage> {
                   OutlineButton(
                     onPressed: () {
                       launchUrlString(
-                        'https://github.com/jonasbark/swiftcontrol/?tab=readme-ov-file#supported-devices',
+                        'https://github.com/OpenBikeControl/bikecontrol/?tab=readme-ov-file#supported-devices',
                       );
                     },
                     leading: Icon(Icons.gamepad_outlined),
@@ -174,8 +178,66 @@ class _DevicePageState extends State<DevicePage> {
                     ),
                 ],
               ),
-            Gap(12),
-            SizedBox(),
+            Gap(24),
+
+            if (!kIsWeb && (Platform.isMacOS || Platform.isWindows || Platform.isIOS))
+              ValueListenableBuilder(
+                valueListenable: core.mediaKeyHandler.isMediaKeyDetectionEnabled,
+                builder: (context, value, child) {
+                  return SelectableCard(
+                    isActive: value,
+                    icon: value ? Icons.check_box : Icons.check_box_outline_blank,
+                    title: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      spacing: 8,
+                      children: [
+                        Text(context.i18n.enableMediaKeyDetection),
+                        Text(
+                          context.i18n.mediaKeyDetectionTooltip,
+                          style: TextStyle(
+                            fontSize: 12,
+                            fontWeight: FontWeight.normal,
+                          ),
+                        ),
+                      ],
+                    ),
+                    onPressed: () {
+                      final newValue = !core.mediaKeyHandler.isMediaKeyDetectionEnabled.value;
+                      core.mediaKeyHandler.isMediaKeyDetectionEnabled.value = newValue;
+                      core.settings.setMediaKeyDetectionEnabled(newValue);
+                    },
+                  );
+                },
+              ),
+            Gap(8),
+            if (!kIsWeb && (Platform.isAndroid || Platform.isIOS) && !core.settings.getShowOnboarding())
+              SelectableCard(
+                isActive: core.settings.getPhoneSteeringEnabled(),
+                icon: core.settings.getPhoneSteeringEnabled() ? Icons.check_box : Icons.check_box_outline_blank,
+                title: Row(
+                  spacing: 4,
+                  children: [
+                    Icon(InGameAction.navigateRight.icon!, size: 16),
+                    Icon(InGameAction.navigateLeft.icon!, size: 16),
+                    SizedBox(),
+                    Expanded(child: Text(AppLocalizations.of(context).enableSteeringWithPhone)),
+                    IconButton.secondary(
+                      icon: Icon(Icons.ondemand_video),
+                      onPressed: () {
+                        launchUrlString('https://youtube.com/shorts/zqD5ARGIVmE?feature=share');
+                      },
+                    ),
+                  ],
+                ),
+                onPressed: () {
+                  final enable = !core.settings.getPhoneSteeringEnabled();
+                  core.settings.setPhoneSteeringEnabled(enable);
+                  core.connection.toggleGyroscopeSteering(enable);
+                  setState(() {});
+                },
+              ),
+
+            SizedBox(height: 16),
             if (core.connection.controllerDevices.isNotEmpty)
               Row(
                 spacing: 8,

lib/pages/login.dart

@@ -0,0 +1,131 @@
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:bike_control/utils/requirements/windows.dart';
+import 'package:crypto/crypto.dart';
+import 'package:flutter/foundation.dart';
+import 'package:google_sign_in/google_sign_in.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:sign_in_button/sign_in_button.dart';
+import 'package:sign_in_with_apple/sign_in_with_apple.dart';
+import 'package:supabase_flutter/supabase_flutter.dart';
+
+import '../utils/core.dart';
+
+class LoginPage extends StatefulWidget {
+  const LoginPage({super.key});
+
+  @override
+  State<LoginPage> createState() => _LoginPageState();
+}
+
+class _LoginPageState extends State<LoginPage> {
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(32.0),
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          const Text('Please sign in to continue'),
+          const SizedBox(height: 16),
+          SignInButton(
+            Buttons.google,
+            onPressed: _nativeGoogleSignIn,
+          ),
+          SignInButton(
+            Buttons.apple,
+            onPressed: _signInWithApple,
+          ),
+          Button.secondary(
+            child: Text('Logout'),
+            onPressed: () {
+              core.supabase.auth.signOut();
+            },
+          ),
+          if (kDebugMode && Platform.isWindows)
+            Button.secondary(
+              child: Text("Register"),
+              onPressed: () {
+                WindowsProtocolHandler().register("bikecontrol");
+              },
+            ),
+        ],
+      ),
+    );
+  }
+
+  Future<AuthResponse?> _nativeGoogleSignIn() async {
+    if (Platform.isAndroid || Platform.isIOS) {
+      /// Web Client ID that you registered with Google Cloud.
+      const webClientId = '709945926587-bgk7j9qc86t7nuemu100ngvl9c7irv9k.apps.googleusercontent.com';
+
+      /// iOS Client ID that you registered with Google Cloud.
+      const iosClientId = '709945926587-0iierajthibf4vhqf85fc7bbpgbdgua2.apps.googleusercontent.com';
+      final scopes = ['email'];
+      final googleSignIn = GoogleSignIn.instance;
+      await googleSignIn.initialize(
+        serverClientId: webClientId,
+        clientId: iosClientId,
+      );
+      GoogleSignInAccount? googleUser = await googleSignIn.attemptLightweightAuthentication(reportAllExceptions: true);
+      googleUser ??= await googleSignIn.authenticate();
+
+      /// Authorization is required to obtain the access token with the appropriate scopes for Supabase authentication,
+      /// while also granting permission to access user information.
+      final authorization =
+          await googleUser.authorizationClient.authorizationForScopes(scopes) ??
+          await googleUser.authorizationClient.authorizeScopes(scopes);
+      final idToken = googleUser.authentication.idToken;
+      if (idToken == null) {
+        throw AuthException('No ID Token found.');
+      }
+      final response = await core.supabase.auth.signInWithIdToken(
+        provider: OAuthProvider.google,
+        idToken: idToken,
+        accessToken: authorization.accessToken,
+      );
+      return response;
+    } else {
+      await core.supabase.auth.signInWithOAuth(
+        OAuthProvider.google,
+        redirectTo: kIsWeb ? null : 'bikecontrol://login/',
+        authScreenLaunchMode: kIsWeb
+            ? LaunchMode.platformDefault
+            : LaunchMode.externalApplication, // Launch the auth screen in a new webview on mobile.
+      );
+      return null;
+    }
+  }
+
+  /// Performs Apple sign in on iOS or macOS
+  Future<AuthResponse?> _signInWithApple() async {
+    if (Platform.isIOS || Platform.isMacOS) {
+      final rawNonce = core.supabase.auth.generateRawNonce();
+      final hashedNonce = sha256.convert(utf8.encode(rawNonce)).toString();
+
+      final credential = await SignInWithApple.getAppleIDCredential(
+        scopes: [AppleIDAuthorizationScopes.email],
+        nonce: hashedNonce,
+      );
+      final idToken = credential.identityToken;
+      if (idToken == null) {
+        throw const AuthException('Could not find ID Token from generated credential.');
+      }
+      final authResponse = await core.supabase.auth.signInWithIdToken(
+        provider: OAuthProvider.apple,
+        idToken: idToken,
+        nonce: rawNonce,
+      );
+      return authResponse;
+    } else {
+      await core.supabase.auth.signInWithOAuth(
+        OAuthProvider.apple,
+        redirectTo: kIsWeb ? null : 'bikecontrol://login/',
+        authScreenLaunchMode: kIsWeb ? LaunchMode.platformDefault : LaunchMode.externalApplication,
+      );
+      return null;
+    }
+  }
+}

lib/pages/markdown.dart

@@ -92,7 +92,7 @@ class _ChangelogPageState extends State<MarkdownPage> {
   Future<void> _loadOnlineVersion() async {
     // load latest version
     final response = await http.get(
-      Uri.parse('https://raw.githubusercontent.com/jonasbark/swiftcontrol/refs/heads/main/${widget.assetPath}'),
+      Uri.parse('https://raw.githubusercontent.com/OpenBikeControl/bikecontrol/refs/heads/main/${widget.assetPath}'),
     );
     if (response.statusCode == 200) {
       final latestMd = response.body;

lib/pages/onboarding.dart

@@ -14,6 +14,7 @@ import 'package:bike_control/widgets/scan.dart';
 import 'package:bike_control/widgets/title.dart';
 import 'package:bike_control/widgets/ui/help_button.dart';
 import 'package:bike_control/widgets/ui/permissions_list.dart';
+import 'package:dartx/dartx.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
@@ -108,9 +109,10 @@ class _OnboardingPageState extends State<OnboardingPage> {
                 _OnboardingStep.trainer => _TrainerOnboardingStep(
                   onComplete: () {
                     setState(() {
-                      if (core.settings.getTrainerApp()?.supportsOpenBikeProtocol.contains(
+                      if (core.settings.getTrainerApp()?.supportsOpenBikeProtocol.containsAny([
                             OpenBikeProtocolSupport.network,
-                          ) ??
+                            OpenBikeProtocolSupport.dircon,
+                          ]) ??
                           false) {
                         _currentStep = _OnboardingStep.openbikecontrol;
                       } else {
@@ -256,7 +258,7 @@ class _ConnectOnboardingStepState extends State<_ConnectOnboardingStep> {
 
           OutlineButton(
             onPressed: () {
-              launchUrlString('https://github.com/jonasbark/swiftcontrol/?tab=readme-ov-file#supported-devices');
+              launchUrlString('https://github.com/OpenBikeControl/bikecontrol/?tab=readme-ov-file#supported-devices');
             },
             leading: Icon(Icons.gamepad_outlined),
             child: Text(context.i18n.showSupportedControllers),

lib/pages/touch_area.dart

@@ -296,6 +296,8 @@ class _TouchAreaSetupPageState extends State<TouchAreaSetupPage> {
                       final relativeX = ((newPos.dx - _imageRect.left) / _imageRect.width).clamp(0.0, 1.0);
                       final relativeY = ((newPos.dy - _imageRect.top) / _imageRect.height).clamp(0.0, 1.0);
                       keyPair.touchPosition = Offset(relativeX * 100.0, relativeY * 100.0);
+                      keyPair.inGameAction = null;
+                      keyPair.inGameActionValue = null;
                       setState(() {});
                     },
                     color: Colors.red,

lib/pages/trainer.dart

@@ -14,17 +14,19 @@ import 'package:bike_control/widgets/apps/openbikecontrol_mdns_tile.dart';
 import 'package:bike_control/widgets/apps/zwift_mdns_tile.dart';
 import 'package:bike_control/widgets/apps/zwift_tile.dart';
 import 'package:bike_control/widgets/iap_status_widget.dart';
-import 'package:bike_control/widgets/pair_widget.dart';
+import 'package:bike_control/widgets/keyboard_pair_widget.dart';
+import 'package:bike_control/widgets/mouse_pair_widget.dart';
 import 'package:bike_control/widgets/ui/colored_title.dart';
 import 'package:bike_control/widgets/ui/toast.dart';
 import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
+import 'package:prop/prop.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:universal_ble/universal_ble.dart';
 import 'package:wakelock_plus/wakelock_plus.dart';
 
-import '../bluetooth/devices/zwift/protocol/zp.pbenum.dart';
 import '../utils/keymap/apps/supported_app.dart';
+import '../utils/keymap/apps/zwift.dart';
 
 class TrainerPage extends StatefulWidget {
   final bool isMobile;
@@ -53,7 +55,7 @@ class _TrainerPageState extends State<TrainerPage> with WidgetsBindingObserver {
       if (core.logic.showForegroundMessage) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
           // show snackbar to inform user that the app needs to stay in foreground
-          buildToast(context, title: AppLocalizations.current.touchSimulationForegroundMessage);
+          buildToast(title: AppLocalizations.current.touchSimulationForegroundMessage);
         });
       }
 
@@ -81,7 +83,7 @@ class _TrainerPageState extends State<TrainerPage> with WidgetsBindingObserver {
         UniversalBle.getBluetoothAvailabilityState().then((state) {
           if (state == AvailabilityState.poweredOn && mounted) {
             core.remotePairing.reconnect();
-            buildToast(context, title: AppLocalizations.current.touchSimulationForegroundMessage);
+            buildToast(title: AppLocalizations.current.touchSimulationForegroundMessage);
           }
         });
       }
@@ -91,9 +93,8 @@ class _TrainerPageState extends State<TrainerPage> with WidgetsBindingObserver {
   @override
   Widget build(BuildContext context) {
     final showLocalAsOther =
-        (core.logic.showObpBluetoothEmulator || core.logic.showObpMdnsEmulator) &&
-        core.logic.showLocalControl &&
-        !core.settings.getLocalEnabled();
+        //(core.logic.showObpBluetoothEmulator || core.logic.showObpMdnsEmulator) &&
+        false && core.logic.showLocalControl && !core.settings.getLocalEnabled();
     final showWhooshLinkAsOther =
         (core.logic.showObpBluetoothEmulator || core.logic.showObpMdnsEmulator) && core.logic.showMyWhooshLink;
 
@@ -122,11 +123,12 @@ class _TrainerPageState extends State<TrainerPage> with WidgetsBindingObserver {
         ),
       if (core.logic.showLocalControl && !showLocalAsOther) LocalTile(),
       if (core.logic.showMyWhooshLink && !showWhooshLinkAsOther) MyWhooshLinkTile(),
+      if (core.logic.showRemote && core.settings.getTrainerApp() is! Zwift) RemoteKeyboardPairingWidget(),
     ];
 
     final otherTiles = [
-      if (core.logic.showRemote) RemotePairingWidget(),
-      if (showLocalAsOther) LocalTile(),
+      if (core.logic.showRemote) RemoteMousePairingWidget(),
+      if (core.logic.showLocalControl && showLocalAsOther) LocalTile(),
       if (showWhooshLinkAsOther) MyWhooshLinkTile(),
     ];
 
@@ -202,8 +204,8 @@ class _TrainerPageState extends State<TrainerPage> with WidgetsBindingObserver {
               ),
             ),
             if (core.settings.getTrainerApp() != null) ...[
-              Gap(22),
               if (recommendedTiles.isNotEmpty) ...[
+                Gap(22),
                 ColoredTitle(text: context.i18n.recommendedConnectionMethods),
                 Gap(12),
               ],
@@ -228,6 +230,8 @@ class _TrainerPageState extends State<TrainerPage> with WidgetsBindingObserver {
                   child: Accordion(
                     items: [
                       AccordionItem(
+                        expanded:
+                            recommendedTiles.isEmpty || (core.logic.showRemote && core.remotePairing.isStarted.value),
                         trigger: AccordionTrigger(child: ColoredTitle(text: context.i18n.otherConnectionMethods)),
                         content: Column(
                           children: [
@@ -269,7 +273,6 @@ class _TrainerPageState extends State<TrainerPage> with WidgetsBindingObserver {
                     onPressed: () {
                       if (core.settings.getTrainerApp() == null) {
                         buildToast(
-                          context,
                           level: LogLevel.LOGLEVEL_WARNING,
                           title: context.i18n.selectTrainerApp,
                         );

lib/pages/unlock.dart

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

lib/utils/actions/android.dart

@@ -17,13 +17,15 @@ class AndroidActions extends BaseActions {
 
   final accessibilityHandler = Accessibility();
   StreamSubscription<void>? _keymapUpdateSubscription;
+  StreamSubscription<WindowEvent>? _accessibilitySubscription;
+  StreamSubscription<AKeyEvent>? _hidKeyPressedSubscription;
 
   AndroidActions({super.supportedModes = const [SupportedMode.touch, SupportedMode.media]});
 
   @override
   void init(SupportedApp? supportedApp) {
     super.init(supportedApp);
-    streamEvents().listen((windowEvent) {
+    _accessibilitySubscription = streamEvents().listen((windowEvent) {
       if (supportedApp != null) {
         windowInfo = windowEvent;
       }
@@ -38,7 +40,7 @@ class AndroidActions extends BaseActions {
       updateHandledKeys();
     });
 
-    hidKeyPressed().listen((keyPressed) async {
+    _hidKeyPressedSubscription = hidKeyPressed().listen((keyPressed) async {
       final hidDevice = HidDevice(keyPressed.source);
       final button = hidDevice.getOrAddButton(keyPressed.hidKey, () => ControllerButton(keyPressed.hidKey));
 
@@ -129,4 +131,11 @@ class AndroidActions extends BaseActions {
 
     accessibilityHandler.setHandledKeys(handledKeys);
   }
+
+  @override
+  void cleanup() {
+    _accessibilitySubscription?.cancel();
+    _keymapUpdateSubscription?.cancel();
+    _hidKeyPressedSubscription?.cancel();
+  }
 }

lib/utils/actions/base_actions.dart

@@ -49,6 +49,8 @@ abstract class BaseActions {
 
   BaseActions({required this.supportedModes});
 
+  void cleanup();
+
   void init(SupportedApp? supportedApp) {
     this.supportedApp = supportedApp;
     debugPrint('Supported app: ${supportedApp?.name ?? "None"}');
@@ -176,11 +178,41 @@ abstract class BaseActions {
 class StubActions extends BaseActions {
   StubActions({super.supportedModes = const []});
 
-  final List<(ControllerButton button, bool isDown, bool isUp)> performedActions = [];
+  final List<PerformedAction> performedActions = [];
 
   @override
   Future<ActionResult> performAction(ControllerButton button, {bool isKeyDown = true, bool isKeyUp = false}) async {
-    performedActions.add((button, isKeyDown, isKeyUp));
+    performedActions.add(PerformedAction(button, isDown: isKeyDown, isUp: isKeyUp));
     return Future.value(Ignored('${button.name.splitByUpperCase()} clicked'));
   }
+
+  @override
+  void cleanup() {
+    performedActions.clear();
+  }
+}
+
+class PerformedAction {
+  final ControllerButton button;
+  final bool isDown;
+  final bool isUp;
+
+  PerformedAction(this.button, {required this.isDown, required this.isUp});
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is PerformedAction &&
+          runtimeType == other.runtimeType &&
+          button.copyWith(sourceDeviceId: null) == other.button.copyWith(sourceDeviceId: null) &&
+          isDown == other.isDown &&
+          isUp == other.isUp;
+
+  @override
+  int get hashCode => Object.hash(button, isDown, isUp);
+
+  @override
+  String toString() {
+    return '{button: $button, isDown: $isDown, isUp: $isUp}';
+  }
 }

lib/utils/actions/desktop.dart

@@ -40,8 +40,6 @@ class DesktopActions extends BaseActions {
           final label = keyPair.logicalKey!.keyLabel;
           final keyName = label.isNotEmpty ? label : keyPair.logicalKey!.debugName ?? 'Key';
           buildToast(
-            navigatorKey.currentContext!,
-
             location: ToastLocation.bottomLeft,
             title:
                 '${isKeyDown
@@ -96,4 +94,7 @@ class DesktopActions extends BaseActions {
       }
     }
   }
+
+  @override
+  void cleanup() {}
 }

lib/utils/actions/remote.dart

@@ -7,7 +7,7 @@ import 'package:bike_control/utils/keymap/buttons.dart';
 import 'package:bike_control/utils/keymap/keymap.dart';
 
 class RemoteActions extends BaseActions {
-  RemoteActions({super.supportedModes = const [SupportedMode.touch]});
+  RemoteActions({super.supportedModes = const [SupportedMode.touch, SupportedMode.keyboard]});
 
   @override
   Future<ActionResult> performAction(ControllerButton button, {required bool isKeyDown, required bool isKeyUp}) async {
@@ -16,14 +16,22 @@ class RemoteActions extends BaseActions {
       return superResult;
     }
     final keyPair = supportedApp!.keymap.getKeyPair(button)!;
-    if (!core.remotePairing.isConnected.value) {
+    if (!core.remotePairing.isConnected.value && !core.remoteKeyboardPairing.isConnected.value) {
       return Error('Not connected to a ${core.settings.getLastTarget()?.name ?? 'remote'} device');
     }
 
-    if (keyPair.physicalKey != null && keyPair.touchPosition == Offset.zero) {
-      return Error('Physical key actions are not supported, yet');
-    } else {
+    if (core.remotePairing.isConnected.value) {
+      if (keyPair.touchPosition == Offset.zero) {
+        return Error('Key $keyPair does not have a valid touch position');
+      }
       return core.remotePairing.sendAction(keyPair, isKeyDown: isKeyDown, isKeyUp: isKeyUp);
+    } else if (core.remoteKeyboardPairing.isConnected.value) {
+      if (keyPair.physicalKey == null) {
+        return Error('Key $keyPair does not have a valid physical key for keyboard actions');
+      }
+      return core.remoteKeyboardPairing.sendAction(keyPair, isKeyDown: isKeyDown, isKeyUp: isKeyUp);
+    } else {
+      return Error('Not connected to a ${core.settings.getLastTarget()?.name ?? 'remote'} device');
     }
   }
 
@@ -32,4 +40,7 @@ class RemoteActions extends BaseActions {
     // for remote actions we use the relative position only
     return keyPair.touchPosition;
   }
+
+  @override
+  void cleanup() {}
 }

lib/utils/core.dart

@@ -5,9 +5,9 @@ import 'package:bike_control/bluetooth/devices/openbikecontrol/obc_mdns_emulator
 import 'package:bike_control/bluetooth/devices/openbikecontrol/protocol_parser.dart';
 import 'package:bike_control/bluetooth/devices/trainer_connection.dart';
 import 'package:bike_control/bluetooth/devices/zwift/ftms_mdns_emulator.dart';
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
 import 'package:bike_control/bluetooth/devices/zwift/zwift_emulator.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
+import 'package:bike_control/bluetooth/remote_keyboard_pairing.dart';
 import 'package:bike_control/bluetooth/remote_pairing.dart';
 import 'package:bike_control/main.dart';
 import 'package:bike_control/utils/actions/android.dart';
@@ -21,6 +21,8 @@ import 'package:dartx/dartx.dart';
 import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:prop/prop.dart';
+import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:universal_ble/universal_ble.dart';
 
 import '../bluetooth/connection.dart';
@@ -38,12 +40,14 @@ class Core {
   final settings = Settings();
   final connection = Connection();
 
+  late final supabase = Supabase.instance.client;
   late final whooshLink = WhooshLink();
   late final zwiftEmulator = ZwiftEmulator();
   late final zwiftMdnsEmulator = FtmsMdnsEmulator();
   late final obpMdnsEmulator = OpenBikeControlMdnsEmulator();
   late final obpBluetoothEmulator = OpenBikeControlBluetoothEmulator();
   late final remotePairing = RemotePairing();
+  late final remoteKeyboardPairing = RemoteKeyboardPairing();
 
   late final mediaKeyHandler = MediaKeyHandler();
   late final logic = CoreLogic();
@@ -168,7 +172,11 @@ class CoreLogic {
   }
 
   bool get showObpMdnsEmulator {
-    return core.settings.getTrainerApp()?.supportsOpenBikeProtocol.contains(OpenBikeProtocolSupport.network) == true;
+    return core.settings.getTrainerApp()?.supportsOpenBikeProtocol.containsAny([
+          OpenBikeProtocolSupport.network,
+          OpenBikeProtocolSupport.dircon,
+        ]) ==
+        true;
   }
 
   bool get showObpBluetoothEmulator {
@@ -180,6 +188,10 @@ class CoreLogic {
     return core.settings.getRemoteControlEnabled() && showRemote;
   }
 
+  bool get isRemoteKeyboardControlEnabled {
+    return core.settings.getRemoteKeyboardControlEnabled() && showRemote;
+  }
+
   bool get showMyWhooshLink =>
       core.settings.getTrainerApp() is MyWhoosh &&
       core.settings.getLastTarget() != null &&
@@ -210,7 +222,8 @@ class CoreLogic {
       core.settings.getTrainerApp()?.supportsOpenBikeProtocol.isNotEmpty == true;
 
   bool get showLocalRemoteOptions =>
-      core.actionHandler.supportedModes.isNotEmpty && ((showLocalControl) || (isRemoteControlEnabled));
+      core.actionHandler.supportedModes.isNotEmpty &&
+      (showLocalControl || isRemoteControlEnabled || isRemoteKeyboardControlEnabled);
 
   bool get hasNoConnectionMethod =>
       !screenshotMode &&
@@ -235,6 +248,7 @@ class CoreLogic {
     if (isZwiftBleEnabled) core.zwiftEmulator,
     if (isZwiftMdnsEnabled) core.zwiftMdnsEmulator,
     if (isRemoteControlEnabled) core.remotePairing,
+    if (isRemoteKeyboardControlEnabled) core.remoteKeyboardPairing,
   ].filter((e) => e.isConnected.value).toList();
 
   List<TrainerConnection> get enabledTrainerConnections => [
@@ -244,6 +258,7 @@ class CoreLogic {
     if (isZwiftBleEnabled) core.zwiftEmulator,
     if (isZwiftMdnsEnabled) core.zwiftMdnsEmulator,
     if (isRemoteControlEnabled) core.remotePairing,
+    if (isRemoteKeyboardControlEnabled) core.remoteKeyboardPairing,
   ];
 
   List<TrainerConnection> get trainerConnections => [
@@ -253,6 +268,7 @@ class CoreLogic {
     if (showZwiftBleEmulator) core.zwiftEmulator,
     if (showZwiftMsdnEmulator) core.zwiftMdnsEmulator,
     if (showRemote) core.remotePairing,
+    if (showRemote) core.remoteKeyboardPairing,
   ];
 
   Future<bool> isTrainerConnected() async {
@@ -329,5 +345,15 @@ class CoreLogic {
         );
       });
     }
+
+    if (isRemoteKeyboardControlEnabled && !core.remoteKeyboardPairing.isStarted.value) {
+      core.remoteKeyboardPairing.startAdvertising().catchError((e, s) {
+        recordError(e, s, context: 'Remote Keyboard Pairing');
+        core.settings.setRemoteKeyboardControlEnabled(false);
+        core.connection.signalNotification(
+          AlertNotification(LogLevel.LOGLEVEL_WARNING, 'Failed to start Remote Keyboard Control pairing: $e'),
+        );
+      });
+    }
   }
 }

lib/utils/iap/iap_manager.dart

@@ -217,6 +217,8 @@ class IAPManager {
   }
 
   void setAttributes() {
-    _revenueCatService?.setAttributes();
+    if (!screenshotMode) {
+      _revenueCatService?.setAttributes();
+    }
   }
 }

lib/utils/iap/iap_service.dart

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

lib/utils/iap/revenuecat_service.dart

@@ -1,9 +1,7 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart' as zp;
 import 'package:bike_control/bluetooth/messages/notification.dart';
-import 'package:bike_control/gen/l10n.dart';
 import 'package:bike_control/main.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/widgets/ui/toast.dart';
@@ -11,9 +9,12 @@ import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:prop/prop.dart' as zp;
+import 'package:prop/prop.dart' hide LogLevel;
 import 'package:purchases_flutter/purchases_flutter.dart';
 import 'package:purchases_ui_flutter/purchases_ui_flutter.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:version/version.dart';
 
 /// RevenueCat-based IAP service for iOS, macOS, and Android
@@ -34,13 +35,14 @@ class RevenueCatService {
   final int Function() getDailyCommandLimit;
   final void Function(int limit) setDailyCommandLimit;
 
-  static const _isAndroidWorking = false;
   bool _isInitialized = false;
   String? _trialStartDate;
   String? _lastCommandDate;
   int? _dailyCommandCount;
   StreamSubscription<CustomerInfo>? _customerInfoSubscription;
 
+  late final StreamSubscription<AuthState> _authSubscription;
+
   RevenueCatService(
     this._prefs, {
     required this.isPurchasedNotifier,
@@ -119,11 +121,37 @@ class RevenueCatService {
 
       _isInitialized = true;
 
-      if (Platform.isAndroid && !isPurchasedNotifier.value && !_isAndroidWorking) {
-        setDailyCommandLimit(10000);
-      } else if (!isTrialExpired && Platform.isAndroid) {
+      if (!isTrialExpired && Platform.isAndroid) {
         setDailyCommandLimit(80);
       }
+
+      _authSubscription = core.supabase.auth.onAuthStateChange.listen((data) {
+        final AuthChangeEvent event = data.event;
+        final Session? session = data.session;
+
+        Logger.info('event: $event, session: ${session?.user.id} via ${session?.user.email}');
+
+        switch (event) {
+          case AuthChangeEvent.initialSession:
+            setAttributes();
+          case AuthChangeEvent.signedIn:
+            setAttributes();
+          // handle signed in
+          case AuthChangeEvent.signedOut:
+            setAttributes();
+          // handle signed out
+          case AuthChangeEvent.passwordRecovery:
+          // handle password recovery
+          case AuthChangeEvent.tokenRefreshed:
+          // handle token refreshed
+          case AuthChangeEvent.userUpdated:
+          // handle user updated
+          case AuthChangeEvent.userDeleted:
+          // handle user deleted
+          case AuthChangeEvent.mfaChallengeVerified:
+          // handle mfa challenge verified
+        }
+      });
     } catch (e, s) {
       recordError(e, s, context: 'Initializing RevenueCat Service');
       core.connection.signalNotification(
@@ -240,14 +268,7 @@ class RevenueCatService {
   /// Purchase the full version (use paywall instead)
   Future<void> purchaseFullVersion(BuildContext context) async {
     // Direct the user to the paywall for a better experience
-    if (Platform.isAndroid && !_isAndroidWorking) {
-      buildToast(
-        navigatorKey.currentContext!,
-        title: AppLocalizations.of(context).unlockingNotPossible,
-        duration: Duration(seconds: 5),
-      );
-      setDailyCommandLimit(10000);
-    } else if (Platform.isMacOS) {
+    if (Platform.isMacOS) {
       try {
         final offerings = await Purchases.getOfferings();
         final purchaseParams = PurchaseParams.package(offerings.current!.availablePackages.first);
@@ -258,7 +279,7 @@ class RevenueCatService {
       } on PlatformException catch (e) {
         var errorCode = PurchasesErrorHelper.getErrorCode(e);
         if (errorCode != PurchasesErrorCode.purchaseCancelledError) {
-          buildToast(context, title: e.message);
+          buildToast(title: e.message);
         }
       }
     } else {
@@ -314,19 +335,30 @@ class RevenueCatService {
 
   /// Increment the daily command count
   Future<void> incrementCommandCount() async {
-    final today = DateTime.now().toIso8601String().split('T')[0];
-    final lastDate = await _prefs.read(key: _lastCommandDateKey);
+    if (isPurchasedNotifier.value) {
+      return; // No need to track for purchased users
+    }
+    try {
+      final today = DateTime.now().toIso8601String().split('T')[0];
+      final lastDate = await _prefs.read(key: _lastCommandDateKey);
 
-    if (lastDate != today) {
-      // Reset counter for new day
-      _lastCommandDate = today;
-      _dailyCommandCount = 1;
-      await _prefs.write(key: _lastCommandDateKey, value: today);
-      await _prefs.write(key: _dailyCommandCountKey, value: '1');
-    } else {
+      if (lastDate != today) {
+        // Reset counter for new day
+        _lastCommandDate = today;
+        _dailyCommandCount = 1;
+        await _prefs.write(key: _lastCommandDateKey, value: today);
+        await _prefs.write(key: _dailyCommandCountKey, value: '1');
+      } else {
+        final count = _dailyCommandCount ?? 0;
+        _dailyCommandCount = count + 1;
+        await _prefs.write(key: _dailyCommandCountKey, value: _dailyCommandCount.toString());
+      }
+    } catch (e, s) {
       final count = _dailyCommandCount ?? 0;
       _dailyCommandCount = count + 1;
-      await _prefs.write(key: _dailyCommandCountKey, value: _dailyCommandCount.toString());
+      // e.g. https://github.com/OpenBikeControl/bikecontrol/issues/279
+      debugPrint('Error incrementing command count: $e');
+      recordError(e, s, context: 'Incrementing command count');
     }
   }
 
@@ -370,8 +402,11 @@ class RevenueCatService {
   }
 
   Future<void> setAttributes() async {
+    final Session? session = core.supabase.auth.currentSession;
+
     // attributes are fully anonymous
     await Purchases.setAttributes({
+      if (session?.user.id != null) "bikecontrol_user": session!.user.id,
       "bikecontrol_trainer": core.settings.getTrainerApp()?.name ?? '-',
       "bikecontrol_target": core.settings.getLastTarget()?.name ?? '-',
       if (core.connection.controllerDevices.isNotEmpty)

lib/utils/iap/windows_iap_service.dart

@@ -8,6 +8,9 @@ import 'package:bike_control/utils/windows_store_environment.dart';
 import 'package:bike_control/widgets/ui/toast.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:gotrue/src/types/auth_state.dart';
+import 'package:prop/prop.dart';
+import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:windows_iap/windows_iap.dart';
 
 /// Windows-specific IAP service
@@ -44,6 +47,32 @@ class WindowsIAPService {
       _lastCommandDate = await _prefs.read(key: _lastCommandDateKey);
       _dailyCommandCount = int.tryParse(await _prefs.read(key: _dailyCommandCountKey) ?? '0');
       _isInitialized = true;
+
+      
+      _authSubscription = core.supabase.auth.onAuthStateChange.listen((data) {
+        final AuthChangeEvent event = data.event;
+        final Session? session = data.session;
+
+        Logger.info('event: $event, session: ${session?.user.id} via ${session?.user.email}');
+
+        switch (event) {
+          case AuthChangeEvent.initialSession:
+          case AuthChangeEvent.signedIn:
+          // handle signed in
+          case AuthChangeEvent.signedOut:
+          // handle signed out
+          case AuthChangeEvent.passwordRecovery:
+          // handle password recovery
+          case AuthChangeEvent.tokenRefreshed:
+          // handle token refreshed
+          case AuthChangeEvent.userUpdated:
+          // handle user updated
+          case AuthChangeEvent.userDeleted:
+          // handle user deleted
+          case AuthChangeEvent.mfaChallengeVerified:
+          // handle mfa challenge verified
+        }
+      });
     } catch (e, s) {
       recordError(e, s, context: 'Initializing');
       debugPrint('Failed to initialize Windows IAP: $e');
@@ -92,7 +121,6 @@ class WindowsIAPService {
       if (status == StorePurchaseStatus.succeeded || status == StorePurchaseStatus.alreadyPurchased) {
         IAPManager.instance.isPurchased.value = true;
         buildToast(
-          navigatorKey.currentContext!,
           title: 'Purchase Successful',
           subtitle: 'Thank you for your purchase! You now have unlimited access.',
         );
@@ -109,6 +137,8 @@ class WindowsIAPService {
   /// Get the number of days remaining in the trial
   int trialDaysRemaining = 0;
 
+  late final StreamSubscription<AuthState> _authSubscription;
+
   /// Check if the trial has expired
   bool get isTrialExpired {
     return !IAPManager.instance.isPurchased.value && hasTrialStarted && trialDaysRemaining <= 0;

lib/utils/keymap/apps/openbikecontrol.dart

@@ -10,7 +10,7 @@ class OpenBikeControl extends SupportedApp {
         packageName: "org.openbikecontrol",
         compatibleTargets: Target.values,
         supportsZwiftEmulation: false,
-        supportsOpenBikeProtocol: OpenBikeProtocolSupport.values,
+        supportsOpenBikeProtocol: [OpenBikeProtocolSupport.network, OpenBikeProtocolSupport.ble],
         keymap: Keymap(
           keyPairs: [],
         ),

lib/utils/keymap/apps/rouvy.dart

@@ -50,6 +50,18 @@ class Rouvy extends SupportedApp {
               logicalKey: LogicalKeyboardKey.keyB,
               inGameAction: InGameAction.back,
             ),
+            KeyPair(
+              buttons: [ZwiftButtons.a],
+              physicalKey: PhysicalKeyboardKey.keyY,
+              logicalKey: LogicalKeyboardKey.keyY,
+              inGameAction: InGameAction.kudos,
+            ),
+            KeyPair(
+              buttons: [ZwiftButtons.y],
+              physicalKey: PhysicalKeyboardKey.keyZ,
+              logicalKey: LogicalKeyboardKey.keyZ,
+              inGameAction: InGameAction.pause,
+            ),
           ],
         ),
       );

lib/utils/keymap/apps/supported_app.dart

@@ -12,6 +12,7 @@ import 'my_whoosh.dart';
 enum OpenBikeProtocolSupport {
   ble,
   network,
+  dircon,
 }
 
 abstract class SupportedApp {

lib/utils/keymap/apps/training_peaks.dart

@@ -18,6 +18,7 @@ class TrainingPeaks extends SupportedApp {
         packageName: "com.indieVelo.client",
         compatibleTargets: !kIsWeb && Platform.isIOS ? [Target.otherDevice] : Target.values,
         supportsZwiftEmulation: false,
+        supportsOpenBikeProtocol: [OpenBikeProtocolSupport.ble, OpenBikeProtocolSupport.dircon],
         star: true,
         keymap: Keymap(
           keyPairs: [

lib/utils/keymap/buttons.dart

@@ -12,8 +12,8 @@ enum InGameAction {
   shiftUp('Shift Up', icon: BootstrapIcons.patchPlus),
   shiftDown('Shift Down', icon: BootstrapIcons.patchMinus),
   uturn('U-Turn', alternativeTitle: 'Down', icon: BootstrapIcons.arrowDownUp),
-  steerLeft('Steer Left', alternativeTitle: 'Left', icon: RadixIcons.doubleArrowLeft),
-  steerRight('Steer Right', alternativeTitle: 'Right', icon: RadixIcons.doubleArrowRight),
+  steerLeft('Steer Left', alternativeTitle: 'Left', icon: RadixIcons.doubleArrowLeft, isLongPress: true),
+  steerRight('Steer Right', alternativeTitle: 'Right', icon: RadixIcons.doubleArrowRight, isLongPress: true),
 
   // mywhoosh
   cameraAngle('Change Camera Angle', possibleValues: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], icon: BootstrapIcons.cameraReels),
@@ -31,9 +31,13 @@ enum InGameAction {
   back('Back', icon: BootstrapIcons.arrowLeft),
   rideOnBomb('Ride On Bomb', icon: LucideIcons.bomb, isLongPress: true),
 
+  // rouvy
+  kudos('Kudos', icon: BootstrapIcons.handThumbsUp),
+  pause('Pause/Resume', icon: BootstrapIcons.pause, isLongPress: true),
+
   // headwind
-  headwindSpeed('Headwind Speed', possibleValues: [0, 25, 50, 75, 100]),
-  headwindHeartRateMode('Headwind HR Mode'),
+  headwindSpeed('Headwind Speed', possibleValues: [0, 25, 50, 75, 100], icon: Icons.air),
+  headwindHeartRateMode('Headwind HR Mode', icon: Icons.favorite),
 
   // openbikecontrol
   up('Up', icon: RadixIcons.arrowUp),

lib/utils/keymap/keymap.dart

@@ -8,6 +8,7 @@ import 'package:bike_control/utils/actions/android.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/keymap/buttons.dart';
 import 'package:dartx/dartx.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 
@@ -82,21 +83,20 @@ class Keymap {
     }
   }
 
-  ControllerButton getOrAddButton(String name, ControllerButton Function() button) {
+  ControllerButton getOrAddButton(String name, ControllerButton button) {
     final allButtons = keyPairs.expand((kp) => kp.buttons).toSet().toList();
     if (allButtons.none((b) => b.name == name)) {
-      final newButton = button();
       addKeyPair(
         KeyPair(
           touchPosition: Offset.zero,
-          buttons: [newButton],
+          buttons: [button],
           physicalKey: null,
           logicalKey: null,
-          inGameAction: newButton.action,
-          isLongPress: newButton.action?.isLongPress ?? false,
+          inGameAction: button.action,
+          isLongPress: button.action?.isLongPress ?? false,
         ),
       );
-      return newButton;
+      return button;
     } else {
       return allButtons.firstWhere((b) => b.name == name);
     }
@@ -105,13 +105,17 @@ class Keymap {
   void addNewButtons(List<ControllerButton> availableButtons) {
     final newButtons = availableButtons.filter((button) => getKeyPair(button) == null);
     for (final button in newButtons) {
+      final buttonFromBase = core.settings.getTrainerApp()?.keymap.getKeyPair(button);
       addKeyPair(
         KeyPair(
-          touchPosition: Offset.zero,
+          touchPosition: buttonFromBase?.touchPosition ?? Offset.zero,
           buttons: [button],
-          physicalKey: null,
-          logicalKey: null,
-          isLongPress: false,
+          inGameAction: button.action,
+          physicalKey: buttonFromBase?.physicalKey,
+          logicalKey: buttonFromBase?.logicalKey,
+          isLongPress: buttonFromBase?.isLongPress ?? false,
+          inGameActionValue: buttonFromBase?.inGameActionValue,
+          androidAction: buttonFromBase?.androidAction,
         ),
       );
     }
@@ -165,7 +169,12 @@ class KeyPair {
         _ => Icons.keyboard,
       },
       //_ when inGameAction != null && core.logic.emulatorEnabled => Icons.link,
-      _ when inGameAction != null && inGameAction!.icon != null && core.logic.emulatorEnabled => inGameAction!.icon,
+      _
+          when inGameAction != null &&
+              inGameAction!.icon != null &&
+              (core.logic.emulatorEnabled ||
+                  [InGameAction.headwindHeartRateMode, InGameAction.headwindSpeed].contains(inGameAction!)) =>
+        inGameAction!.icon,
 
       _
           when androidAction != null &&
@@ -194,10 +203,9 @@ class KeyPair {
 
   bool get hasActiveAction =>
       screenshotMode ||
-      (physicalKey != null &&
-          core.logic.showLocalControl &&
-          core.settings.getLocalEnabled() &&
-          core.actionHandler.supportedModes.contains(SupportedMode.keyboard)) ||
+      (physicalKey != null && (core.logic.showLocalControl && core.settings.getLocalEnabled()) ||
+          (core.logic.showRemote && core.settings.getRemoteKeyboardControlEnabled()) &&
+              core.actionHandler.supportedModes.contains(SupportedMode.keyboard)) ||
       (isSpecialKey &&
           core.logic.showLocalControl &&
           core.settings.getLocalEnabled() &&
@@ -223,11 +231,17 @@ class KeyPair {
       (inGameAction != null &&
           core.logic.showZwiftMsdnEmulator &&
           core.settings.getZwiftMdnsEmulatorEnabled() &&
-          core.zwiftMdnsEmulator.supportedActions.contains(inGameAction));
+          core.zwiftMdnsEmulator.supportedActions.contains(inGameAction)) ||
+      (inGameAction != null &&
+          [InGameAction.headwindHeartRateMode, InGameAction.headwindSpeed].contains(inGameAction) &&
+          (core.connection.accessories.isNotEmpty || kDebugMode));
 
   @override
   String toString() {
-    final text = (inGameAction != null && core.logic.emulatorEnabled)
+    final text =
+        (inGameAction != null &&
+            (core.logic.emulatorEnabled ||
+                [InGameAction.headwindHeartRateMode, InGameAction.headwindSpeed].contains(inGameAction!)))
         ? [
             inGameAction!.title,
             if (inGameActionValue != null) '$inGameActionValue',
@@ -247,13 +261,16 @@ class KeyPair {
         : (physicalKey != null && core.actionHandler.supportedModes.contains(SupportedMode.keyboard))
         ? null
         : (touchPosition != Offset.zero && core.logic.showLocalRemoteOptions)
-        ? 'X:${touchPosition.dx.toInt()}, Y:${touchPosition.dy.toInt()}'
+        ? 'X:${touchPosition.dx.toInt()}, Y:${touchPosition.dy.toInt()}${inGameAction != null ? ' (${inGameAction!.title})' : ''}'
         : '';
     if (text != null && text.isNotEmpty) {
       return text;
     }
     final baseKey = logicalKey?.keyLabel ?? text ?? 'Not assigned';
 
+    if (physicalKey == null || !core.actionHandler.supportedModes.contains(SupportedMode.keyboard)) {
+      return 'Not assigned';
+    }
     if (modifiers.isEmpty || baseKey == 'Not assigned') {
       if (baseKey.trim().isEmpty) {
         return 'Space';

lib/utils/keymap/manager.dart

@@ -91,9 +91,9 @@ class KeymapManager {
                     if (jsonData != null && jsonData.isNotEmpty) {
                       final success = await core.settings.importCustomAppProfile(jsonData);
                       if (success) {
-                        buildToast(context, title: context.i18n.profileImportedSuccessfully);
+                        buildToast(title: context.i18n.profileImportedSuccessfully);
                       } else {
-                        buildToast(context, title: context.i18n.failedToImportProfile);
+                        buildToast(title: context.i18n.failedToImportProfile);
                       }
                     }
                   },
@@ -107,7 +107,7 @@ class KeymapManager {
                       if (jsonData != null) {
                         Clipboard.setData(ClipboardData(text: jsonData));
 
-                        buildToast(context, title: context.i18n.profileExportedToClipboard(currentProfile));
+                        buildToast(title: context.i18n.profileExportedToClipboard(currentProfile));
                       }
                     },
                   ),
@@ -247,9 +247,11 @@ class KeymapManager {
       } else {
         final customApp = CustomApp(profileName: newName);
 
-        final connectedDevice = core.connection.devices.firstOrNull;
+        final connectedDeviceButtons = IterableFlatMap(
+          core.connection.controllerDevices,
+        ).flatMap((e) => e.availableButtons).toSet();
         core.actionHandler.supportedApp!.keymap.keyPairs.forEachIndexed((pair, index) {
-          pair.buttons.filter((button) => connectedDevice?.availableButtons.contains(button) == true).forEachIndexed((
+          pair.buttons.filter((button) => connectedDeviceButtons.contains(button) == true).forEachIndexed((
             button,
             indexB,
           ) {
@@ -288,9 +290,11 @@ class KeymapManager {
     } else {
       final customApp = CustomApp(profileName: newName);
 
-      final connectedDevice = core.connection.devices.firstOrNull;
+      final connectedDeviceButtons = IterableFlatMap(
+        core.connection.controllerDevices,
+      ).flatMap((e) => e.availableButtons).toSet();
       core.actionHandler.supportedApp!.keymap.keyPairs.forEachIndexed((pair, index) {
-        pair.buttons.filter((button) => connectedDevice?.availableButtons.contains(button) == true).forEachIndexed((
+        pair.buttons.filter((button) => connectedDeviceButtons.contains(button) == true).forEachIndexed((
           button,
           indexB,
         ) {

lib/utils/requirements/android.dart

@@ -4,7 +4,6 @@ import 'dart:isolate';
 import 'dart:ui';
 
 import 'package:bike_control/gen/l10n.dart';
-import 'package:bike_control/main.dart';
 import 'package:bike_control/utils/actions/android.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/requirements/platform.dart';
@@ -133,7 +132,6 @@ class NotificationRequirement extends PlatformRequirement {
           ?.requestNotificationsPermission();
       if (result == false) {
         buildToast(
-          navigatorKey.currentContext!,
           title: 'Enable notifications for BikeControl in Android Settings',
         );
       }
@@ -148,7 +146,6 @@ class NotificationRequirement extends PlatformRequirement {
       core.settings.setHasAskedPermissions(true);
       if (result == false) {
         buildToast(
-          navigatorKey.currentContext!,
           title: 'Enable notifications for BikeControl in System Preferences → Notifications → Bike Control',
         );
         launchUrlString('x-apple.systempreferences:com.apple.preference.notifications');
@@ -164,7 +161,6 @@ class NotificationRequirement extends PlatformRequirement {
       core.settings.setHasAskedPermissions(true);
       if (result == false) {
         buildToast(
-          navigatorKey.currentContext!,
           title: 'Enable notifications for BikeControl in System Preferences → Notifications → Bike Control',
         );
         launchUrlString('x-apple.systempreferences:com.apple.preference.notifications');
@@ -290,6 +286,7 @@ class NotificationRequirement extends PlatformRequirement {
         core.connection.disconnectAll();
       }
       if (message == 'close') {
+        core.actionHandler.cleanup();
         core.connection.stop();
         SystemNavigator.pop();
         AndroidFlutterLocalNotificationsPlugin().stopForegroundService();

lib/utils/requirements/multi.dart

@@ -22,7 +22,6 @@ class KeyboardRequirement extends PlatformRequirement {
   @override
   Future<void> call(BuildContext context, VoidCallback onUpdate) async {
     buildToast(
-      context,
       title: AppLocalizations.current.enableKeyboardAccessMessage,
     );
     await keyPressSimulator.requestAccess(onlyOpenPrefPane: Platform.isMacOS);
@@ -62,7 +61,7 @@ class BluetoothTurnedOn extends PlatformRequirement {
       await PeripheralManager().showAppSettings();
     } else if (currentState == AvailabilityState.poweredOff) {
       if (Platform.isMacOS) {
-        buildToast(context, title: name);
+        buildToast(title: name);
       } else {
         await UniversalBle.enableBluetooth();
       }

lib/utils/requirements/windows.dart

@@ -0,0 +1,70 @@
+import 'dart:io';
+
+import 'package:ffi/ffi.dart';
+import 'package:flutter/foundation.dart';
+import 'package:win32/win32.dart';
+
+const _hive = HKEY_CURRENT_USER;
+
+class WindowsProtocolHandler {
+  List<String> getArguments(List<String>? arguments) {
+    if (arguments == null) return ['%s'];
+
+    if (arguments.isEmpty && !arguments.any((e) => e.contains('%s'))) {
+      throw ArgumentError('arguments must contain at least 1 instance of "%s"');
+    }
+
+    return arguments;
+  }
+
+  void register(String scheme, {String? executable, List<String>? arguments}) {
+    if (defaultTargetPlatform != TargetPlatform.windows) return;
+
+    final prefix = _regPrefix(scheme);
+    final capitalized = scheme[0].toUpperCase() + scheme.substring(1);
+    final args = getArguments(arguments).map((a) => _sanitize(a));
+    final cmd = '${executable ?? Platform.resolvedExecutable} ${args.join(' ')}';
+
+    _regCreateStringKey(_hive, prefix, '', 'URL:$capitalized');
+    _regCreateStringKey(_hive, prefix, 'URL Protocol', '');
+    _regCreateStringKey(_hive, '$prefix\\shell\\open\\command', '', cmd);
+  }
+
+  void unregister(String scheme) {
+    if (defaultTargetPlatform != TargetPlatform.windows) return;
+
+    final txtKey = TEXT(_regPrefix(scheme));
+    try {
+      RegDeleteTree(HKEY_CURRENT_USER, txtKey);
+    } finally {
+      free(txtKey);
+    }
+  }
+
+  String _regPrefix(String scheme) => 'SOFTWARE\\Classes\\$scheme';
+
+  int _regCreateStringKey(int hKey, String key, String valueName, String data) {
+    final txtKey = TEXT(key);
+    final txtValue = TEXT(valueName);
+    final txtData = TEXT(data);
+    try {
+      return RegSetKeyValue(
+        hKey,
+        txtKey,
+        txtValue,
+        REG_SZ,
+        txtData,
+        txtData.length * 2 + 2,
+      );
+    } finally {
+      free(txtKey);
+      free(txtValue);
+      free(txtData);
+    }
+  }
+
+  String _sanitize(String value) {
+    value = value.replaceAll(r'%s', '%1').replaceAll(r'"', '\\"');
+    return '"$value"';
+  }
+}

lib/utils/settings/settings.dart

@@ -11,8 +11,10 @@ import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
 import 'package:path/path.dart' as path;
 import 'package:path_provider_windows/path_provider_windows.dart';
+import 'package:prop/emulators/prefs.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:shared_preferences_windows/shared_preferences_windows.dart';
+import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:window_manager/window_manager.dart';
 
 import '../../main.dart';
@@ -26,6 +28,7 @@ class Settings {
   Future<String?> init({bool retried = false}) async {
     try {
       prefs = await SharedPreferences.getInstance();
+      propPrefs.initialize(prefs);
       try {
         await NotificationRequirement.setup();
       } catch (error, stack) {
@@ -47,6 +50,15 @@ class Settings {
       final app = getKeyMap();
       core.actionHandler.init(app);
 
+      try {
+        await Supabase.initialize(
+          url: 'https://pikrcyynovdvogrldfnw.supabase.co',
+          anonKey: const String.fromEnvironment('SUPABASE_ANON_KEY'),
+        );
+      } catch (e, s) {
+        recordError(e, s, context: 'Supabase initialization');
+      }
+
       // Initialize IAP manager
       await IAPManager.instance.initialize();
 
@@ -317,6 +329,14 @@ class Settings {
     return prefs.getBool('remote_control_enabled') ?? false;
   }
 
+  void setRemoteKeyboardControlEnabled(bool value) {
+    prefs.setBool('remote_keyboard_control_enabled', value);
+  }
+
+  bool getRemoteKeyboardControlEnabled() {
+    return prefs.getBool('remote_keyboard_control_enabled') ?? false;
+  }
+
   bool getLocalEnabled() {
     return prefs.getBool('local_control_enabled') ?? false;
   }
@@ -404,4 +424,12 @@ class Settings {
   Future<void> setHasAskedPermissions(bool asked) async {
     await prefs.setBool('asked_permissions', asked);
   }
+
+  bool getMediaKeyDetectionEnabled() {
+    return prefs.getBool('media_key_detection_enabled') ?? false;
+  }
+
+  Future<void> setMediaKeyDetectionEnabled(bool enabled) async {
+    await prefs.setBool('media_key_detection_enabled', enabled);
+  }
 }

lib/widgets/apps/mywhoosh_link_tile.dart

@@ -1,4 +1,3 @@
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
 import 'package:bike_control/gen/l10n.dart';
 import 'package:bike_control/main.dart';
 import 'package:bike_control/pages/markdown.dart';
@@ -6,6 +5,7 @@ import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/i18n_extension.dart';
 import 'package:bike_control/widgets/ui/connection_method.dart';
 import 'package:bike_control/widgets/ui/toast.dart';
+import 'package:prop/prop.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 
 class MyWhooshLinkTile extends StatefulWidget {
@@ -43,7 +43,6 @@ class _MywhooshLinkTileState extends State<MyWhooshLinkTile> {
                   core.whooshLink.stopServer();
                 } else if (value) {
                   buildToast(
-                    navigatorKey.currentContext!,
                     title: AppLocalizations.of(context).myWhooshLinkInfo,
                     level: LogLevel.LOGLEVEL_INFO,
                     duration: Duration(seconds: 6),
@@ -60,7 +59,6 @@ class _MywhooshLinkTileState extends State<MyWhooshLinkTile> {
                     recordError(e, s, context: 'MyWhoosh Link Server');
                     core.settings.setMyWhooshLinkEnabled(false);
                     buildToast(
-                      context,
                       title: context.i18n.errorStartingMyWhooshLink,
                     );
                   });

lib/widgets/apps/openbikecontrol_ble_tile.dart

@@ -1,10 +1,10 @@
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pb.dart';
 import 'package:bike_control/main.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/i18n_extension.dart';
 import 'package:bike_control/widgets/ui/connection_method.dart';
 import 'package:bike_control/widgets/ui/toast.dart';
 import 'package:dartx/dartx.dart';
+import 'package:prop/prop.dart';
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 
 class OpenBikeControlBluetoothTile extends StatefulWidget {
@@ -45,7 +45,6 @@ class _OpenBikeProtocolTileState extends State<OpenBikeControlBluetoothTile> {
                     recordError(e, s, context: 'OBP BLE Emulator');
                     core.settings.setObpBleEnabled(false);
                     buildToast(
-                      context,
                       level: LogLevel.LOGLEVEL_WARNING,
                       title: context.i18n.errorStartingOpenBikeControlBluetoothServer,
                     );

lib/widgets/apps/openbikecontrol_mdns_tile.dart

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

lib/widgets/apps/zwift_mdns_tile.dart

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

lib/widgets/apps/zwift_tile.dart

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

lib/widgets/custom_keymap_selector.dart

@@ -1,13 +1,15 @@
 import 'dart:async';
+import 'dart:io';
 
-import 'package:dartx/dartx.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/gen/l10n.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:flutter/material.dart';
+import 'package:flutter/services.dart';
 
 import '../utils/keymap/apps/custom_app.dart';
 
@@ -152,8 +154,48 @@ class _HotKeyListenerState extends State<HotKeyListenerDialog> {
                 mainAxisSize: MainAxisSize.min,
                 spacing: 20,
                 children: [
-                  Text(AppLocalizations.current.pressKeyToAssign(_pressedButton.toString())),
+                  Text(
+                    AppLocalizations.current.pressKeyToAssign(_pressedButton?.displayName ?? _pressedButton.toString()),
+                  ),
                   Text(_formatKey(_pressedKey)),
+                  if (kDebugMode && (Platform.isAndroid || Platform.isIOS))
+                    SizedBox(
+                      height: 300,
+                      width: 300,
+                      child: ListView(
+                        shrinkWrap: true,
+                        children: LogicalKeyboardKey.knownLogicalKeys
+                            .map(
+                              (key) => ListTile(
+                                contentPadding: EdgeInsets.zero,
+                                minVerticalPadding: 0,
+                                title: Row(
+                                  children: [
+                                    Chip(label: Text(key.keyLabel)),
+                                  ],
+                                ),
+                                onTap: () {
+                                  setState(() {
+                                    _pressedKey = KeyDownEvent(
+                                      physicalKey: PhysicalKeyboardKey(0x80),
+                                      logicalKey: key,
+                                      character: null,
+                                      timeStamp: Duration.zero,
+                                    );
+                                    widget.customApp.setKey(
+                                      _pressedButton!,
+                                      physicalKey: _pressedKey!.physicalKey,
+                                      logicalKey: key,
+                                      modifiers: _activeModifiers.toList(),
+                                      touchPosition: widget.keyPair?.touchPosition,
+                                    );
+                                  });
+                                },
+                              ),
+                            )
+                            .toList(),
+                      ),
+                    ),
                 ],
               ),
             ),

lib/widgets/iap_status_widget.dart

@@ -3,7 +3,6 @@ import 'dart:io';
 
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/gen/l10n.dart';
-import 'package:bike_control/main.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/i18n_extension.dart';
 import 'package:bike_control/utils/iap/iap_manager.dart';
@@ -280,7 +279,6 @@ class _IAPStatusWidgetState extends State<IAPStatusWidget> {
                                       if (redeemed) {
                                         await IAPManager.instance.redeem(purchaseId);
                                         buildToast(
-                                          context,
                                           title: 'Success',
                                           subtitle: 'Purchase redeemed successfully!',
                                         );
@@ -469,7 +467,6 @@ class _IAPStatusWidgetState extends State<IAPStatusWidget> {
     } catch (e) {
       if (mounted) {
         buildToast(
-          navigatorKey.currentContext!,
           title: 'Error',
           subtitle: 'An error occurred: $e',
         );

lib/widgets/keyboard_pair_widget.dart

@@ -0,0 +1,53 @@
+import 'package:bike_control/bluetooth/messages/notification.dart';
+import 'package:bike_control/gen/l10n.dart';
+import 'package:bike_control/utils/core.dart';
+import 'package:bike_control/widgets/ui/connection_method.dart';
+import 'package:prop/prop.dart' show LogLevel;
+import 'package:shadcn_flutter/shadcn_flutter.dart';
+
+class RemoteKeyboardPairingWidget extends StatefulWidget {
+  const RemoteKeyboardPairingWidget({super.key});
+
+  @override
+  State<RemoteKeyboardPairingWidget> createState() => _PairWidgetState();
+}
+
+class _PairWidgetState extends State<RemoteKeyboardPairingWidget> {
+  @override
+  Widget build(BuildContext context) {
+    return ValueListenableBuilder(
+      valueListenable: core.remoteKeyboardPairing.isStarted,
+      builder: (context, isStarted, child) {
+        return ValueListenableBuilder(
+          valueListenable: core.remoteKeyboardPairing.isConnected,
+          builder: (context, isConnected, child) {
+            return ConnectionMethod(
+              supportedActions: null,
+              isEnabled: core.logic.isRemoteKeyboardControlEnabled,
+              isStarted: isStarted,
+              showTroubleshooting: true,
+              type: ConnectionMethodType.bluetooth,
+              instructionLink: 'https://youtube.com/shorts/qalBSiAz7wg',
+              title: AppLocalizations.of(context).actAsBluetoothKeyboard,
+              description: AppLocalizations.of(context).bluetoothKeyboardExplanation,
+              isConnected: isConnected,
+              requirements: core.permissions.getRemoteControlRequirements(),
+              onChange: (value) async {
+                core.settings.setRemoteKeyboardControlEnabled(value);
+                if (!value) {
+                  core.remoteKeyboardPairing.stopAdvertising();
+                } else {
+                  core.remoteKeyboardPairing.startAdvertising().catchError((e) {
+                    core.settings.setRemoteControlEnabled(false);
+                    core.connection.signalNotification(AlertNotification(LogLevel.LOGLEVEL_ERROR, e.toString()));
+                  });
+                }
+                setState(() {});
+              },
+            );
+          },
+        );
+      },
+    );
+  }
+}

lib/widgets/keymap_explanation.dart

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

lib/widgets/logviewer.dart

@@ -69,7 +69,7 @@ class _LogviewerState extends State<LogViewer> {
                       .join('\n');
                   Clipboard.setData(ClipboardData(text: logText));
 
-                  buildToast(context, title: context.i18n.logsHaveBeenCopiedToClipboard);
+                  buildToast(title: context.i18n.logsHaveBeenCopiedToClipboard);
                 },
               ),
             ],

lib/widgets/menu.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:bike_control/bluetooth/devices/zwift/zwift_clickv2.dart';
+import 'package:bike_control/pages/login.dart';
 import 'package:bike_control/pages/markdown.dart';
 import 'package:bike_control/pages/navigation.dart';
 import 'package:bike_control/utils/core.dart';
@@ -143,6 +144,22 @@ class BKMenuButton extends StatelessWidget {
                   await core.settings.reset();
                 },
               ),
+              MenuButton(
+                child: Text('Disconnect'),
+                onPressed: (c) async {
+                  core.connection.disconnectAll();
+                },
+              ),
+              MenuButton(
+                child: Text('Login'),
+                onPressed: (c) async {
+                  openDrawer(
+                    context: context,
+                    builder: (c) => LoginPage(),
+                    position: OverlayPosition.bottom,
+                  );
+                },
+              ),
               MenuDivider(),
             ],
             if (currentPage == BCPage.logs) ...[

lib/widgets/mouse_pair_widget.dart

@@ -1,22 +1,22 @@
 import 'dart:io';
 
-import 'package:bike_control/bluetooth/devices/zwift/protocol/zp.pbenum.dart' show LogLevel;
 import 'package:bike_control/bluetooth/messages/notification.dart';
 import 'package:bike_control/utils/core.dart';
 import 'package:bike_control/utils/i18n_extension.dart';
 import 'package:bike_control/widgets/ui/connection_method.dart';
+import 'package:prop/prop.dart' show LogLevel;
 import 'package:shadcn_flutter/shadcn_flutter.dart';
 
 import '../utils/requirements/multi.dart';
 
-class RemotePairingWidget extends StatefulWidget {
-  const RemotePairingWidget({super.key});
+class RemoteMousePairingWidget extends StatefulWidget {
+  const RemoteMousePairingWidget({super.key});
 
   @override
-  State<RemotePairingWidget> createState() => _PairWidgetState();
+  State<RemoteMousePairingWidget> createState() => _PairWidgetState();
 }
 
-class _PairWidgetState extends State<RemotePairingWidget> {
+class _PairWidgetState extends State<RemoteMousePairingWidget> {
   @override
   Widget build(BuildContext context) {
     return ValueListenableBuilder(