Merge branch 'master' of https://github.com/cagnulein/qdomyos-zwift

cagnulein · Sep 29, 2023 · c807291 · c807291
2 parents 29c4e32 + 4b14084
commit c807291
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/homeform.cpp b/src/homeform.cpp
@@ -551,7 +551,7 @@ homeform::homeform(QQmlApplicationEngine *engine, bluetooth *bl) {
         deviceConnected(b);
     }
 
-#ifdef Q_OS_ANDROID
+#ifndef Q_OS_IOS
     iphone_browser = new QMdnsEngine::Browser(&iphone_server, "_qz_iphone._tcp.local.", &iphone_cache);
 
     QObject::connect(iphone_browser, &QMdnsEngine::Browser::serviceAdded, [](const QMdnsEngine::Service &service) {
@@ -2870,8 +2870,8 @@ void homeform::pelotonOffset_Minus() { Minus(QStringLiteral("peloton_offset"));
 void homeform::bluetoothDeviceConnected(bluetoothdevice *b) {
     this->innerTemplateManager->start(b);
     this->userTemplateManager->start(b);
-#ifdef Q_OS_ANDROID
-    // heart rate received from apple watch while QZ is running on android via TCP socket (iphone_socket)
+#ifndef Q_OS_IOS
+    // heart rate received from apple watch while QZ is running on a different device via TCP socket (iphone_socket)
     connect(this, SIGNAL(heartRate(uint8_t)), b, SLOT(heartRate(uint8_t)));
 #endif
 }
@@ -5064,7 +5064,7 @@ void homeform::update() {
                 lapTrigger = false;
             }
 
-#ifdef Q_OS_ANDROID
+#ifndef Q_OS_IOS
             if (iphone_socket && iphone_socket->state() == QAbstractSocket::ConnectedState) {
                 QString toSend =
                     "SENDER=PAD#HR=" + QString::number(bluetoothManager->device()->currentHeart().value()) +

diff --git a/src/homeform.h b/src/homeform.h
@@ -719,7 +719,9 @@ class homeform : public QObject {
 
 #ifdef Q_OS_ANDROID
     bool floating_open = false;
+#endif
 
+#ifndef Q_OS_IOS
     QMdnsEngine::Browser* iphone_browser = nullptr;
     QMdnsEngine::Resolver* iphone_resolver = nullptr;
     QMdnsEngine::Server iphone_server;