- improve iOS reactivity by delaying button events for a few milliseconds

- use correct icon for shift down buttons
- add more troubleshooting for iOS devices

.github/FUNDING.yml

@@ -1,3 +1,2 @@
 github: [jonasbark]
-open_collective: jonas-bark1
-custom: ["https://paypal.me/boni"]
+custom: ["https://paypal.me/boni", "https://donate.stripe.com/9B6aEX0muajY8bZ1Kl6J200"]

.github/workflows/build.yml

@@ -1,15 +1,32 @@
 name: "Build"
 
 on:
-  push:
-    branches:
-      - main
-    paths:
-      - '.github/workflows/**'
-      - 'lib/**'
-      - 'accessibility/**'
-      - 'keypress_simulator/**'
-      - 'pubspec.yaml'
+  workflow_dispatch:
+    inputs:
+      build_mac:
+        description: 'Build for macOS'
+        required: false
+        default: 'true'
+      build_windows:
+        description: 'Build for Windows'
+        required: false
+        default: 'true'
+      build_android:
+        description: 'Build for Android'
+        required: false
+        default: 'true'
+      build_ios:
+        description: 'Build for iOS'
+        required: false
+        default: 'true'
+      build_web:
+        description: 'Build for Web'
+        required: false
+        default: 'true'
+
+env:
+  SHOREBIRD_TOKEN: ${{ secrets.SHOREBIRD_TOKEN }}
+  FLUTTER_VERSION: 3.35.5
 
 jobs:
   build:
@@ -27,17 +44,30 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install certificates
+        if: github.event.inputs.build_mac == 'true' || github.event.inputs.build_ios == 'true'
         env:
           DEVELOPER_ID_APPLICATION_P12_BASE64_MAC: ${{ secrets.DEVELOPER_ID_APPLICATION_P12_BASE64_MAC }}
+          DEVELOPER_ID_INSTALLER_P12_BASE64_MAC: ${{ secrets.DEVELOPER_ID_INSTALLER_P12_BASE64_MAC }}
           P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
           KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+          APPSTORE_PROFILE_IOS_BASE64: ${{ secrets.APPSTORE_PROFILE_IOS_BASE64 }}
+          APPSTORE_PROFILE_MACOS_BASE64: ${{ secrets.APPSTORE_PROFILE_MACOS_BASE64 }}
+          APPSTORE_PROFILE_DEV_IOS_BASE64: ${{ secrets.APPSTORE_PROFILE_DEV_IOS_BASE64 }}
         run: |
           # create variables
           DEVELOPER_ID_APPLICATION_CERTIFICATE_PATH=$RUNNER_TEMP/build_developerID_application_certificate.p12
+          DEVELOPER_ID_INSTALLER_CERTIFICATE_PATH=$RUNNER_TEMP/build_developerID_installer_certificate.p12
+          PP_PATH_IOS=$RUNNER_TEMP/build_pp_ios.mobileprovision
+          PP_PATH_IOS_DEV=$RUNNER_TEMP/build_pp_ios_dev.mobileprovision
+          PP_PATH_MACOS=$RUNNER_TEMP/build_pp_macos.provisionprofile
           KEYCHAIN_PATH=$RUNNER_TEMP/pg-signing.keychain-db
           
           # import certificate and provisioning profile from secrets
           echo -n "$DEVELOPER_ID_APPLICATION_P12_BASE64_MAC" | base64 --decode --output $DEVELOPER_ID_APPLICATION_CERTIFICATE_PATH
+          echo -n "$DEVELOPER_ID_INSTALLER_P12_BASE64_MAC" | base64 --decode --output $DEVELOPER_ID_INSTALLER_CERTIFICATE_PATH
+          echo -n "$APPSTORE_PROFILE_IOS_BASE64" | base64 --decode -o $PP_PATH_IOS
+          echo -n "$APPSTORE_PROFILE_DEV_IOS_BASE64" | base64 --decode -o $PP_PATH_IOS_DEV
+          echo -n "$APPSTORE_PROFILE_MACOS_BASE64" | base64 --decode -o $PP_PATH_MACOS
           
           # create temporary keychain
           security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
@@ -47,61 +77,146 @@ jobs:
           
           # import certificate to keychain
           security import $DEVELOPER_ID_APPLICATION_CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+          security import $DEVELOPER_ID_INSTALLER_CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
           security list-keychain -d user -s $KEYCHAIN_PATH
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          
+          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+          cp $PP_PATH_IOS ~/Library/MobileDevice/Provisioning\ Profiles
+          cp $PP_PATH_IOS_DEV ~/Library/MobileDevice/Provisioning\ Profiles
+          cp $PP_PATH_MACOS ~/Library/MobileDevice/Provisioning\ Profiles
 
-        #2 Setup Java
-      - name: Set Up Java
-        uses: actions/setup-java@v3.12.0
+      - name: 🐦 Setup Shorebird
+        uses: shorebirdtech/setup-shorebird@v1
         with:
-          distribution: 'oracle'
-          java-version: '17'
+          cache: true
 
-        #3 Setup Flutter
-      - name: Set Up Flutter
-        uses: subosito/flutter-action@v2
+      - name: 🚀 Shorebird Release macOS
+        if: github.event.inputs.build_mac == 'true'
+        uses: shorebirdtech/shorebird-release@v1
         with:
-          channel: 'stable'
-
-        #4 Install Dependencies
-      - name: Install Dependencies
-        run: flutter pub get
-
-        #8 Build app ( macos Build )
-      - name: Build App
-        run: flutter build macos --release
-
-      - name: Code Signing
-        run: /usr/bin/codesign --deep --force -s "$DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY" --options runtime SwiftControl.app -v
-        working-directory: build/macos/Build/Products/Release
-        env:
-          DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY: ${{ secrets.DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY }}
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+          platform: macos
 
       - name: Decode Keystore
+        if: github.event.inputs.build_android == 'true'
         run: |
           echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 --decode > android/android.keystore;
           echo "${{ secrets.KEYSTORE_PROPERTIES }}" > android/keystore.properties;
 
-        #6 Building APK
-      - name: Build APK
-        run: flutter build apk --release
+      - name: 🚀 Shorebird Release Android
+        if: github.event.inputs.build_android == 'true'
+        uses: shorebirdtech/shorebird-release@v1
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+          platform: android
+          args: "--artifact=apk"
+
+      - name: Set Up Flutter
+        if: github.event.inputs.build_web == 'true'
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+          flutter-version: ${{ env.FLUTTER_VERSION }}
 
       - name: Build Web
+        if: github.event.inputs.build_web == 'true'
         run: flutter build web --release --base-href "/swiftcontrol/"
 
-      - name: Handle archives
+      - name: Upload static files as artifact
+        if: github.event.inputs.build_web == 'true'
+        id: deployment
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: build/web
+
+      - name: Web Deploy
+        if: github.event.inputs.build_web == 'true'
+        uses: actions/deploy-pages@v4
+
+      - name: Extract latest changelog
+        id: changelog
+        run: |
+          chmod +x scripts/get_latest_changelog.sh
+          mkdir -p whatsnew
+          ./scripts/get_latest_changelog.sh | head -c 500 > whatsnew/whatsnew-en-US
+
+      - name: 🚀 Shorebird Release iOS
+        if: github.event.inputs.build_ios == 'true'
+        uses: shorebirdtech/shorebird-release@v1
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+          platform: ios
+          args: "--export-options-plist ios/ExportOptions.plist"
+
+      - name: Prepare App Store authentication key
+        if: github.event.inputs.build_ios == 'true' || github.event.inputs.build_mac == 'true'
+        env:
+          API_KEY_BASE64: ${{ secrets.APPSTORE_API_KEY_FILE_BASE64 }}
+          APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
+        run: |
+          mkdir -p ./private_keys;
+          printf %s "$API_KEY_BASE64" | base64 -D > "./private_keys/AuthKey_${APPSTORE_API_KEY}.p8";      
+
+      - name: Upload to Play Store
+        if: github.event.inputs.build_android == 'true'
+        uses: r0adkll/upload-google-play@v1
+        with:
+          serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
+          packageName: de.jonasbark.swiftcontrol
+          releaseFiles: build/app/outputs/bundle/release/app-release.aab
+          track: production
+          whatsNewDirectory: whatsnew
+
+      - name: Upload to macOS App Store
+        if: github.event.inputs.build_mac == 'true'
+        env:
+          APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
+          APPSTORE_API_ISSUER_ID: ${{ secrets.APPSTORE_API_ISSUER_ID }}
+        run: |
+          productbuild --component "build/macos/Build/Products/Release/SwiftControl.app" /Applications "SwiftControl.pkg" --sign "3rd Party Mac Developer Installer: JONAS TASSILO BARK (UZRHKPVWN9)";    
+          xcrun altool --upload-app -f SwiftControl.pkg -t osx --apiKey "$APPSTORE_API_KEY" --apiIssuer "$APPSTORE_API_ISSUER_ID"; 
+
+      - name: Upload to iOS App Store
+        if: github.event.inputs.build_ios == 'true'
+        env:
+          APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
+          APPSTORE_API_ISSUER_ID: ${{ secrets.APPSTORE_API_ISSUER_ID }}
+        run: |
+          xcrun altool --upload-app -f build/ios/ipa/swift_play.ipa -t ios --apiKey "$APPSTORE_API_KEY" --apiIssuer "$APPSTORE_API_ISSUER_ID";
+
+      - name: Handle Android archives
+        if: github.event.inputs.build_android == 'true'
         run: |
           cp build/app/outputs/flutter-apk/app-release.apk build/app/outputs/flutter-apk/SwiftControl.android.apk
+
+      - name: Code Signing of macOS app
+        if: github.event.inputs.build_mac == 'true'
+        run: /usr/bin/codesign --deep --force -s "$DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY" --entitlements ../../../../../macos/Runner/Release.entitlements --options runtime SwiftControl.app -v
+        working-directory: build/macos/Build/Products/Release
+        env:
+          DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY: ${{ secrets.DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY }}
+
+      - name: Handle macOS archives
+        if: github.event.inputs.build_mac == 'true'
+        run: |
           cd build/macos/Build/Products/Release/
           zip -r SwiftControl.macos.zip SwiftControl.app/
 
-        #9 Upload Artifacts
-      - name: Upload Artifacts
+      - name: Upload Android Artifacts
+        if: github.event.inputs.build_android == 'true'
         uses: actions/upload-artifact@v4
         with:
           name: Releases
           path: |
             build/app/outputs/flutter-apk/SwiftControl.android.apk
+
+      - name: Upload macOS Artifacts
+        if: github.event.inputs.build_mac == 'true'
+        uses: actions/upload-artifact@v4
+        with:
+          name: Releases
+          path: |
             build/macos/Build/Products/Release/SwiftControl.macos.zip
 
         #10 Extract Version
@@ -134,20 +249,15 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           artifacts: "build/app/outputs/flutter-apk/SwiftControl.android.apk,build/macos/Build/Products/Release/SwiftControl.macos.zip"
+          allowUpdates: true
+          prerelease: ${{ endsWith(env.VERSION, '1337') }}
+          bodyFile: scripts/RELEASE_NOTES.md
           tag: v${{ env.VERSION }}
           token: ${{ secrets.TOKEN }}
 
-      - name: Upload static files as artifact
-        id: deployment
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: build/web
-
-      - name: Web Deploy
-        uses: actions/deploy-pages@v4
-
   windows:
     needs: build
+    if: github.event.inputs.build_windows == 'true'
     name: Build & Release on Windows
     runs-on: windows-latest
 
@@ -163,22 +273,39 @@ jobs:
           distribution: 'oracle'
           java-version: '17'
 
-        #3 Setup Flutter
-      - name: Set Up Flutter
-        uses: subosito/flutter-action@v2
+      - name: 🐦 Setup Shorebird
+        uses: shorebirdtech/setup-shorebird@v1
         with:
-          channel: 'stable'
+          cache: true
 
-        #4 Install Dependencies
-      - name: Install Dependencies
-        run: flutter pub get
-
-      - name: Build App
-        run: flutter build windows
+      - name: 🚀 Shorebird Release Windows
+        uses: shorebirdtech/shorebird-release@v1
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+          platform: windows
 
       - name: Zip directory (Windows)
         shell: pwsh
         run: |
+  
+          $source = "C:\Windows\System32"
+          $destination = "build\windows\x64\runner\Release"
+          
+          # List of required DLLs
+          $dlls = @("msvcp140.dll", "vcruntime140.dll", "vcruntime140_1.dll")
+          
+          # Copy each file
+          foreach ($dll in $dlls) {
+            $srcPath = Join-Path $source $dll
+            $destPath = Join-Path $destination $dll
+              
+            if (Test-Path $srcPath) {
+              Copy-Item -Path $srcPath -Destination $destPath -Force
+              Write-Output "Copied $dll to $destination"
+            } else {
+              Write-Warning "$dll not found in $source"
+            }
+          }
           Compress-Archive -Path "build/windows/x64/runner/Release/*" -DestinationPath "build/windows/x64/runner/Release/SwiftControl.windows.zip"
 
       #9 Upload Artifacts
@@ -206,5 +333,6 @@ jobs:
         with:
           allowUpdates: true
           artifacts: "build/windows/x64/runner/Release/SwiftControl.windows.zip"
+          bodyFile: scripts/RELEASE_NOTES.md
           tag: v${{ env.VERSION }}
           token: ${{ secrets.TOKEN }}

.github/workflows/patch.yml

@@ -0,0 +1,161 @@
+name: "Patch"
+
+on:
+  workflow_dispatch:
+
+env:
+  SHOREBIRD_TOKEN: ${{ secrets.SHOREBIRD_TOKEN }}
+  FLUTTER_VERSION: 3.35.5
+
+jobs:
+  build:
+    name: Patch iOS, Android & macOS
+    runs-on: macos-latest
+
+    permissions:
+      id-token: write
+      pages: write
+      contents: write
+
+    steps:
+      #1 Checkout Repository
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - name: 🐦 Setup Shorebird
+        uses: shorebirdtech/setup-shorebird@v1
+        with:
+          cache: true
+
+      - name: Install certificates
+        env:
+          DEVELOPER_ID_APPLICATION_P12_BASE64_MAC: ${{ secrets.DEVELOPER_ID_APPLICATION_P12_BASE64_MAC }}
+          DEVELOPER_ID_INSTALLER_P12_BASE64_MAC: ${{ secrets.DEVELOPER_ID_INSTALLER_P12_BASE64_MAC }}
+          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+          APPSTORE_PROFILE_IOS_BASE64: ${{ secrets.APPSTORE_PROFILE_IOS_BASE64 }}
+          APPSTORE_PROFILE_MACOS_BASE64: ${{ secrets.APPSTORE_PROFILE_MACOS_BASE64 }}
+          APPSTORE_PROFILE_DEV_IOS_BASE64: ${{ secrets.APPSTORE_PROFILE_DEV_IOS_BASE64 }}
+        run: |
+          # create variables
+          DEVELOPER_ID_APPLICATION_CERTIFICATE_PATH=$RUNNER_TEMP/build_developerID_application_certificate.p12
+          DEVELOPER_ID_INSTALLER_CERTIFICATE_PATH=$RUNNER_TEMP/build_developerID_installer_certificate.p12
+          PP_PATH_IOS=$RUNNER_TEMP/build_pp_ios.mobileprovision
+          PP_PATH_IOS_DEV=$RUNNER_TEMP/build_pp_ios_dev.mobileprovision
+          PP_PATH_MACOS=$RUNNER_TEMP/build_pp_macos.provisionprofile
+          KEYCHAIN_PATH=$RUNNER_TEMP/pg-signing.keychain-db
+          
+          # import certificate and provisioning profile from secrets
+          echo -n "$DEVELOPER_ID_APPLICATION_P12_BASE64_MAC" | base64 --decode --output $DEVELOPER_ID_APPLICATION_CERTIFICATE_PATH
+          echo -n "$DEVELOPER_ID_INSTALLER_P12_BASE64_MAC" | base64 --decode --output $DEVELOPER_ID_INSTALLER_CERTIFICATE_PATH
+          echo -n "$APPSTORE_PROFILE_IOS_BASE64" | base64 --decode -o $PP_PATH_IOS
+          echo -n "$APPSTORE_PROFILE_DEV_IOS_BASE64" | base64 --decode -o $PP_PATH_IOS_DEV
+          echo -n "$APPSTORE_PROFILE_MACOS_BASE64" | base64 --decode -o $PP_PATH_MACOS
+          
+          # create temporary keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          # security default-keychain -s $KEYCHAIN_PATH
+          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          
+          # import certificate to keychain
+          security import $DEVELOPER_ID_APPLICATION_CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+          security import $DEVELOPER_ID_INSTALLER_CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+          security list-keychain -d user -s $KEYCHAIN_PATH
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          
+          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+          cp $PP_PATH_IOS ~/Library/MobileDevice/Provisioning\ Profiles
+          cp $PP_PATH_IOS_DEV ~/Library/MobileDevice/Provisioning\ Profiles
+          cp $PP_PATH_MACOS ~/Library/MobileDevice/Provisioning\ Profiles
+
+      - name: Decode Keystore
+        run: |
+          echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 --decode > android/android.keystore;
+          echo "${{ secrets.KEYSTORE_PROPERTIES }}" > android/keystore.properties;
+
+      - name: 🚀 Shorebird Patch macOS
+        uses: shorebirdtech/shorebird-patch@v1
+        with:
+          platform: macos
+          release-version: latest
+          args: '--allow-asset-diffs'
+
+      - name: 🚀 Shorebird Patch Android
+        uses: shorebirdtech/shorebird-patch@v1
+        with:
+          platform: android
+          release-version: latest
+          args: '--allow-asset-diffs'
+
+      - name: 🚀 Shorebird Patch iOS
+        uses: shorebirdtech/shorebird-patch@v1
+        with:
+          platform: ios
+          release-version: latest
+          args: '--allow-asset-diffs'
+
+      - name: Set Up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+
+      # shorebird struggles with the app from GitHub
+      - name: Build macOS
+        env:
+          DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY: ${{ secrets.DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY }}
+        run: |
+          flutter build macos --release;
+          cd build/macos/Build/Products/Release/;
+          zip -r SwiftControl.macos.zip SwiftControl.app/;
+          version=$(grep '^version: ' pubspec.yaml | cut -d ' ' -f 2 | tr -d '\r');
+          echo "VERSION=$version" >> $GITHUB_ENV;
+          /usr/bin/codesign --deep --force -s "$DEVELOPER_ID_APPLICATION_SIGNING_IDENTITY" --entitlements ../../../../../macos/Runner/Release.entitlements --options runtime SwiftControl.app -v;
+
+      #9 Upload Artifacts
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          overwrite: true
+          name: Releases
+          path: |
+            build/macos/Build/Products/Release/SwiftControl.macos.zip
+
+      # add artifact to release
+      - name: Create Release
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifacts: "build/macos/Build/Products/Release/SwiftControl.macos.zip"
+          bodyFile: scripts/RELEASE_NOTES.md
+          tag: v${{ env.VERSION }}
+          token: ${{ secrets.TOKEN }}
+
+  windows:
+    name: Patch Windows
+    runs-on: windows-latest
+
+    steps:
+      #1 Checkout Repository
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+        #2 Setup Java
+      - name: Set Up Java
+        uses: actions/setup-java@v3.12.0
+        with:
+          distribution: 'oracle'
+          java-version: '17'
+
+      - name: 🐦 Setup Shorebird
+        uses: shorebirdtech/setup-shorebird@v1
+        with:
+          cache: true
+
+      - name: 🚀 Shorebird Patch Windows
+        uses: shorebirdtech/shorebird-patch@v1
+        with:
+          platform: windows
+          release-version: latest
+          args: '--allow-asset-diffs'

.github/workflows/web.yml

@@ -0,0 +1,51 @@
+name: "Build"
+
+on:
+  push:
+    branches:
+      - web
+      - wahoo_kickr_bike_shift
+      - main
+    paths:
+      - '.github/workflows/web.yml'
+      - 'lib/**'
+      - 'accessibility/**'
+      - 'keypress_simulator/**'
+      - 'pubspec.yaml'
+
+jobs:
+  build:
+    name: Build Web
+    runs-on: macos-latest
+
+    permissions:
+      id-token: write
+      pages: write
+      contents: write
+
+    steps:
+      #1 Checkout Repository
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+        #3 Setup Flutter
+      - name: Set Up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: 'stable'
+
+        #4 Install Dependencies
+      - name: Install Dependencies
+        run: flutter pub get
+
+      - name: Build Web
+        run: flutter build web --release --base-href "/swiftcontrol/"
+
+      - name: Upload static files as artifact
+        id: deployment
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: build/web
+
+      - name: Web Deploy
+        uses: actions/deploy-pages@v4

.gitignore

@@ -45,3 +45,5 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+service-account.json

.vscode/launch.json

@@ -0,0 +1,23 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+
+    {
+      "name": "swiftcontrol",
+      "request": "launch",
+      "type": "dart"
+    },
+    {
+      "name": "swiftcontrol (profile mode)",
+      "request": "launch",
+      "type": "dart",
+      "flutterMode": "profile"
+    },
+    {
+      "name": "swiftcontrol (release mode)",
+      "request": "launch",
+      "type": "dart",
+      "flutterMode": "release"
+    }
+  ]
+}

CHANGELOG.md

@@ -1,3 +1,63 @@
+### 3.0.4 (not released yet) 
+- adjusted MyWhoosh keyboard navigation mapping (thanks @bin101)
+- initial support for Wahook Kickr Bike Shift (thanks @MattW2)
+- initial support for Elite Square Smart Frame 
+
+### 3.0.3 (2025-10-12)
+- SwiftControl now supports iOS!
+  - Note that you can't run SwiftControl and your trainer app on the same iPhone due to iOS limitations but...:
+- You can now use SwiftControl as "remote control" for other devices, such as an iPad. Example scenario:
+    - your phone (Android/iOS) runs SwiftControl and connects to your Click devices
+    - your iPad or other tablet runs e.g. MyWhoosh (does not need to have SwiftControl installed)
+    - after pairing SwiftControl to your iPad / tablet via Bluetooth your phone will send the button presses to your iPad / tablet
+- Ride: analog paddles are now supported thanks to contributor @jmoro
+- you can now zoom in and out in the Keymap customization screen
+
+### 2.6.3 (2025-10-01)
+- fix a few issues with the new touch placement feature
+- add a workaround for Zwift Click V2 which resets the device when button events are no longer sent
+- fix issue on Android and Desktop where only a "touch down" was sent, but no "touch up"
+- improve UI when handling custom keymaps around the edges of the screen
+
+### 2.6.0 (2025-09-30)
+- refactor touch placements: show touches on screen, fix misplaced coordinates - should fix #64
+- show firmware version of connected device
+- Fix crashes on some Android devices
+- warn the user how to make Zwift Click V2 work properly
+- many UI improvements
+- add setting to enable or disable vibration on button press for Zwift Ride and Zwift Play controllers
+
+### 2.5.0 (2025-09-25)
+- Improve usability
+- SwiftControl is now available via the Play Store: https://play.google.com/store/apps/details?id=de.jonasbark.swiftcontrol
+  - SwiftControl will continue to be available to download for free on GitHub
+  - contact me if you already donated and I'll get a voucher for you :)
+
+### 2.4.0+1 (2025-09-17)
+- Windows: fix mouse clicks at wrong location due to display scaling (fixes #64)
+
+### 2.4.0 (2025-09-16)
+- Show an overview of the keymap bindings
+- Allow customizing an existing keymap
+- Add more donation options
+
+### 2.3.0 (2025-09-11)
+- Add support for latest Zwift Click v2
+
+### 2.2.0 (2025-09-08)
+- Add Long Press Mode option for custom keymaps - buttons can now send sustained key presses instead of repeated taps, perfect for movement controls in games (fixes #61)
+- Windows: adjust key sending method to improve compatibility with more apps (fixes #62)
+
+### 2.1.0 (2025-07-03)
+- Windows: automatically focus compatible training apps (MyWhoosh, IndieVelo, Biketerra) when sending keystrokes, enabling seamless multi-window usage
+
+### 2.0.9 (2025-05-04)
+- you can now assign Escape and arrow down key to your custom keymap (#18)
+
+### 2.0.8 (2025-05-02)
+- only use the light theme for the app
+- more troubleshooting information
+
 ### 2.0.7 (2025-04-18)
 - add Biketerra.com keymap
 - some UX improvements

README.md

@@ -4,7 +4,7 @@
 
 ## Description
 
-With SwiftControl you can control your favorite trainer app using your Zwift Click, Zwift Ride or Zwift Play devices. Here's what you can do with it, depending on your configuration:
+With SwiftControl you can **control your favorite trainer app** using your Zwift Click, Zwift Ride or Zwift Play devices. Here's what you can do with it, depending on your configuration:
 - Virtual Gear shifting
 - Steering / turning
 - adjust workout intensity
@@ -18,43 +18,66 @@ https://github.com/user-attachments/assets/1f81b674-1628-4763-ad66-5f3ed7a3f159
 
 
 ## Downloads
-Get the latest version here: https://github.com/jonasbark/swiftcontrol/releases
+Check the compatibility matrix below!
+
+<a href="https://play.google.com/store/apps/details?id=de.jonasbark.swiftcontrol"><img width="270" height="80" alt="GetItOnGooglePlay_Badge_Web_color_English" src="https://github.com/user-attachments/assets/a059d5a1-2efb-4f65-8117-ef6a99823b21" /></a>
+<a href="https://apps.apple.com/us/app/swiftcontrol/id6753721284?platform=iphone"><img width="270" height="80" alt="App Store" src="https://github.com/user-attachments/assets/c23f977a-48f6-4951-811e-ae530dbfa014" /></a>
+<a href="https://apps.apple.com/us/app/swiftcontrol/id6753721284?platform=mac"><img width="270" height="80" alt="Mac App Store" src="https://github.com/user-attachments/assets/b3552436-409c-43b0-ba7d-b6a72ae30ff1" /></a>
+
+
+Get the latest version for Windows here: https://github.com/jonasbark/swiftcontrol/releases
 
 ## Supported Apps
 - MyWhoosh
-- indieVelo / Training Peaks
-- Biketerra.com
-- any other: 
-  - Android: you can customize simulated touch points of all your buttons in the app
-  - Desktop: you can customize keyboard shortcuts and mouse clicks in the app
+- TrainingPeaks Virtual / indieVelo
+- Biketerra.com (they do offer native integration already - check it out)
+- Rouvy (most Zwift devices are already supported by Rouvy)
+- any other! You can add custom mapping and adjust touch points or keyboard shortcuts to your liking
 
 ## Supported Devices
 - Zwift Click
+- Zwift Click v2 (mostly, see issue #68)
 - Zwift Ride
 - Zwift Play
+- Elite Square Smart Frame (beta)
+- Wahoo Kickr Bike Shift (beta)
 
 ## Supported Platforms
-- Android
-- macOS
-- Windows 
-  - make sure you have installed the "[Microsoft Visual C++ Runtime libraries](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170)"
-  - Windows may flag the app as virus. I think it does so because the app does control the mouse and keyboard.
-- [Web](https://jonasbark.github.io/swiftcontrol/) (you won't be able to do much)
+
+| Platform you want to run your Trainer app, e.g. MyWhoosh on | Possible | Link                                                                                                                                                                                                                                                        | Information                                                                                                                                                                                                                                                                                                                                                                                                                            |
+|-------------------------------------------------------------|----------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Android                                                     | ✅        | <a href="https://play.google.com/store/apps/details?id=de.jonasbark.swiftcontrol"><img width="270" height="80" alt="GetItOnGooglePlay_Badge_Web_color_English" src="https://github.com/user-attachments/assets/a059d5a1-2efb-4f65-8117-ef6a99823b21" /></a> |                                                                                                                                                                                                                                                                                                                                                                                                                                        |
+| iPad (and possibly Apple TV)                                | ✅        | <a href="https://apps.apple.com/us/app/swiftcontrol/id6753721284?platform=iphone"><img width="270" height="80" alt="App Store" src="https://github.com/user-attachments/assets/c23f977a-48f6-4951-811e-ae530dbfa014" /></a>                                 | You will need to use SwiftControl as a "remote" to control the trainer app on your iPad. Typically you would use an iPhone or an Android phone for that.                                                                                                                                                                                                                                                                               |
+| Windows                                                     | ✅        | [Get it here](https://github.com/jonasbark/swiftcontrol/releases)                                                                                                                                                                       | - Windows may flag the app as virus. It likely does so because the app controls the mouse and keyboard.<br>- Bluetooth connection unstable? You may need to use an [external Bluetooth adapter](https://github.com/jonasbark/swiftcontrol/issues/14#issuecomment-3193839509).<br>- Make sure your Zwift device is not paired with Windows Bluetooth settings: [more information](https://github.com/jonasbark/swiftcontrol/issues/70). |
+| macOS                                                       | ✅        | <a href="https://apps.apple.com/us/app/swiftcontrol/id6753721284?platform=mac"><img width="270" height="80" alt="Mac App Store" src="https://github.com/user-attachments/assets/b3552436-409c-43b0-ba7d-b6a72ae30ff1" /></a>                                |                                                                                                                                                                                                                                                                                                                                                                                                                                        |
+| iPhone                                                      | ❌        |                                                                                                                                                                                                                                                             | Note that you can't run SwiftControl and your trainer app on the same iPhone due to iOS limitations, but you can use it to remotely control MyWhoosh and similar on e.g. an iPad.                                                                                                                                                                                                                                                      |
+
+
+For testing purposes you can also run it on [Web](https://jonasbark.github.io/swiftcontrol/) but this is just a tech demo - you won't be able to control other apps.
 
 ## Troubleshooting
-Your Zwift device is found but connection does not work properly? You may need to update the firmware in Zwift Companion app.
+Check the troubleshooting guide [here](TROUBLESHOOTING.md).
 
 ## How does it work?
-The app connects to your Zwift device automatically. 
+The app connects to your Zwift devices automatically. It does not connect to your trainer itself.
 
-- When using Android a "click" on a certain part of the screen is simulated to trigger the action.
-- When using macOS or Windows a keyboard or mouse click is used to trigger the action. 
-  - there are predefined Keymaps for MyWhoosh and indieVelo / Training Peaks
+- **Android**: SwiftControl uses the AccessibilityService API to simulate touch gestures on specific parts of your screen to trigger actions in training apps. The service monitors which training app window is currently active to ensure gestures are sent to the correct app.
+- **iOS**: use SwiftControl as "remote control" for other devices, such as an iPad. Example scenario:
+  - your phone (Android/iOS) runs SwiftControl and connects to your Zwift devices
+  - your iPad or other tablet runs e.g. MyWhoosh (does not need to have SwiftControl installed)
+  - after pairing SwiftControl to your iPad / tablet via Bluetooth your phone will send the button presses to your iPad / tablet
+- **macOS** / **Windows** a keyboard or mouse click is used to trigger the action. 
+  - there are predefined Keymaps for MyWhoosh, indieVelo / Training Peaks, and others
   - you can also create your own Keymaps for any other app
   - you can also use the mouse to click on a certain part of the screen, or use keyboard shortcuts
+</details>
+
+## Alternatives
+- [qdomyos-zwift](https://www.qzfitness.com/) directly controls the trainer (as opposed to controlling the trainer app). This can be useful if your trainer app does not support virtual shifting.
 
 ## Donate
 Please consider donating to support the development of this app :)
 
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/boni)
-
+- [via PayPal](https://paypal.me/boni)
+- [via Credit Card, Google Pay, Apple Pay, etc (USD)](https://donate.stripe.com/8x24gzc5c4ZE3VJdt36J201)
+- [via Credit Card, Google Pay, Apple Pay, etc (EUR)](https://donate.stripe.com/9B6aEX0muajY8bZ1Kl6J200)

TROUBLESHOOTING.md

@@ -0,0 +1,28 @@
+## Click device cannot be found
+You may need to update the firmware in Zwift Companion app.
+
+## Click device does not send any data
+You may need to update the firmware in Zwift Companion app.
+
+## My Click v2 disconnects after a minute
+Check [this](https://github.com/jonasbark/swiftcontrol/issues/68) discussion.
+
+To make your Click V2 work best you should connect it in the Zwift app once each day.
+If you don't do that SwiftControl will need to reconnect every minute.
+
+1. Open Zwift app (not the Companion)
+2. Log in (subscription not required) and open the device connection screen
+3. Connect your Trainer, then connect the Click V2
+4. Close the Zwift app again and connect again in SwiftControl
+
+## Remote control is not working - nothing happens
+- Try to unpair it from your phone / computer Bluetooth settings, then re-pair it.
+- Try restarting the pairing process in SwiftControl
+- try restarting Bluetooth on your phone and on the device you want to control
+- If your other device is an iOS device, go to Settings > Accessibility > Touch > AssistiveTouch > Pointer Devices > Devices and pair your device. Make sure AssistiveTouch is enabled.
+- it is very important that both devices (e.g. iPhone and iPad) receive the "pairing dialog" after initial connection. If you miss it, unpair and try again. It may take a few seconds for the dialog to appear. Afterwards you may need to click on "Reconnect" in SwiftControl / restart SwiftControl.
+
+## Remote control only clicks on a single coordinate on my iPad
+iOS seems to be buggy here - try this in the iOS settings:
+AssistiveTouch settings > Pointer Devices > Devices > Connected Devices > iPhone (or SwiftControl iOS) > Button 1 
+switch the setting to None, then back to Single-Tap and it should work again

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

@@ -4,7 +4,12 @@
 
 
 import android.util.Log
-import io.flutter.plugin.common.*
+import io.flutter.plugin.common.BasicMessageChannel
+import io.flutter.plugin.common.BinaryMessenger
+import io.flutter.plugin.common.EventChannel
+import io.flutter.plugin.common.MessageCodec
+import io.flutter.plugin.common.StandardMethodCodec
+import io.flutter.plugin.common.StandardMessageCodec
 import java.io.ByteArrayOutputStream
 import java.nio.ByteBuffer
 
@@ -134,7 +139,7 @@ val AccessibilityApiPigeonMethodCodec = StandardMethodCodec(AccessibilityApiPige
 interface Accessibility {
   fun hasPermission(): Boolean
   fun openPermissions()
-  fun performTouch(x: Double, y: Double)
+  fun performTouch(x: Double, y: Double, isKeyDown: Boolean, isKeyUp: Boolean)
   fun controlMedia(action: MediaAction)
 
   companion object {
@@ -184,8 +189,10 @@ interface Accessibility {
             val args = message as List<Any?>
             val xArg = args[0] as Double
             val yArg = args[1] as Double
+            val isKeyDownArg = args[2] as Boolean
+            val isKeyUpArg = args[3] as Boolean
             val wrapped: List<Any?> = try {
-              api.performTouch(xArg, yArg)
+              api.performTouch(xArg, yArg, isKeyDownArg, isKeyUpArg)
               listOf(null)
             } catch (exception: Throwable) {
               wrapError(exception)
@@ -235,9 +242,9 @@ private class AccessibilityApiPigeonStreamHandler<T>(
 }
 
 interface AccessibilityApiPigeonEventChannelWrapper<T> {
-  fun onListen(p0: Any?, sink: PigeonEventSink<T>) {}
+  open fun onListen(p0: Any?, sink: PigeonEventSink<T>) {}
 
-  fun onCancel(p0: Any?) {}
+  open fun onCancel(p0: Any?) {}
 }
 
 class PigeonEventSink<T>(private val sink: EventChannel.EventSink) {
@@ -253,7 +260,7 @@ class PigeonEventSink<T>(private val sink: EventChannel.EventSink) {
     sink.endOfStream()
   }
 }
-
+      
 abstract class StreamEventsStreamHandler : AccessibilityApiPigeonEventChannelWrapper<WindowEvent> {
   companion object {
     fun register(messenger: BinaryMessenger, streamHandler: StreamEventsStreamHandler, instanceName: String = "") {
@@ -266,4 +273,4 @@ abstract class StreamEventsStreamHandler : AccessibilityApiPigeonEventChannelWra
     }
   }
 }
-
+      

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

@@ -51,23 +51,27 @@ class AccessibilityPlugin: FlutterPlugin, Accessibility {
     }, Bundle.EMPTY)
   }
 
-  override fun performTouch(x: Double, y: Double) {
-    Observable.toService?.performTouch(x = x, y = y) ?: error("Service not running")
+  override fun performTouch(x: Double, y: Double, isKeyDown: Boolean, isKeyUp: Boolean) {
+    Observable.toService?.performTouch(x = x, y = y, isKeyUp = isKeyUp, isKeyDown = isKeyDown) ?: error("Service not running")
   }
 
   override fun controlMedia(action: MediaAction) {
     val audioService = context.getSystemService(Context.AUDIO_SERVICE) as android.media.AudioManager
     when (action) {
       MediaAction.PLAY_PAUSE -> {
-        audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_DOWN, android.view.KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE))
-        audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_UP, android.view.KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE))
+          audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_DOWN, android.view.KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE))
+          audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_UP, android.view.KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE))
       }
       MediaAction.NEXT -> {
-        audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_DOWN, android.view.KeyEvent.KEYCODE_MEDIA_NEXT))
-        audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_UP, android.view.KeyEvent.KEYCODE_MEDIA_NEXT))
+          audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_DOWN, android.view.KeyEvent.KEYCODE_MEDIA_NEXT))
+          audioService.dispatchMediaKeyEvent(android.view.KeyEvent(android.view.KeyEvent.ACTION_UP, android.view.KeyEvent.KEYCODE_MEDIA_NEXT))
+      }
+      MediaAction.VOLUME_DOWN -> {
+          audioService.adjustVolume(android.media.AudioManager.ADJUST_LOWER, android.media.AudioManager.FLAG_SHOW_UI)
+      }
+      MediaAction.VOLUME_UP -> {
+          audioService.adjustVolume(android.media.AudioManager.ADJUST_RAISE, android.media.AudioManager.FLAG_SHOW_UI)
       }
-      MediaAction.VOLUME_DOWN -> audioService.adjustVolume(android.media.AudioManager.ADJUST_LOWER, android.media.AudioManager.FLAG_SHOW_UI)
-      MediaAction.VOLUME_UP -> audioService.adjustVolume(android.media.AudioManager.ADJUST_RAISE, android.media.AudioManager.FLAG_SHOW_UI)
     }
   }
 

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

@@ -41,27 +41,24 @@ class AccessibilityService : AccessibilityService(), Listener {
 
     private fun getWindowSize(): Rect {
         val outBounds = Rect()
-        rootInActiveWindow.getBoundsInScreen(outBounds)
+        rootInActiveWindow?.getBoundsInScreen(outBounds)
         return outBounds
     }
 
-    private fun simulateTap(x: Double, y: Double) {
-        val gestureBuilder = GestureDescription.Builder()
-        val path = Path()
-        path.moveTo(x.toFloat(), y.toFloat())
-        path.lineTo(x.toFloat()+1, y.toFloat())
-
-        val stroke = StrokeDescription(path, 0, ViewConfiguration.getTapTimeout().toLong())
-        gestureBuilder.addStroke(stroke)
-
-        dispatchGesture(gestureBuilder.build(), null, null)
-    }
 
     override fun onInterrupt() {
         Log.d("AccessibilityService", "Service Interrupted")
     }
 
-    override fun performTouch(x: Double, y: Double) {
-        simulateTap(x, y)
+    override fun performTouch(x: Double, y: Double, isKeyDown: Boolean, isKeyUp: Boolean) {
+        val gestureBuilder = GestureDescription.Builder()
+        val path = Path()
+        path.moveTo(x.toFloat(), y.toFloat())
+        path.lineTo(x.toFloat()+1, y.toFloat())
+
+        val stroke = StrokeDescription(path, 0, ViewConfiguration.getTapTimeout().toLong(), isKeyDown && !isKeyUp)
+        gestureBuilder.addStroke(stroke)
+
+        dispatchGesture(gestureBuilder.build(), null, null)
     }
 }

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

@@ -8,9 +8,9 @@ object Observable {
 }
 
 interface Listener {
-    fun performTouch(x: Double, y: Double)
+    fun performTouch(x: Double, y: Double, isKeyDown: Boolean, isKeyUp: Boolean)
 }
 
 interface Receiver {
     fun onChange(packageName: String, window: Rect)
-}
+}

accessibility/api.dart

@@ -6,7 +6,7 @@ abstract class Accessibility {
 
   void openPermissions();
 
-  void performTouch(double x, double y);
+  void performTouch(double x, double y, {bool isKeyDown = true, bool isKeyUp = false});
 
   void controlMedia(MediaAction action);
 }

accessibility/lib/accessibility.dart

@@ -187,14 +187,14 @@ class Accessibility {
     }
   }
 
-  Future<void> performTouch(double x, double y) async {
+  Future<void> performTouch(double x, double y, {bool isKeyDown = true, bool isKeyUp = false, }) async {
     final String pigeonVar_channelName = 'dev.flutter.pigeon.accessibility.Accessibility.performTouch$pigeonVar_messageChannelSuffix';
     final BasicMessageChannel<Object?> pigeonVar_channel = BasicMessageChannel<Object?>(
       pigeonVar_channelName,
       pigeonChannelCodec,
       binaryMessenger: pigeonVar_binaryMessenger,
     );
-    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[x, y]);
+    final Future<Object?> pigeonVar_sendFuture = pigeonVar_channel.send(<Object?>[x, y, isKeyDown, isKeyUp]);
     final List<Object?>? pigeonVar_replyList =
         await pigeonVar_sendFuture as List<Object?>?;
     if (pigeonVar_replyList == null) {

analysis_options.yaml

@@ -23,6 +23,10 @@ linter:
   rules:
     # avoid_print: false  # Uncomment to disable the `avoid_print` rule
     # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
+    - require_trailing_commas
 
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options
+formatter:
+  page_width: 120
+  trailing_commas: preserve

android/app/build.gradle.kts

@@ -14,7 +14,7 @@ val keystoreProperties = Properties()
 keystoreProperties.load(FileInputStream(keystorePropertiesFile))
 
 android {
-    namespace = "de.jonasbark.swift_play"
+    namespace = "de.jonasbark.swiftcontrol"
     compileSdk = flutter.compileSdkVersion
     ndkVersion = "27.0.12077973"
 
@@ -32,7 +32,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "de.jonasbark.swift_play"
+        applicationId = "de.jonasbark.swiftcontrol"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = 24

android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,9 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
     <!-- Allow Bluetooth -->
     <uses-feature android:name="android.hardware.bluetooth_le" android:required="true" />
 
+    <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE"/>
+
     <!-- New Bluetooth permissions in Android 12
     https://developer.android.com/about/versions/12/features/bluetooth-permissions -->
     <uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:usesPermissionFlags="neverForLocation" />
@@ -16,7 +18,7 @@
 
 
     <!-- legacy for Android 9 or lower -->
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" android:maxSdkVersion="28" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" android:maxSdkVersion="28" tools:replace="android:maxSdkVersion" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <!-- to check if you have the latest version -->

android/app/src/main/kotlin/de/jonasbark/swiftcontrol/MainActivity.kt

@@ -1,4 +1,4 @@
-package de.jonasbark.swift_play
+package de.jonasbark.swiftcontrol
 
 import io.flutter.embedding.android.FlutterActivity
 

android/settings.gradle.kts

@@ -18,8 +18,8 @@ pluginManagement {
 
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.7.0" apply false
-    id("org.jetbrains.kotlin.android") version "1.8.22" apply false
+    id("com.android.application") version "8.7.3" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
 }
 
 include(":app")

flutter_launcher_icons.yaml

@@ -9,9 +9,9 @@ flutter_launcher_icons:
   # adaptive_icon_foreground: "assets/icon/foreground.png"
   # adaptive_icon_monochrome: "assets/icon/monochrome.png"
 
-  ios: false
+  ios: true
   # image_path_ios: "assets/icon/icon.png"
-  remove_alpha_channel_ios: true
+  remove_alpha_ios: true
   # image_path_ios_dark_transparent: "assets/icon/icon_dark.png"
   # image_path_ios_tinted_grayscale: "assets/icon/icon_tinted.png"
   # desaturate_tinted_to_grayscale_ios: true

ios/ExportOptions.plist

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>destination</key>
+	<string>export</string>
+	<key>generateAppStoreInformation</key>
+	<false/>
+	<key>manageAppVersionAndBuildNumber</key>
+	<true/>
+	<key>method</key>
+	<string>app-store-connect</string>
+	<key>signingStyle</key>
+	<string>manual</string>
+    <key>provisioningProfiles</key>
+    <dict>
+        <key>de.jonasbark.swiftcontrol.darwin</key>
+        <string>ios app store</string>
+    </dict>
+	<key>stripSwiftSymbols</key>
+	<true/>
+	<key>teamID</key>
+	<string>UZRHKPVWN9</string>
+	<key>testFlightInternalTestingOnly</key>
+	<false/>
+	<key>uploadSymbols</key>
+	<true/>
+</dict>
+</plist>

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>12.0</string>
+  <string>13.0</string>
 </dict>
 </plist>

ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '12.0'
+# platform :ios, '13.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

ios/Podfile.lock

@@ -0,0 +1,91 @@
+PODS:
+  - bluetooth_low_energy_darwin (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - device_info_plus (0.0.1):
+    - Flutter
+  - Flutter (1.0.0)
+  - flutter_local_notifications (0.0.1):
+    - Flutter
+  - image_picker_ios (0.0.1):
+    - Flutter
+  - package_info_plus (0.4.5):
+    - Flutter
+  - permission_handler_apple (9.3.0):
+    - Flutter
+  - restart (1.0.0):
+    - Flutter
+  - restart_app (0.0.1):
+    - Flutter
+  - shared_preferences_foundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - universal_ble (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - url_launcher_ios (0.0.1):
+    - Flutter
+  - wakelock_plus (0.0.1):
+    - Flutter
+
+DEPENDENCIES:
+  - 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`)
+  - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
+  - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
+  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
+  - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
+  - restart (from `.symlinks/plugins/restart/ios`)
+  - restart_app (from `.symlinks/plugins/restart_app/ios`)
+  - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
+  - universal_ble (from `.symlinks/plugins/universal_ble/darwin`)
+  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
+  - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
+
+EXTERNAL SOURCES:
+  bluetooth_low_energy_darwin:
+    :path: ".symlinks/plugins/bluetooth_low_energy_darwin/darwin"
+  device_info_plus:
+    :path: ".symlinks/plugins/device_info_plus/ios"
+  Flutter:
+    :path: Flutter
+  flutter_local_notifications:
+    :path: ".symlinks/plugins/flutter_local_notifications/ios"
+  image_picker_ios:
+    :path: ".symlinks/plugins/image_picker_ios/ios"
+  package_info_plus:
+    :path: ".symlinks/plugins/package_info_plus/ios"
+  permission_handler_apple:
+    :path: ".symlinks/plugins/permission_handler_apple/ios"
+  restart:
+    :path: ".symlinks/plugins/restart/ios"
+  restart_app:
+    :path: ".symlinks/plugins/restart_app/ios"
+  shared_preferences_foundation:
+    :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
+  universal_ble:
+    :path: ".symlinks/plugins/universal_ble/darwin"
+  url_launcher_ios:
+    :path: ".symlinks/plugins/url_launcher_ios/ios"
+  wakelock_plus:
+    :path: ".symlinks/plugins/wakelock_plus/ios"
+
+SPEC CHECKSUMS:
+  bluetooth_low_energy_darwin: 764d8d1ae5abefbcdb839e812b4b25c0061fcf8b
+  device_info_plus: bf2e3232933866d73fe290f2942f2156cdd10342
+  Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
+  flutter_local_notifications: ff50f8405aaa0ccdc7dcfb9022ca192e8ad9688f
+  image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
+  package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
+  permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
+  restart: b5fe16e6e038f0024b2f3af43768e9d2a1557554
+  restart_app: 806659942bf932f6ce51c5372f91ce5e81c8c14a
+  shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
+  universal_ble: cf52a7b3fd2e7c14d6d7262e9fdadb72ab6b88a6
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
+  wakelock_plus: 76957ab028e12bfa4e66813c99e46637f367fc7e
+
+PODFILE CHECKSUM: 3c63482e143d1b91d2d2560aee9fb04ecc74ac7e
+
+COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj

@@ -10,10 +10,12 @@
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		3E50CA021EFA25CF89FE46AB /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2C0E42A04700D6B661C7EE82 /* Pods_RunnerTests.framework */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
 		97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
+		9DEFD285994D09CFCE400F36 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE7ADD07A99710C0FB974A8 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -40,14 +42,20 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		0CF32F9ECDBEA4B014717FF8 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		2C0E42A04700D6B661C7EE82 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
+		5CE7ADD07A99710C0FB974A8 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+		7D133E5D5548E2EF2879734F /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
+		86D436F6DAF367742EF27F51 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		8AA6D129479129F106E2298A /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -55,19 +63,43 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		DFFDC4B9C4D6EF6A3BDE2E73 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
+		EFDECED99A47773C293F8819 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+		5046C8DCA17DB268ED17F005 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				3E50CA021EFA25CF89FE46AB /* Pods_RunnerTests.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		97C146EB1CF9000F007C117D /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				9DEFD285994D09CFCE400F36 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		31E2F9ED567016937E8AEA3B /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				86D436F6DAF367742EF27F51 /* Pods-Runner.debug.xcconfig */,
+				0CF32F9ECDBEA4B014717FF8 /* Pods-Runner.release.xcconfig */,
+				7D133E5D5548E2EF2879734F /* Pods-Runner.profile.xcconfig */,
+				DFFDC4B9C4D6EF6A3BDE2E73 /* Pods-RunnerTests.debug.xcconfig */,
+				8AA6D129479129F106E2298A /* Pods-RunnerTests.release.xcconfig */,
+				EFDECED99A47773C293F8819 /* Pods-RunnerTests.profile.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
 		331C8082294A63A400263BE5 /* RunnerTests */ = {
 			isa = PBXGroup;
 			children = (
@@ -76,6 +108,15 @@
 			path = RunnerTests;
 			sourceTree = "<group>";
 		};
+		6A38311855DC1CB8C0E2FD04 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				5CE7ADD07A99710C0FB974A8 /* Pods_Runner.framework */,
+				2C0E42A04700D6B661C7EE82 /* Pods_RunnerTests.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
@@ -94,6 +135,8 @@
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
 				331C8082294A63A400263BE5 /* RunnerTests */,
+				31E2F9ED567016937E8AEA3B /* Pods */,
+				6A38311855DC1CB8C0E2FD04 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -128,8 +171,10 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
 			buildPhases = (
+				5E1D2B1ED00966C758CA2289 /* [CP] Check Pods Manifest.lock */,
 				331C807D294A63A400263BE5 /* Sources */,
 				331C807F294A63A400263BE5 /* Resources */,
+				5046C8DCA17DB268ED17F005 /* Frameworks */,
 			);
 			buildRules = (
 			);
@@ -145,12 +190,15 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
+				AF2FDC69578083D4D16AB4D6 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				EEF1FBDEE98BA93C4FBDB3AE /* [CP] Embed Pods Frameworks */,
+				1F0C44A79AE73641A1C3FF47 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -222,6 +270,23 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		1F0C44A79AE73641A1C3FF47 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -238,6 +303,28 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		5E1D2B1ED00966C758CA2289 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -253,6 +340,45 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		AF2FDC69578083D4D16AB4D6 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		EEF1FBDEE98BA93C4FBDB3AE /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -346,7 +472,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -361,16 +487,19 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 7BL8RUV2K6;
+				DEVELOPMENT_TEAM = UZRHKPVWN9;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = de.jonasbark.swiftPlay;
+				PRODUCT_BUNDLE_IDENTIFIER = de.jonasbark.swiftcontrol.darwin;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -379,6 +508,7 @@
 		};
 		331C8088294A63A400263BE5 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = DFFDC4B9C4D6EF6A3BDE2E73 /* Pods-RunnerTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -396,6 +526,7 @@
 		};
 		331C8089294A63A400263BE5 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = 8AA6D129479129F106E2298A /* Pods-RunnerTests.release.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -411,6 +542,7 @@
 		};
 		331C808A294A63A400263BE5 /* Profile */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = EFDECED99A47773C293F8819 /* Pods-RunnerTests.profile.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -428,7 +560,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -473,7 +605,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -485,7 +617,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -524,7 +656,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -541,16 +673,19 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 7BL8RUV2K6;
+				DEVELOPMENT_TEAM = UZRHKPVWN9;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = de.jonasbark.swiftPlay;
+				PRODUCT_BUNDLE_IDENTIFIER = de.jonasbark.swiftcontrol.darwin;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -564,16 +699,19 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 7BL8RUV2K6;
+				DEVELOPMENT_TEAM = UZRHKPVWN9;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = de.jonasbark.swiftPlay;
+				PRODUCT_BUNDLE_IDENTIFIER = de.jonasbark.swiftcontrol.darwin;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -54,6 +55,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

ios/Runner.xcworkspace/contents.xcworkspacedata

@@ -4,4 +4,7 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
 </Workspace>

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,122 +1 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}

ios/Runner/Info.plist

@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -24,6 +26,17 @@
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSBluetoothAlwaysUsageDescription</key>
+	<string>SwiftControl uses Bluetooth to connect to accessories.</string>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
+	<key>UIBackgroundModes</key>
+	<array>
+		<string>bluetooth-peripheral</string>
+		<string>bluetooth-central</string>
+	</array>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -41,9 +54,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
-	<key>UIApplicationSupportsIndirectInputEvents</key>
-	<true/>
 </dict>
 </plist>

keypress_simulator/packages/keypress_simulator/lib/src/keypress_simulator.dart

@@ -20,8 +20,12 @@ class KeyPressSimulator {
     return _platform.requestAccess(onlyOpenPrefPane: onlyOpenPrefPane);
   }
 
-  Future<void> simulateMouseClick(Offset position) {
-    return _platform.simulateMouseClick(position);
+  Future<void> simulateMouseClickDown(Offset position) {
+    return _platform.simulateMouseClick(position, keyDown: true);
+  }
+
+  Future<void> simulateMouseClickUp(Offset position) {
+    return _platform.simulateMouseClick(position, keyDown: false);
   }
 
   /// Simulate key down.

keypress_simulator/packages/keypress_simulator_macos/macos/Classes/KeypressSimulatorMacosPlugin.swift

@@ -62,6 +62,7 @@ public class KeypressSimulatorMacosPlugin: NSObject, FlutterPlugin {
 
         let x: Double = args["x"] as! Double
         let y: Double = args["y"] as! Double
+        let keyDown: Bool = args["keyDown"] as! Bool
 
         let point = CGPoint(x: x, y: y)
 
@@ -72,19 +73,21 @@ public class KeypressSimulatorMacosPlugin: NSObject, FlutterPlugin {
                            mouseButton: .left)
         move?.post(tap: .cghidEventTap)*/
 
-        // Mouse down
-        let mouseDown = CGEvent(mouseEventSource: nil,
-                                mouseType: .leftMouseDown,
-                                mouseCursorPosition: point,
-                                mouseButton: .left)
-        mouseDown?.post(tap: .cghidEventTap)
-
-        // Mouse up
-        let mouseUp = CGEvent(mouseEventSource: nil,
-                              mouseType: .leftMouseUp,
-                              mouseCursorPosition: point,
-                              mouseButton: .left)
-        mouseUp?.post(tap: .cghidEventTap)
+        if (keyDown) {
+            // Mouse down
+            let mouseDown = CGEvent(mouseEventSource: nil,
+                                    mouseType: .leftMouseDown,
+                                    mouseCursorPosition: point,
+                                    mouseButton: .left)
+            mouseDown?.post(tap: .cghidEventTap)
+        } else {
+            // Mouse up
+            let mouseUp = CGEvent(mouseEventSource: nil,
+                                  mouseType: .leftMouseUp,
+                                  mouseCursorPosition: point,
+                                  mouseButton: .left)
+            mouseUp?.post(tap: .cghidEventTap)
+        }
         result(true)
     }
 

keypress_simulator/packages/keypress_simulator_platform_interface/lib/src/keypress_simulator_method_channel.dart

@@ -53,10 +53,11 @@ class MethodChannelKeyPressSimulator extends KeyPressSimulatorPlatform {
   }
 
   @override
-  Future<void> simulateMouseClick(Offset position) async {
-    final Map<String, double> arguments = {
+  Future<void> simulateMouseClick(Offset position, {required bool keyDown}) async {
+    final Map<String, Object?> arguments = {
       'x': position.dx,
       'y': position.dy,
+      'keyDown': keyDown,
     };
     await methodChannel.invokeMethod('simulateMouseClick', arguments);
   }

keypress_simulator/packages/keypress_simulator_platform_interface/lib/src/keypress_simulator_platform_interface.dart

@@ -41,7 +41,7 @@ abstract class KeyPressSimulatorPlatform extends PlatformInterface {
     throw UnimplementedError('simulateKeyPress() has not been implemented.');
   }
 
-  Future<void> simulateMouseClick(Offset position) {
+  Future<void> simulateMouseClick(Offset position, {required bool keyDown}) {
     throw UnimplementedError('simulateKeyPress() has not been implemented.');
   }
 }

keypress_simulator/packages/keypress_simulator_windows/windows/keypress_simulator_windows_plugin.cpp

@@ -2,6 +2,9 @@
 
 // This must be included before many other Windows headers.
 #include <windows.h>
+#include <psapi.h>
+#include <string.h>
+#include <flutter_windows.h>
 
 #include <flutter/method_channel.h>
 #include <flutter/plugin_registrar_windows.h>
@@ -16,6 +19,16 @@ using flutter::EncodableValue;
 
 namespace keypress_simulator_windows {
 
+// Forward declarations
+struct FindWindowData {
+  std::string targetProcessName;
+  std::string targetWindowTitle;
+  HWND foundWindow;
+};
+
+BOOL CALLBACK EnumWindowsCallback(HWND hwnd, LPARAM lParam);
+HWND FindTargetWindow(const std::string& processName, const std::string& windowTitle);
+
 // static
 void KeypressSimulatorWindowsPlugin::RegisterWithRegistrar(
     flutter::PluginRegistrarWindows* registrar) {
@@ -54,33 +67,43 @@ void KeypressSimulatorWindowsPlugin::SimulateKeyPress(
     modifiers.push_back(key_modifier);
   }
 
-  INPUT input[6];
+  // List of compatible training apps to look for
+  std::vector<std::string> compatibleApps = {
+    "MyWhooshHD.exe",
+    "indieVelo.exe",
+    "biketerra.exe"
+  };
 
-  for (int32_t i = 0; i < modifiers.size(); i++) {
-    if (modifiers[i].compare("shiftModifier") == 0) {
-      input[i].ki.wVk = VK_SHIFT;
-    } else if (modifiers[i].compare("controlModifier") == 0) {
-      input[i].ki.wVk = VK_CONTROL;
-    } else if (modifiers[i].compare("altModifier") == 0) {
-      input[i].ki.wVk = VK_MENU;
-    } else if (modifiers[i].compare("metaModifier") == 0) {
-      input[i].ki.wVk = VK_LWIN;
+  // Try to find and focus a compatible app
+  HWND targetWindow = NULL;
+  for (const std::string& processName : compatibleApps) {
+    targetWindow = FindTargetWindow(processName, "");
+    if (targetWindow != NULL) {
+      // Only focus the window if it's not already in the foreground
+      if (GetForegroundWindow() != targetWindow) {
+        SetForegroundWindow(targetWindow);
+        Sleep(50); // Brief delay to ensure window is focused
+      }
+      break;
     }
-
-    input[i].ki.dwFlags = keyDown ? 0 : KEYEVENTF_KEYUP;
-    input[i].type = INPUT_KEYBOARD;
   }
 
-  /*int keyIndex = static_cast<int>(modifiers.size());
-  input[keyIndex].ki.wVk = static_cast<WORD>(keyCode);
-  input[keyIndex].ki.dwFlags = keyDown ? 0 : KEYEVENTF_KEYUP;
-  input[keyIndex].type = INPUT_KEYBOARD;*/
+  WORD sc = (WORD)MapVirtualKey(keyCode, MAPVK_VK_TO_VSC);
 
-  // Send key sequence to system
-  //SendInput(static_cast<UINT>(std::size(input)), input, sizeof(INPUT));
+  INPUT in = {0};
+  in.type = INPUT_KEYBOARD;
+  in.ki.wVk = 0;                 // when using SCANCODE, set VK=0
+  in.ki.wScan = sc;
+  in.ki.dwFlags = KEYEVENTF_SCANCODE | (keyDown ? 0 : KEYEVENTF_KEYUP);
+  if (keyCode == VK_LEFT || keyCode == VK_RIGHT || keyCode == VK_UP || keyCode == VK_DOWN ||
+    keyCode == VK_INSERT || keyCode == VK_DELETE || keyCode == VK_HOME || keyCode == VK_END ||
+    keyCode == VK_PRIOR || keyCode == VK_NEXT) {
+    in.ki.dwFlags |= KEYEVENTF_EXTENDEDKEY;
+  }
+  SendInput(1, &in, sizeof(INPUT));
 
-  BYTE byteValue = static_cast<BYTE>(keyCode);
-  keybd_event(byteValue, 0x45, keyDown ? 0 : KEYEVENTF_KEYUP, 0);
+  /*BYTE byteValue = static_cast<BYTE>(keyCode);
+  keybd_event(byteValue, 0x45, keyDown ? 0 : KEYEVENTF_KEYUP, 0);*/
 
   result->Success(flutter::EncodableValue(true));
 }
@@ -93,6 +116,7 @@ void KeypressSimulatorWindowsPlugin::SimulateMouseClick(
   double x = 0;
   double y = 0;
 
+  bool keyDown = std::get<bool>(args.at(EncodableValue("keyDown")));
   auto it_x = args.find(EncodableValue("x"));
   if (it_x != args.end() && std::holds_alternative<double>(it_x->second)) {
       x = std::get<double>(it_x->second);
@@ -103,24 +127,97 @@ void KeypressSimulatorWindowsPlugin::SimulateMouseClick(
       y = std::get<double>(it_y->second);
   }
 
+  // Get the monitor containing the target point and its DPI
+  const POINT target_point = {static_cast<LONG>(x), static_cast<LONG>(y)};
+  HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST);
+  UINT dpi = FlutterDesktopGetDpiForMonitor(monitor);
+  double scale_factor = dpi / 96.0;
+  
+  // Scale the coordinates according to the DPI scaling
+  int scaled_x = static_cast<int>(x * scale_factor);
+  int scaled_y = static_cast<int>(y * scale_factor);
+
   // Move the mouse to the specified coordinates
-  SetCursorPos(static_cast<int>(x), static_cast<int>(y));
+  SetCursorPos(scaled_x, scaled_y);
 
   // Prepare input for mouse down and up
   INPUT input = {0};
   input.type = INPUT_MOUSE;
 
-  // Mouse left button down
-  input.mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
-  SendInput(1, &input, sizeof(INPUT));
+  if (keyDown) {
+      // Mouse left button down
+      input.mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
+      SendInput(1, &input, sizeof(INPUT));
 
-  // Mouse left button up
-  input.mi.dwFlags = MOUSEEVENTF_LEFTUP;
-  SendInput(1, &input, sizeof(INPUT));
+  } else {
+      // Mouse left button up
+      input.mi.dwFlags = MOUSEEVENTF_LEFTUP;
+      SendInput(1, &input, sizeof(INPUT));
+  }
 
   result->Success(flutter::EncodableValue(true));
 }
 
+BOOL CALLBACK EnumWindowsCallback(HWND hwnd, LPARAM lParam) {
+  FindWindowData* data = reinterpret_cast<FindWindowData*>(lParam);
+
+  // Check if window is visible and not minimized
+  if (!IsWindowVisible(hwnd) || IsIconic(hwnd)) {
+    return TRUE; // Continue enumeration
+  }
+
+  // Get window title
+  char windowTitle[256];
+  GetWindowTextA(hwnd, windowTitle, sizeof(windowTitle));
+
+  // Get process name
+  DWORD processId;
+  GetWindowThreadProcessId(hwnd, &processId);
+  HANDLE hProcess = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, processId);
+  char processName[MAX_PATH];
+  if (hProcess) {
+    DWORD size = sizeof(processName);
+    if (QueryFullProcessImageNameA(hProcess, 0, processName, &size)) {
+      // Extract just the filename from the full path
+      char* filename = strrchr(processName, '\\');
+      if (filename) {
+        filename++; // Skip the backslash
+      } else {
+        filename = processName;
+      }
+
+      // Check if this matches our target
+      if (!data->targetProcessName.empty() &&
+          _stricmp(filename, data->targetProcessName.c_str()) == 0) {
+        data->foundWindow = hwnd;
+        return FALSE; // Stop enumeration
+      }
+    }
+    CloseHandle(hProcess);
+  }
+
+  // Check window title if process name didn't match
+  if (!data->targetWindowTitle.empty() &&
+      _stricmp(windowTitle, data->targetWindowTitle.c_str()) == 0) {
+    data->foundWindow = hwnd;
+    return FALSE; // Stop enumeration
+  }
+
+  return TRUE; // Continue enumeration
+}
+
+HWND FindTargetWindow(const std::string& processName, const std::string& windowTitle) {
+  FindWindowData data;
+  data.targetProcessName = processName;
+  data.targetWindowTitle = windowTitle;
+  data.foundWindow = NULL;
+
+  EnumWindows(EnumWindowsCallback, reinterpret_cast<LPARAM>(&data));
+  return data.foundWindow;
+}
+
+
+
 void KeypressSimulatorWindowsPlugin::HandleMethodCall(
     const flutter::MethodCall<flutter::EncodableValue>& method_call,
     std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result) {

keypress_simulator/packages/keypress_simulator_windows/windows/keypress_simulator_windows_plugin.h

@@ -30,6 +30,8 @@ class KeypressSimulatorWindowsPlugin : public flutter::Plugin {
       const flutter::MethodCall<flutter::EncodableValue>& method_call,
       std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result);
 
+
+
   // Called when a method is called on this plugin's channel from Dart.
   void HandleMethodCall(
       const flutter::MethodCall<flutter::EncodableValue>& method_call,

lib/bluetooth/ble.dart

@@ -1,6 +1,12 @@
-import 'dart:typed_data';
+import 'package:flutter/services.dart';
 
 class BleUuid {
+  static final DEVICE_INFORMATION_SERVICE_UUID = "0000180a-0000-1000-8000-00805f9b34fb".toLowerCase();
+  static final DEVICE_INFORMATION_CHARACTERISTIC_FIRMWARE_REVISION = "00002a26-0000-1000-8000-00805f9b34fb"
+      .toLowerCase();
+
+  static final DEVICE_BATTERY_SERVICE_UUID = "0000180f-0000-1000-8000-00805f9b34fb".toLowerCase();
+  static final DEVICE_INFORMATION_CHARACTERISTIC_BATTERY_LEVEL = "00002a19-0000-1000-8000-00805f9b34fb".toLowerCase();
   static final ZWIFT_CUSTOM_SERVICE_UUID = "00000001-19CA-4651-86E5-FA29DCDD09D1".toLowerCase();
   static final ZWIFT_RIDE_CUSTOM_SERVICE_UUID = "0000fc82-0000-1000-8000-00805f9b34fb".toLowerCase();
   static final ZWIFT_ASYNC_CHARACTERISTIC_UUID = "00000002-19CA-4651-86E5-FA29DCDD09D1".toLowerCase();
@@ -9,7 +15,7 @@ class BleUuid {
 }
 
 class Constants {
-  static const ZWIFT_MANUFACTURER_ID = 2378; // Zwift, Inc
+  static const ZWIFT_MANUFACTURER_ID = 2378; // Zwift, Inc => 0x094A
 
   // Zwift Play = RC1
   static const RC1_LEFT_SIDE = 0x03;
@@ -22,6 +28,11 @@ class Constants {
   // Zwift Click = BC1
   static const BC1 = 0x09;
 
+  // Zwift Click v2 Right (unconfirmed)
+  static const CLICK_V2_RIGHT_SIDE = 0x0A;
+  // Zwift Click v2 Right (unconfirmed)
+  static const CLICK_V2_LEFT_SIDE = 0x0B;
+
   static final RIDE_ON = Uint8List.fromList([0x52, 0x69, 0x64, 0x65, 0x4f, 0x6e]);
   static final VIBRATE_PATTERN = Uint8List.fromList([0x12, 0x12, 0x08, 0x0A, 0x06, 0x08, 0x02, 0x10, 0x00, 0x18]);
 
@@ -29,11 +40,45 @@ class Constants {
   static final REQUEST_START = Uint8List.fromList([0, 9]); //byteArrayOf(1, 2)
   static final RESPONSE_START_CLICK = Uint8List.fromList([1, 3]); // from device
   static final RESPONSE_START_PLAY = Uint8List.fromList([1, 4]); // from device
+  static final RESPONSE_START_CLICK_V2 = Uint8List.fromList([0x02, 0x03]); // from device
+  static final RESPONSE_STOPPED_CLICK_V2 = Uint8List.fromList([
+    0xff,
+    0x05,
+    0x00,
+    0xea,
+    0x05,
+    0x19,
+    0x0a,
+    0x0c,
+    0x35,
+    0x38,
+    0x44,
+    0x31,
+    0x35,
+    0x41,
+    0x42,
+    0x42,
+    0x34,
+    0x33,
+    0x36,
+    0x33,
+    0x10,
+    0x01,
+    0x18,
+    0x84,
+    0x07,
+    0x20,
+    0x08,
+    0x28,
+    0x09,
+    0x30,
+  ]); // from device
 
   // Message types received from device
   static const CONTROLLER_NOTIFICATION_MESSAGE_TYPE = 07;
   static const EMPTY_MESSAGE_TYPE = 21;
   static const BATTERY_LEVEL_TYPE = 25;
+  static const UNKNOWN_CLICKV2_TYPE = 0x3C;
 
   // not figured out the protobuf type this really is, the content is just two varints.
   static const int CLICK_NOTIFICATION_MESSAGE_TYPE = 55;
@@ -46,6 +91,8 @@ class Constants {
 
 enum DeviceType {
   click,
+  clickV2Right,
+  clickV2Left,
   playLeft,
   playRight,
   rideRight,
@@ -61,6 +108,10 @@ enum DeviceType {
     switch (data) {
       case Constants.BC1:
         return DeviceType.click;
+      case Constants.CLICK_V2_RIGHT_SIDE:
+        return DeviceType.clickV2Right;
+      case Constants.CLICK_V2_LEFT_SIDE:
+        return DeviceType.clickV2Left;
       case Constants.RC1_LEFT_SIDE:
         return DeviceType.playLeft;
       case Constants.RC1_RIGHT_SIDE:

lib/bluetooth/connection.dart

@@ -3,6 +3,9 @@ import 'dart:io';
 
 import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:swift_control/main.dart';
+import 'package:swift_control/utils/actions/android.dart';
 import 'package:swift_control/utils/requirements/android.dart';
 import 'package:universal_ble/universal_ble.dart';
 
@@ -12,7 +15,7 @@ import 'messages/notification.dart';
 
 class Connection {
   final devices = <BaseDevice>[];
-  var androidNotificationsSetup = false;
+  var _androidNotificationsSetup = false;
 
   final _connectionQueue = <BaseDevice>[];
   var _handlingConnectionQueue = false;
@@ -21,7 +24,7 @@ class Connection {
   final StreamController<BaseNotification> _actionStreams = StreamController<BaseNotification>.broadcast();
   Stream<BaseNotification> get actionStream => _actionStreams.stream;
 
-  final Map<BaseDevice, StreamSubscription<BleConnectionUpdate>> _connectionSubscriptions = {};
+  final Map<BaseDevice, StreamSubscription<bool>> _connectionSubscriptions = {};
   final StreamController<BaseDevice> _connectionStreams = StreamController<BaseDevice>.broadcast();
   Stream<BaseDevice> get connectionStream => _connectionStreams.stream;
 
@@ -34,11 +37,16 @@ class Connection {
       if (_lastScanResult.none((e) => e.deviceId == result.deviceId)) {
         _lastScanResult.add(result);
         final scanResult = BaseDevice.fromScanResult(result);
-        _actionStreams.add(
-          LogNotification('Found new device: ${result.name ?? scanResult?.runtimeType ?? result.deviceId}'),
-        );
+
         if (scanResult != null) {
+          _actionStreams.add(LogNotification('Found new device: ${scanResult.runtimeType}'));
           _addDevices([scanResult]);
+        } else {
+          final manufacturerData = result.manufacturerDataList;
+          final data = manufacturerData
+              .firstOrNullWhere((e) => e.companyId == Constants.ZWIFT_MANUFACTURER_ID)
+              ?.payload;
+          _actionStreams.add(LogNotification('Found unknown device with identifier: ${data?.firstOrNull}'));
         }
       }
     };
@@ -47,6 +55,7 @@ class Connection {
       final device = devices.firstOrNullWhere((e) => e.device.deviceId == deviceId);
       if (device == null) {
         _actionStreams.add(LogNotification('Device not found: $deviceId'));
+        UniversalBle.disconnect(deviceId);
         return;
       } else {
         device.processCharacteristic(characteristicUuid, value);
@@ -61,7 +70,7 @@ class Connection {
     // does not work on web, may not work on Windows
     if (!kIsWeb && !Platform.isWindows) {
       UniversalBle.getSystemDevices(
-        withServices: [BleUuid.ZWIFT_CUSTOM_SERVICE_UUID, BleUuid.ZWIFT_RIDE_CUSTOM_SERVICE_UUID],
+        withServices: BaseDevice.servicesToScan,
       ).then((devices) async {
         final baseDevices = devices.mapNotNull(BaseDevice.fromScanResult).toList();
         if (baseDevices.isNotEmpty) {
@@ -71,8 +80,8 @@ class Connection {
     }
 
     await UniversalBle.startScan(
-      scanFilter: ScanFilter(withServices: [BleUuid.ZWIFT_CUSTOM_SERVICE_UUID, BleUuid.ZWIFT_RIDE_CUSTOM_SERVICE_UUID]),
-      platformConfig: PlatformConfig(web: WebOptions(optionalServices: [BleUuid.ZWIFT_CUSTOM_SERVICE_UUID])),
+      scanFilter: ScanFilter(withServices: BaseDevice.servicesToScan),
+      platformConfig: PlatformConfig(web: WebOptions(optionalServices: BaseDevice.servicesToScan)),
     );
     Future.delayed(Duration(seconds: 30)).then((_) {
       if (isScanning.value) {
@@ -90,8 +99,8 @@ class Connection {
     _handleConnectionQueue();
 
     hasDevices.value = devices.isNotEmpty;
-    if (devices.isNotEmpty && !androidNotificationsSetup && !kIsWeb && Platform.isAndroid) {
-      androidNotificationsSetup = true;
+    if (devices.isNotEmpty && !_androidNotificationsSetup && !kIsWeb && Platform.isAndroid) {
+      _androidNotificationsSetup = true;
       NotificationRequirement.setup().catchError((e) {
         _actionStreams.add(LogNotification(e.toString()));
       });
@@ -128,7 +137,7 @@ class Connection {
         _actionStreams.add(data);
       });
       final connectionStateSubscription = UniversalBle.connectionStream(bleDevice.device.deviceId).listen((state) {
-        bleDevice.isConnected = state.isConnected;
+        bleDevice.isConnected = state;
         _connectionStreams.add(bleDevice);
         if (!bleDevice.isConnected) {
           devices.remove(bleDevice);
@@ -159,6 +168,11 @@ class Connection {
   }
 
   void reset() {
+    _actionStreams.add(LogNotification('Disconnecting all devices'));
+    if (actionHandler is AndroidActions) {
+      AndroidFlutterLocalNotificationsPlugin().stopForegroundService();
+      _androidNotificationsSetup = false;
+    }
     UniversalBle.stopScan();
     isScanning.value = false;
     for (var device in devices) {
@@ -173,6 +187,10 @@ class Connection {
     devices.clear();
   }
 
+  void signalNotification(BaseNotification notification) {
+    _actionStreams.add(notification);
+  }
+
   void signalChange(BaseDevice baseDevice) {
     _connectionStreams.add(baseDevice);
   }

lib/bluetooth/devices/base_device.dart

@@ -1,51 +1,73 @@
 import 'dart:async';
-import 'dart:io';
 
 import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
 import 'package:swift_control/bluetooth/ble.dart';
-import 'package:swift_control/bluetooth/devices/zwift_click.dart';
-import 'package:swift_control/bluetooth/devices/zwift_play.dart';
-import 'package:swift_control/bluetooth/devices/zwift_ride.dart';
+import 'package:swift_control/bluetooth/devices/wahoo/wahoo_kickr_bike_shift.dart';
+import 'package:swift_control/bluetooth/devices/zwift/zwift_click.dart';
+import 'package:swift_control/bluetooth/devices/zwift/zwift_clickv2.dart';
+import 'package:swift_control/bluetooth/devices/zwift/zwift_play.dart';
+import 'package:swift_control/bluetooth/devices/zwift/zwift_ride.dart';
 import 'package:swift_control/main.dart';
-import 'package:swift_control/utils/crypto/local_key_provider.dart';
-import 'package:swift_control/utils/crypto/zap_crypto.dart';
-import 'package:swift_control/utils/single_line_exception.dart';
+import 'package:swift_control/utils/actions/desktop.dart';
 import 'package:universal_ble/universal_ble.dart';
 
-import '../../utils/crypto/encryption_utils.dart';
 import '../../utils/keymap/buttons.dart';
 import '../messages/notification.dart';
+import 'elite/elite_square.dart';
 
 abstract class BaseDevice {
   final BleDevice scanResult;
-  BaseDevice(this.scanResult);
+  final bool isBeta;
+  final List<ControllerButton> availableButtons;
 
-  final zapEncryption = ZapCrypto(LocalKeyProvider());
+  BaseDevice(this.scanResult, {required this.availableButtons, this.isBeta = false});
 
   bool isConnected = false;
+  int? batteryLevel;
+  String? firmwareVersion;
 
-  bool supportsEncryption = true;
-
-  BleCharacteristic? syncRxCharacteristic;
   Timer? _longPressTimer;
+  Set<ControllerButton> _previouslyPressedButtons = <ControllerButton>{};
 
-  List<int> get startCommand => Constants.RIDE_ON + Constants.RESPONSE_START_CLICK;
-  String get customServiceId => BleUuid.ZWIFT_CUSTOM_SERVICE_UUID;
+  static List<String> servicesToScan = [
+    BleUuid.ZWIFT_CUSTOM_SERVICE_UUID,
+    BleUuid.ZWIFT_RIDE_CUSTOM_SERVICE_UUID,
+    SquareConstants.SERVICE_UUID,
+    WahooKickrBikeShiftConstants.SERVICE_UUID,
+  ];
 
   static BaseDevice? fromScanResult(BleDevice scanResult) {
     // Use the name first as the "System Devices" and Web (android sometimes Windows) don't have manufacturer data
-    final device = switch (scanResult.name) {
-      //'Zwift Ride' => ZwiftRide(scanResult), special case for Zwift Ride: we must only connect to the left controller
-      // https://www.makinolo.com/blog/2024/07/26/zwift-ride-protocol/
-      'Zwift Play' => ZwiftPlay(scanResult),
-      'Zwift Click' => ZwiftClick(scanResult),
-      _ => null,
-    };
+    BaseDevice? device;
+    if (kIsWeb) {
+      device = switch (scanResult.name) {
+        'Zwift Ride' => ZwiftRide(scanResult),
+        'Zwift Play' => ZwiftPlay(scanResult),
+        'Zwift Click' => ZwiftClickV2(scanResult),
+        'SQUARE' => EliteSquare(scanResult),
+        _ => null,
+      };
+
+      if (scanResult.name != null && scanResult.name!.toUpperCase().startsWith('KICKR BIKE SHIFT')) {
+        device = WahooKickrBikeShift(scanResult);
+      }
+    } else {
+      device = switch (scanResult.name) {
+        //'Zwift Ride' => ZwiftRide(scanResult), special case for Zwift Ride: we must only connect to the left controller
+        // https://www.makinolo.com/blog/2024/07/26/zwift-ride-protocol/
+        'Zwift Play' => ZwiftPlay(scanResult),
+        //'Zwift Click' => ZwiftClick(scanResult), special case for Zwift Click v2: we must only connect to the left controller
+        _ => null,
+      };
+    }
 
     if (device != null) {
       return device;
-    } else {
+    } else if (scanResult.services.containsAny([
+      BleUuid.ZWIFT_CUSTOM_SERVICE_UUID,
+      BleUuid.ZWIFT_RIDE_CUSTOM_SERVICE_UUID,
+    ])) {
       // otherwise use the manufacturer data to identify the device
       final manufacturerData = scanResult.manufacturerDataList;
       final data = manufacturerData.firstOrNullWhere((e) => e.companyId == Constants.ZWIFT_MANUFACTURER_ID)?.payload;
@@ -59,10 +81,25 @@ abstract class BaseDevice {
         DeviceType.click => ZwiftClick(scanResult),
         DeviceType.playRight => ZwiftPlay(scanResult),
         DeviceType.playLeft => ZwiftPlay(scanResult),
-        //DeviceType.rideRight => ZwiftRide(scanResult), // see comment above
         DeviceType.rideLeft => ZwiftRide(scanResult),
+        //DeviceType.rideRight => ZwiftRide(scanResult), // see comment above
+        DeviceType.clickV2Left => ZwiftClickV2(scanResult),
+        //DeviceType.clickV2Right => ZwiftClickV2(scanResult), // see comment above
         _ => null,
       };
+    } else if (scanResult.services.contains(SquareConstants.SERVICE_UUID)) {
+      return EliteSquare(scanResult);
+    } else if (scanResult.services.contains(WahooKickrBikeShiftConstants.SERVICE_UUID)) {
+      if (scanResult.name != null && !scanResult.name!.toUpperCase().contains('KICKR BIKE SHIFT')) {
+        return WahooKickrBikeShift(scanResult);
+      } else if (kIsWeb && scanResult.name == null) {
+        // some devices don't broadcast the name, so we must rely on the service UUID
+        return WahooKickrBikeShift(scanResult);
+      } else {
+        return null;
+      }
+    } else {
+      return null;
     }
   }
 
@@ -82,7 +119,6 @@ abstract class BaseDevice {
   BleDevice get device => scanResult;
   final StreamController<BaseNotification> actionStreamInternal = StreamController<BaseNotification>.broadcast();
 
-  int? batteryLevel;
   Stream<BaseNotification> get actionStream => actionStreamInternal.stream;
 
   Future<void> connect() async {
@@ -92,195 +128,100 @@ abstract class BaseDevice {
 
     await UniversalBle.connect(device.deviceId);
 
-    if (!kIsWeb && Platform.isAndroid) {
-      //await UniversalBle.requestMtu(device.deviceId, 256);
+    if (!kIsWeb) {
+      await UniversalBle.requestMtu(device.deviceId, 517);
     }
 
     final services = await UniversalBle.discoverServices(device.deviceId);
-    await _handleServices(services);
+    await handleServices(services);
   }
 
-  Future<void> _handleServices(List<BleService> services) async {
-    final customService = services.firstOrNullWhere((service) => service.uuid == customServiceId);
+  Future<void> handleServices(List<BleService> services);
+  Future<void> processCharacteristic(String characteristic, Uint8List bytes);
 
-    if (customService == null) {
-      throw Exception(
-        'Custom service $customServiceId not found for device $this ${device.name ?? device.rawName}.\nYou may need to update the firmware in Zwift Companion app.\nWe found: ${services.joinToString(transform: (s) => s.uuid)}',
-      );
-    }
+  Future<void> handleButtonsClicked(List<ControllerButton>? buttonsClicked) async {
+    if (buttonsClicked == null) {
+      // ignore, no changes
+    } else if (buttonsClicked.isEmpty) {
+      actionStreamInternal.add(LogNotification('Buttons released'));
+      _longPressTimer?.cancel();
 
-    final asyncCharacteristic = customService.characteristics.firstOrNullWhere(
-      (characteristic) => characteristic.uuid == BleUuid.ZWIFT_ASYNC_CHARACTERISTIC_UUID,
-    );
-    final syncTxCharacteristic = customService.characteristics.firstOrNullWhere(
-      (characteristic) => characteristic.uuid == BleUuid.ZWIFT_SYNC_TX_CHARACTERISTIC_UUID,
-    );
-    syncRxCharacteristic = customService.characteristics.firstOrNullWhere(
-      (characteristic) => characteristic.uuid == BleUuid.ZWIFT_SYNC_RX_CHARACTERISTIC_UUID,
-    );
-
-    if (asyncCharacteristic == null || syncTxCharacteristic == null || syncRxCharacteristic == null) {
-      throw Exception('Characteristics not found');
-    }
-
-    await UniversalBle.setNotifiable(
-      device.deviceId,
-      customService.uuid,
-      asyncCharacteristic.uuid,
-      BleInputProperty.notification,
-    );
-    await UniversalBle.setNotifiable(
-      device.deviceId,
-      customService.uuid,
-      syncTxCharacteristic.uuid,
-      BleInputProperty.indication,
-    );
-
-    await _setupHandshake();
-  }
-
-  Future<void> _setupHandshake() async {
-    if (supportsEncryption) {
-      await UniversalBle.writeValue(
-        device.deviceId,
-        customServiceId,
-        syncRxCharacteristic!.uuid,
-        Uint8List.fromList([
-          ...Constants.RIDE_ON,
-          ...Constants.REQUEST_START,
-          ...zapEncryption.localKeyProvider.getPublicKeyBytes(),
-        ]),
-        BleOutputProperty.withoutResponse,
-      );
-    } else {
-      await UniversalBle.writeValue(
-        device.deviceId,
-        customServiceId,
-        syncRxCharacteristic!.uuid,
-        Constants.RIDE_ON,
-        BleOutputProperty.withoutResponse,
-      );
-    }
-  }
-
-  void processCharacteristic(String characteristic, Uint8List bytes) {
-    if (kDebugMode && false) {
-      print('Received $characteristic: ${bytes.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')}');
-      print('Received $characteristic: ${String.fromCharCodes(bytes)}');
-    }
-
-    if (bytes.isEmpty) {
-      return;
-    }
-
-    try {
-      if (bytes.startsWith(startCommand)) {
-        _processDevicePublicKeyResponse(bytes);
-      } else if (bytes.startsWith(Constants.RIDE_ON)) {
-        //print("Empty RideOn response - unencrypted mode");
-      } else if (!supportsEncryption || (bytes.length > Int32List.bytesPerElement + EncryptionUtils.MAC_LENGTH)) {
-        _processData(bytes);
+      // Handle release events for long press keys
+      final buttonsReleased = _previouslyPressedButtons.toList();
+      final isLongPress =
+          buttonsReleased.singleOrNull != null &&
+          actionHandler.supportedApp?.keymap.getKeyPair(buttonsReleased.single)?.isLongPress == true;
+      if (buttonsReleased.isNotEmpty && isLongPress) {
+        await performRelease(buttonsReleased);
       }
-    } catch (e, stackTrace) {
-      print("Error processing data: $e");
-      print("Stack Trace: $stackTrace");
-      if (e is SingleLineException) {
-        actionStreamInternal.add(LogNotification(e.message));
+      _previouslyPressedButtons.clear();
+    } else {
+      // Handle release events for buttons that are no longer pressed
+      final buttonsReleased = _previouslyPressedButtons.difference(buttonsClicked.toSet()).toList();
+      final wasLongPress =
+          buttonsReleased.singleOrNull != null &&
+          actionHandler.supportedApp?.keymap.getKeyPair(buttonsReleased.single)?.isLongPress == true;
+      if (buttonsReleased.isNotEmpty && wasLongPress) {
+        await performRelease(buttonsReleased);
+      }
+
+      final isLongPress =
+          buttonsClicked.singleOrNull != null &&
+          actionHandler.supportedApp?.keymap.getKeyPair(buttonsClicked.single)?.isLongPress == true;
+
+      if (!isLongPress &&
+          !(buttonsClicked.singleOrNull == ControllerButton.onOffLeft ||
+              buttonsClicked.singleOrNull == ControllerButton.onOffRight)) {
+        // we don't want to trigger the long press timer for the on/off buttons, also not when it's a long press key
+        _longPressTimer?.cancel();
+        _longPressTimer = Timer.periodic(const Duration(milliseconds: 350), (timer) async {
+          performClick(buttonsClicked);
+        });
+      }
+      // Update currently pressed buttons
+      _previouslyPressedButtons = buttonsClicked.toSet();
+
+      if (isLongPress) {
+        return performDown(buttonsClicked);
       } else {
-        actionStreamInternal.add(LogNotification("$e\n$stackTrace"));
+        return performClick(buttonsClicked);
       }
     }
   }
 
-  void _processDevicePublicKeyResponse(Uint8List bytes) {
-    final devicePublicKeyBytes = bytes.sublist(Constants.RIDE_ON.length + Constants.RESPONSE_START_CLICK.length);
-    zapEncryption.initialise(devicePublicKeyBytes);
-    if (kDebugMode) {
-      print("Device Public Key - ${devicePublicKeyBytes.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')}");
-    }
-  }
-
-  void _processData(Uint8List bytes) {
-    int type;
-    Uint8List message;
-
-    if (supportsEncryption) {
-      final counter = bytes.sublist(0, 4); // Int.SIZE_BYTES is 4
-      final payload = bytes.sublist(4);
-
-      if (zapEncryption.encryptionKeyBytes == null) {
-        actionStreamInternal.add(LogNotification('Encryption not initialized, yet.'));
-        return;
-      }
-
-      final data = zapEncryption.decrypt(counter, payload);
-      type = data[0];
-      message = data.sublist(1);
-    } else {
-      type = bytes[0];
-      message = bytes.sublist(1);
-    }
-
-    switch (type) {
-      case Constants.EMPTY_MESSAGE_TYPE:
-        //print("Empty Message"); // expected when nothing happening
-        break;
-      case Constants.BATTERY_LEVEL_TYPE:
-        if (batteryLevel != message[1]) {
-          batteryLevel = message[1];
-          connection.signalChange(this);
-        }
-        break;
-      case Constants.CLICK_NOTIFICATION_MESSAGE_TYPE:
-      case Constants.PLAY_NOTIFICATION_MESSAGE_TYPE:
-      case Constants.RIDE_NOTIFICATION_MESSAGE_TYPE: // untested
-        processClickNotification(message)
-            .then((buttonsClicked) async {
-              if (buttonsClicked == null) {
-                // ignore, no changes
-              } else if (buttonsClicked.isEmpty) {
-                actionStreamInternal.add(LogNotification('Buttons released'));
-                _longPressTimer?.cancel();
-              } else {
-                if (!(buttonsClicked.singleOrNull == ZwiftButton.onOffLeft ||
-                    buttonsClicked.singleOrNull == ZwiftButton.onOffRight)) {
-                  // we don't want to trigger the long press timer for the on/off buttons
-                  _longPressTimer?.cancel();
-                  _longPressTimer = Timer.periodic(const Duration(milliseconds: 250), (timer) async {
-                    _performActions(buttonsClicked, true);
-                  });
-                }
-
-                _performActions(buttonsClicked, false);
-              }
-            })
-            .catchError((e) {
-              actionStreamInternal.add(LogNotification(e.toString()));
-            });
-        break;
-    }
-  }
-
-  Future<List<ZwiftButton>?> processClickNotification(Uint8List message);
-
-  Future<void> _performActions(List<ZwiftButton> buttonsClicked, bool repeated) async {
-    if (!repeated &&
-        buttonsClicked.any(((e) => e.action == InGameAction.shiftDown || e.action == InGameAction.shiftUp))) {
-      await _vibrate();
-    }
+  Future<void> performDown(List<ControllerButton> buttonsClicked) async {
     for (final action in buttonsClicked) {
-      actionStreamInternal.add(LogNotification(await actionHandler.performAction(action)));
+      // For repeated actions, don't trigger key down/up events (useful for long press)
+      actionStreamInternal.add(
+        LogNotification(await actionHandler.performAction(action, isKeyDown: true, isKeyUp: false)),
+      );
     }
   }
 
-  Future<void> _vibrate() async {
-    final vibrateCommand = Uint8List.fromList([...Constants.VIBRATE_PATTERN, 0x20]);
-    await UniversalBle.writeValue(
-      device.deviceId,
-      customServiceId,
-      syncRxCharacteristic!.uuid,
-      supportsEncryption ? zapEncryption.encrypt(vibrateCommand) : vibrateCommand,
-      BleOutputProperty.withoutResponse,
-    );
+  Future<void> performClick(List<ControllerButton> buttonsClicked) async {
+    for (final action in buttonsClicked) {
+      actionStreamInternal.add(
+        LogNotification(await actionHandler.performAction(action, isKeyDown: true, isKeyUp: true)),
+      );
+    }
+  }
+
+  Future<void> performRelease(List<ControllerButton> buttonsReleased) async {
+    for (final action in buttonsReleased) {
+      actionStreamInternal.add(
+        LogNotification(await actionHandler.performAction(action, isKeyDown: false, isKeyUp: true)),
+      );
+    }
+  }
+
+  Future<void> disconnect() async {
+    _longPressTimer?.cancel();
+    // Release any held keys in long press mode
+    if (actionHandler is DesktopActions) {
+      await (actionHandler as DesktopActions).releaseAllHeldKeys(_previouslyPressedButtons.toList());
+    }
+    _previouslyPressedButtons.clear();
+    await UniversalBle.disconnect(device.deviceId);
+    isConnected = false;
   }
 }

lib/bluetooth/devices/elite/elite_square.dart

@@ -0,0 +1,108 @@
+import 'dart:typed_data';
+
+import 'package:dartx/dartx.dart';
+import 'package:swift_control/bluetooth/devices/base_device.dart';
+import 'package:swift_control/utils/keymap/buttons.dart';
+import 'package:universal_ble/universal_ble.dart';
+
+import '../../messages/notification.dart';
+
+class EliteSquare extends BaseDevice {
+  EliteSquare(super.scanResult)
+    : super(
+        availableButtons: SquareConstants.BUTTON_MAPPING.values.toList(),
+        isBeta: true,
+      );
+
+  String? _lastValue;
+
+  @override
+  Future<void> handleServices(List<BleService> services) async {
+    final service = services.firstOrNullWhere((e) => e.uuid == SquareConstants.SERVICE_UUID);
+    if (service == null) {
+      throw Exception('Service not found: ${SquareConstants.SERVICE_UUID}');
+    }
+    final characteristic = service.characteristics.firstOrNullWhere(
+      (e) => e.uuid == SquareConstants.CHARACTERISTIC_UUID,
+    );
+    if (characteristic == null) {
+      throw Exception('Characteristic not found: ${SquareConstants.CHARACTERISTIC_UUID}');
+    }
+
+    await UniversalBle.subscribeNotifications(device.deviceId, service.uuid, characteristic.uuid);
+  }
+
+  @override
+  Future<void> processCharacteristic(String characteristic, Uint8List bytes) async {
+    if (characteristic == SquareConstants.CHARACTERISTIC_UUID) {
+      final fullValue = _bytesToHex(bytes);
+      final currentValue = _extractButtonCode(fullValue);
+
+      if (_lastValue != null) {
+        final currentRelevantPart = fullValue.length >= 19
+            ? fullValue.substring(6, fullValue.length - 13)
+            : fullValue.substring(6);
+        final lastRelevantPart = _lastValue!.length >= 19
+            ? _lastValue!.substring(6, _lastValue!.length - 13)
+            : _lastValue!.substring(6);
+
+        if (currentRelevantPart != lastRelevantPart) {
+          final buttonClicked = SquareConstants.BUTTON_MAPPING[currentValue];
+          if (buttonClicked != null) {
+            actionStreamInternal.add(LogNotification('Button pressed: $buttonClicked'));
+          }
+          handleButtonsClicked([
+            if (buttonClicked != null) buttonClicked,
+          ]);
+        }
+      }
+
+      _lastValue = fullValue;
+    }
+  }
+
+  String _extractButtonCode(String hexValue) {
+    if (hexValue.length >= 14) {
+      final buttonCode = hexValue.substring(6, 14);
+      if (SquareConstants.BUTTON_MAPPING.containsKey(buttonCode)) {
+        return buttonCode;
+      }
+    }
+    return hexValue;
+  }
+
+  String _bytesToHex(List<int> bytes) {
+    return bytes.map((byte) => byte.toRadixString(16).padLeft(2, '0')).join();
+  }
+}
+
+class SquareConstants {
+  static const String DEVICE_NAME = "SQUARE";
+  static const String CHARACTERISTIC_UUID = "347b0043-7635-408b-8918-8ff3949ce592";
+  static const String SERVICE_UUID = "347b0001-7635-408b-8918-8ff3949ce592";
+  static const int RECONNECT_DELAY = 5; // seconds between reconnection attempts
+
+  // Button mapping https://images.bike24.com/i/mb/c7/36/d9/elite-square-smart-frame-indoor-bike-3-1724305.jpg
+  static const Map<String, ControllerButton> BUTTON_MAPPING = {
+    "00000200": ControllerButton.navigationUp, //"Up",
+    "00000100": ControllerButton.navigationLeft, //"Left",
+    "00000800": ControllerButton.navigationDown, // "Down",
+    "00000400": ControllerButton.navigationRight, //"Right",
+    "00002000": ControllerButton.powerUpLeft, //"X",
+    "00001000": ControllerButton.sideButtonLeft, // "Square",
+    "00008000": ControllerButton.campagnoloLeft, // "Left Campagnolo",
+    "00004000": ControllerButton.onOffLeft, //"Left brake",
+    "00000002": ControllerButton.shiftDownLeft, //"Left shift 1",
+    "00000001": ControllerButton.paddleLeft, // "Left shift 2",
+    "02000000": ControllerButton.y, // "Y",
+    "01000000": ControllerButton.a, //"A",
+    "08000000": ControllerButton.b, // "B",
+    "04000000": ControllerButton.z, // "Z",
+    "20000000": ControllerButton.powerUpRight, // "Circle",
+    "10000000": ControllerButton.sideButtonRight, //"Triangle",
+    "80000000": ControllerButton.campagnoloRight, // "Right Campagnolo",
+    "40000000": ControllerButton.onOffRight, //"Right brake",
+    "00020000": ControllerButton.sideButtonRight, //"Right shift 1",
+    "00010000": ControllerButton.paddleRight, //"Right shift 2",
+  };
+}

lib/bluetooth/devices/wahoo/wahoo_kickr_bike_shift.dart

@@ -0,0 +1,128 @@
+import 'dart:collection';
+import 'dart:typed_data';
+
+import 'package:swift_control/bluetooth/devices/base_device.dart';
+import 'package:swift_control/utils/keymap/buttons.dart';
+import 'package:universal_ble/universal_ble.dart';
+
+class WahooKickrBikeShift extends BaseDevice {
+  WahooKickrBikeShift(super.scanResult)
+    : super(
+        availableButtons: WahooKickrBikeShiftConstants.prefixToButton.values.toList(),
+        isBeta: true,
+      );
+
+  @override
+  Future<void> handleServices(List<BleService> services) async {
+    final service = services.firstWhere(
+      (e) => e.uuid == WahooKickrBikeShiftConstants.SERVICE_UUID,
+      orElse: () => throw Exception('Service not found: ${WahooKickrBikeShiftConstants.SERVICE_UUID}'),
+    );
+    final characteristic = service.characteristics.firstWhere(
+      (e) => e.uuid == WahooKickrBikeShiftConstants.CHARACTERISTIC_UUID,
+      orElse: () => throw Exception('Characteristic not found: ${WahooKickrBikeShiftConstants.CHARACTERISTIC_UUID}'),
+    );
+
+    await UniversalBle.subscribeNotifications(device.deviceId, service.uuid, characteristic.uuid);
+  }
+
+  @override
+  Future<void> processCharacteristic(String characteristic, Uint8List bytes) {
+    if (characteristic == WahooKickrBikeShiftConstants.CHARACTERISTIC_UUID) {
+      final hex = toHex(bytes);
+
+      // Short-frame detection (hard-coded families)
+      final s = parseShortFrame(hex);
+      if (s != null) {
+        if (s.pressed) {
+          handleButtonsClicked([s.button]);
+        } else {
+          handleButtonsClicked([]);
+        }
+        return Future.value();
+      }
+    }
+    return Future.value();
+  }
+
+  // Deduplicate per (prefix, type) using the 7-bit rolling sequence
+  final Map<String, int> lastSeqByPrefix = HashMap<String, int>();
+
+  String toHex(Uint8List bytes) => bytes.map((b) => b.toRadixString(16).padLeft(2, '0')).join().toUpperCase();
+
+  // Parse short frames like "PPQQRR" (e.g., "0001E6", "80005E", "40008F", "010004")
+  ShortFrame? parseShortFrame(String hex) {
+    final re = RegExp(r'^[0-9A-F]{6}$', caseSensitive: false);
+    if (!re.hasMatch(hex)) return null;
+
+    final prefix = hex.substring(0, 4); // PPQQ
+    final rrHex = hex.substring(4, 6); // RR
+    if (!WahooKickrBikeShiftConstants.prefixToButton.containsKey(prefix)) return null;
+
+    final idx = int.parse(rrHex, radix: 16);
+    final type = (idx & 0x80) != 0 ? true : false; // MSB of RR
+    final seq = idx & 0x7F; // rolling counter for dedupe
+
+    return ShortFrame(
+      prefix: prefix,
+      rrHex: rrHex,
+      idx: idx,
+      pressed: type,
+      seq: seq,
+      button: WahooKickrBikeShiftConstants.prefixToButton[prefix]!,
+    );
+  }
+
+  bool isLongFrame(String hex) {
+    final re = RegExp(r'^FF0F01', caseSensitive: false);
+    return re.hasMatch(hex);
+  }
+
+  // Returns true if this (prefix,type,seq) has not been handled yet
+  bool shouldHandleOnce(String prefix, String type, int seq) {
+    final key = '$prefix:$type';
+    final last = lastSeqByPrefix[key];
+    if (last == seq) return false;
+    lastSeqByPrefix[key] = seq;
+    return true;
+  }
+}
+
+class ShortFrame {
+  final String prefix; // PPQQ
+  final String rrHex; // RR
+  final int idx;
+  final bool pressed;
+  final int seq;
+  final ControllerButton button;
+
+  ShortFrame({
+    required this.prefix,
+    required this.rrHex,
+    required this.idx,
+    required this.pressed,
+    required this.seq,
+    required this.button,
+  });
+}
+
+class WahooKickrBikeShiftConstants {
+  static const String SERVICE_UUID = "a026ee0d-0a7d-4ab3-97fa-f1500f9feb8b";
+  static const String CHARACTERISTIC_UUID = "a026e03c-0a7d-4ab3-97fa-f1500f9feb8b";
+
+  // https://support.wahoofitness.com/hc/en-us/articles/22259367275410-Shifter-and-button-configuration-for-KICKR-BIKE-1-2
+  static const Map<String, ControllerButton> prefixToButton = {
+    '0001': ControllerButton.powerUpRight, //'Right Up',
+    '8000': ControllerButton.sideButtonRight, //'Right Down',
+    '0008': ControllerButton.navigationRight, //'Right Steer',
+    '0200': ControllerButton.powerUpLeft, // 'Left Up',
+    '0400': ControllerButton.sideButtonLeft, //'Left Down',
+    '2000': ControllerButton.navigationLeft, //'Left Steer',
+    '0004': ControllerButton.shiftUpRight, // 'Right Shift Up',
+    '0002': ControllerButton.shiftDownRight, // 'Right Shift Down',
+    '1000': ControllerButton.shiftUpLeft, //'Left Shift Up',
+    '0800': ControllerButton.shiftDownLeft, //'Left Shift Down',
+    '4000': ControllerButton.paddleRight, //'Right Brake',
+    '0100': ControllerButton.paddleLeft, //'Left Brake',
+  };
+}

lib/bluetooth/devices/zwift/zwift_click.dart

@@ -1,16 +1,17 @@
 import 'package:flutter/foundation.dart';
-import 'package:swift_control/bluetooth/devices/base_device.dart';
+import 'package:swift_control/bluetooth/devices/zwift/zwift_device.dart';
 import 'package:swift_control/utils/keymap/buttons.dart';
 
-import '../messages/click_notification.dart';
+import '../../messages/click_notification.dart';
 
-class ZwiftClick extends BaseDevice {
-  ZwiftClick(super.scanResult);
+class ZwiftClick extends ZwiftDevice {
+  ZwiftClick(super.scanResult)
+    : super(availableButtons: [ControllerButton.shiftUpRight, ControllerButton.shiftDownLeft]);
 
   ClickNotification? _lastClickNotification;
 
   @override
-  Future<List<ZwiftButton>?> processClickNotification(Uint8List message) async {
+  Future<List<ControllerButton>?> processClickNotification(Uint8List message) async {
     final ClickNotification clickNotification = ClickNotification(message);
     if (_lastClickNotification == null || _lastClickNotification != clickNotification) {
       _lastClickNotification = clickNotification;

lib/bluetooth/devices/zwift/zwift_clickv2.dart

@@ -0,0 +1,71 @@
+import 'dart:typed_data';
+
+import 'package:swift_control/bluetooth/devices/zwift/zwift_ride.dart';
+
+import '../../ble.dart';
+import '../../protocol/zp.pbenum.dart';
+
+class ZwiftClickV2 extends ZwiftRide {
+  ZwiftClickV2(super.scanResult) : super(isBeta: true);
+
+  @override
+  bool get supportsEncryption => false;
+
+  @override
+  List<int> get startCommand => Constants.RIDE_ON + Constants.RESPONSE_START_CLICK_V2;
+
+  @override
+  Future<void> setupHandshake() async {
+    super.setupHandshake();
+    await sendCommandBuffer(Uint8List.fromList([0xFF, 0x04, 0x00]));
+  }
+
+  Future<void> test() async {
+    await sendCommand(Opcode.RESET, null);
+    //await sendCommand(Opcode.GET, Get(dataObjectId: VendorDO.PAGE_DEVICE_PAIRING.value)); // 0008 82E0 03
+
+    /*await sendCommand(Opcode.GET, Get(dataObjectId: DO.PAGE_DEV_INFO.value)); // 0008 00
+    await sendCommand(Opcode.LOG_LEVEL_SET, LogLevelSet(logLevel: LogLevel.LOGLEVEL_TRACE)); // 4108 05
+
+    await sendCommand(Opcode.GET, Get(dataObjectId: DO.PAGE_CLIENT_SERVER_CONFIGURATION.value)); // 0008 10
+    await sendCommand(Opcode.GET, Get(dataObjectId: DO.PAGE_CLIENT_SERVER_CONFIGURATION.value)); // 0008 10
+    await sendCommand(Opcode.GET, Get(dataObjectId: DO.PAGE_CLIENT_SERVER_CONFIGURATION.value)); // 0008 10
+
+    await sendCommand(Opcode.GET, Get(dataObjectId: DO.PAGE_CONTROLLER_INPUT_CONFIG.value)); // 0008 80 08
+
+    await sendCommand(Opcode.GET, Get(dataObjectId: DO.BATTERY_STATE.value)); // 0008 83 06
+
+    // 	Value: FF04 000A 1540 E9D9 C96B 7463 C27F 1B4E 4D9F 1CB1 205D 882E D7CE
+    // 	Value: FF04 000A 15B2 6324 0A31 D6C6 B81F C129 D6A4 E99D FFFC B9FC 418D
+    await sendCommandBuffer(
+      Uint8List.fromList([
+        0xFF,
+        0x04,
+        0x00,
+        0x0A,
+        0x15,
+        0xC2,
+        0x63,
+        0x24,
+        0x0A,
+        0x31,
+        0xD6,
+        0xC6,
+        0xB8,
+        0x1F,
+        0xC1,
+        0x29,
+        0xD6,
+        0xA4,
+        0xE9,
+        0x9D,
+        0xFF,
+        0xFC,
+        0xB9,
+        0xFC,
+        0x41,
+        0x8D,
+      ]),
+    );*/
+  }
+}

lib/bluetooth/devices/zwift/zwift_device.dart

@@ -0,0 +1,214 @@
+import 'dart:async';
+
+import 'package:dartx/dartx.dart';
+import 'package:flutter/foundation.dart';
+import 'package:swift_control/bluetooth/ble.dart';
+import 'package:swift_control/bluetooth/devices/base_device.dart';
+import 'package:swift_control/bluetooth/messages/notification.dart';
+import 'package:swift_control/main.dart';
+import 'package:swift_control/utils/crypto/local_key_provider.dart';
+import 'package:swift_control/utils/crypto/zap_crypto.dart';
+import 'package:swift_control/utils/keymap/buttons.dart';
+import 'package:swift_control/utils/single_line_exception.dart';
+import 'package:universal_ble/universal_ble.dart';
+
+import '../../../utils/crypto/encryption_utils.dart';
+
+abstract class ZwiftDevice extends BaseDevice {
+  final zapEncryption = ZapCrypto(LocalKeyProvider());
+
+  ZwiftDevice(super.scanResult, {required super.availableButtons, super.isBeta});
+
+  bool supportsEncryption = false;
+
+  BleCharacteristic? syncRxCharacteristic;
+
+  List<int> get startCommand => Constants.RIDE_ON + Constants.RESPONSE_START_CLICK;
+  String get customServiceId => BleUuid.ZWIFT_CUSTOM_SERVICE_UUID;
+
+  @override
+  Future<void> handleServices(List<BleService> services) async {
+    final customService = services.firstOrNullWhere((service) => service.uuid == customServiceId);
+
+    if (customService == null) {
+      throw Exception(
+        'Custom service $customServiceId not found for device $this ${device.name ?? device.rawName}.\nYou may need to update the firmware in Zwift Companion app.\nWe found: ${services.joinToString(transform: (s) => s.uuid)}',
+      );
+    }
+
+    final deviceInformationService = services.firstOrNullWhere(
+      (service) => service.uuid == BleUuid.DEVICE_INFORMATION_SERVICE_UUID,
+    );
+    final firmwareCharacteristic = deviceInformationService?.characteristics.firstOrNullWhere(
+      (c) => c.uuid == BleUuid.DEVICE_INFORMATION_CHARACTERISTIC_FIRMWARE_REVISION,
+    );
+    if (firmwareCharacteristic != null) {
+      final firmwareData = await UniversalBle.read(
+        device.deviceId,
+        deviceInformationService!.uuid,
+        firmwareCharacteristic.uuid,
+      );
+      firmwareVersion = String.fromCharCodes(firmwareData);
+      connection.signalChange(this);
+    }
+
+    final asyncCharacteristic = customService.characteristics.firstOrNullWhere(
+      (characteristic) => characteristic.uuid == BleUuid.ZWIFT_ASYNC_CHARACTERISTIC_UUID,
+    );
+    final syncTxCharacteristic = customService.characteristics.firstOrNullWhere(
+      (characteristic) => characteristic.uuid == BleUuid.ZWIFT_SYNC_TX_CHARACTERISTIC_UUID,
+    );
+    syncRxCharacteristic = customService.characteristics.firstOrNullWhere(
+      (characteristic) => characteristic.uuid == BleUuid.ZWIFT_SYNC_RX_CHARACTERISTIC_UUID,
+    );
+
+    if (asyncCharacteristic == null || syncTxCharacteristic == null || syncRxCharacteristic == null) {
+      throw Exception('Characteristics not found');
+    }
+
+    await UniversalBle.subscribeNotifications(device.deviceId, customService.uuid, asyncCharacteristic.uuid);
+    await UniversalBle.subscribeIndications(device.deviceId, customService.uuid, syncTxCharacteristic.uuid);
+
+    await setupHandshake();
+  }
+
+  Future<void> setupHandshake() async {
+    if (supportsEncryption) {
+      await UniversalBle.write(
+        device.deviceId,
+        customServiceId,
+        syncRxCharacteristic!.uuid,
+        Uint8List.fromList([
+          ...Constants.RIDE_ON,
+          ...Constants.REQUEST_START,
+          ...zapEncryption.localKeyProvider.getPublicKeyBytes(),
+        ]),
+        withoutResponse: true,
+      );
+    } else {
+      await UniversalBle.write(
+        device.deviceId,
+        customServiceId,
+        syncRxCharacteristic!.uuid,
+        Constants.RIDE_ON,
+        withoutResponse: true,
+      );
+    }
+  }
+
+  @override
+  Future<void> processCharacteristic(String characteristic, Uint8List bytes) async {
+    if (kDebugMode && false) {
+      print(
+        "${DateTime.now().toString().split(" ").last} Received data on $characteristic: ${bytes.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')}",
+      );
+    }
+    if (bytes.isEmpty) {
+      return;
+    }
+
+    try {
+      if (bytes.startsWith(startCommand)) {
+        _processDevicePublicKeyResponse(bytes);
+      } else if (!supportsEncryption || (bytes.length > Int32List.bytesPerElement + EncryptionUtils.MAC_LENGTH)) {
+        processData(bytes);
+      }
+    } catch (e, stackTrace) {
+      print("Error processing data: $e");
+      print("Stack Trace: $stackTrace");
+      if (e is SingleLineException) {
+        actionStreamInternal.add(LogNotification(e.message));
+      } else {
+        actionStreamInternal.add(LogNotification("$e\n$stackTrace"));
+      }
+    }
+  }
+
+  void _processDevicePublicKeyResponse(Uint8List bytes) {
+    final devicePublicKeyBytes = bytes.sublist(Constants.RIDE_ON.length + Constants.RESPONSE_START_CLICK.length);
+    if (kDebugMode) {
+      print("Device Public Key - ${devicePublicKeyBytes.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')}");
+    }
+    zapEncryption.initialise(devicePublicKeyBytes);
+  }
+
+  Future<void> processData(Uint8List bytes) async {
+    int type;
+    Uint8List message;
+
+    if (supportsEncryption) {
+      final counter = bytes.sublist(0, 4); // Int.SIZE_BYTES is 4
+      final payload = bytes.sublist(4);
+
+      if (zapEncryption.encryptionKeyBytes == null) {
+        actionStreamInternal.add(
+          LogNotification(
+            'Encryption not initialized, yet. You may need to update the firmware of your device with the Zwift Companion app.',
+          ),
+        );
+        return;
+      }
+
+      final data = zapEncryption.decrypt(counter, payload);
+      type = data[0];
+      message = data.sublist(1);
+    } else {
+      type = bytes[0];
+      message = bytes.sublist(1);
+    }
+
+    switch (type) {
+      case Constants.EMPTY_MESSAGE_TYPE:
+        //print("Empty Message"); // expected when nothing happening
+        break;
+      case Constants.BATTERY_LEVEL_TYPE:
+        if (batteryLevel != message[1]) {
+          batteryLevel = message[1];
+          connection.signalChange(this);
+        }
+        break;
+      case Constants.CLICK_NOTIFICATION_MESSAGE_TYPE:
+      case Constants.PLAY_NOTIFICATION_MESSAGE_TYPE:
+      case Constants.RIDE_NOTIFICATION_MESSAGE_TYPE:
+        processClickNotification(message)
+            .then((buttonsClicked) async {
+              return handleButtonsClicked(buttonsClicked);
+            })
+            .catchError((e) {
+              actionStreamInternal.add(LogNotification(e.toString()));
+            });
+        break;
+    }
+  }
+
+  Future<List<ControllerButton>?> processClickNotification(Uint8List message);
+
+  @override
+  Future<void> performDown(List<ControllerButton> buttonsClicked) async {
+    if (buttonsClicked.any(((e) => e.action == InGameAction.shiftDown || e.action == InGameAction.shiftUp)) &&
+        settings.getVibrationEnabled()) {
+      await _vibrate();
+    }
+    return super.performDown(buttonsClicked);
+  }
+
+  @override
+  Future<void> performClick(List<ControllerButton> buttonsClicked) async {
+    if (buttonsClicked.any(((e) => e.action == InGameAction.shiftDown || e.action == InGameAction.shiftUp)) &&
+        settings.getVibrationEnabled()) {
+      await _vibrate();
+    }
+    return super.performClick(buttonsClicked);
+  }
+
+  Future<void> _vibrate() async {
+    final vibrateCommand = Uint8List.fromList([...Constants.VIBRATE_PATTERN, 0x20]);
+    await UniversalBle.write(
+      device.deviceId,
+      customServiceId,
+      syncRxCharacteristic!.uuid,
+      supportsEncryption ? zapEncryption.encrypt(vibrateCommand) : vibrateCommand,
+      withoutResponse: true,
+    );
+  }
+}

lib/bluetooth/devices/zwift/zwift_play.dart

@@ -0,0 +1,51 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:swift_control/bluetooth/devices/zwift/zwift_device.dart';
+import 'package:swift_control/bluetooth/messages/play_notification.dart';
+import 'package:swift_control/utils/keymap/buttons.dart';
+
+import '../../ble.dart';
+
+class ZwiftPlay extends ZwiftDevice {
+  ZwiftPlay(super.scanResult)
+    : super(
+        availableButtons: [
+          ControllerButton.y,
+          ControllerButton.z,
+          ControllerButton.a,
+          ControllerButton.b,
+          ControllerButton.onOffRight,
+          ControllerButton.sideButtonRight,
+          ControllerButton.paddleRight,
+          ControllerButton.navigationUp,
+          ControllerButton.navigationLeft,
+          ControllerButton.navigationRight,
+          ControllerButton.navigationDown,
+          ControllerButton.onOffLeft,
+          ControllerButton.sideButtonLeft,
+          ControllerButton.paddleLeft,
+        ],
+      );
+
+  PlayNotification? _lastControllerNotification;
+
+  @override
+  List<int> get startCommand => Constants.RIDE_ON + Constants.RESPONSE_START_PLAY;
+
+  @override
+  Future<List<ControllerButton>?> processClickNotification(Uint8List message) async {
+    final PlayNotification clickNotification = PlayNotification(message);
+    if (_lastControllerNotification == null || _lastControllerNotification != clickNotification) {
+      _lastControllerNotification = clickNotification;
+
+      if (clickNotification.buttonsClicked.isNotEmpty) {
+        actionStreamInternal.add(clickNotification);
+      }
+
+      return clickNotification.buttonsClicked;
+    } else {
+      return null;
+    }
+  }
+}

lib/bluetooth/devices/zwift/zwift_ride.dart

@@ -0,0 +1,250 @@
+import 'package:dartx/dartx.dart';
+import 'package:flutter/foundation.dart';
+import 'package:protobuf/protobuf.dart' as $pb;
+import 'package:swift_control/bluetooth/devices/zwift/zwift_clickv2.dart';
+import 'package:swift_control/bluetooth/devices/zwift/zwift_device.dart';
+import 'package:swift_control/bluetooth/messages/ride_notification.dart';
+import 'package:swift_control/bluetooth/protocol/zp_vendor.pb.dart';
+import 'package:swift_control/utils/keymap/buttons.dart';
+import 'package:universal_ble/universal_ble.dart';
+
+import '../../../main.dart';
+import '../../ble.dart';
+import '../../messages/notification.dart';
+import '../../protocol/zp.pb.dart';
+
+class ZwiftRide extends ZwiftDevice {
+  /// Minimum absolute analog value (0-100) required to trigger paddle button press.
+  /// Values below this threshold are ignored to prevent accidental triggers from
+  /// analog drift or light touches.
+  static const int analogPaddleThreshold = 25;
+
+  ZwiftRide(super.scanResult, {super.isBeta})
+    : super(
+        availableButtons: [
+          ControllerButton.navigationLeft,
+          ControllerButton.navigationRight,
+          ControllerButton.navigationUp,
+          ControllerButton.navigationDown,
+          ControllerButton.a,
+          ControllerButton.b,
+          ControllerButton.y,
+          ControllerButton.z,
+          ControllerButton.shiftUpLeft,
+          ControllerButton.shiftDownLeft,
+          ControllerButton.shiftUpRight,
+          ControllerButton.shiftDownRight,
+          ControllerButton.powerUpLeft,
+          ControllerButton.powerUpRight,
+          ControllerButton.onOffLeft,
+          ControllerButton.onOffRight,
+          ControllerButton.paddleLeft,
+          ControllerButton.paddleRight,
+        ],
+      );
+
+  @override
+  String get customServiceId => BleUuid.ZWIFT_RIDE_CUSTOM_SERVICE_UUID;
+
+  @override
+  bool get supportsEncryption => false;
+
+  RideNotification? _lastControllerNotification;
+
+  @override
+  Future<void> processData(Uint8List bytes) async {
+    Opcode? opcode;
+    Uint8List message;
+
+    if (supportsEncryption) {
+      final counter = bytes.sublist(0, 4); // Int.SIZE_BYTES is 4
+      final payload = bytes.sublist(4);
+
+      if (zapEncryption.encryptionKeyBytes == null) {
+        actionStreamInternal.add(
+          LogNotification(
+            'Encryption not initialized, yet. You may need to update the firmware of your device with the Zwift Companion app.',
+          ),
+        );
+        return;
+      }
+
+      final data = zapEncryption.decrypt(counter, payload);
+      opcode = Opcode.valueOf(data[0]);
+      message = data.sublist(1);
+    } else {
+      opcode = Opcode.valueOf(bytes[0]);
+      message = bytes.sublist(1);
+    }
+
+    if (kDebugMode) {
+      print(
+        '${DateTime.now().toString().split(" ").last} Received $opcode: ${bytes.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')} => ${String.fromCharCodes(bytes)} ',
+      );
+    }
+
+    if (bytes.startsWith(Constants.RESPONSE_STOPPED_CLICK_V2) && this is ZwiftClickV2) {
+      actionStreamInternal.add(
+        LogNotification(
+          'Your Zwift Click V2 no longer sends events. Connect it in the Zwift app once per day. Resetting the device now.',
+        ),
+      );
+      sendCommand(Opcode.RESET, null);
+    }
+
+    switch (opcode) {
+      case Opcode.RIDE_ON:
+        //print("Empty RideOn response - unencrypted mode");
+
+        break;
+      case Opcode.STATUS_RESPONSE:
+        final status = StatusResponse.fromBuffer(message);
+        if (kDebugMode) {
+          print('StatusResponse: ${status.command} status: ${Status.valueOf(status.status)}');
+        }
+        break;
+      case Opcode.GET_RESPONSE:
+        final response = GetResponse.fromBuffer(message);
+        final dataObjectType = DO.valueOf(response.dataObjectId);
+        if (kDebugMode) {
+          print(
+            'GetResponse: ${dataObjectType?.value.toRadixString(16).padLeft(4, '0') ?? response.dataObjectId} $dataObjectType',
+          );
+        }
+
+        switch (dataObjectType) {
+          case DO.PAGE_DEV_INFO:
+            final pageDevInfo = DevInfoPage.fromBuffer(response.dataObjectData);
+            if (kDebugMode) {
+              print('PageDevInfo: $pageDevInfo');
+            }
+            break;
+          case DO.PAGE_DATE_TIME:
+            final pageDateTime = DateTimePage.fromBuffer(response.dataObjectData);
+            if (kDebugMode) {
+              print('PageDateTime: $pageDateTime');
+            }
+            break;
+          case DO.PAGE_CONTROLLER_INPUT_CONFIG:
+            final pageDateTime = ControllerInputConfigPage.fromBuffer(response.dataObjectData);
+            if (kDebugMode) {
+              print('PageDateTime: $pageDateTime');
+            }
+            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);
+        if (kDebugMode) {
+          actionStreamInternal.add(LogNotification(logMessage.toString()));
+        }
+        break;
+      case Opcode.BATTERY_NOTIF:
+        final notification = BatteryNotification.fromBuffer(message);
+        if (batteryLevel != notification.newPercLevel) {
+          batteryLevel = notification.newPercLevel;
+          connection.signalChange(this);
+        }
+        break;
+      case Opcode.CONTROLLER_NOTIFICATION:
+        processClickNotification(message)
+            .then((buttonsClicked) async {
+              return handleButtonsClicked(buttonsClicked);
+            })
+            .catchError((e) {
+              actionStreamInternal.add(LogNotification(e.toString()));
+            });
+        break;
+      case null:
+        if (bytes[0] == 0x1A) {
+          final batteryStatus = BatteryStatus.fromBuffer(message);
+          if (kDebugMode) {
+            print('BatteryStatus: $batteryStatus');
+          }
+        }
+        break;
+    }
+  }
+
+  @override
+  Future<List<ControllerButton>?> processClickNotification(Uint8List message) async {
+    final RideNotification clickNotification = RideNotification(
+      message,
+      analogPaddleThreshold: analogPaddleThreshold,
+    );
+
+    if (_lastControllerNotification == null || _lastControllerNotification != clickNotification) {
+      _lastControllerNotification = clickNotification;
+
+      if (clickNotification.buttonsClicked.isNotEmpty) {
+        actionStreamInternal.add(clickNotification);
+      }
+      return clickNotification.buttonsClicked;
+    } else {
+      return null;
+    }
+  }
+
+  Future<void> sendCommand(Opcode opCode, $pb.GeneratedMessage? message) async {
+    final buffer = Uint8List.fromList([opCode.value, ...message?.writeToBuffer() ?? []]);
+    if (kDebugMode) {
+      print("Sending $opCode: ${buffer.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')}");
+    }
+    await UniversalBle.write(
+      device.deviceId,
+      customServiceId,
+      syncRxCharacteristic!.uuid,
+      buffer,
+      withoutResponse: true,
+    );
+    await Future.delayed(Duration(milliseconds: 500));
+  }
+
+  Future<void> sendCommandBuffer(Uint8List buffer) async {
+    if (kDebugMode) {
+      print("Sending ${buffer.map((e) => e.toRadixString(16).padLeft(2, '0')).join(' ')}");
+    }
+    await UniversalBle.write(
+      device.deviceId,
+      customServiceId,
+      syncRxCharacteristic!.uuid,
+      buffer,
+      withoutResponse: true,
+    );
+  }
+}

lib/bluetooth/devices/zwift_play.dart

@@ -1,33 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/foundation.dart';
-import 'package:swift_control/bluetooth/devices/base_device.dart';
-import 'package:swift_control/bluetooth/messages/play_notification.dart';
-import 'package:swift_control/utils/keymap/buttons.dart';
-
-import '../ble.dart';
-
-class ZwiftPlay extends BaseDevice {
-  ZwiftPlay(super.scanResult);
-
-  PlayNotification? _lastControllerNotification;
-
-  @override
-  List<int> get startCommand => Constants.RIDE_ON + Constants.RESPONSE_START_PLAY;
-
-  @override
-  Future<List<ZwiftButton>?> processClickNotification(Uint8List message) async {
-    final PlayNotification clickNotification = PlayNotification(message);
-    if (_lastControllerNotification == null || _lastControllerNotification != clickNotification) {
-      _lastControllerNotification = clickNotification;
-
-      if (clickNotification.buttonsClicked.isNotEmpty) {
-        actionStreamInternal.add(clickNotification);
-      }
-
-      return clickNotification.buttonsClicked;
-    } else {
-      return null;
-    }
-  }
-}

lib/bluetooth/devices/zwift_ride.dart

@@ -1,34 +0,0 @@
-import 'dart:typed_data';
-
-import 'package:swift_control/bluetooth/devices/base_device.dart';
-import 'package:swift_control/bluetooth/messages/ride_notification.dart';
-import 'package:swift_control/utils/keymap/buttons.dart';
-
-import '../ble.dart';
-
-class ZwiftRide extends BaseDevice {
-  ZwiftRide(super.scanResult);
-
-  @override
-  String get customServiceId => BleUuid.ZWIFT_RIDE_CUSTOM_SERVICE_UUID;
-
-  @override
-  bool get supportsEncryption => false;
-
-  RideNotification? _lastControllerNotification;
-
-  @override
-  Future<List<ZwiftButton>?> processClickNotification(Uint8List message) async {
-    final RideNotification clickNotification = RideNotification(message);
-    if (_lastControllerNotification == null || _lastControllerNotification != clickNotification) {
-      _lastControllerNotification = clickNotification;
-
-      if (clickNotification.buttonsClicked.isNotEmpty) {
-        actionStreamInternal.add(clickNotification);
-      }
-      return clickNotification.buttonsClicked;
-    } else {
-      return null;
-    }
-  }
-}

lib/bluetooth/messages/click_notification.dart

@@ -2,24 +2,25 @@ import 'dart:typed_data';
 
 import 'package:dartx/dartx.dart';
 import 'package:swift_control/utils/keymap/buttons.dart';
+import 'package:swift_control/widgets/keymap_explanation.dart';
 
 import '../protocol/zwift.pb.dart';
 import 'notification.dart';
 
 class ClickNotification extends BaseNotification {
-  late List<ZwiftButton> buttonsClicked;
+  late List<ControllerButton> buttonsClicked;
 
   ClickNotification(Uint8List message) {
     final status = ClickKeyPadStatus.fromBuffer(message);
     buttonsClicked = [
-      if (status.buttonPlus == PlayButtonStatus.ON) ZwiftButton.shiftUpRight,
-      if (status.buttonMinus == PlayButtonStatus.ON) ZwiftButton.shiftDownLeft,
+      if (status.buttonPlus == PlayButtonStatus.ON) ControllerButton.shiftUpRight,
+      if (status.buttonMinus == PlayButtonStatus.ON) ControllerButton.shiftDownLeft,
     ];
   }
 
   @override
   String toString() {
-    return 'Buttons: ${buttonsClicked.joinToString(transform: (e) => e.name)}';
+    return 'Buttons: ${buttonsClicked.joinToString(transform: (e) => e.name.splitByUpperCase())}';
   }
 
   @override

lib/bluetooth/messages/play_notification.dart

@@ -4,38 +4,39 @@ import 'package:dartx/dartx.dart';
 import 'package:swift_control/bluetooth/messages/notification.dart';
 import 'package:swift_control/bluetooth/protocol/zwift.pb.dart';
 import 'package:swift_control/utils/keymap/buttons.dart';
+import 'package:swift_control/widgets/keymap_explanation.dart';
 
 class PlayNotification extends BaseNotification {
-  late List<ZwiftButton> buttonsClicked;
+  late List<ControllerButton> buttonsClicked;
 
   PlayNotification(Uint8List message) {
     final status = PlayKeyPadStatus.fromBuffer(message);
 
     buttonsClicked = [
       if (status.rightPad == PlayButtonStatus.ON) ...[
-        if (status.buttonYUp == PlayButtonStatus.ON) ZwiftButton.y,
-        if (status.buttonZLeft == PlayButtonStatus.ON) ZwiftButton.z,
-        if (status.buttonARight == PlayButtonStatus.ON) ZwiftButton.a,
-        if (status.buttonBDown == PlayButtonStatus.ON) ZwiftButton.b,
-        if (status.buttonOn == PlayButtonStatus.ON) ZwiftButton.onOffRight,
-        if (status.buttonShift == PlayButtonStatus.ON) ZwiftButton.sideButtonRight,
-        if (status.analogLR.abs() == 100) ZwiftButton.paddleRight,
+        if (status.buttonYUp == PlayButtonStatus.ON) ControllerButton.y,
+        if (status.buttonZLeft == PlayButtonStatus.ON) ControllerButton.z,
+        if (status.buttonARight == PlayButtonStatus.ON) ControllerButton.a,
+        if (status.buttonBDown == PlayButtonStatus.ON) ControllerButton.b,
+        if (status.buttonOn == PlayButtonStatus.ON) ControllerButton.onOffRight,
+        if (status.buttonShift == PlayButtonStatus.ON) ControllerButton.sideButtonRight,
+        if (status.analogLR.abs() == 100) ControllerButton.paddleRight,
       ],
       if (status.rightPad == PlayButtonStatus.OFF) ...[
-        if (status.buttonYUp == PlayButtonStatus.ON) ZwiftButton.navigationUp,
-        if (status.buttonZLeft == PlayButtonStatus.ON) ZwiftButton.navigationLeft,
-        if (status.buttonARight == PlayButtonStatus.ON) ZwiftButton.navigationRight,
-        if (status.buttonBDown == PlayButtonStatus.ON) ZwiftButton.navigationDown,
-        if (status.buttonOn == PlayButtonStatus.ON) ZwiftButton.onOffLeft,
-        if (status.buttonShift == PlayButtonStatus.ON) ZwiftButton.sideButtonLeft,
-        if (status.analogLR.abs() == 100) ZwiftButton.paddleLeft,
+        if (status.buttonYUp == PlayButtonStatus.ON) ControllerButton.navigationUp,
+        if (status.buttonZLeft == PlayButtonStatus.ON) ControllerButton.navigationLeft,
+        if (status.buttonARight == PlayButtonStatus.ON) ControllerButton.navigationRight,
+        if (status.buttonBDown == PlayButtonStatus.ON) ControllerButton.navigationDown,
+        if (status.buttonOn == PlayButtonStatus.ON) ControllerButton.onOffLeft,
+        if (status.buttonShift == PlayButtonStatus.ON) ControllerButton.sideButtonLeft,
+        if (status.analogLR.abs() == 100) ControllerButton.paddleLeft,
       ],
     ];
   }
 
   @override
   String toString() {
-    return 'Buttons: ${buttonsClicked.joinToString(transform: (e) => e.name)}';
+    return 'Buttons: ${buttonsClicked.joinToString(transform: (e) => e.name.splitByUpperCase())}';
   }
 
   @override

lib/bluetooth/messages/ride_notification.dart

@@ -1,9 +1,9 @@
-import 'dart:typed_data';
-
 import 'package:dartx/dartx.dart';
+import 'package:flutter/foundation.dart';
 import 'package:swift_control/bluetooth/messages/notification.dart';
 import 'package:swift_control/bluetooth/protocol/zwift.pb.dart';
 import 'package:swift_control/utils/keymap/buttons.dart';
+import 'package:swift_control/widgets/keymap_explanation.dart';
 
 enum _RideButtonMask {
   LEFT_BTN(0x00001),
@@ -32,47 +32,74 @@ enum _RideButtonMask {
 }
 
 class RideNotification extends BaseNotification {
-  late List<ZwiftButton> buttonsClicked;
+  late List<ControllerButton> buttonsClicked;
+  late List<ControllerButton> analogButtons;
 
-  RideNotification(Uint8List message) {
+  RideNotification(Uint8List message, {required int analogPaddleThreshold}) {
     final status = RideKeyPadStatus.fromBuffer(message);
 
+    // Debug: Log all button mask detections (moved to ZwiftRide.processClickNotification)
+
+    // Process DIGITAL buttons separately
     buttonsClicked = [
-      if (status.buttonMap & _RideButtonMask.LEFT_BTN.mask == PlayButtonStatus.ON.value) ZwiftButton.navigationLeft,
-      if (status.buttonMap & _RideButtonMask.RIGHT_BTN.mask == PlayButtonStatus.ON.value) ZwiftButton.navigationRight,
-      if (status.buttonMap & _RideButtonMask.UP_BTN.mask == PlayButtonStatus.ON.value) ZwiftButton.navigationUp,
-      if (status.buttonMap & _RideButtonMask.DOWN_BTN.mask == PlayButtonStatus.ON.value) ZwiftButton.navigationDown,
-      if (status.buttonMap & _RideButtonMask.A_BTN.mask == PlayButtonStatus.ON.value) ZwiftButton.a,
-      if (status.buttonMap & _RideButtonMask.B_BTN.mask == PlayButtonStatus.ON.value) ZwiftButton.b,
-      if (status.buttonMap & _RideButtonMask.Y_BTN.mask == PlayButtonStatus.ON.value) ZwiftButton.y,
-      if (status.buttonMap & _RideButtonMask.Z_BTN.mask == PlayButtonStatus.ON.value) ZwiftButton.z,
-      if (status.buttonMap & _RideButtonMask.SHFT_UP_L_BTN.mask == PlayButtonStatus.ON.value) ZwiftButton.shiftUpLeft,
-      if (status.buttonMap & _RideButtonMask.SHFT_DN_L_BTN.mask == PlayButtonStatus.ON.value) ZwiftButton.shiftDownLeft,
-      if (status.buttonMap & _RideButtonMask.SHFT_UP_R_BTN.mask == PlayButtonStatus.ON.value) ZwiftButton.shiftUpRight,
+      if (status.buttonMap & _RideButtonMask.LEFT_BTN.mask == PlayButtonStatus.ON.value)
+        ControllerButton.navigationLeft,
+      if (status.buttonMap & _RideButtonMask.RIGHT_BTN.mask == PlayButtonStatus.ON.value)
+        ControllerButton.navigationRight,
+      if (status.buttonMap & _RideButtonMask.UP_BTN.mask == PlayButtonStatus.ON.value) ControllerButton.navigationUp,
+      if (status.buttonMap & _RideButtonMask.DOWN_BTN.mask == PlayButtonStatus.ON.value)
+        ControllerButton.navigationDown,
+      if (status.buttonMap & _RideButtonMask.A_BTN.mask == PlayButtonStatus.ON.value) ControllerButton.a,
+      if (status.buttonMap & _RideButtonMask.B_BTN.mask == PlayButtonStatus.ON.value) ControllerButton.b,
+      if (status.buttonMap & _RideButtonMask.Y_BTN.mask == PlayButtonStatus.ON.value) ControllerButton.y,
+      if (status.buttonMap & _RideButtonMask.Z_BTN.mask == PlayButtonStatus.ON.value) ControllerButton.z,
+      if (status.buttonMap & _RideButtonMask.SHFT_UP_L_BTN.mask == PlayButtonStatus.ON.value)
+        ControllerButton.shiftUpLeft,
+      if (status.buttonMap & _RideButtonMask.SHFT_DN_L_BTN.mask == PlayButtonStatus.ON.value)
+        ControllerButton.shiftDownLeft,
+      if (status.buttonMap & _RideButtonMask.SHFT_UP_R_BTN.mask == PlayButtonStatus.ON.value)
+        ControllerButton.shiftUpRight,
       if (status.buttonMap & _RideButtonMask.SHFT_DN_R_BTN.mask == PlayButtonStatus.ON.value)
-        ZwiftButton.shiftDownRight,
-      if (status.buttonMap & _RideButtonMask.POWERUP_L_BTN.mask == PlayButtonStatus.ON.value) ZwiftButton.powerUpLeft,
-      if (status.buttonMap & _RideButtonMask.POWERUP_R_BTN.mask == PlayButtonStatus.ON.value) ZwiftButton.powerUpRight,
-      if (status.buttonMap & _RideButtonMask.ONOFF_L_BTN.mask == PlayButtonStatus.ON.value) ZwiftButton.onOffLeft,
-      if (status.buttonMap & _RideButtonMask.ONOFF_R_BTN.mask == PlayButtonStatus.ON.value) ZwiftButton.onOffRight,
+        ControllerButton.shiftDownRight,
+      if (status.buttonMap & _RideButtonMask.POWERUP_L_BTN.mask == PlayButtonStatus.ON.value)
+        ControllerButton.powerUpLeft,
+      if (status.buttonMap & _RideButtonMask.POWERUP_R_BTN.mask == PlayButtonStatus.ON.value)
+        ControllerButton.powerUpRight,
+      if (status.buttonMap & _RideButtonMask.ONOFF_L_BTN.mask == PlayButtonStatus.ON.value) ControllerButton.onOffLeft,
+      if (status.buttonMap & _RideButtonMask.ONOFF_R_BTN.mask == PlayButtonStatus.ON.value) ControllerButton.onOffRight,
     ];
 
-    for (final analogue in status.analogButtons.groupStatus) {
-      if (analogue.analogValue.abs() == 100) {
-        if (analogue.location == RideAnalogLocation.LEFT) {
-          buttonsClicked.add(ZwiftButton.paddleLeft);
-        } else if (analogue.location == RideAnalogLocation.RIGHT) {
-          buttonsClicked.add(ZwiftButton.paddleRight);
-        } else if (analogue.location == RideAnalogLocation.DOWN || analogue.location == RideAnalogLocation.UP) {
-          // TODO what is this even?
+    // Process ANALOG inputs separately - now properly separated from digital
+    // All analog paddles (L0-L3) appear in field 3 as repeated RideAnalogKeyPress
+    analogButtons = [];
+    try {
+      for (final paddle in status.analogPaddles) {
+        if (paddle.hasLocation() && paddle.hasAnalogValue()) {
+          if (paddle.analogValue.abs() >= analogPaddleThreshold) {
+            final button = switch (paddle.location.value) {
+              0 => ControllerButton.paddleLeft, // L0 = left paddle
+              1 => ControllerButton.paddleRight, // L1 = right paddle
+              _ => null, // L2, L3 unused
+            };
+
+            if (button != null) {
+              buttonsClicked.add(button);
+              analogButtons.add(button);
+            }
+          }
         }
       }
+    } catch (e) {
+      if (kDebugMode) {
+        print('Error parsing analog paddle data: $e');
+      }
     }
   }
 
   @override
   String toString() {
-    return 'Buttons: ${buttonsClicked.joinToString(transform: (e) => e.name)}';
+    final digitalButtons = buttonsClicked.where((b) => !analogButtons.contains(b)).toList();
+    return 'Digital: ${digitalButtons.joinToString(transform: (e) => e.name.splitByUpperCase())} | Analog: ${analogButtons.joinToString(transform: (e) => e.name.splitByUpperCase())}';
   }
 
   @override

lib/bluetooth/protocol/zp.pbenum.dart

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

lib/bluetooth/protocol/zp.pbserver.dart

@@ -0,0 +1,14 @@
+//
+//  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/protocol/zp_vendor.pb.dart

@@ -0,0 +1,896 @@
+//
+//  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/protocol/zp_vendor.pbenum.dart

@@ -0,0 +1,101 @@
+//
+//  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/protocol/zp_vendor.pbjson.dart

@@ -0,0 +1,267 @@
+//
+//  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/protocol/zp_vendor.pbserver.dart

@@ -0,0 +1,14 @@
+//
+//  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/protocol/zwift.pb.dart

@@ -480,62 +480,19 @@ class RideAnalogKeyPress extends $pb.GeneratedMessage {
   void clearAnalogValue() => clearField(2);
 }
 
-class RideAnalogKeyGroup extends $pb.GeneratedMessage {
-  factory RideAnalogKeyGroup({
-    $core.Iterable<RideAnalogKeyPress>? groupStatus,
-  }) {
-    final $result = create();
-    if (groupStatus != null) {
-      $result.groupStatus.addAll(groupStatus);
-    }
-    return $result;
-  }
-  RideAnalogKeyGroup._() : super();
-  factory RideAnalogKeyGroup.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r);
-  factory RideAnalogKeyGroup.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r);
-
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RideAnalogKeyGroup', package: const $pb.PackageName(_omitMessageNames ? '' : 'de.jonasbark'), createEmptyInstance: create)
-    ..pc<RideAnalogKeyPress>(1, _omitFieldNames ? '' : 'GroupStatus', $pb.PbFieldType.PM, protoName: 'GroupStatus', subBuilder: RideAnalogKeyPress.create)
-    ..hasRequiredFields = false
-  ;
-
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
-  'Will be removed in next major version')
-  RideAnalogKeyGroup clone() => RideAnalogKeyGroup()..mergeFromMessage(this);
-  @$core.Deprecated(
-  'Using this can add significant overhead to your binary. '
-  'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
-  'Will be removed in next major version')
-  RideAnalogKeyGroup copyWith(void Function(RideAnalogKeyGroup) updates) => super.copyWith((message) => updates(message as RideAnalogKeyGroup)) as RideAnalogKeyGroup;
-
-  $pb.BuilderInfo get info_ => _i;
-
-  @$core.pragma('dart2js:noInline')
-  static RideAnalogKeyGroup create() => RideAnalogKeyGroup._();
-  RideAnalogKeyGroup createEmptyInstance() => create();
-  static $pb.PbList<RideAnalogKeyGroup> createRepeated() => $pb.PbList<RideAnalogKeyGroup>();
-  @$core.pragma('dart2js:noInline')
-  static RideAnalogKeyGroup getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<RideAnalogKeyGroup>(create);
-  static RideAnalogKeyGroup? _defaultInstance;
-
-  @$pb.TagNumber(1)
-  $core.List<RideAnalogKeyPress> get groupStatus => $_getList(0);
-}
-
 /// The command code prepending this message is 0x23
+/// All analog paddles (L0-L3) appear as repeated RideAnalogKeyPress in field 3
 class RideKeyPadStatus extends $pb.GeneratedMessage {
   factory RideKeyPadStatus({
     $core.int? buttonMap,
-    RideAnalogKeyGroup? analogButtons,
+    $core.Iterable<RideAnalogKeyPress>? analogPaddles,
   }) {
     final $result = create();
     if (buttonMap != null) {
       $result.buttonMap = buttonMap;
     }
-    if (analogButtons != null) {
-      $result.analogButtons = analogButtons;
+    if (analogPaddles != null) {
+      $result.analogPaddles.addAll(analogPaddles);
     }
     return $result;
   }
@@ -545,7 +502,7 @@ class RideKeyPadStatus extends $pb.GeneratedMessage {
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'RideKeyPadStatus', package: const $pb.PackageName(_omitMessageNames ? '' : 'de.jonasbark'), createEmptyInstance: create)
     ..a<$core.int>(1, _omitFieldNames ? '' : 'ButtonMap', $pb.PbFieldType.OU3, protoName: 'ButtonMap')
-    ..aOM<RideAnalogKeyGroup>(2, _omitFieldNames ? '' : 'AnalogButtons', protoName: 'AnalogButtons', subBuilder: RideAnalogKeyGroup.create)
+    ..pc<RideAnalogKeyPress>(3, _omitFieldNames ? '' : 'AnalogPaddles', $pb.PbFieldType.PM, protoName: 'AnalogPaddles', subBuilder: RideAnalogKeyPress.create)
     ..hasRequiredFields = false
   ;
 
@@ -579,16 +536,8 @@ class RideKeyPadStatus extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   void clearButtonMap() => clearField(1);
 
-  @$pb.TagNumber(2)
-  RideAnalogKeyGroup get analogButtons => $_getN(1);
-  @$pb.TagNumber(2)
-  set analogButtons(RideAnalogKeyGroup v) { setField(2, v); }
-  @$pb.TagNumber(2)
-  $core.bool hasAnalogButtons() => $_has(1);
-  @$pb.TagNumber(2)
-  void clearAnalogButtons() => clearField(2);
-  @$pb.TagNumber(2)
-  RideAnalogKeyGroup ensureAnalogButtons() => $_ensure(1);
+  @$pb.TagNumber(3)
+  $core.List<RideAnalogKeyPress> get analogPaddles => $_getList(1);
 }
 
 /// ------------------ Zwift Click messages

lib/bluetooth/protocol/zwift.pbjson.dart

@@ -170,33 +170,20 @@ final $typed_data.Uint8List rideAnalogKeyPressDescriptor = $convert.base64Decode
     'lkZUFuYWxvZ0xvY2F0aW9uUghMb2NhdGlvbhIgCgtBbmFsb2dWYWx1ZRgCIAEoEVILQW5hbG9n'
     'VmFsdWU=');
 
-@$core.Deprecated('Use rideAnalogKeyGroupDescriptor instead')
-const RideAnalogKeyGroup$json = {
-  '1': 'RideAnalogKeyGroup',
-  '2': [
-    {'1': 'GroupStatus', '3': 1, '4': 3, '5': 11, '6': '.de.jonasbark.RideAnalogKeyPress', '10': 'GroupStatus'},
-  ],
-};
-
-/// Descriptor for `RideAnalogKeyGroup`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List rideAnalogKeyGroupDescriptor = $convert.base64Decode(
-    'ChJSaWRlQW5hbG9nS2V5R3JvdXASQgoLR3JvdXBTdGF0dXMYASADKAsyIC5kZS5qb25hc2Jhcm'
-    'suUmlkZUFuYWxvZ0tleVByZXNzUgtHcm91cFN0YXR1cw==');
-
 @$core.Deprecated('Use rideKeyPadStatusDescriptor instead')
 const RideKeyPadStatus$json = {
   '1': 'RideKeyPadStatus',
   '2': [
     {'1': 'ButtonMap', '3': 1, '4': 1, '5': 13, '10': 'ButtonMap'},
-    {'1': 'AnalogButtons', '3': 2, '4': 1, '5': 11, '6': '.de.jonasbark.RideAnalogKeyGroup', '10': 'AnalogButtons'},
+    {'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'
-    'xvZ0J1dHRvbnMYAiABKAsyIC5kZS5qb25hc2JhcmsuUmlkZUFuYWxvZ0tleUdyb3VwUg1BbmFs'
-    'b2dCdXR0b25z');
+    'xvZ1BhZGRsZXMYAyADKAsyIC5kZS5qb25hc2JhcmsuUmlkZUFuYWxvZ0tleVByZXNzUg1BbmFs'
+    'b2dQYWRkbGVz');
 
 @$core.Deprecated('Use clickKeyPadStatusDescriptor instead')
 const ClickKeyPadStatus$json = {

lib/bluetooth/protocol/zwift.proto

@@ -79,14 +79,11 @@ message RideAnalogKeyPress {
   optional sint32 AnalogValue = 2;
 }
 
-message RideAnalogKeyGroup {
-  repeated RideAnalogKeyPress GroupStatus = 1;
-}
-
 // The command code prepending this message is 0x23
+// All analog paddles (L0-L3) appear as repeated RideAnalogKeyPress in field 3
 message RideKeyPadStatus {
   optional uint32 ButtonMap = 1;
-  optional RideAnalogKeyGroup AnalogButtons = 2;
+  repeated RideAnalogKeyPress AnalogPaddles = 3;  // Field 3 contains all paddles
 }
 
 //------------------ Zwift Click messages

lib/main.dart

@@ -8,6 +8,7 @@ import 'package:swift_control/pages/requirements.dart';
 import 'package:swift_control/theme.dart';
 import 'package:swift_control/utils/actions/android.dart';
 import 'package:swift_control/utils/actions/desktop.dart';
+import 'package:swift_control/utils/actions/remote.dart';
 import 'package:swift_control/utils/settings/settings.dart';
 import 'package:window_manager/window_manager.dart';
 
@@ -15,26 +16,41 @@ import 'bluetooth/connection.dart';
 import 'utils/actions/base_actions.dart';
 
 final connection = Connection();
-late final BaseActions actionHandler;
+late BaseActions actionHandler;
 final accessibilityHandler = Accessibility();
 final flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin();
 final settings = Settings();
+const screenshotMode = false;
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  if (kIsWeb) {
-    actionHandler = StubActions();
-  } else if (Platform.isAndroid) {
-    actionHandler = AndroidActions();
-  } else {
-    actionHandler = DesktopActions();
+
+  initializeActions(true);
+  if (actionHandler is DesktopActions) {
     // Must add this line.
     await windowManager.ensureInitialized();
+    windowManager.setSize(Size(1280, 800));
   }
 
   runApp(const SwiftPlayApp());
 }
 
+Future<void> initializeActions(bool local) async {
+  if (kIsWeb) {
+    actionHandler = StubActions();
+  } else if (Platform.isAndroid) {
+    if (local) {
+      actionHandler = AndroidActions();
+    } else {
+      actionHandler = RemoteActions();
+    }
+  } else if (Platform.isIOS) {
+    actionHandler = RemoteActions();
+  } else {
+    actionHandler = DesktopActions();
+  }
+}
+
 class SwiftPlayApp extends StatelessWidget {
   const SwiftPlayApp({super.key});
 
@@ -45,7 +61,7 @@ class SwiftPlayApp extends StatelessWidget {
       title: 'SwiftControl',
       theme: AppTheme.light,
       darkTheme: AppTheme.dark,
-      themeMode: ThemeMode.dark,
+      themeMode: ThemeMode.light,
       home: const RequirementsPage(),
     );
   }

lib/pages/device.dart

@@ -4,14 +4,26 @@ import 'dart:io';
 import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:swift_control/bluetooth/devices/zwift/zwift_clickv2.dart';
+import 'package:swift_control/bluetooth/protocol/zp.pb.dart';
 import 'package:swift_control/main.dart';
+import 'package:swift_control/pages/markdown.dart';
 import 'package:swift_control/pages/touch_area.dart';
+import 'package:swift_control/utils/actions/desktop.dart';
+import 'package:swift_control/widgets/keymap_explanation.dart';
+import 'package:swift_control/widgets/loading_widget.dart';
 import 'package:swift_control/widgets/logviewer.dart';
+import 'package:swift_control/widgets/small_progress_indicator.dart';
+import 'package:swift_control/widgets/testbed.dart';
 import 'package:swift_control/widgets/title.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
 
 import '../bluetooth/devices/base_device.dart';
+import '../utils/actions/remote.dart';
 import '../utils/keymap/apps/custom_app.dart';
 import '../utils/keymap/apps/supported_app.dart';
+import '../utils/requirements/remote.dart';
 import '../widgets/menu.dart';
 
 class DevicePage extends StatefulWidget {
@@ -21,14 +33,50 @@ class DevicePage extends StatefulWidget {
   State<DevicePage> createState() => _DevicePageState();
 }
 
-class _DevicePageState extends State<DevicePage> {
+class _DevicePageState extends State<DevicePage> with WidgetsBindingObserver {
   late StreamSubscription<BaseDevice> _connectionStateSubscription;
   final controller = TextEditingController(text: actionHandler.supportedApp?.name);
 
+  List<SupportedApp> _getAllApps() {
+    final baseApps = SupportedApp.supportedApps.where((app) => app is! CustomApp).toList();
+    final customProfiles = settings.getCustomAppProfiles();
+
+    final customApps = customProfiles.map((profile) {
+      final customApp = CustomApp(profileName: profile);
+      final savedKeymap = settings.getCustomAppKeymap(profile);
+      if (savedKeymap != null) {
+        customApp.decodeKeymap(savedKeymap);
+      }
+      return customApp;
+    }).toList();
+
+    // If no custom profiles exist, add the default "Custom" one
+    if (customApps.isEmpty) {
+      customApps.add(CustomApp());
+    }
+
+    return [...baseApps, ...customApps];
+  }
+
   @override
   void initState() {
     super.initState();
 
+    // keep screen on - this is required for iOS to keep the bluetooth connection alive
+    WakelockPlus.enable();
+    WidgetsBinding.instance.addObserver(this);
+
+    if (actionHandler is RemoteActions && !kIsWeb && Platform.isIOS) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        // show snackbar to inform user that the app needs to stay in foreground
+        _snackBarMessengerKey.currentState?.showSnackBar(
+          SnackBar(
+            content: Text('To keep working properly the app needs to stay in the foreground.'),
+            duration: Duration(seconds: 5),
+          ),
+        );
+      });
+    }
     _connectionStateSubscription = connection.connectionStream.listen((state) async {
       setState(() {});
     });
@@ -36,119 +84,602 @@ class _DevicePageState extends State<DevicePage> {
 
   @override
   void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+
     _connectionStateSubscription.cancel();
     controller.dispose();
     super.dispose();
   }
 
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    if (state == AppLifecycleState.resumed && actionHandler is RemoteActions && Platform.isIOS) {
+      final requirement = RemoteRequirement();
+      requirement.reconnect();
+      _snackBarMessengerKey.currentState?.showSnackBar(
+        SnackBar(
+          content: Text('To keep working properly the app needs to stay in the foreground.'),
+          duration: Duration(seconds: 5),
+        ),
+      );
+    }
+  }
+
   final _snackBarMessengerKey = GlobalKey<ScaffoldMessengerState>();
 
   @override
   Widget build(BuildContext context) {
+    final canVibrate = connection.devices.any(
+      (device) => (device.device.name == 'Zwift Ride' || device.device.name == 'Zwift Play') && device.isConnected,
+    );
+
+    final paddingMultiplicator = actionHandler is DesktopActions ? 2.5 : 1.0;
+
     return ScaffoldMessenger(
       key: _snackBarMessengerKey,
       child: PopScope(
         onPopInvokedWithResult: (hello, _) {
           connection.reset();
         },
-        child: Scaffold(
-          appBar: AppBar(
-            title: AppTitle(),
-            actions: buildMenuButtons(),
-            backgroundColor: Theme.of(context).colorScheme.inversePrimary,
-          ),
-          body: Padding(
-            padding: const EdgeInsets.all(8.0),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              spacing: 10,
-              children: [
-                Text(
-                  'Devices:\n${connection.devices.joinToString(separator: '\n', transform: (it) {
-                    return "${it.device.name ?? it.runtimeType}: ${it.isConnected ? 'Connected' : 'Not connected'}${it.batteryLevel != null ? ' - Battery Level: ${it.batteryLevel}%' : ''}";
-                  })}',
+        child: Stack(
+          children: [
+            Scaffold(
+              appBar: AppBar(
+                title: AppTitle(),
+                actions: buildMenuButtons(),
+                backgroundColor: Theme.of(context).colorScheme.inversePrimary,
+              ),
+              body: SingleChildScrollView(
+                padding: EdgeInsets.only(
+                  top: 16,
+                  left: 8.0 * paddingMultiplicator,
+                  right: 8 * paddingMultiplicator,
+                  bottom: 8,
                 ),
-                Divider(color: Theme.of(context).colorScheme.primary, height: 30),
-                if (!kIsWeb)
-                  Wrap(
-                    spacing: 8,
-                    runSpacing: 8,
-                    crossAxisAlignment: WrapCrossAlignment.center,
-                    children: [
-                      DropdownMenu<SupportedApp>(
-                        controller: controller,
-                        dropdownMenuEntries:
-                            SupportedApp.supportedApps
-                                .map(
-                                  (app) => DropdownMenuEntry<SupportedApp>(
-                                    value: app,
-                                    label: app.name,
-                                    trailingIcon: IconButton(
-                                      icon: Icon(Icons.info_outline),
-                                      onPressed: () {
-                                        showDialog(
-                                          context: context,
-                                          builder:
-                                              (context) => AlertDialog(
-                                                title: Text(app.name),
-                                                content: SelectableText(app.keymap.toString()),
-                                                actions: [
-                                                  TextButton(
-                                                    onPressed: () => Navigator.of(context).pop(),
-                                                    child: Text('OK'),
-                                                  ),
-                                                ],
-                                              ),
-                                        );
-                                      },
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 4),
+                      child: Text('Connected Devices', style: Theme.of(context).textTheme.titleMedium),
+                    ),
+                    Card(
+                      child: Padding(
+                        padding: EdgeInsets.only(
+                          left: 16.0,
+                          right: 16,
+                          top: 16,
+                          bottom: actionHandler is RemoteActions ? 0 : 12,
+                        ),
+                        child: Column(
+                          children: [
+                            if (connection.devices.isEmpty)
+                              Text('No devices connected. Go back and connect a device to get started.'),
+                            ...connection.devices.map(
+                              (device) => Row(
+                                children: [
+                                  Text(
+                                    device.device.name?.screenshot ?? device.runtimeType.toString(),
+                                    style: TextStyle(fontWeight: FontWeight.bold),
+                                  ),
+                                  if (device.isBeta)
+                                    Padding(
+                                      padding: const EdgeInsets.only(left: 8.0),
+                                      child: Container(
+                                        padding: EdgeInsets.symmetric(horizontal: 6, vertical: 2),
+                                        decoration: BoxDecoration(
+                                          color: Colors.orange,
+                                          borderRadius: BorderRadius.circular(4),
+                                        ),
+                                        child: Text(
+                                          'BETA',
+                                          style: TextStyle(
+                                            color: Colors.white,
+                                            fontSize: 10,
+                                            fontWeight: FontWeight.bold,
+                                          ),
+                                        ),
+                                      ),
+                                    ),
+                                  if (device.batteryLevel != null) ...[
+                                    Icon(switch (device.batteryLevel!) {
+                                      >= 80 => Icons.battery_full,
+                                      >= 60 => Icons.battery_6_bar,
+                                      >= 50 => Icons.battery_5_bar,
+                                      >= 25 => Icons.battery_4_bar,
+                                      >= 10 => Icons.battery_2_bar,
+                                      _ => Icons.battery_alert,
+                                    }),
+                                    Text('${device.batteryLevel}%'),
+                                    if (device.firmwareVersion != null) Text(' - Firmware: ${device.firmwareVersion}'),
+                                  ],
+                                ],
+                              ),
+                            ),
+                            if (actionHandler is RemoteActions)
+                              Row(
+                                children: [
+                                  Text(
+                                    'Remote Control Mode: ${(actionHandler as RemoteActions).isConnected ? 'Connected' : 'Not connected'}',
+                                  ),
+                                  LoadingWidget(
+                                    futureCallback: () async {
+                                      final requirement = RemoteRequirement();
+                                      await requirement.reconnect();
+                                    },
+                                    renderChild: (isLoading, tap) => TextButton(
+                                      onPressed: tap,
+                                      child: isLoading ? SmallProgressIndicator() : Text('Reconnect'),
                                     ),
                                   ),
-                                )
-                                .toList(),
-                        label: Text('Keymap'),
-                        onSelected: (app) async {
-                          if (app == null) {
-                            return;
-                          }
-                          controller.text = app.name ?? '';
-                          actionHandler.supportedApp = app;
-                          settings.setApp(app);
-                          setState(() {});
-                          if (app is! CustomApp && !kIsWeb && (Platform.isMacOS || Platform.isWindows)) {
-                            _snackBarMessengerKey.currentState!.showSnackBar(
-                              SnackBar(
-                                content: Text(
-                                  'Use Custom keymap if you experience any issues (e.g. wrong keyboard output)',
+                                ],
+                              ),
+
+                            if (connection.devices.any((device) => (device is ZwiftClickV2) && device.isConnected))
+                              Container(
+                                margin: EdgeInsets.only(bottom: 6),
+                                decoration: BoxDecoration(
+                                  color: Theme.of(context).colorScheme.errorContainer,
+                                  borderRadius: BorderRadius.circular(8),
+                                ),
+                                padding: const EdgeInsets.all(8),
+                                child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.start,
+                                  mainAxisAlignment: MainAxisAlignment.start,
+                                  children: [
+                                    Text(
+                                      '''To make your Zwift Click V2 work best you should connect it in the Zwift app once each day.\nIf you don't do that SwiftControl will need to reconnect every minute.
+
+1. Open Zwift app
+2. Log in (subscription not required) and open the device connection screen
+3. Connect your Trainer, then connect the Zwift Click V2
+4. Close the Zwift app again and connect again in SwiftControl''',
+                                    ),
+                                    Row(
+                                      children: [
+                                        TextButton(
+                                          onPressed: () {
+                                            connection.devices.whereType<ZwiftClickV2>().forEach(
+                                              (device) => device.sendCommand(Opcode.RESET, null),
+                                            );
+                                          },
+                                          child: Text('Reset now'),
+                                        ),
+                                        TextButton(
+                                          onPressed: () {
+                                            Navigator.push(
+                                              context,
+                                              MaterialPageRoute(
+                                                builder: (_) => MarkdownPage(assetPath: 'TROUBLESHOOTING.md'),
+                                              ),
+                                            );
+                                          },
+                                          child: Text('Troubleshooting'),
+                                        ),
+                                      ],
+                                    ),
+                                  ],
                                 ),
                               ),
-                            );
-                          }
-                        },
-                        initialSelection: actionHandler.supportedApp,
-                        hintText: 'Select your Keymap',
-                      ),
-
-                      if (actionHandler.supportedApp is CustomApp)
-                        ElevatedButton(
-                          onPressed: () async {
-                            final result = await Navigator.of(
-                              context,
-                            ).push<bool>(MaterialPageRoute(builder: (_) => TouchAreaSetupPage()));
-                            if (result == true && actionHandler.supportedApp is CustomApp) {
-                              settings.setApp(actionHandler.supportedApp!);
-                            }
-                            setState(() {});
-                          },
-                          child: Text('Customize Keymap'),
+                          ],
                         ),
+                      ),
+                    ),
+
+                    if (!kIsWeb) ...[
+                      SizedBox(height: 20),
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 4),
+                        child: Text('Customize', style: Theme.of(context).textTheme.titleMedium),
+                      ),
+                      Card(
+                        child: Padding(
+                          padding: EdgeInsets.only(
+                            left: 16.0,
+                            right: 16,
+                            top: 16,
+                            bottom: canVibrate ? 0 : 12,
+                          ),
+                          child: Column(
+                            spacing: 12,
+                            mainAxisAlignment: MainAxisAlignment.start,
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Row(
+                                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                                spacing: 8,
+                                children: [
+                                  Expanded(
+                                    child: DropdownMenu<SupportedApp?>(
+                                      controller: controller,
+                                      dropdownMenuEntries: [
+                                        ..._getAllApps().map(
+                                          (app) => DropdownMenuEntry<SupportedApp>(value: app, label: app.name),
+                                        ),
+                                        DropdownMenuEntry(
+                                          value: CustomApp(profileName: 'New'),
+                                          label: 'Create new keymap',
+                                          labelWidget: Text('Create new keymap'),
+                                          leadingIcon: Icon(Icons.add),
+                                        ),
+                                      ],
+                                      label: Text('Select Keymap / app'),
+                                      onSelected: (app) async {
+                                        if (app == null) {
+                                          return;
+                                        } else if (app.name == 'New') {
+                                          final profileName = await _showNewProfileDialog();
+                                          if (profileName != null && profileName.isNotEmpty) {
+                                            final customApp = CustomApp(profileName: profileName);
+                                            actionHandler.supportedApp = customApp;
+                                            await settings.setApp(customApp);
+                                            controller.text = profileName;
+                                            setState(() {});
+                                          }
+                                        } else {
+                                          controller.text = app.name ?? '';
+                                          actionHandler.supportedApp = app;
+                                          await settings.setApp(app);
+                                          setState(() {});
+                                          if (app is! CustomApp &&
+                                              !kIsWeb &&
+                                              (Platform.isMacOS || Platform.isWindows)) {
+                                            _snackBarMessengerKey.currentState!.showSnackBar(
+                                              SnackBar(
+                                                content: Text(
+                                                  'Customize the keymap if you experience any issues (e.g. wrong keyboard output)',
+                                                ),
+                                              ),
+                                            );
+                                          }
+                                        }
+                                      },
+                                      initialSelection: actionHandler.supportedApp,
+                                      hintText: 'Select your Keymap',
+                                    ),
+                                  ),
+
+                                  Row(
+                                    children: [
+                                      if (actionHandler.supportedApp != null)
+                                        ElevatedButton.icon(
+                                          onPressed: () async {
+                                            if (actionHandler.supportedApp is! CustomApp) {
+                                              await _duplicate(actionHandler.supportedApp!.name);
+                                            }
+                                            final result = await Navigator.of(
+                                              context,
+                                            ).push<bool>(MaterialPageRoute(builder: (_) => TouchAreaSetupPage()));
+
+                                            if (result == true && actionHandler.supportedApp is CustomApp) {
+                                              await settings.setApp(actionHandler.supportedApp!);
+                                            }
+                                            setState(() {});
+                                          },
+                                          icon: Icon(Icons.edit),
+                                          label: Text('Edit'),
+                                        ),
+
+                                      IconButton(
+                                        onPressed: () async {
+                                          final currentProfile = actionHandler.supportedApp?.name;
+                                          final action = await _showManageProfileDialog(currentProfile);
+                                          if (action != null) {
+                                            if (action == 'rename') {
+                                              final newName = await _showRenameProfileDialog(currentProfile!);
+                                              if (newName != null && newName.isNotEmpty && newName != currentProfile) {
+                                                await settings.duplicateCustomAppProfile(currentProfile, newName);
+                                                await settings.deleteCustomAppProfile(currentProfile);
+                                                final customApp = CustomApp(profileName: newName);
+                                                final savedKeymap = settings.getCustomAppKeymap(newName);
+                                                if (savedKeymap != null) {
+                                                  customApp.decodeKeymap(savedKeymap);
+                                                }
+                                                actionHandler.supportedApp = customApp;
+                                                await settings.setApp(customApp);
+                                                controller.text = newName;
+                                                setState(() {});
+                                              }
+                                            } else if (action == 'duplicate') {
+                                              _duplicate(currentProfile!);
+                                            } else if (action == 'delete') {
+                                              final confirmed = await _showDeleteConfirmDialog(currentProfile!);
+                                              if (confirmed == true) {
+                                                await settings.deleteCustomAppProfile(currentProfile);
+                                                controller.text = '';
+                                                setState(() {});
+                                              }
+                                            } else if (action == 'import') {
+                                              final jsonData = await _showImportDialog();
+                                              if (jsonData != null && jsonData.isNotEmpty) {
+                                                final success = await settings.importCustomAppProfile(jsonData);
+                                                if (mounted) {
+                                                  if (success) {
+                                                    _snackBarMessengerKey.currentState!.showSnackBar(
+                                                      SnackBar(
+                                                        content: Text('Profile imported successfully'),
+                                                        duration: Duration(seconds: 5),
+                                                      ),
+                                                    );
+                                                    setState(() {});
+                                                  } else {
+                                                    _snackBarMessengerKey.currentState!.showSnackBar(
+                                                      SnackBar(
+                                                        content: Text('Failed to import profile. Invalid format.'),
+                                                        duration: Duration(seconds: 5),
+                                                        backgroundColor: Colors.red,
+                                                      ),
+                                                    );
+                                                  }
+                                                }
+                                              }
+                                            } else if (action == 'export') {
+                                              final currentProfile =
+                                                  (actionHandler.supportedApp as CustomApp).profileName;
+                                              final jsonData = settings.exportCustomAppProfile(currentProfile);
+                                              if (jsonData != null) {
+                                                await Clipboard.setData(ClipboardData(text: jsonData));
+                                                if (mounted) {
+                                                  _snackBarMessengerKey.currentState!.showSnackBar(
+                                                    SnackBar(
+                                                      content: Text('Profile "$currentProfile" exported to clipboard'),
+                                                      duration: Duration(seconds: 5),
+                                                    ),
+                                                  );
+                                                }
+                                              }
+                                            }
+                                          }
+                                        },
+                                        icon: Icon(Icons.more_vert),
+                                      ),
+                                    ],
+                                  ),
+                                ],
+                              ),
+                              if (actionHandler.supportedApp != null)
+                                KeymapExplanation(
+                                  key: Key(actionHandler.supportedApp!.keymap.runtimeType.toString()),
+                                  keymap: actionHandler.supportedApp!.keymap,
+                                  onUpdate: () {
+                                    setState(() {});
+                                    controller.text = actionHandler.supportedApp?.name ?? '';
+                                  },
+                                ),
+                              if (canVibrate) ...[
+                                SwitchListTile(
+                                  title: Text('Enable vibration feedback when shifting gears'),
+                                  value: settings.getVibrationEnabled(),
+                                  contentPadding: EdgeInsets.zero,
+                                  onChanged: (value) async {
+                                    await settings.setVibrationEnabled(value);
+                                    setState(() {});
+                                  },
+                                ),
+                              ],
+                            ],
+                          ),
+                        ),
+                      ),
                     ],
-                  ),
-                Expanded(child: LogViewer()),
-              ],
+                    SizedBox(height: 20),
+                    Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 4),
+                      child: Text('Logs', style: Theme.of(context).textTheme.titleMedium),
+                    ),
+                    LogViewer(),
+                  ],
+                ),
+              ),
             ),
-          ),
+            Positioned.fill(child: Testbed()),
+          ],
         ),
       ),
     );
   }
+
+  Future<String?> _showNewProfileDialog() async {
+    final controller = TextEditingController();
+    return showDialog<String>(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text('New Custom Profile'),
+        content: TextField(
+          controller: controller,
+          decoration: InputDecoration(labelText: 'Profile Name', hintText: 'e.g., Workout, Race, Event'),
+          autofocus: true,
+        ),
+        actions: [
+          TextButton(onPressed: () => Navigator.pop(context), child: Text('Cancel')),
+          TextButton(onPressed: () => Navigator.pop(context, controller.text), child: Text('Create')),
+        ],
+      ),
+    );
+  }
+
+  Future<String?> _showManageProfileDialog(String? currentProfile) async {
+    return showDialog<String>(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text('Manage Profile: ${currentProfile ?? ''}'),
+        content: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            if (currentProfile != null && actionHandler.supportedApp is CustomApp)
+              ListTile(
+                leading: Icon(Icons.edit),
+                title: Text('Rename'),
+                onTap: () => Navigator.pop(context, 'rename'),
+              ),
+            if (currentProfile != null)
+              ListTile(
+                leading: Icon(Icons.copy),
+                title: Text('Duplicate'),
+                onTap: () => Navigator.pop(context, 'duplicate'),
+              ),
+            ListTile(
+              leading: Icon(Icons.file_upload),
+              title: Text('Import'),
+              onTap: () => Navigator.pop(context, 'import'),
+            ),
+            if (currentProfile != null)
+              ListTile(
+                leading: Icon(Icons.share),
+                title: Text('Export'),
+                onTap: () => Navigator.pop(context, 'export'),
+              ),
+            if (currentProfile != null)
+              ListTile(
+                leading: Icon(Icons.delete, color: Theme.of(context).colorScheme.error),
+                title: Text('Delete', style: TextStyle(color: Theme.of(context).colorScheme.error)),
+                onTap: () => Navigator.pop(context, 'delete'),
+              ),
+          ],
+        ),
+        actions: [TextButton(onPressed: () => Navigator.pop(context), child: Text('Cancel'))],
+      ),
+    );
+  }
+
+  Future<String?> _showRenameProfileDialog(String currentName) async {
+    final controller = TextEditingController(text: currentName);
+    return showDialog<String>(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text('Rename Profile'),
+        content: TextField(
+          controller: controller,
+          decoration: InputDecoration(labelText: 'Profile Name'),
+          autofocus: true,
+        ),
+        actions: [
+          TextButton(onPressed: () => Navigator.pop(context), child: Text('Cancel')),
+          TextButton(onPressed: () => Navigator.pop(context, controller.text), child: Text('Rename')),
+        ],
+      ),
+    );
+  }
+
+  Future<String?> _showDuplicateProfileDialog(String currentName) async {
+    final controller = TextEditingController(text: '$currentName (Copy)');
+    return showDialog<String>(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text('Duplicate Profile'),
+        content: TextField(
+          controller: controller,
+          decoration: InputDecoration(labelText: 'New Profile Name'),
+          autofocus: true,
+        ),
+        actions: [
+          TextButton(onPressed: () => Navigator.pop(context), child: Text('Cancel')),
+          TextButton(onPressed: () => Navigator.pop(context, controller.text), child: Text('Duplicate')),
+        ],
+      ),
+    );
+  }
+
+  Future<bool?> _showDeleteConfirmDialog(String profileName) async {
+    return showDialog<bool>(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text('Delete Profile'),
+        content: Text('Are you sure you want to delete "$profileName"? This action cannot be undone.'),
+        actions: [
+          TextButton(onPressed: () => Navigator.pop(context, false), child: Text('Cancel')),
+          TextButton(
+            onPressed: () => Navigator.pop(context, true),
+            child: Text('Delete'),
+            style: TextButton.styleFrom(foregroundColor: Colors.red),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future<String?> _showImportDialog() async {
+    final controller = TextEditingController();
+
+    // Try to get data from clipboard
+    try {
+      final clipboardData = await Clipboard.getData('text/plain');
+      if (clipboardData?.text != null) {
+        controller.text = clipboardData!.text!;
+      }
+    } catch (e) {
+      // Ignore clipboard errors
+    }
+
+    return showDialog<String>(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text('Import Profile'),
+        content: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Text('Paste the exported JSON data below:'),
+            SizedBox(height: 16),
+            TextField(
+              controller: controller,
+              decoration: InputDecoration(labelText: 'JSON Data', border: OutlineInputBorder()),
+              maxLines: 5,
+              autofocus: true,
+            ),
+          ],
+        ),
+        actions: [
+          TextButton(onPressed: () => Navigator.pop(context), child: Text('Cancel')),
+          TextButton(onPressed: () => Navigator.pop(context, controller.text), child: Text('Import')),
+        ],
+      ),
+    );
+  }
+
+  Future<void> _duplicate(String currentProfile) async {
+    final newName = await _showDuplicateProfileDialog(currentProfile);
+    if (newName != null && newName.isNotEmpty) {
+      if (actionHandler.supportedApp is CustomApp) {
+        await settings.duplicateCustomAppProfile(currentProfile, newName);
+        final customApp = CustomApp(profileName: newName);
+        final savedKeymap = settings.getCustomAppKeymap(newName);
+        if (savedKeymap != null) {
+          customApp.decodeKeymap(savedKeymap);
+        }
+        actionHandler.supportedApp = customApp;
+        await settings.setApp(customApp);
+        controller.text = newName;
+        setState(() {});
+      } else {
+        final customApp = CustomApp(profileName: newName);
+
+        final connectedDevice = connection.devices.firstOrNull;
+        actionHandler.supportedApp!.keymap.keyPairs.forEachIndexed((pair, index) {
+          pair.buttons.filter((button) => connectedDevice?.availableButtons.contains(button) == true).forEachIndexed((
+            button,
+            indexB,
+          ) {
+            customApp.setKey(
+              button,
+              physicalKey: pair.physicalKey,
+              logicalKey: pair.logicalKey,
+              isLongPress: pair.isLongPress,
+              touchPosition: pair.touchPosition != Offset.zero
+                  ? pair.touchPosition
+                  : Offset(((indexB + 1)) * 10, 20 + (index * 10)),
+            );
+          });
+        });
+
+        actionHandler.supportedApp = customApp;
+        await settings.setApp(customApp);
+        controller.text = newName;
+        setState(() {});
+      }
+    }
+  }
+}
+
+extension Screenshot on String {
+  String get screenshot => screenshotMode ? replaceAll('Zwift ', '') : this;
 }

lib/pages/markdown.dart

@@ -0,0 +1,84 @@
+import 'package:flex_color_scheme/flex_color_scheme.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_md/flutter_md.dart';
+import 'package:http/http.dart' as http;
+import 'package:url_launcher/url_launcher_string.dart';
+
+class MarkdownPage extends StatefulWidget {
+  final String assetPath;
+  const MarkdownPage({super.key, required this.assetPath});
+
+  @override
+  State<MarkdownPage> createState() => _ChangelogPageState();
+}
+
+class _ChangelogPageState extends State<MarkdownPage> {
+  Markdown? _markdown;
+  String? _error;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadChangelog();
+  }
+
+  Future<void> _loadChangelog() async {
+    try {
+      final md = await rootBundle.loadString(widget.assetPath);
+      setState(() {
+        _markdown = Markdown.fromString(md);
+      });
+
+      // load latest version
+      final response = await http.get(
+        Uri.parse('https://raw.githubusercontent.com/jonasbark/swiftcontrol/refs/heads/main/${widget.assetPath}'),
+      );
+      if (response.statusCode == 200) {
+        final latestMd = response.body;
+        if (latestMd != md) {
+          setState(() {
+            _markdown = Markdown.fromString(md);
+          });
+        }
+      }
+    } catch (e) {
+      setState(() {
+        _error = 'Failed to load changelog: $e';
+      });
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(widget.assetPath.replaceAll('.md', '').toLowerCase().capitalize),
+        backgroundColor: Theme.of(context).colorScheme.inversePrimary,
+      ),
+      body:
+          _error != null
+              ? Center(child: Text(_error!))
+              : _markdown == null
+              ? Center(child: CircularProgressIndicator())
+              : SingleChildScrollView(
+                padding: EdgeInsets.all(16),
+                child: Row(
+                  children: [
+                    Expanded(
+                      child: MarkdownWidget(
+                        markdown: _markdown!,
+                        theme: MarkdownThemeData(
+                          textStyle: TextStyle(fontSize: 14.0, color: Colors.black87),
+                          onLinkTap: (title, url) {
+                            launchUrlString(url);
+                          },
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+    );
+  }
+}

lib/pages/requirements.dart

@@ -3,8 +3,10 @@ import 'dart:io';
 import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:package_info_plus/package_info_plus.dart';
 import 'package:swift_control/main.dart';
 import 'package:swift_control/utils/requirements/platform.dart';
+import 'package:swift_control/widgets/changelog_dialog.dart';
 import 'package:swift_control/widgets/menu.dart';
 import 'package:swift_control/widgets/title.dart';
 
@@ -19,6 +21,7 @@ class RequirementsPage extends StatefulWidget {
 
 class _RequirementsPageState extends State<RequirementsPage> with WidgetsBindingObserver {
   int _currentStep = 0;
+  var _local = true;
 
   List<PlatformRequirement> _requirements = [];
 
@@ -27,11 +30,14 @@ class _RequirementsPageState extends State<RequirementsPage> with WidgetsBinding
     super.initState();
     WidgetsBinding.instance.addObserver(this);
 
+    _local = kIsWeb || !Platform.isIOS;
+
     // call after first frame
     WidgetsBinding.instance.addPostFrameCallback((_) {
       settings.init().then((_) {
+        _checkAndShowChangelog();
         if (!kIsWeb && Platform.isMacOS) {
-          // add more delay due tu CBManagerStateUnknown
+          // add more delay due to CBManagerStateUnknown
           Future.delayed(const Duration(seconds: 2), () {
             _reloadRequirements();
           });
@@ -48,6 +54,23 @@ class _RequirementsPageState extends State<RequirementsPage> with WidgetsBinding
     });
   }
 
+  Future<void> _checkAndShowChangelog() async {
+    try {
+      final packageInfo = await PackageInfo.fromPlatform();
+      final currentVersion = packageInfo.version;
+      final lastSeenVersion = settings.getLastSeenVersion();
+
+      if (mounted) {
+        await ChangelogDialog.showIfNeeded(context, currentVersion, lastSeenVersion);
+      }
+
+      // Update last seen version
+      await settings.setLastSeenVersion(currentVersion);
+    } catch (e) {
+      print('Failed to check changelog: $e');
+    }
+  }
+
   @override
   dispose() {
     WidgetsBinding.instance.removeObserver(this);
@@ -69,70 +92,103 @@ class _RequirementsPageState extends State<RequirementsPage> with WidgetsBinding
         backgroundColor: Theme.of(context).colorScheme.inversePrimary,
         actions: buildMenuButtons(),
       ),
-      body:
-          _requirements.isEmpty
-              ? Center(child: CircularProgressIndicator())
-              : Stepper(
-                currentStep: _currentStep,
-                connectorColor: WidgetStateProperty.resolveWith<Color>(
-                  (Set<WidgetState> states) => Theme.of(context).colorScheme.primary,
+      body: _requirements.isEmpty
+          ? Center(child: CircularProgressIndicator())
+          : Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              spacing: 8,
+              children: [
+                SwitchListTile.adaptive(
+                  value: _local,
+                  title: Text('Trainer app is running on this device'),
+                  subtitle: Text('Turn off if you want to control another device, e.g. your tablet'),
+                  onChanged: (local) {
+                    if (kIsWeb || Platform.isIOS) {
+                      ScaffoldMessenger.of(context).showSnackBar(
+                        SnackBar(
+                          content: Text('This platform only supports controlling trainer apps on other devices'),
+                        ),
+                      );
+                    } else {
+                      initializeActions(local);
+                      setState(() {
+                        _local = local;
+                        _reloadRequirements();
+                      });
+                    }
+                  },
                 ),
-                onStepContinue:
-                    _currentStep < _requirements.length
-                        ? () {
-                          setState(() {
-                            _currentStep += 1;
-                          });
+                Expanded(
+                  child: Card(
+                    margin: EdgeInsets.symmetric(horizontal: 16),
+                    child: Stepper(
+                      currentStep: _currentStep,
+                      connectorColor: WidgetStateProperty.resolveWith<Color>(
+                        (Set<WidgetState> states) => Theme.of(context).colorScheme.primary,
+                      ),
+                      onStepContinue: _currentStep < _requirements.length
+                          ? () {
+                              setState(() {
+                                _currentStep += 1;
+                              });
+                            }
+                          : null,
+                      onStepTapped: (step) {
+                        if (_requirements[step].status) {
+                          return;
                         }
-                        : null,
-                onStepTapped: (step) {
-                  if (_requirements[step].status) {
-                    return;
-                  }
-                  final hasEarlierIncomplete = _requirements.indexWhere((req) => !req.status) < step;
-                  if (hasEarlierIncomplete) {
-                    return;
-                  }
-                  setState(() {
-                    _currentStep = step;
-                  });
-                },
-                controlsBuilder: (context, details) => Container(),
-                steps:
-                    _requirements
-                        .mapIndexed(
-                          (index, req) => Step(
-                            title: Text(req.name),
-                            content: Container(
-                              padding: const EdgeInsets.symmetric(vertical: 16.0),
-                              alignment: Alignment.centerLeft,
-                              child:
-                                  (index == _currentStep
-                                      ? req.build(context, () {
-                                        _reloadRequirements();
-                                      })
-                                      : null) ??
-                                  ElevatedButton(
-                                    onPressed: req.status ? null : () => _callRequirement(req),
-                                    child: Text(req.name),
-                                  ),
+                        final hasEarlierIncomplete = _requirements.indexWhere((req) => !req.status) < step;
+                        if (hasEarlierIncomplete && !kDebugMode) {
+                          return;
+                        }
+                        setState(() {
+                          _currentStep = step;
+                        });
+                      },
+                      controlsBuilder: (context, details) => Container(),
+                      steps: _requirements
+                          .mapIndexed(
+                            (index, req) => Step(
+                              title: Text(req.name, style: TextStyle(fontWeight: FontWeight.w600)),
+                              subtitle: req.description != null ? Text(req.description!) : null,
+                              content: Container(
+                                padding: const EdgeInsets.only(top: 16.0),
+                                alignment: Alignment.centerLeft,
+                                child:
+                                    (index == _currentStep
+                                        ? req.build(context, () {
+                                            _reloadRequirements();
+                                          })
+                                        : null) ??
+                                    ElevatedButton(
+                                      onPressed: req.status
+                                          ? null
+                                          : () => _callRequirement(req, context, () {
+                                              _reloadRequirements();
+                                            }),
+                                      child: Text(req.name),
+                                    ),
+                              ),
+                              state: req.status ? StepState.complete : StepState.indexed,
                             ),
-                            state: req.status ? StepState.complete : StepState.indexed,
-                          ),
-                        )
-                        .toList(),
-              ),
+                          )
+                          .toList(),
+                    ),
+                  ),
+                ),
+              ],
+            ),
     );
   }
 
-  void _callRequirement(PlatformRequirement req) {
-    req.call().then((_) {
+  void _callRequirement(PlatformRequirement req, BuildContext context, VoidCallback onUpdate) {
+    req.call(context, onUpdate).then((_) {
       _reloadRequirements();
     });
   }
 
   void _reloadRequirements() {
-    getRequirements().then((req) {
+    getRequirements(_local).then((req) {
       _requirements = req;
       _currentStep = req.indexWhere((req) => !req.status);
       if (mounted) {

lib/pages/scan.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:swift_control/main.dart';
+import 'package:swift_control/pages/markdown.dart';
 import 'package:swift_control/widgets/small_progress_indicator.dart';
 
 import '../widgets/logviewer.dart';
@@ -45,9 +46,9 @@ class _ScanWidgetState extends State<ScanWidget> {
   Widget build(BuildContext context) {
     return Container(
       constraints: BoxConstraints(minHeight: 200),
-      child: ListView(
-        padding: EdgeInsets.all(16),
-        shrinkWrap: true,
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.start,
+        crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           ValueListenableBuilder(
             valueListenable: connection.isScanning,
@@ -55,10 +56,21 @@ class _ScanWidgetState extends State<ScanWidget> {
               if (isScanning) {
                 return Column(
                   spacing: 12,
+                  mainAxisAlignment: MainAxisAlignment.start,
+                  crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     Text(
                       'Scanning for devices... Make sure they are powered on and in range and not connected to another device.',
                     ),
+                    TextButton(
+                      onPressed: () {
+                        Navigator.push(
+                          context,
+                          MaterialPageRoute(builder: (c) => MarkdownPage(assetPath: 'TROUBLESHOOTING.md')),
+                        );
+                      },
+                      child: const Text("Show Troubleshooting Guide"),
+                    ),
                     SmallProgressIndicator(),
                   ],
                 );
@@ -76,7 +88,7 @@ class _ScanWidgetState extends State<ScanWidget> {
               }
             },
           ),
-          if (kDebugMode) SizedBox(height: 500, child: LogViewer()),
+          if (kDebugMode && false) SizedBox(height: 500, child: LogViewer()),
         ],
       ),
     );

lib/pages/touch_area.dart

@@ -1,19 +1,23 @@
 import 'dart:async';
 import 'dart:io';
+import 'dart:math';
 
-import 'package:dartx/dartx.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:keypress_simulator/keypress_simulator.dart';
 import 'package:swift_control/main.dart';
+import 'package:swift_control/widgets/keymap_explanation.dart';
+import 'package:swift_control/widgets/menu.dart';
+import 'package:swift_control/widgets/testbed.dart';
 import 'package:window_manager/window_manager.dart';
 
 import '../bluetooth/messages/click_notification.dart';
 import '../bluetooth/messages/notification.dart';
 import '../bluetooth/messages/play_notification.dart';
 import '../bluetooth/messages/ride_notification.dart';
+import '../utils/actions/base_actions.dart';
 import '../utils/keymap/apps/custom_app.dart';
 import '../utils/keymap/buttons.dart';
 import '../utils/keymap/keymap.dart';
@@ -31,15 +35,38 @@ class TouchAreaSetupPage extends StatefulWidget {
 class _TouchAreaSetupPageState extends State<TouchAreaSetupPage> {
   File? _backgroundImage;
   late StreamSubscription<BaseNotification> _actionSubscription;
-  ZwiftButton? _pressedButton;
+  ControllerButton? _pressedButton;
+  final TransformationController _transformationController = TransformationController();
+
+  late Rect _imageRect;
 
   Future<void> _pickScreenshot() async {
     final picker = ImagePicker();
     final result = await picker.pickImage(source: ImageSource.gallery);
     if (result != null) {
-      setState(() {
-        _backgroundImage = File(result.path);
-      });
+      final image = File(result.path);
+
+      // need to decode image to get its size so we can have a percentage mapping
+      final decodedImage = await decodeImageFromList(image.readAsBytesSync());
+      // calculate image rectangle in the current screen, given it's boxfit contain
+      final screenSize = MediaQuery.sizeOf(context);
+      final imageAspectRatio = decodedImage.width / decodedImage.height;
+      final screenAspectRatio = screenSize.width / screenSize.height;
+      if (imageAspectRatio > screenAspectRatio) {
+        // image is wider than screen
+        final width = screenSize.width;
+        final height = width / imageAspectRatio;
+        final top = (screenSize.height - height) / 2;
+        _imageRect = Rect.fromLTWH(0, top, width, height);
+      } else {
+        // image is taller than screen
+        final height = screenSize.height;
+        final width = height * imageAspectRatio;
+        final left = (screenSize.width - width) / 2;
+        _imageRect = Rect.fromLTWH(left, 0, width, height);
+      }
+      _backgroundImage = image;
+      setState(() {});
     }
   }
 
@@ -53,6 +80,13 @@ class _TouchAreaSetupPageState extends State<TouchAreaSetupPage> {
     _actionSubscription.cancel();
     // Exit full screen
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: SystemUiOverlay.values);
+    // Reset orientation preferences to allow all orientations
+    SystemChrome.setPreferredOrientations([
+      DeviceOrientation.portraitUp,
+      DeviceOrientation.portraitDown,
+      DeviceOrientation.landscapeLeft,
+      DeviceOrientation.landscapeRight,
+    ]);
     if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) {
       windowManager.setFullScreen(false);
     }
@@ -62,6 +96,14 @@ class _TouchAreaSetupPageState extends State<TouchAreaSetupPage> {
   void initState() {
     super.initState();
 
+    // initialize _imageRect by using Flutter view size
+    final flutterView = WidgetsBinding.instance.platformDispatcher.views.first;
+    final size = flutterView.physicalSize / flutterView.devicePixelRatio;
+    _imageRect = Rect.fromLTWH(0, 0, size.width, size.height);
+
+    // Force landscape orientation during keymap editing
+    SystemChrome.setPreferredOrientations([DeviceOrientation.landscapeLeft, DeviceOrientation.landscapeRight]);
+
     SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersiveSticky, overlays: []);
     if (Platform.isWindows || Platform.isLinux || Platform.isMacOS) {
       windowManager.setFullScreen(true);
@@ -85,12 +127,11 @@ class _TouchAreaSetupPageState extends State<TouchAreaSetupPage> {
           final KeyPair keyPair;
           actionHandler.supportedApp!.keymap.keyPairs.add(
             keyPair = KeyPair(
-              touchPosition: context.size!
-                  .center(Offset.zero)
-                  .translate(actionHandler.supportedApp!.keymap.keyPairs.length * 40, 0),
+              touchPosition: Offset((actionHandler.supportedApp!.keymap.keyPairs.length + 1) * 10, 10),
               buttons: [_pressedButton!],
               physicalKey: null,
               logicalKey: null,
+              isLongPress: false,
             ),
           );
           setState(() {});
@@ -98,7 +139,8 @@ class _TouchAreaSetupPageState extends State<TouchAreaSetupPage> {
           // open menu
           if (Platform.isMacOS || Platform.isWindows) {
             await Future.delayed(Duration(milliseconds: 300));
-            await keyPressSimulator.simulateMouseClick(keyPair.touchPosition);
+            await keyPressSimulator.simulateMouseClickDown(keyPair.touchPosition);
+            await keyPressSimulator.simulateMouseClickUp(keyPair.touchPosition);
           }
         }
       }
@@ -106,246 +148,403 @@ class _TouchAreaSetupPageState extends State<TouchAreaSetupPage> {
   }
 
   Widget _buildDraggableArea({
-    required Offset position,
+    required bool enableTouch,
     required void Function(Offset newPosition) onPositionChanged,
     required Color color,
     required KeyPair keyPair,
-    required String label,
   }) {
-    return Positioned(
-      left: position.dx,
-      top: position.dy,
-      child: PopupMenuButton<PhysicalKeyboardKey>(
-        tooltip: 'Drag or click for special keys',
-        itemBuilder:
-            (context) => [
+    // map the percentage position to the image rect
+    final relativeX = min(100.0, keyPair.touchPosition.dx) / 100.0;
+    final relativeY = min(100.0, keyPair.touchPosition.dy) / 100.0;
+    //print('Relative position: $relativeX, $relativeY');
+    final flutterView = WidgetsBinding.instance.platformDispatcher.views.first;
+
+    // figure out notch height for e.g. macOS. On Windows the display size is not available (0,0).
+    final differenceInHeight = (flutterView.display.size.height > 0 && !Platform.isIOS)
+        ? (flutterView.display.size.height - flutterView.physicalSize.height) / flutterView.devicePixelRatio
+        : 0.0;
+
+    // Store the initial drag position to calculate drag distance
+    Offset? dragStartPosition;
+
+    if (kDebugMode && false) {
+      print('Display Size: ${flutterView.display.size}');
+      print('View size: ${flutterView.physicalSize}');
+      print('Difference: $differenceInHeight');
+    }
+
+    //final isOnTheRightEdge = position.dx > (MediaQuery.sizeOf(context).width - 250);
+
+    final iconSize = 40.0;
+
+    final Offset position = Offset(
+      _imageRect.left + relativeX * _imageRect.width - iconSize / 2,
+      _imageRect.top + relativeY * _imageRect.height - differenceInHeight - iconSize / 2,
+    );
+
+    final actions = [
+      if (actionHandler.supportedModes.contains(SupportedMode.keyboard))
+        PopupMenuItem<PhysicalKeyboardKey>(
+          value: null,
+          child: ListTile(
+            leading: Icon(Icons.keyboard_alt_outlined),
+            title: const Text('Simulate Keyboard shortcut'),
+            trailing: keyPair.physicalKey != null ? Checkbox(value: true, onChanged: null) : null,
+          ),
+          onTap: () async {
+            await showDialog<void>(
+              context: context,
+              barrierDismissible: false, // enable Escape key
+              builder: (c) =>
+                  HotKeyListenerDialog(customApp: actionHandler.supportedApp! as CustomApp, keyPair: keyPair),
+            );
+            setState(() {});
+          },
+        ),
+      if (actionHandler.supportedModes.contains(SupportedMode.touch))
+        PopupMenuItem<PhysicalKeyboardKey>(
+          value: null,
+          child: ListTile(
+            title: const Text('Simulate Touch'),
+            leading: Icon(Icons.touch_app_outlined),
+            trailing: keyPair.physicalKey == null && keyPair.touchPosition != Offset.zero
+                ? Checkbox(value: true, onChanged: null)
+                : null,
+          ),
+          onTap: () {
+            keyPair.physicalKey = null;
+            keyPair.logicalKey = null;
+            setState(() {});
+          },
+        ),
+
+      if (actionHandler.supportedModes.contains(SupportedMode.media))
+        PopupMenuItem<PhysicalKeyboardKey>(
+          child: PopupMenuButton<PhysicalKeyboardKey>(
+            padding: EdgeInsets.zero,
+            itemBuilder: (context) => [
+              PopupMenuItem<PhysicalKeyboardKey>(
+                value: PhysicalKeyboardKey.mediaPlayPause,
+                child: const Text('Media: Play/Pause'),
+              ),
+              PopupMenuItem<PhysicalKeyboardKey>(
+                value: PhysicalKeyboardKey.mediaStop,
+                child: const Text('Media: Stop'),
+              ),
+              PopupMenuItem<PhysicalKeyboardKey>(
+                value: PhysicalKeyboardKey.mediaTrackPrevious,
+                child: const Text('Media: Previous'),
+              ),
+              PopupMenuItem<PhysicalKeyboardKey>(
+                value: PhysicalKeyboardKey.mediaTrackNext,
+                child: const Text('Media: Next'),
+              ),
+              PopupMenuItem<PhysicalKeyboardKey>(
+                value: PhysicalKeyboardKey.audioVolumeUp,
+                child: const Text('Media: Volume Up'),
+              ),
+              PopupMenuItem<PhysicalKeyboardKey>(
+                value: PhysicalKeyboardKey.audioVolumeDown,
+                child: const Text('Media: Volume Down'),
+              ),
+            ],
+            onSelected: (key) {
+              keyPair.physicalKey = key;
+              keyPair.logicalKey = null;
+
+              setState(() {});
+            },
+            child: ListTile(
+              leading: Icon(Icons.music_note_outlined),
+              trailing: Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  if (keyPair.isSpecialKey) Checkbox(value: true, onChanged: null),
+                  Icon(Icons.arrow_right),
+                ],
+              ),
+              title: Text('Simulate Media key'),
+            ),
+          ),
+        ),
+    ];
+
+    final icon = Container(
+      constraints: BoxConstraints(minHeight: iconSize, minWidth: iconSize),
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.start,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          if (keyPair.buttons.singleOrNull?.color == null)
+            Container(
+              decoration: BoxDecoration(
+                color: color.withOpacity(0.4),
+                shape: BoxShape.circle,
+                border: Border.all(color: Colors.white, width: 2),
+              ),
+              width: iconSize,
+              height: iconSize,
+              child: Icon(
+                keyPair.icon,
+                size: iconSize - 12,
+                shadows: [
+                  Shadow(color: Colors.white, offset: Offset(1, 1)),
+                  Shadow(color: Colors.white, offset: Offset(-1, -1)),
+                  Shadow(color: Colors.white, offset: Offset(-1, 1)),
+                  Shadow(color: Colors.white, offset: Offset(-1, 1)),
+                  Shadow(color: Colors.white, offset: Offset(1, -1)),
+                ],
+              ),
+            ),
+          PopupMenuButton<PhysicalKeyboardKey>(
+            enabled: enableTouch,
+            itemBuilder: (context) => [
+              if (actions.length > 1) ...actions,
               PopupMenuItem<PhysicalKeyboardKey>(
                 value: null,
-                child: const Text('Set Keyboard shortcut'),
-                onTap: () async {
-                  await showDialog<void>(
-                    context: context,
-                    builder:
-                        (c) =>
-                            HotKeyListenerDialog(customApp: actionHandler.supportedApp! as CustomApp, keyPair: keyPair),
-                  );
+                onTap: () {
+                  keyPair.isLongPress = !keyPair.isLongPress;
                   setState(() {});
                 },
-              ),
-              PopupMenuItem(
-                child: PopupMenuButton<PhysicalKeyboardKey>(
-                  padding: EdgeInsets.zero,
-                  itemBuilder:
-                      (context) => [
-                        PopupMenuItem<PhysicalKeyboardKey>(
-                          value: PhysicalKeyboardKey.mediaPlayPause,
-                          child: const Text('Media: Play/Pause'),
-                        ),
-                        PopupMenuItem<PhysicalKeyboardKey>(
-                          value: PhysicalKeyboardKey.mediaStop,
-                          child: const Text('Media: Stop'),
-                        ),
-                        PopupMenuItem<PhysicalKeyboardKey>(
-                          value: PhysicalKeyboardKey.mediaTrackPrevious,
-                          child: const Text('Media: Previous'),
-                        ),
-                        PopupMenuItem<PhysicalKeyboardKey>(
-                          value: PhysicalKeyboardKey.mediaTrackNext,
-                          child: const Text('Media: Next'),
-                        ),
-                        PopupMenuItem<PhysicalKeyboardKey>(
-                          value: PhysicalKeyboardKey.audioVolumeUp,
-                          child: const Text('Media: Volume Up'),
-                        ),
-                        PopupMenuItem<PhysicalKeyboardKey>(
-                          value: PhysicalKeyboardKey.audioVolumeDown,
-                          child: const Text('Media: Volume Down'),
-                        ),
-                      ],
-                  onSelected: (key) {
-                    keyPair.physicalKey = key;
-                    keyPair.logicalKey = null;
-
+                child: CheckboxListTile(
+                  value: keyPair.isLongPress,
+                  onChanged: (value) {
+                    keyPair.isLongPress = value ?? false;
                     setState(() {});
+                    Navigator.of(context).pop();
                   },
-                  child: SizedBox(
-                    height: 50,
-                    width: 180,
-                    child: Align(alignment: Alignment.centerLeft, child: Text('Set Media key')),
-                  ),
+                  title: const Text('Long Press Mode (vs. repeating)'),
                 ),
               ),
+              PopupMenuDivider(),
               PopupMenuItem<PhysicalKeyboardKey>(
                 value: null,
-                child: const Text('Use as touch button'),
-                onTap: () {
-                  keyPair.physicalKey = null;
-                  keyPair.logicalKey = null;
-                  setState(() {});
-                },
-              ),
-              PopupMenuItem<PhysicalKeyboardKey>(
-                value: null,
-                child: const Text('Remove'),
+                child: ListTile(
+                  title: const Text('Delete Keymap'),
+                  leading: Icon(Icons.delete, color: Colors.red),
+                ),
                 onTap: () {
                   actionHandler.supportedApp!.keymap.keyPairs.remove(keyPair);
                   setState(() {});
                 },
               ),
             ],
-        onSelected: (key) {
-          keyPair.physicalKey = key;
-          keyPair.logicalKey = null;
-          setState(() {});
-        },
-        child: Container(
-          color: kDebugMode && false ? Colors.yellow : null,
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Draggable(
-                feedback: Material(
-                  color: Colors.transparent,
-                  child: _TouchDot(color: Colors.yellow, label: label, keyPair: keyPair),
-                ),
-                childWhenDragging: const SizedBox.shrink(),
-                onDraggableCanceled: (_, offset) {
-                  setState(() => onPositionChanged(offset));
-                },
-                child: _TouchDot(color: color, label: label, keyPair: keyPair),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final isDesktop = Platform.isWindows || Platform.isLinux || Platform.isMacOS;
-    final devicePixelRatio = isDesktop ? 1.0 : MediaQuery.devicePixelRatioOf(context);
-    return Scaffold(
-      body: Stack(
-        children: [
-          if (_backgroundImage != null)
-            Positioned.fill(child: Opacity(opacity: 0.5, child: Image.file(_backgroundImage!, fit: BoxFit.contain)))
-          else
-            Center(
-              child: Padding(
-                padding: const EdgeInsets.all(16.0),
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  spacing: 8,
-                  children: [
-                    Text('''1. Create an in-game screenshot of your app (e.g. within MyWhoosh)
-2. Load the screenshot with the button below
-3. Make sure the app is in the correct orientation (portrait or landscape)
-4. Press a button on your Zwift device to create a touch area
-5. Drag the touch areas to the desired position on the screenshot
-5. Save and close this screen'''),
-                    ElevatedButton(
-                      onPressed: () {
-                        _pickScreenshot();
-                      },
-                      child: Text('Load in-game screenshot for placement'),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          // Touch Areas
-          ...?actionHandler.supportedApp?.keymap.keyPairs.map(
-            (keyPair) => _buildDraggableArea(
-              position: Offset(
-                keyPair.touchPosition.dx / devicePixelRatio - touchAreaSize / 2,
-                keyPair.touchPosition.dy / devicePixelRatio - touchAreaSize / 2 - (isDesktop ? touchAreaSize * 1.5 : 0),
-              ),
-              keyPair: keyPair,
-              onPositionChanged: (newPos) {
-                final converted =
-                    newPos.translate(touchAreaSize / 2, touchAreaSize / 2 + (isDesktop ? touchAreaSize * 1.5 : 0)) *
-                    devicePixelRatio;
-                keyPair.touchPosition = converted;
-                setState(() {});
-              },
-              color: Colors.red,
-              label: keyPair.buttons.joinToString(transform: (e) => e.name, separator: '\n'),
-            ),
-          ),
-
-          Positioned(
-            top: 40,
-            right: 20,
+            onSelected: (key) {
+              keyPair.physicalKey = key;
+              keyPair.logicalKey = null;
+              setState(() {});
+            },
             child: Row(
-              spacing: 8,
               children: [
-                ElevatedButton.icon(
-                  onPressed: () {
-                    actionHandler.supportedApp?.keymap.reset();
-                    setState(() {});
-                  },
-                  icon: const Icon(Icons.lock_reset),
-                  label: Text('Reset'),
-                ),
-                ElevatedButton.icon(onPressed: _saveAndClose, icon: const Icon(Icons.save), label: const Text("Save")),
+                KeypairExplanation(withKey: true, keyPair: keyPair),
+                Icon(Icons.more_vert),
               ],
             ),
           ),
         ],
       ),
     );
+
+    return Positioned(
+      left: position.dx,
+      top: position.dy,
+      child: Tooltip(
+        message: 'Drag to reposition',
+        child: Draggable(
+          dragAnchorStrategy: (widget, context, position) {
+            final scale = _transformationController.value.getMaxScaleOnAxis();
+            final RenderBox renderObject = context.findRenderObject() as RenderBox;
+            return renderObject.globalToLocal(position).scale(scale, scale);
+          },
+          feedback: Material(
+            color: Colors.transparent,
+            child: icon,
+          ),
+          childWhenDragging: const SizedBox.shrink(),
+          onDragStarted: () {
+            // Capture the starting position to calculate drag distance later
+            dragStartPosition = position;
+          },
+          onDragEnd: (details) {
+            // Calculate drag distance to prevent accidental repositioning from clicks
+            // while allowing legitimate drags even with low velocity (e.g., when overlapping buttons)
+            final dragDistance = dragStartPosition != null
+                ? (details.offset - dragStartPosition!).distance
+                : double.infinity;
+
+            // Only update position if dragged more than 5 pixels (prevents accidental clicks)
+            if (dragDistance > 5) {
+              final matrix = Matrix4.inverted(_transformationController.value);
+              final height = 0;
+              final sceneY = details.offset.dy - height;
+              final viewportPoint = MatrixUtils.transformPoint(
+                matrix,
+                Offset(details.offset.dx, sceneY) + Offset(iconSize / 2, differenceInHeight + iconSize / 2),
+              );
+              setState(() => onPositionChanged(viewportPoint));
+            }
+          },
+          child: icon,
+        ),
+      ),
+    );
   }
-}
-
-class _TouchDot extends StatelessWidget {
-  final Color color;
-  final String label;
-  final KeyPair keyPair;
-
-  const _TouchDot({required this.color, required this.label, required this.keyPair});
 
   @override
   Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Container(
-          width: touchAreaSize,
-          height: touchAreaSize,
-          decoration: BoxDecoration(
-            color: color.withOpacity(0.6),
-            shape: BoxShape.circle,
-            border: Border.all(color: Colors.black, width: 2),
-          ),
-          child: Icon(
-            keyPair.isSpecialKey
-                ? Icons.music_note_outlined
-                : keyPair.physicalKey != null
-                ? Icons.keyboard_alt_outlined
-                : Icons.add,
-          ),
-        ),
+    return Scaffold(
+      body: LayoutBuilder(
+        builder: (context, constraints) {
+          if (_backgroundImage == null && constraints.biggest != _imageRect.size) {
+            _imageRect = Rect.fromLTWH(0, 0, constraints.maxWidth, constraints.maxHeight);
+          }
+          return InteractiveViewer(
+            transformationController: _transformationController,
+            child: Stack(
+              children: [
+                if (_backgroundImage != null)
+                  Positioned.fill(
+                    child: Opacity(
+                      opacity: 0.5,
+                      child: Image.file(
+                        _backgroundImage!,
+                        fit: BoxFit.contain,
+                      ),
+                    ),
+                  ),
 
-        Container(
-          color: Colors.white.withAlpha(180),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Text(label, style: TextStyle(color: Colors.black, fontSize: 12)),
-              if (keyPair.physicalKey != null)
-                Text(switch (keyPair.physicalKey) {
-                  PhysicalKeyboardKey.mediaPlayPause => 'Media: Play/Pause',
-                  PhysicalKeyboardKey.mediaStop => 'Media: Stop',
-                  PhysicalKeyboardKey.mediaTrackPrevious => 'Media: Previous',
-                  PhysicalKeyboardKey.mediaTrackNext => 'Media: Next',
-                  PhysicalKeyboardKey.audioVolumeUp => 'Media: Volume Up',
-                  PhysicalKeyboardKey.audioVolumeDown => 'Media: Volume Down',
-                  _ => keyPair.logicalKey?.keyLabel ?? 'Unknown',
-                }, style: TextStyle(color: Colors.black87, fontSize: 12)),
-            ],
+                // draw _imageRect for debugging
+                if (kDebugMode)
+                  Positioned(
+                    left: _imageRect.left,
+                    top: _imageRect.top,
+                    child: Container(
+                      decoration: BoxDecoration(
+                        border: Border.all(color: Colors.green, width: 2),
+                      ),
+                      child: SizedBox.fromSize(size: _imageRect.size),
+                    ),
+                  ),
+
+                ...?actionHandler.supportedApp?.keymap.keyPairs.map((keyPair) {
+                  return _buildDraggableArea(
+                    enableTouch: true,
+                    keyPair: keyPair,
+                    onPositionChanged: (newPos) {
+                      // convert to percentage
+                      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);
+                      setState(() {});
+                    },
+                    color: Colors.red,
+                  );
+                }),
+
+                Positioned.fill(child: Testbed()),
+
+                if (_backgroundImage == null)
+                  Center(
+                    child: Padding(
+                      padding: const EdgeInsets.all(16.0),
+                      child: Column(
+                        mainAxisSize: MainAxisSize.min,
+                        spacing: 8,
+                        children: [
+                          IgnorePointer(
+                            child: Text(
+                              '''1. Create an in-game screenshot of your app (e.g. within MyWhoosh) in landscape orientation
+2. Load the screenshot with the button below
+3. The app is automatically set to landscape orientation for accurate mapping
+4. Press a button on your Click device to create a touch area
+5. Drag the touch areas to the desired position on the screenshot
+6. Save and close this screen''',
+                            ),
+                          ),
+                          ElevatedButton(
+                            onPressed: () {
+                              _pickScreenshot();
+                            },
+                            child: Text('Load in-game screenshot for placement'),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+
+                Positioned(
+                  top: 40,
+                  right: 20,
+                  child: Row(
+                    spacing: 8,
+                    children: [
+                      ElevatedButton.icon(
+                        onPressed: _saveAndClose,
+                        icon: const Icon(Icons.save),
+                        label: const Text("Save"),
+                      ),
+                      PopupMenuButton(
+                        itemBuilder: (c) => [
+                          PopupMenuItem(
+                            child: Text('Reset'),
+                            onTap: () {
+                              _backgroundImage = null;
+                              actionHandler.supportedApp?.keymap.reset();
+                              setState(() {});
+                            },
+                          ),
+                        ],
+                        icon: Icon(Icons.more_vert),
+                      ),
+                      if (kDebugMode) MenuButton(),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+}
+
+class KeypairExplanation extends StatelessWidget {
+  final bool withKey;
+  final KeyPair keyPair;
+
+  const KeypairExplanation({super.key, required this.keyPair, this.withKey = false});
+
+  @override
+  Widget build(BuildContext context) {
+    return Wrap(
+      spacing: 4,
+      crossAxisAlignment: WrapCrossAlignment.center,
+      children: [
+        if (withKey)
+          Row(
+            children: keyPair.buttons.map((b) => ButtonWidget(button: b, big: true)).toList(),
+          )
+        else
+          Icon(keyPair.icon),
+        if (keyPair.physicalKey != null && actionHandler.supportedModes.contains(SupportedMode.keyboard)) ...[
+          KeyWidget(
+            label: switch (keyPair.physicalKey) {
+              PhysicalKeyboardKey.mediaPlayPause => 'Play/Pause',
+              PhysicalKeyboardKey.mediaStop => 'Stop',
+              PhysicalKeyboardKey.mediaTrackPrevious => 'Previous',
+              PhysicalKeyboardKey.mediaTrackNext => 'Next',
+              PhysicalKeyboardKey.audioVolumeUp => 'Volume Up',
+              PhysicalKeyboardKey.audioVolumeDown => 'Volume Down',
+              _ => keyPair.logicalKey?.keyLabel ?? 'Unknown',
+            },
           ),
-        ),
+          if (keyPair.isLongPress) Text('long\npress', style: TextStyle(fontSize: 10)),
+        ] else ...[
+          if (!withKey)
+            KeyWidget(label: 'X: ${keyPair.touchPosition.dx.toInt()}, Y: ${keyPair.touchPosition.dy.toInt()}'),
+          if (keyPair.isLongPress) Text('long\npress', style: TextStyle(fontSize: 10)),
+        ],
       ],
     );
   }

lib/theme.dart

@@ -7,6 +7,9 @@ abstract final class AppTheme {
   static ThemeData light = FlexThemeData.light(
     // Using FlexColorScheme built-in FlexScheme enum based colors
     scheme: FlexScheme.redM3,
+    primary: Color(0xFF0E74B7),
+    primaryContainer: Color(0x7C0E9297),
+    onPrimaryContainer: Colors.black,
     // Component theme configurations for light mode.
     subThemesData: const FlexSubThemesData(
       interactionEffects: true,
@@ -23,27 +26,28 @@ abstract final class AppTheme {
   );
 
   // The FlexColorScheme defined dark mode ThemeData.
-  static ThemeData dark = FlexThemeData.dark(
-    // Using FlexColorScheme built-in FlexScheme enum based colors.
-    scheme: FlexScheme.redM3,
-    // Component theme configurations for dark mode.
-    subThemesData: const FlexSubThemesData(
-      interactionEffects: true,
-      tintedDisabledControls: true,
-      blendOnColors: true,
-      useM2StyleDividerInM3: true,
-      inputDecoratorIsFilled: true,
-      inputDecoratorBorderType: FlexInputBorderType.outline,
-      alignedDropdown: true,
-      navigationRailUseIndicator: true,
-    ),
-    // Direct ThemeData properties.
-    visualDensity: FlexColorScheme.comfortablePlatformDensity,
-    cupertinoOverrideTheme: const CupertinoThemeData(applyThemeToAll: true),
-  ).copyWith(
-    scaffoldBackgroundColor: Color(0xff0b1623),
-    elevatedButtonTheme: ElevatedButtonThemeData(
-      style: ElevatedButton.styleFrom(backgroundColor: Colors.red, foregroundColor: Colors.white),
-    ),
-  );
+  static ThemeData dark =
+      FlexThemeData.dark(
+        // Using FlexColorScheme built-in FlexScheme enum based colors.
+        scheme: FlexScheme.redM3,
+        // Component theme configurations for dark mode.
+        subThemesData: const FlexSubThemesData(
+          interactionEffects: true,
+          tintedDisabledControls: true,
+          blendOnColors: true,
+          useM2StyleDividerInM3: true,
+          inputDecoratorIsFilled: true,
+          inputDecoratorBorderType: FlexInputBorderType.outline,
+          alignedDropdown: true,
+          navigationRailUseIndicator: true,
+        ),
+        // Direct ThemeData properties.
+        visualDensity: FlexColorScheme.comfortablePlatformDensity,
+        cupertinoOverrideTheme: const CupertinoThemeData(applyThemeToAll: true),
+      ).copyWith(
+        scaffoldBackgroundColor: Color(0xff0b1623),
+        elevatedButtonTheme: ElevatedButtonThemeData(
+          style: ElevatedButton.styleFrom(backgroundColor: Colors.red, foregroundColor: Colors.white),
+        ),
+      );
 }

lib/utils/actions/android.dart

@@ -4,6 +4,7 @@ import 'package:swift_control/main.dart';
 import 'package:swift_control/utils/actions/base_actions.dart';
 import 'package:swift_control/utils/keymap/apps/custom_app.dart';
 import 'package:swift_control/utils/keymap/buttons.dart';
+import 'package:swift_control/widgets/keymap_explanation.dart';
 
 import '../keymap/apps/supported_app.dart';
 import '../single_line_exception.dart';
@@ -11,6 +12,8 @@ import '../single_line_exception.dart';
 class AndroidActions extends BaseActions {
   WindowEvent? windowInfo;
 
+  AndroidActions({super.supportedModes = const [SupportedMode.touch, SupportedMode.media]});
+
   @override
   void init(SupportedApp? supportedApp) {
     super.init(supportedApp);
@@ -22,9 +25,9 @@ class AndroidActions extends BaseActions {
   }
 
   @override
-  Future<String> performAction(ZwiftButton button) async {
+  Future<String> performAction(ControllerButton button, {bool isKeyDown = true, bool isKeyUp = false}) async {
     if (supportedApp == null) {
-      return ("Could not perform ${button.name}: No keymap set");
+      return ("Could not perform ${button.name.splitByUpperCase()}: No keymap set");
     }
 
     if (supportedApp is CustomApp) {
@@ -40,11 +43,15 @@ class AndroidActions extends BaseActions {
         return "Key pressed: ${keyPair.toString()}";
       }
     }
-    final point = supportedApp!.resolveTouchPosition(action: button, windowInfo: windowInfo);
+    final point = await resolveTouchPosition(action: button, windowInfo: windowInfo);
     if (point != Offset.zero) {
-      accessibilityHandler.performTouch(point.dx, point.dy);
-      return "No touch performed";
+      accessibilityHandler.performTouch(point.dx, point.dy, isKeyDown: isKeyDown, isKeyUp: isKeyUp);
+      return "Touch performed at: ${point.dx.toInt()}, ${point.dy.toInt()} -> ${isKeyDown && isKeyUp
+          ? "click"
+          : isKeyDown
+          ? "down"
+          : "up"}";
     }
-    return "Touch performed at: ${point.dx.toInt()}, ${point.dy.toInt()}";
+    return "No touch performed";
   }
 }

lib/utils/actions/base_actions.dart

@@ -1,20 +1,88 @@
+import 'dart:io';
+
+import 'package:accessibility/accessibility.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:screen_retriever/screen_retriever.dart';
+import 'package:swift_control/utils/actions/android.dart';
+import 'package:swift_control/utils/actions/desktop.dart';
 import 'package:swift_control/utils/keymap/buttons.dart';
 
 import '../keymap/apps/supported_app.dart';
 
+enum SupportedMode { keyboard, touch, media }
+
 abstract class BaseActions {
+  final List<SupportedMode> supportedModes;
+
   SupportedApp? supportedApp;
 
+  BaseActions({required this.supportedModes});
+
   void init(SupportedApp? supportedApp) {
     this.supportedApp = supportedApp;
   }
 
-  Future<String> performAction(ZwiftButton action);
+  Future<Offset> resolveTouchPosition({required ControllerButton action, required WindowEvent? windowInfo}) async {
+    final keyPair = supportedApp!.keymap.getKeyPair(action);
+    if (keyPair != null && keyPair.touchPosition != Offset.zero) {
+      // convert relative position to absolute position based on window info
+
+      if (windowInfo != null && windowInfo.top > 0) {
+        final x = windowInfo.left + (keyPair.touchPosition.dx / 100) * (windowInfo.right - windowInfo.left);
+        final y = windowInfo.top + (keyPair.touchPosition.dy / 100) * (windowInfo.bottom - windowInfo.top);
+
+        if (kDebugMode) {
+          print("Window info: ${windowInfo.encode()} => Touch at: $x, $y");
+        }
+        return Offset(x, y);
+      } else {
+        // TODO support multiple screens
+        final Size displaySize;
+        final double devicePixelRatio;
+        if (Platform.isWindows) {
+          // TODO remove once https://github.com/flutter/flutter/pull/164460 is available in stable
+          final display = await screenRetriever.getPrimaryDisplay();
+          displaySize = display.size;
+          devicePixelRatio = 1.0;
+        } else {
+          final display = WidgetsBinding.instance.platformDispatcher.views.first.display;
+          displaySize = display.size;
+          devicePixelRatio = display.devicePixelRatio;
+        }
+
+        late final Size physicalSize;
+        if (this is AndroidActions) {
+          // display size is already in physical pixels
+          physicalSize = displaySize;
+        } else if (this is DesktopActions) {
+          // display size is in logical pixels, convert to physical pixels
+          // TODO on macOS the notch is included here, but it's not part of the usable screen area, so we should exclude it
+          physicalSize = displaySize / devicePixelRatio;
+        } else {
+          physicalSize = displaySize;
+        }
+
+        final x = (keyPair.touchPosition.dx / 100.0) * physicalSize.width;
+        final y = (keyPair.touchPosition.dy / 100.0) * physicalSize.height;
+
+        if (kDebugMode) {
+          print("Screen size: $physicalSize => Touch at: $x, $y");
+        }
+        return Offset(x, y);
+      }
+    }
+    return Offset.zero;
+  }
+
+  Future<String> performAction(ControllerButton action, {bool isKeyDown = true, bool isKeyUp = false});
 }
 
 class StubActions extends BaseActions {
+  StubActions({super.supportedModes = const []});
+
   @override
-  Future<String> performAction(ZwiftButton action) {
+  Future<String> performAction(ControllerButton action, {bool isKeyDown = true, bool isKeyUp = false}) {
     return Future.value(action.name);
   }
 }

lib/utils/actions/desktop.dart

@@ -1,27 +1,60 @@
 import 'package:keypress_simulator/keypress_simulator.dart';
 import 'package:swift_control/utils/actions/base_actions.dart';
 import 'package:swift_control/utils/keymap/buttons.dart';
+import 'package:swift_control/widgets/keymap_explanation.dart';
 
 class DesktopActions extends BaseActions {
+  DesktopActions({super.supportedModes = const [SupportedMode.keyboard, SupportedMode.touch, SupportedMode.media]});
+
+  // Track keys that are currently held down in long press mode
+
   @override
-  Future<String> performAction(ZwiftButton action) async {
+  Future<String> performAction(ControllerButton action, {bool isKeyDown = true, bool isKeyUp = false}) async {
     if (supportedApp == null) {
       return ('Supported app is not set');
     }
 
     final keyPair = supportedApp!.keymap.getKeyPair(action);
     if (keyPair == null) {
-      return ('Keymap entry not found for action: $action');
+      return ('Keymap entry not found for action: ${action.toString().splitByUpperCase()}');
     }
 
+    // Handle regular key press mode (existing behavior)
     if (keyPair.physicalKey != null) {
-      await keyPressSimulator.simulateKeyDown(keyPair.physicalKey);
-      await keyPressSimulator.simulateKeyUp(keyPair.physicalKey);
-      return 'Key pressed: ${keyPair.logicalKey?.keyLabel}';
+      if (isKeyDown && isKeyUp) {
+        await keyPressSimulator.simulateKeyDown(keyPair.physicalKey);
+        await keyPressSimulator.simulateKeyUp(keyPair.physicalKey);
+        return 'Key clicked: $keyPair';
+      } else if (isKeyDown) {
+        await keyPressSimulator.simulateKeyDown(keyPair.physicalKey);
+        return 'Key pressed: $keyPair';
+      } else {
+        await keyPressSimulator.simulateKeyUp(keyPair.physicalKey);
+        return 'Key released: $keyPair';
+      }
     } else {
-      final point = supportedApp!.resolveTouchPosition(action: action, windowInfo: null);
-      await keyPressSimulator.simulateMouseClick(point);
-      return 'Mouse clicked at: $point';
+      final point = await resolveTouchPosition(action: action, windowInfo: null);
+      if (isKeyDown && isKeyUp) {
+        await keyPressSimulator.simulateMouseClickDown(point);
+        await keyPressSimulator.simulateMouseClickUp(point);
+        return 'Mouse clicked at: ${point.dx} ${point.dy}';
+      } else if (isKeyDown) {
+        await keyPressSimulator.simulateMouseClickDown(point);
+        return 'Mouse down at: ${point.dx} ${point.dy}';
+      } else {
+        await keyPressSimulator.simulateMouseClickUp(point);
+        return 'Mouse up at: ${point.dx} ${point.dy}';
+      }
+    }
+  }
+
+  // Release all held keys (useful for cleanup)
+  Future<void> releaseAllHeldKeys(List<ControllerButton> list) async {
+    for (final action in list) {
+      final keyPair = supportedApp?.keymap.getKeyPair(action);
+      if (keyPair?.physicalKey != null) {
+        await keyPressSimulator.simulateKeyUp(keyPair!.physicalKey);
+      }
     }
   }
 }

lib/utils/actions/remote.dart

@@ -0,0 +1,87 @@
+import 'dart:ui';
+
+import 'package:accessibility/accessibility.dart';
+import 'package:bluetooth_low_energy/bluetooth_low_energy.dart';
+import 'package:flutter/foundation.dart';
+import 'package:swift_control/bluetooth/devices/zwift/zwift_click.dart';
+import 'package:swift_control/main.dart';
+import 'package:swift_control/utils/actions/base_actions.dart';
+import 'package:swift_control/utils/keymap/buttons.dart';
+import 'package:swift_control/widgets/keymap_explanation.dart';
+import 'package:universal_ble/universal_ble.dart';
+
+import '../requirements/remote.dart';
+
+class RemoteActions extends BaseActions {
+  RemoteActions({super.supportedModes = const [SupportedMode.touch]});
+
+  @override
+  Future<String> performAction(ControllerButton action, {bool isKeyDown = true, bool isKeyUp = false}) async {
+    if (supportedApp == null) {
+      return 'Supported app is not set';
+    }
+
+    final keyPair = supportedApp!.keymap.getKeyPair(action);
+    if (keyPair == null) {
+      return 'Keymap entry not found for action: ${action.toString().splitByUpperCase()}';
+    }
+
+    if (!(actionHandler as RemoteActions).isConnected) {
+      return 'Not connected to a device';
+    }
+
+    if (keyPair.physicalKey != null && keyPair.touchPosition == Offset.zero) {
+      return ('Physical key actions are not supported, yet');
+    } else {
+      final point = await resolveTouchPosition(action: action, windowInfo: null);
+      final point2 = point; //Offset(100, 99.0);
+      await sendAbsMouseReport(0, point2.dx.toInt(), point2.dy.toInt());
+      await sendAbsMouseReport(1, point2.dx.toInt(), point2.dy.toInt());
+      await sendAbsMouseReport(0, point2.dx.toInt(), point2.dy.toInt());
+      return 'Mouse clicked at: ${point2.dx} ${point2.dy}';
+    }
+  }
+
+  @override
+  Future<Offset> resolveTouchPosition({required ControllerButton action, required WindowEvent? windowInfo}) async {
+    // for remote actions we use the relative position only
+    final keyPair = supportedApp!.keymap.getKeyPair(action);
+    if (keyPair != null && keyPair.touchPosition != Offset.zero) {
+      return keyPair.touchPosition;
+    }
+    return Offset.zero;
+  }
+
+  Uint8List absMouseReport(int buttons3bit, int x, int y) {
+    final b = buttons3bit & 0x07;
+    final xi = x.clamp(0, 100);
+    final yi = y.clamp(0, 100);
+    return Uint8List.fromList([b, xi, yi]);
+  }
+
+  // Send a relative mouse move + button state as 3-byte report: [buttons, dx, dy]
+  Future<void> sendAbsMouseReport(int buttons, int dx, int dy) async {
+    final bytes = absMouseReport(buttons, dx, dy);
+    if (kDebugMode) {
+      print('Preparing to send abs mouse report: buttons=$buttons, dx=$dx, dy=$dy');
+      print('Sending abs mouse report: ${bytes.map((e) => e.toRadixString(16).padLeft(2, '0'))}');
+    }
+
+    await peripheralManager.notifyCharacteristic(connectedCentral!, connectedCharacteristic!, value: bytes);
+
+    // we don't want to overwhelm the target device
+    await Future.delayed(Duration(milliseconds: 10));
+  }
+
+  Central? connectedCentral;
+  GATTCharacteristic? connectedCharacteristic;
+
+  void setConnectedCentral(Central? central, GATTCharacteristic? gattCharacteristic) {
+    connectedCentral = central;
+    connectedCharacteristic = gattCharacteristic;
+
+    connection.signalChange(ZwiftClick(BleDevice(deviceId: 'deviceId', name: 'name')));
+  }
+
+  bool get isConnected => connectedCentral != null;
+}

lib/utils/keymap/apps/biketerra.dart

@@ -1,4 +1,3 @@
-import 'package:accessibility/accessibility.dart';
 import 'package:dartx/dartx.dart';
 import 'package:flutter/services.dart';
 import 'package:swift_control/utils/keymap/apps/supported_app.dart';
@@ -14,27 +13,27 @@ class Biketerra extends SupportedApp {
         keymap: Keymap(
           keyPairs: [
             KeyPair(
-              buttons: ZwiftButton.values.filter((e) => e.action == InGameAction.shiftDown).toList(),
+              buttons: ControllerButton.values.filter((e) => e.action == InGameAction.shiftDown).toList(),
               physicalKey: PhysicalKeyboardKey.keyS,
               logicalKey: LogicalKeyboardKey.keyS,
             ),
             KeyPair(
-              buttons: ZwiftButton.values.filter((e) => e.action == InGameAction.shiftUp).toList(),
+              buttons: ControllerButton.values.filter((e) => e.action == InGameAction.shiftUp).toList(),
               physicalKey: PhysicalKeyboardKey.keyW,
               logicalKey: LogicalKeyboardKey.keyW,
             ),
             KeyPair(
-              buttons: ZwiftButton.values.filter((e) => e.action == InGameAction.navigateRight).toList(),
+              buttons: ControllerButton.values.filter((e) => e.action == InGameAction.navigateRight).toList(),
               physicalKey: PhysicalKeyboardKey.arrowRight,
               logicalKey: LogicalKeyboardKey.arrowRight,
             ),
             KeyPair(
-              buttons: ZwiftButton.values.filter((e) => e.action == InGameAction.navigateLeft).toList(),
+              buttons: ControllerButton.values.filter((e) => e.action == InGameAction.navigateLeft).toList(),
               physicalKey: PhysicalKeyboardKey.arrowLeft,
               logicalKey: LogicalKeyboardKey.arrowLeft,
             ),
             KeyPair(
-              buttons: ZwiftButton.values.filter((e) => e.action == InGameAction.toggleUi).toList(),
+              buttons: ControllerButton.values.filter((e) => e.action == InGameAction.toggleUi).toList(),
               physicalKey: PhysicalKeyboardKey.keyU,
               logicalKey: LogicalKeyboardKey.keyU,
             ),
@@ -42,8 +41,3 @@ class Biketerra extends SupportedApp {
         ),
       );
 }
-
-extension WindowSize on WindowEvent {
-  int get width => right - left;
-  int get height => bottom - top;
-}

lib/utils/keymap/apps/custom_app.dart

@@ -1,23 +1,19 @@
-import 'package:accessibility/accessibility.dart';
 import 'package:dartx/dartx.dart';
 import 'package:flutter/services.dart';
 import 'package:swift_control/utils/keymap/apps/supported_app.dart';
 
-import '../../single_line_exception.dart';
 import '../buttons.dart';
 import '../keymap.dart';
 
 class CustomApp extends SupportedApp {
-  CustomApp() : super(name: 'Custom', packageName: "custom", keymap: Keymap.custom);
+  final String profileName;
 
-  @override
-  Offset resolveTouchPosition({required ZwiftButton action, required WindowEvent? windowInfo}) {
-    final keyPair = keymap.getKeyPair(action);
-    if (keyPair == null || keyPair.touchPosition == Offset.zero) {
-      throw SingleLineException("No key pair found for action: $action");
-    }
-    return keyPair.touchPosition;
-  }
+  CustomApp({this.profileName = 'Custom'})
+    : super(
+        name: profileName,
+        packageName: "custom_$profileName",
+        keymap: Keymap(keyPairs: []),
+      );
 
   List<String> encodeKeymap() {
     // encode to save in preferences
@@ -39,17 +35,29 @@ class CustomApp extends SupportedApp {
   }
 
   void setKey(
-    ZwiftButton zwiftButton, {
-    required PhysicalKeyboardKey physicalKey,
+    ControllerButton zwiftButton, {
+    required PhysicalKeyboardKey? physicalKey,
     required LogicalKeyboardKey? logicalKey,
+    bool isLongPress = false,
+    Offset? touchPosition,
   }) {
     // set the key for the zwift button
     final keyPair = keymap.getKeyPair(zwiftButton);
     if (keyPair != null) {
       keyPair.physicalKey = physicalKey;
       keyPair.logicalKey = logicalKey;
+      keyPair.isLongPress = isLongPress;
+      keyPair.touchPosition = touchPosition ?? Offset.zero;
     } else {
-      keymap.keyPairs.add(KeyPair(buttons: [zwiftButton], physicalKey: physicalKey, logicalKey: logicalKey));
+      keymap.keyPairs.add(
+        KeyPair(
+          buttons: [zwiftButton],
+          physicalKey: physicalKey,
+          logicalKey: logicalKey,
+          isLongPress: isLongPress,
+          touchPosition: touchPosition ?? Offset.zero,
+        ),
+      );
     }
   }
 }

lib/utils/keymap/apps/my_whoosh.dart

@@ -1,10 +1,7 @@
-import 'package:accessibility/accessibility.dart';
 import 'package:dartx/dartx.dart';
 import 'package:flutter/services.dart';
-import 'package:swift_control/main.dart';
 import 'package:swift_control/utils/keymap/apps/supported_app.dart';
 
-import '../../single_line_exception.dart';
 import '../buttons.dart';
 import '../keymap.dart';
 
@@ -16,81 +13,37 @@ class MyWhoosh extends SupportedApp {
         keymap: Keymap(
           keyPairs: [
             KeyPair(
-              buttons: ZwiftButton.values.filter((e) => e.action == InGameAction.shiftDown).toList(),
+              buttons: ControllerButton.values.filter((e) => e.action == InGameAction.shiftDown).toList(),
               physicalKey: PhysicalKeyboardKey.keyI,
               logicalKey: LogicalKeyboardKey.keyI,
+              touchPosition: Offset(80, 94),
             ),
             KeyPair(
-              buttons: ZwiftButton.values.filter((e) => e.action == InGameAction.shiftUp).toList(),
+              buttons: ControllerButton.values.filter((e) => e.action == InGameAction.shiftUp).toList(),
               physicalKey: PhysicalKeyboardKey.keyK,
               logicalKey: LogicalKeyboardKey.keyK,
+              touchPosition: Offset(98, 94),
             ),
             KeyPair(
-              buttons: ZwiftButton.values.filter((e) => e.action == InGameAction.navigateRight).toList(),
-              physicalKey: PhysicalKeyboardKey.keyD,
-              logicalKey: LogicalKeyboardKey.keyD,
+              buttons: ControllerButton.values.filter((e) => e.action == InGameAction.navigateRight).toList(),
+              physicalKey: PhysicalKeyboardKey.arrowRight,
+              logicalKey: LogicalKeyboardKey.arrowRight,
+              touchPosition: Offset(98, 80),
+              isLongPress: true,
             ),
             KeyPair(
-              buttons: ZwiftButton.values.filter((e) => e.action == InGameAction.navigateLeft).toList(),
-              physicalKey: PhysicalKeyboardKey.keyA,
-              logicalKey: LogicalKeyboardKey.keyA,
+              buttons: ControllerButton.values.filter((e) => e.action == InGameAction.navigateLeft).toList(),
+              physicalKey: PhysicalKeyboardKey.arrowLeft,
+              logicalKey: LogicalKeyboardKey.arrowLeft,
+              touchPosition: Offset(32, 80),
+              isLongPress: true,
             ),
             KeyPair(
-              buttons: ZwiftButton.values.filter((e) => e.action == InGameAction.toggleUi).toList(),
+              buttons: ControllerButton.values.filter((e) => e.action == InGameAction.toggleUi).toList(),
               physicalKey: PhysicalKeyboardKey.keyH,
               logicalKey: LogicalKeyboardKey.keyH,
             ),
           ],
         ),
       );
-
-  @override
-  Offset resolveTouchPosition({required ZwiftButton action, required WindowEvent? windowInfo}) {
-    final superPosition = super.resolveTouchPosition(action: action, windowInfo: windowInfo);
-    if (superPosition != Offset.zero) {
-      return superPosition;
-    }
-    if (windowInfo == null) {
-      throw SingleLineException("Window size not known - open $this first");
-    }
-
-    // just my personal preference
-    switch (action) {
-      case ZwiftButton.y:
-        accessibilityHandler.controlMedia(MediaAction.volumeUp);
-        return Offset.zero;
-      case ZwiftButton.b:
-        accessibilityHandler.controlMedia(MediaAction.volumeDown);
-        return Offset.zero;
-      case ZwiftButton.a:
-        accessibilityHandler.controlMedia(MediaAction.next);
-        return Offset.zero;
-      case ZwiftButton.z:
-        accessibilityHandler.controlMedia(MediaAction.playPause);
-        return Offset.zero;
-      default:
-        break;
-    }
-
-    return switch (action.action) {
-      InGameAction.shiftUp => Offset(
-        windowInfo.right - windowInfo.width * 0.02,
-        windowInfo.bottom - windowInfo.height * 0.06,
-      ),
-      InGameAction.shiftDown => Offset(
-        windowInfo.right - windowInfo.width * 0.20,
-        windowInfo.bottom - windowInfo.height * 0.06,
-      ),
-      InGameAction.navigateRight => Offset(
-        windowInfo.right - windowInfo.width * 0.02,
-        windowInfo.bottom - windowInfo.height * 0.20,
-      ),
-      _ => throw SingleLineException("Unsupported action for MyWhoosh: $action"),
-    };
-  }
-}
-
-extension WindowSize on WindowEvent {
-  int get width => right - left;
-  int get height => bottom - top;
 }

lib/utils/keymap/apps/supported_app.dart

@@ -1,11 +1,6 @@
-import 'dart:ui';
-
-import 'package:accessibility/accessibility.dart';
 import 'package:swift_control/utils/keymap/apps/biketerra.dart';
 import 'package:swift_control/utils/keymap/apps/training_peaks.dart';
 
-import '../../single_line_exception.dart';
-import '../buttons.dart';
 import '../keymap.dart';
 import 'custom_app.dart';
 import 'my_whoosh.dart';
@@ -15,17 +10,6 @@ abstract class SupportedApp {
   final String name;
   final Keymap keymap;
 
-  Offset resolveTouchPosition({required ZwiftButton action, required WindowEvent? windowInfo}) {
-    if (this is CustomApp) {
-      final keyPair = keymap.getKeyPair(action);
-      if (keyPair == null || keyPair.touchPosition == Offset.zero) {
-        throw SingleLineException("No key pair found for action: $action");
-      }
-      return keyPair.touchPosition;
-    }
-    return Offset.zero;
-  }
-
   const SupportedApp({required this.name, required this.packageName, required this.keymap});
 
   static final List<SupportedApp> supportedApps = [MyWhoosh(), TrainingPeaks(), Biketerra(), CustomApp()];

lib/utils/keymap/apps/training_peaks.dart

@@ -1,73 +1,56 @@
-import 'package:accessibility/accessibility.dart';
 import 'package:dartx/dartx.dart';
 import 'package:flutter/services.dart';
-import 'package:swift_control/utils/keymap/apps/my_whoosh.dart';
 import 'package:swift_control/utils/keymap/apps/supported_app.dart';
 import 'package:swift_control/utils/keymap/buttons.dart';
-import 'package:swift_control/utils/single_line_exception.dart';
 
 import '../keymap.dart';
 
 class TrainingPeaks extends SupportedApp {
   TrainingPeaks()
     : super(
-        name: 'IndieVelo / TrainingPeaks',
+        name: 'TrainingPeaks Virtual / IndieVelo',
         packageName: "com.indieVelo.client",
         keymap: Keymap(
           keyPairs: [
             // https://help.trainingpeaks.com/hc/en-us/articles/31340399556877-TrainingPeaks-Virtual-Controls-and-Keyboard-Shortcuts
             KeyPair(
-              buttons: ZwiftButton.values.filter((e) => e.action == InGameAction.shiftDown).toList(),
+              buttons: ControllerButton.values.filter((e) => e.action == InGameAction.shiftDown).toList(),
               physicalKey: PhysicalKeyboardKey.numpadSubtract,
               logicalKey: LogicalKeyboardKey.numpadSubtract,
+              touchPosition: Offset(50 * 1.32, 74),
             ),
             KeyPair(
-              buttons: ZwiftButton.values.filter((e) => e.action == InGameAction.shiftUp).toList(),
+              buttons: ControllerButton.values.filter((e) => e.action == InGameAction.shiftUp).toList(),
               physicalKey: PhysicalKeyboardKey.numpadAdd,
               logicalKey: LogicalKeyboardKey.numpadAdd,
+              touchPosition: Offset(50 * 1.15, 74),
             ),
             KeyPair(
-              buttons: ZwiftButton.values.filter((e) => e.action == InGameAction.navigateRight).toList(),
+              buttons: ControllerButton.values.filter((e) => e.action == InGameAction.navigateRight).toList(),
               physicalKey: PhysicalKeyboardKey.arrowRight,
               logicalKey: LogicalKeyboardKey.arrowRight,
             ),
             KeyPair(
-              buttons: ZwiftButton.values.filter((e) => e.action == InGameAction.navigateLeft).toList(),
+              buttons: ControllerButton.values.filter((e) => e.action == InGameAction.navigateLeft).toList(),
               physicalKey: PhysicalKeyboardKey.arrowLeft,
               logicalKey: LogicalKeyboardKey.arrowLeft,
             ),
             KeyPair(
-              buttons: ZwiftButton.values.filter((e) => e.action == InGameAction.toggleUi).toList(),
+              buttons: ControllerButton.values.filter((e) => e.action == InGameAction.toggleUi).toList(),
               physicalKey: PhysicalKeyboardKey.keyH,
               logicalKey: LogicalKeyboardKey.keyH,
             ),
             KeyPair(
-              buttons: ZwiftButton.values.filter((e) => e.action == InGameAction.increaseResistance).toList(),
+              buttons: ControllerButton.values.filter((e) => e.action == InGameAction.increaseResistance).toList(),
               physicalKey: PhysicalKeyboardKey.pageUp,
               logicalKey: LogicalKeyboardKey.pageUp,
             ),
             KeyPair(
-              buttons: ZwiftButton.values.filter((e) => e.action == InGameAction.decreaseResistance).toList(),
+              buttons: ControllerButton.values.filter((e) => e.action == InGameAction.decreaseResistance).toList(),
               physicalKey: PhysicalKeyboardKey.pageDown,
               logicalKey: LogicalKeyboardKey.pageDown,
             ),
           ],
         ),
       );
-
-  @override
-  Offset resolveTouchPosition({required ZwiftButton action, required WindowEvent? windowInfo}) {
-    final superPosition = super.resolveTouchPosition(action: action, windowInfo: windowInfo);
-    if (superPosition != Offset.zero) {
-      return superPosition;
-    }
-    if (windowInfo == null) {
-      throw SingleLineException("Window size not known - open $this first");
-    }
-    return switch (action.action) {
-      InGameAction.shiftUp => Offset(windowInfo.width / 2 * 1.32, windowInfo.height * 0.74),
-      InGameAction.shiftDown => Offset(windowInfo.width / 2 * 1.15, windowInfo.height * 0.74),
-      _ => throw SingleLineException("Unsupported action for IndieVelo: $action"),
-    };
-  }
 }

lib/utils/keymap/buttons.dart

@@ -1,3 +1,5 @@
+import 'package:flutter/material.dart';
+
 enum InGameAction {
   shiftUp,
   shiftDown,
@@ -13,37 +15,43 @@ enum InGameAction {
   }
 }
 
-enum ZwiftButton {
+enum ControllerButton {
   // left controller
-  navigationUp._(InGameAction.increaseResistance),
-  navigationDown._(InGameAction.decreaseResistance),
-  navigationLeft._(InGameAction.navigateLeft),
-  navigationRight._(InGameAction.navigateRight),
+  navigationUp._(InGameAction.increaseResistance, icon: Icons.keyboard_arrow_up, color: Colors.black),
+  navigationDown._(InGameAction.decreaseResistance, icon: Icons.keyboard_arrow_down, color: Colors.black),
+  navigationLeft._(InGameAction.navigateLeft, icon: Icons.keyboard_arrow_left, color: Colors.black),
+  navigationRight._(InGameAction.navigateRight, icon: Icons.keyboard_arrow_right, color: Colors.black),
   onOffLeft._(InGameAction.toggleUi),
   sideButtonLeft._(InGameAction.shiftDown),
   paddleLeft._(InGameAction.shiftDown),
 
   // zwift ride only
-  shiftUpLeft._(InGameAction.shiftDown),
-  shiftDownLeft._(InGameAction.shiftDown),
+  shiftUpLeft._(InGameAction.shiftDown, icon: Icons.remove, color: Colors.black),
+  shiftDownLeft._(InGameAction.shiftDown, icon: Icons.remove, color: Colors.black),
   powerUpLeft._(InGameAction.shiftDown),
 
   // right controller
-  a._(null),
-  b._(null),
-  z._(null),
-  y._(null),
+  a._(null, color: Colors.lightGreen),
+  b._(null, color: Colors.pinkAccent),
+  z._(null, color: Colors.deepOrangeAccent),
+  y._(null, color: Colors.lightBlue),
   onOffRight._(InGameAction.toggleUi),
   sideButtonRight._(InGameAction.shiftUp),
   paddleRight._(InGameAction.shiftUp),
 
   // zwift ride only
-  shiftUpRight._(InGameAction.shiftUp),
+  shiftUpRight._(InGameAction.shiftUp, icon: Icons.add, color: Colors.black),
   shiftDownRight._(InGameAction.shiftUp),
-  powerUpRight._(InGameAction.shiftUp);
+  powerUpRight._(InGameAction.shiftUp),
+
+  // elite square only
+  campagnoloLeft._(InGameAction.shiftDown),
+  campagnoloRight._(InGameAction.shiftUp);
 
   final InGameAction? action;
-  const ZwiftButton._(this.action);
+  final Color? color;
+  final IconData? icon;
+  const ControllerButton._(this.action, {this.color, this.icon});
 
   @override
   String toString() {