Update project.pbxproj

Mail from: Aaron B.
Subject: Something broke w the last beta update
Date: 11/12/2025

Refines the condition for updating inclination to ensure it only triggers when the gear value changes and the requestInclination is not -100. This prevents unnecessary updates and improves the logic for bikes without resistance.

build-qdomyos-zwift-Qt_5_15_2_for_iOS-Debug/qdomyoszwift.xcodeproj/project.pbxproj

@@ -4569,7 +4569,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "../src/ios/qdomyos-zwift.entitlements";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1223;
+				CURRENT_PROJECT_VERSION = 1227;
 				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
 				DEVELOPMENT_TEAM = 6335M7T29D;
 				ENABLE_BITCODE = NO;
@@ -4770,7 +4770,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = "../src/ios/qdomyos-zwift.entitlements";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1223;
+				CURRENT_PROJECT_VERSION = 1227;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
 				DEVELOPMENT_TEAM = 6335M7T29D;
@@ -5007,7 +5007,7 @@
 				CODE_SIGN_ENTITLEMENTS = "watchkit Extension/WatchKit Extension.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1223;
+				CURRENT_PROJECT_VERSION = 1227;
 				DEVELOPMENT_TEAM = 6335M7T29D;
 				ENABLE_BITCODE = YES;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -5103,7 +5103,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_ENTITLEMENTS = "watchkit Extension/WatchKit Extension.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1223;
+				CURRENT_PROJECT_VERSION = 1227;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 6335M7T29D;
 				ENABLE_BITCODE = YES;
@@ -5195,7 +5195,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_ENTITLEMENTS = "watchkit Extension/WatchKit Extension.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1223;
+				CURRENT_PROJECT_VERSION = 1227;
 				DEVELOPMENT_ASSET_PATHS = "\"watchkit Extension/Preview Content\"";
 				ENABLE_BITCODE = YES;
 				ENABLE_PREVIEWS = YES;
@@ -5311,7 +5311,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_ENTITLEMENTS = "watchkit Extension/WatchKit Extension.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1223;
+				CURRENT_PROJECT_VERSION = 1227;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_ASSET_PATHS = "\"watchkit Extension/Preview Content\"";
 				ENABLE_BITCODE = YES;
@@ -5421,7 +5421,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_ENTITLEMENTS = QZWidgetExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1223;
+				CURRENT_PROJECT_VERSION = 1227;
 				DEVELOPMENT_TEAM = 6335M7T29D;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -5512,7 +5512,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_ENTITLEMENTS = QZWidgetExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1223;
+				CURRENT_PROJECT_VERSION = 1227;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 6335M7T29D;
 				ENABLE_NS_ASSERTIONS = NO;

src/AccordionElement.qml

@@ -25,6 +25,11 @@ ColumnLayout {
         Layout.fillWidth: true
         height: 48
 
+        Accessible.role: Accessible.Button         
+        Accessible.name: title 
+        Accessible.description: expanded ? "Expanded" : "Collapsed"
+        Accessible.onPressAction: toggle()
+
         Rectangle {
             id: indicatRect
             x: 16; y: 20

src/Home.qml

@@ -14,6 +14,10 @@ HomeForm {
         width: parent.fill
         height: parent.fill
         color: settings.theme_background_color
+
+        // VoiceOver accessibility - ignore decorative background
+        Accessible.role: Accessible.Pane
+        Accessible.ignored: true
     }
     signal start_clicked;
     signal stop_clicked;
@@ -185,6 +189,8 @@ HomeForm {
                 gridView.leftMargin = (parent.width % cellWidth) / 2;
         }
 
+        Accessible.ignored: true
+
         delegate: Item {
             id: id1
             width: 170 * settings.ui_zoom / 100
@@ -193,6 +199,12 @@ HomeForm {
             visible: visibleItem
             Component.onCompleted: console.log("completed " + objectName)
 
+            // VoiceOver accessibility support
+            Accessible.role: largeButton ? Accessible.Button : (writable ? Accessible.Pane : Accessible.StaticText)
+            Accessible.name: name + (largeButton ? "" : (": " + value))
+            Accessible.description: largeButton ? largeButtonLabel : (secondLine !== "" ? secondLine : (writable ? qsTr("Adjustable. Current value: ") + value : qsTr("Current value: ") + value))
+            Accessible.focusable: true
+
             Behavior on x {
                 enabled: id1.state != "active"
                 NumberAnimation { duration: 400; easing.type: Easing.OutBack }
@@ -226,6 +238,9 @@ HomeForm {
                 border.color: (settings.theme_tile_shadow_enabled ? settings.theme_tile_shadow_color : settings.theme_tile_background_color)
                 color: settings.theme_tile_background_color
                 id: rect
+
+                // Ignore for VoiceOver - decorative background only
+                Accessible.ignored: true
             }
 
             DropShadow {
@@ -256,6 +271,9 @@ HomeForm {
                 height: 48 * settings.ui_zoom / 100
                 source: icon
                 visible: settings.theme_tile_icon_enabled && !largeButton
+
+                // Ignore for VoiceOver - decorative only
+                Accessible.ignored: true
             }
             Text {
                 objectName: "value"
@@ -270,6 +288,9 @@ HomeForm {
                 font.pointSize: valueFontSize * settings.ui_zoom / 100
                 font.bold: true
                 visible: !largeButton
+
+                // Ignore for VoiceOver - parent Item handles accessibility
+                Accessible.ignored: true
             }
             Text {
                 objectName: "secondLine"
@@ -285,6 +306,9 @@ HomeForm {
                 font.pointSize: settings.theme_tile_secondline_textsize * settings.ui_zoom / 100
                 font.bold: false
                 visible: !largeButton
+
+                // Ignore for VoiceOver - parent Item handles accessibility
+                Accessible.ignored: true
             }
             Text {
                 id: myText
@@ -299,6 +323,9 @@ HomeForm {
                 anchors.leftMargin: 55 * settings.ui_zoom / 100
                 anchors.topMargin: 20 * settings.ui_zoom / 100
                 visible: !largeButton
+
+                // Ignore for VoiceOver - parent Item handles accessibility
+                Accessible.ignored: true
             }
             RoundButton {
                 objectName: minusName
@@ -311,6 +338,13 @@ HomeForm {
                 anchors.leftMargin: 2
                 width: 48 * settings.ui_zoom / 100
                 height: 48 * settings.ui_zoom / 100
+
+                // VoiceOver accessibility
+                Accessible.role: Accessible.Button
+                Accessible.name: qsTr("Decrease ") + name
+                Accessible.description: qsTr("Decrease the value of ") + name
+                Accessible.focusable: true
+                Accessible.onPressAction: { minus_clicked(objectName) }
             }
             RoundButton {
                 autoRepeat: true
@@ -323,6 +357,13 @@ HomeForm {
                 anchors.rightMargin: 2
                 width: 48 * settings.ui_zoom / 100
                 height: 48 * settings.ui_zoom / 100
+
+                // VoiceOver accessibility
+                Accessible.role: Accessible.Button
+                Accessible.name: qsTr("Increase ") + name
+                Accessible.description: qsTr("Increase the value of ") + name
+                Accessible.focusable: true
+                Accessible.onPressAction: { plus_clicked(objectName) }
             }
             RoundButton {
                 autoRepeat: true
@@ -336,6 +377,13 @@ HomeForm {
                             radius: 20
                             }
                 font.pointSize: 20 * settings.ui_zoom / 100
+
+                // VoiceOver accessibility
+                Accessible.role: Accessible.Button
+                Accessible.name: largeButtonLabel
+                Accessible.description: name + ": " + largeButtonLabel
+                Accessible.focusable: true
+                Accessible.onPressAction: { largeButton_clicked(objectName) }
             }
         }
     }

src/HomeForm.ui.qml

@@ -9,6 +9,9 @@ Page {
     title: qsTr("QZ Fitness")
     id: page
 
+    // VoiceOver accessibility - ignore Page itself, only children are accessible
+    Accessible.ignored: true
+
     property alias start: start
     property alias stop: stop
     property alias lap: lap
@@ -39,6 +42,8 @@ Page {
                 width: 50
                 height: row.height
 					 color: settings.theme_background_color
+                Accessible.ignored: true
+
                 Column {
                     id: column
                     anchors.horizontalCenter: parent.horizontalCenter
@@ -47,10 +52,13 @@ Page {
                     height: row.height
                     spacing: 0
                     padding: 0
+                    Accessible.ignored: true
+
                     Rectangle {
                         width: 50
                         height: row.height
                         color: settings.theme_background_color
+                        Accessible.ignored: true
 
                         Image {
                             anchors.verticalCenter: parent.verticalCenter
@@ -60,6 +68,12 @@ Page {
                             source: "icons/icons/bluetooth-icon.png"
                             enabled: rootItem.device
                             smooth: true
+
+                            // VoiceOver accessibility
+                            Accessible.role: Accessible.Indicator
+                            Accessible.name: qsTr("Bluetooth connection")
+                            Accessible.description: rootItem.device ? qsTr("Device connected") : qsTr("Device not connected")
+                            Accessible.focusable: true
                         }
                         ColorOverlay {
                             anchors.fill: treadmill_connection
@@ -74,6 +88,7 @@ Page {
                         height: row.height - 76
                         source: rootItem.signal
                         smooth: true
+                        Accessible.ignored: true
                     }
                 }
             }
@@ -82,6 +97,8 @@ Page {
                 width: 120
                 height: row.height
 					 color: settings.theme_background_color
+                Accessible.ignored: true
+
                 RoundButton {
                     icon.source: rootItem.startIcon
                     icon.height: row.height - 54
@@ -91,6 +108,12 @@ Page {
                     id: start
                     width: 120
                     height: row.height - 4
+
+                    // VoiceOver accessibility
+                    Accessible.role: Accessible.Button
+                    Accessible.name: rootItem.startText
+                    Accessible.description: qsTr("Start workout")
+                    Accessible.focusable: true
                 }
                 ColorOverlay {
                     anchors.fill: start
@@ -104,6 +127,7 @@ Page {
                 width: 120
                 height: row.height
 					 color: settings.theme_background_color
+                Accessible.ignored: true
 
                 RoundButton {
                     icon.source: rootItem.stopIcon
@@ -114,6 +138,12 @@ Page {
                     id: stop
                     width: 120
                     height: row.height - 4
+
+                    // VoiceOver accessibility
+                    Accessible.role: Accessible.Button
+                    Accessible.name: rootItem.stopText
+                    Accessible.description: qsTr("Stop workout")
+                    Accessible.focusable: true
                 }
                 ColorOverlay {
                     anchors.fill: stop
@@ -128,6 +158,8 @@ Page {
                 width: 50
                 height: row.height
 					 color: settings.theme_background_color
+                Accessible.ignored: true
+
                 RoundButton {
                     anchors.verticalCenter: parent.verticalCenter
                     id: lap
@@ -138,6 +170,12 @@ Page {
                     icon.height: 48
                     enabled: rootItem.lap
                     smooth: true
+
+                    // VoiceOver accessibility
+                    Accessible.role: Accessible.Button
+                    Accessible.name: qsTr("Lap")
+                    Accessible.description: qsTr("Record a new lap")
+                    Accessible.focusable: true
                 }
                 ColorOverlay {
                     anchors.fill: lap

src/NewPageElement.qml

@@ -22,6 +22,11 @@ ColumnLayout {
         Layout.fillWidth: true;
         height: 48
 
+        Accessible.role: Accessible.Button 
+        Accessible.name: title 
+        Accessible.description: expanded ? "Expanded" : "Collapsed"
+        Accessible.onPressAction: toggle()
+
         Rectangle{
            id:indicatRect
            x: 16; y: 20

src/devices/bluetooth.cpp

@@ -1763,6 +1763,7 @@ void bluetooth::deviceDiscovered(const QBluetoothDeviceInfo &device) {
                         (b.name().toUpper().startsWith("JUSTO")) ||
                         (b.name().toUpper().startsWith("MYCYCLE ")) ||
                         (b.name().toUpper().startsWith("T2 ")) ||                        
+                        (b.name().toUpper().startsWith("S18")) ||
                         (b.name().toUpper().startsWith("RC-MAX-")) ||
                         (b.name().toUpper().startsWith("TPS-SPBIKE-2.0")) ||
                         (b.name().toUpper().startsWith("NEO BIKE SMART")) ||

src/devices/ftmsbike/ftmsbike.cpp

@@ -369,7 +369,7 @@ void ftmsbike::update() {
         
         // gpx scenario for example
         if(!virtualBike || !virtualBike->ftmsDeviceConnected()) {
-            if ((requestInclination != -100 || lastGearValue != gears())) {
+            if ((requestInclination != -100 || (lastGearValue != gears() && requestInclination != -100))) {
                 emit debug(QStringLiteral("writing inclination ") + QString::number(requestInclination));
                 forceInclination(requestInclination + gears()); // since this bike doesn't have the concept of resistance,
                                                                 // i'm using the gears in the inclination
@@ -1781,6 +1781,10 @@ void ftmsbike::deviceDiscovered(const QBluetoothDeviceInfo &device) {
             qDebug() << QStringLiteral("FS-YK- found");
             FS_YK = true;
             ergModeSupported = false; // this bike doesn't have ERG mode natively
+        } else if(device.name().toUpper().startsWith("S18")) {
+            qDebug() << QStringLiteral("S18 found");
+            S18 = true;
+            max_resistance = 24;
         }
 
 

src/devices/ftmsbike/ftmsbike.h

@@ -167,6 +167,7 @@ class ftmsbike : public bike {
     bool YPBM = false;
     bool SPORT01 = false;
     bool FS_YK = false;
+    bool S18 = false;
 
     uint8_t secondsToResetTimer = 5;
 

src/main.qml

@@ -17,8 +17,8 @@ ApplicationWindow {
     visibility: Qt.WindowFullScreen
     visible: true
 	 objectName: "stack"
-    title: qsTr("qDomyos-Zwift")
-    
+    title: Qt.platform.os === "ios" ? "" : qsTr("qDomyos-Zwift")
+
     // Force update on orientation change
     property int currentOrientation: Screen.orientation
     onCurrentOrientationChanged: {
@@ -729,6 +729,7 @@ ApplicationWindow {
         bottomPadding: getBottomPadding()
         leftPadding: getLeftPadding()
         rightPadding: getRightPadding()
+        Accessible.ignored: !drawer.opened
 
         ScrollView {
             contentWidth: -1
@@ -756,12 +757,12 @@ ApplicationWindow {
                     width: parent.width
                     onClicked: {
                         toolButtonLoadSettings.visible = true;
-                        toolButtonSaveSettings.visible = true;
+                        toolButtonSaveSettings.visible = true;                        
                         stackView.push("settings.qml")
                         stackView.currentItem.peloton_connect_clicked.connect(function() {
                             peloton_connect_clicked()
                          });
-                        drawer.close()
+                         drawer.close()
                     }
                 }
 
@@ -989,17 +990,22 @@ ApplicationWindow {
                         }
             }
         }
-    }    
+    }
 
-    StackView {
-        id: stackView
-        initialItem: "Home.qml"
+    // Wrapper Item to prevent ApplicationWindow from capturing all VoiceOver focus
+    Item {
         anchors.fill: parent
-        anchors.bottomMargin: (Screen.orientation === Qt.PortraitOrientation || Screen.orientation === Qt.InvertedPortraitOrientation) ? getBottomPadding() : 0
-        anchors.rightMargin: getRightPadding()
-        anchors.leftMargin: getLeftPadding()
-        focus: true
-        Keys.onVolumeUpPressed: (event)=> { console.log("onVolumeUpPressed"); volumeUp(); event.accepted = settings.volume_change_gears; }
+        Accessible.ignored: true
+
+        StackView {
+            id: stackView
+            initialItem: "Home.qml"
+            anchors.fill: parent
+            anchors.bottomMargin: (Screen.orientation === Qt.PortraitOrientation || Screen.orientation === Qt.InvertedPortraitOrientation) ? getBottomPadding() : 0
+            anchors.rightMargin: getRightPadding()
+            anchors.leftMargin: getLeftPadding()
+            focus: true
+            Keys.onVolumeUpPressed: (event)=> { console.log("onVolumeUpPressed"); volumeUp(); event.accepted = settings.volume_change_gears; }
         Keys.onVolumeDownPressed: (event)=> { console.log("onVolumeDownPressed"); volumeDown(); event.accepted = settings.volume_change_gears; }
         Keys.onPressed: (event)=> {
             if (event.key === Qt.Key_MediaPrevious)
@@ -1013,6 +1019,7 @@ ApplicationWindow {
 
             event.accepted = settings.volume_change_gears;
         }
+        }
     }
 }