Merge branch 'master' into Renpho-smart-bike-r-q002-n-(Issue-#2401)

cagnulein · Aug 5, 2024 · 7938931 · 7938931
2 parents a956d18 + 3327b8b
commit 7938931
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/src/android/build.gradle b/src/android/build.gradle
@@ -18,7 +18,6 @@ repositories {
     google()
     jcenter()
     maven { url 'https://jitpack.io' }
-	 maven { url 'https://dl.bintray.com/rvalerio/maven' }
 }
 
 apply plugin: 'com.android.application'
@@ -28,7 +27,6 @@ def amazon = System.getenv('AMAZON')
 println(amazon)
 
 dependencies {
-    compile 'com.rvalerio:fgchecker:1.1.0'
     implementation "androidx.core:core:1.12.0"
     implementation "androidx.core:core-ktx:1.12.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0"

diff --git a/src/android/libs/fgchecker-1.1.0.aar b/src/android/libs/fgchecker-1.1.0.aar
diff --git a/src/android/libs/fgchecker-1.1.0.pom b/src/android/libs/fgchecker-1.1.0.pom
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.rvalerio</groupId>
+  <artifactId>fgchecker</artifactId>
+  <version>1.1.0</version>
+  <packaging>aar</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>com.android.support</groupId>
+      <artifactId>appcompat-v7</artifactId>
+      <version>26.0.1</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/src/virtualdevices/virtualbike.cpp b/src/virtualdevices/virtualbike.cpp
@@ -778,8 +778,8 @@ void virtualbike::characteristicChanged(const QLowEnergyCharacteristic &characte
                    ((uint8_t)newValue.at(8)) == 0x02) { // ff0f0204020b070b0202041032020a0068000000
             qDebug() << "ifit ans 15 stop request";
             iFit_timer = 0;
-            reply1 = QByteArray::fromHex("fe02090200b40000005802000000000038000000");
-            reply2 = QByteArray::fromHex("ff09010402050705020210000000000038000000");
+            reply1 = QByteArray::fromHex("fe0209020205070502021000ffffffffffffffff");
+            reply2 = QByteArray::fromHex("ff0901040205070502021000ffffffffffffffff");
             writeCharacteristic(service, characteristic, reply1);
             writeCharacteristic(service, characteristic, reply2);
         } else if (newValue.length() > 12 && ((uint8_t)newValue.at(0)) == 0xFF &&