From 938f08c78240c521b8009dea244c6a3a33b96126 Mon Sep 17 00:00:00 2001 From: Roberto Viola Date: Mon, 29 Jan 2024 09:20:33 +0100 Subject: [PATCH] Nordictrack Elite 1000 (Issue #78) --- .github/workflows/main.yml | 2 +- app/build.gradle | 4 ++-- app/src/main/AndroidManifest.xml | 2 +- .../qzcompanionnordictracktreadmill/UDPListenerService.java | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a56fb34..7391785 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -74,7 +74,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: 3.3.32 #${{ steps.get_version.outputs.VERSION }} + tag_name: 3.3.33 #${{ steps.get_version.outputs.VERSION }} asset_path: ${{steps.sign_app.outputs.signedReleaseFile}} asset_name: QZCompanionNordictrackTreadmill.apk asset_content_type: application/zip diff --git a/app/build.gradle b/app/build.gradle index 43450b0..adb758f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "org.cagnulein.qzcompanionnordictracktreadmill" minSdkVersion 21 targetSdkVersion 34 - versionCode 112 - versionName "3.3.32" + versionCode 113 + versionName "3.3.33" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 026ea6d..bf87d22 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="org.cagnulein.qzcompanionnordictracktreadmill" android:versionName="3.3.33" android:versionCode="113" > diff --git a/app/src/main/java/org/cagnulein/qzcompanionnordictracktreadmill/UDPListenerService.java b/app/src/main/java/org/cagnulein/qzcompanionnordictracktreadmill/UDPListenerService.java index 0873935..3e09774 100644 --- a/app/src/main/java/org/cagnulein/qzcompanionnordictracktreadmill/UDPListenerService.java +++ b/app/src/main/java/org/cagnulein/qzcompanionnordictracktreadmill/UDPListenerService.java @@ -426,9 +426,9 @@ private void listenAndWaitAndThrowIntent(InetAddress broadcastIP, Integer port) y1Inclination = 520 - (int) (QZService.lastInclinationFloat * 20); y2 = y1Inclination - (int) ((reqInclination - QZService.lastInclinationFloat) * 20); } else if (device == _device.elite1000) { - x1 = 75; - y1Inclination = 615 - (int) (QZService.lastInclinationFloat * 32.58); - y2 = y1Inclination - (int) ((reqInclination - QZService.lastInclinationFloat) * 32.58); + x1 = 76; + y1Inclination = 589 - (int) (QZService.lastInclinationFloat * 32.8); + y2 = y1Inclination - (int) ((reqInclination - QZService.lastInclinationFloat) * 32.8); } else { x1 = 79; y2 = (int) ((-21.804 * reqInclination) + 520.11);