Skip to content

Commit b1c6cf7

Browse files
committed
Fix case sensitivity in Echelon Rower device detection
Updated the Bluetooth device discovery logic to use case-insensitive matching for Echelon Rower device names by converting names to uppercase before comparison. This ensures devices with varying name cases are correctly detected.
1 parent 50e18b1 commit b1c6cf7

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4573,7 +4573,7 @@
45734573
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
45744574
CODE_SIGN_ENTITLEMENTS = "../src/ios/qdomyos-zwift.entitlements";
45754575
COPY_PHASE_STRIP = NO;
4576-
CURRENT_PROJECT_VERSION = 1269;
4576+
CURRENT_PROJECT_VERSION = 1270;
45774577
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
45784578
DEVELOPMENT_TEAM = 6335M7T29D;
45794579
ENABLE_BITCODE = NO;
@@ -4774,7 +4774,7 @@
47744774
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
47754775
CODE_SIGN_ENTITLEMENTS = "../src/ios/qdomyos-zwift.entitlements";
47764776
COPY_PHASE_STRIP = NO;
4777-
CURRENT_PROJECT_VERSION = 1269;
4777+
CURRENT_PROJECT_VERSION = 1270;
47784778
DEBUG_INFORMATION_FORMAT = dwarf;
47794779
DERIVE_MACCATALYST_PRODUCT_BUNDLE_IDENTIFIER = YES;
47804780
DEVELOPMENT_TEAM = 6335M7T29D;
@@ -5011,7 +5011,7 @@
50115011
CODE_SIGN_ENTITLEMENTS = "watchkit Extension/WatchKit Extension.entitlements";
50125012
CODE_SIGN_IDENTITY = "Apple Development";
50135013
CODE_SIGN_STYLE = Automatic;
5014-
CURRENT_PROJECT_VERSION = 1269;
5014+
CURRENT_PROJECT_VERSION = 1270;
50155015
DEVELOPMENT_TEAM = 6335M7T29D;
50165016
ENABLE_BITCODE = YES;
50175017
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -5107,7 +5107,7 @@
51075107
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
51085108
CODE_SIGN_ENTITLEMENTS = "watchkit Extension/WatchKit Extension.entitlements";
51095109
CODE_SIGN_STYLE = Automatic;
5110-
CURRENT_PROJECT_VERSION = 1269;
5110+
CURRENT_PROJECT_VERSION = 1270;
51115111
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
51125112
DEVELOPMENT_TEAM = 6335M7T29D;
51135113
ENABLE_BITCODE = YES;
@@ -5199,7 +5199,7 @@
51995199
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
52005200
CODE_SIGN_ENTITLEMENTS = "watchkit Extension/WatchKit Extension.entitlements";
52015201
CODE_SIGN_STYLE = Automatic;
5202-
CURRENT_PROJECT_VERSION = 1269;
5202+
CURRENT_PROJECT_VERSION = 1270;
52035203
DEVELOPMENT_ASSET_PATHS = "\"watchkit Extension/Preview Content\"";
52045204
ENABLE_BITCODE = YES;
52055205
ENABLE_PREVIEWS = YES;
@@ -5315,7 +5315,7 @@
53155315
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
53165316
CODE_SIGN_ENTITLEMENTS = "watchkit Extension/WatchKit Extension.entitlements";
53175317
CODE_SIGN_STYLE = Automatic;
5318-
CURRENT_PROJECT_VERSION = 1269;
5318+
CURRENT_PROJECT_VERSION = 1270;
53195319
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
53205320
DEVELOPMENT_ASSET_PATHS = "\"watchkit Extension/Preview Content\"";
53215321
ENABLE_BITCODE = YES;
@@ -5425,7 +5425,7 @@
54255425
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
54265426
CODE_SIGN_ENTITLEMENTS = QZWidgetExtension.entitlements;
54275427
CODE_SIGN_STYLE = Automatic;
5428-
CURRENT_PROJECT_VERSION = 1269;
5428+
CURRENT_PROJECT_VERSION = 1270;
54295429
DEVELOPMENT_TEAM = 6335M7T29D;
54305430
ENABLE_STRICT_OBJC_MSGSEND = YES;
54315431
ENABLE_TESTABILITY = YES;
@@ -5516,7 +5516,7 @@
55165516
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
55175517
CODE_SIGN_ENTITLEMENTS = QZWidgetExtension.entitlements;
55185518
CODE_SIGN_STYLE = Automatic;
5519-
CURRENT_PROJECT_VERSION = 1269;
5519+
CURRENT_PROJECT_VERSION = 1270;
55205520
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
55215521
DEVELOPMENT_TEAM = 6335M7T29D;
55225522
ENABLE_NS_ASSERTIONS = NO;

src/devices/bluetooth.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2092,9 +2092,9 @@ void bluetooth::deviceDiscovered(const QBluetoothDeviceInfo &device) {
20922092
connect(lifespanTreadmill, &lifespantreadmill::inclinationChanged, this, &bluetooth::inclinationChanged);
20932093
lifespanTreadmill->deviceDiscovered(b);
20942094
this->signalBluetoothDeviceConnected(lifespanTreadmill);
2095-
} else if ((b.name().startsWith(QStringLiteral("ECH-ROW")) ||
2095+
} else if ((b.name().toUpper().startsWith(QStringLiteral("ECH-ROW")) ||
20962096
b.name().toUpper().startsWith(QStringLiteral("ROWSPORT")) ||
2097-
b.name().startsWith(QStringLiteral("ROW-S"))) &&
2097+
b.name().toUpper().startsWith(QStringLiteral("ROW-S"))) &&
20982098
!echelonRower && filter) {
20992099
this->setLastBluetoothDevice(b);
21002100
this->stopDiscovery();

0 commit comments

Comments
 (0)