From 80a569cff14d504b3f03be806fa6a5f807b856f4 Mon Sep 17 00:00:00 2001 From: doudar Date: Mon, 23 Jan 2023 13:12:43 -0600 Subject: [PATCH 1/2] Fixed bug where "none" hr still scanned --- CHANGELOG.md | 2 +- src/Main.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9c7db42..22777c9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - ### Changed -- +- Fixed bug where "none" hr still scanned. ### Hardware - diff --git a/src/Main.cpp b/src/Main.cpp index 05e853e1..d946ab79 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -562,7 +562,7 @@ void SS2K::rxSerial(void) { void SS2K::checkBLEReconnect() { static int bleCheck = 0; - if ((String(userConfig.getConnectedPowerMeter()) == "none") && ((String(userConfig.getConnectedPowerMeter()) == "none"))) { // Exit immediately if "none" and "none" + if ((String(userConfig.getConnectedHeartMonitor()) == "none") && ((String(userConfig.getConnectedPowerMeter()) == "none"))) { // Exit immediately if "none" and "none" bleCheck = 0; return; } @@ -574,7 +574,7 @@ void SS2K::checkBLEReconnect() { bleCheck = 0; return; } - if (((String(userConfig.getConnectedPowerMeter()) == "none") && (spinBLEClient.connectedPM))) { // Exit if "none" HR and PM is connected + if (((String(userConfig.getConnectedHeartMonitor()) == "none") && (spinBLEClient.connectedPM))) { // Exit if "none" HR and PM is connected bleCheck = 0; return; } From 5de9325033b897df9112116cf9478de072e7a947 Mon Sep 17 00:00:00 2001 From: doudar Date: Mon, 23 Jan 2023 13:14:52 -0600 Subject: [PATCH 2/2] Update CHANGELOG.md Added credit to @xpectnil Co-Authored-By: xpectnil <123363271+xpectnil@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22777c9b..fb42e201 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - ### Changed -- Fixed bug where "none" hr still scanned. +- Fixed bug where "none" hr still scanned. Credit to @xpectnil for discovering. ### Hardware -