From 9020d85d2f8833b4dfc9f42a546b694afe6d10c1 Mon Sep 17 00:00:00 2001 From: Anthony Doud Date: Sat, 25 Feb 2023 15:58:03 -0600 Subject: [PATCH] fixed Scanning with "none" selected --- CHANGELOG.md | 5 +++-- data/bluetoothscanner.html | 3 --- include/Builtin_Pages.h | 1 + include/SmartSpin_parameters.h | 6 +++--- include/settings.h | 2 +- src/BLE_Client.cpp | 19 +++++++++++-------- src/HTTP_Server_Basic.cpp | 11 +++++------ src/SmartSpin_parameters.cpp | 1 + 8 files changed, 25 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b76f54db..b21f882f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,12 +8,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Added battery monitoring of BLE devices by @Flo100. Implemented BLE HID shifting. ### Changed --Disregard Peloton serial power and cadence if user has a BLE power Meter selected. +- Disregard Peloton serial power and cadence if user has a BLE power Meter selected. - Filesystem no longer updates when auto-update is unchecked. - Holding shifter buttons on boot now erases LittleFS as well as resetting settings. - Fixed bug where "none" hr still scanned. Credit to @xpectnil for discovering. - Simplified Platform Packages to work better with newest version of PlatformIO. -- Fixed broken images in wiki +- Fixed broken images in wiki. +- Valid files displayed on OTA page. ### Hardware - Revised an old shifter cover for more options. - Updated arm folder to procedurally generated arms ov various lengths. diff --git a/data/bluetoothscanner.html b/data/bluetoothscanner.html index 27bb9fba..5c92e7ab 100644 --- a/data/bluetoothscanner.html +++ b/data/bluetoothscanner.html @@ -195,11 +195,8 @@

anyOptionPM.text = 'any'; let anyOptionHR = document.createElement('option'); anyOptionHR.text = 'any'; - let anyOptionRemote = document.createElement('option'); - anyOptionRemote.text = 'any'; PMDropdown.add(anyOptionPM); HRDropdown.add(anyOptionHR); - remoteDropdown.add(anyOptionRemote); let noneOptionPM = document.createElement('option'); noneOptionPM.text = 'none'; let noneOptionHR = document.createElement('option'); diff --git a/include/Builtin_Pages.h b/include/Builtin_Pages.h index 9aca7cd6..52ef5bef 100644 --- a/include/Builtin_Pages.h +++ b/include/Builtin_Pages.h @@ -78,6 +78,7 @@ String OTAServerIndex = "" "
0%
" "" + "
Valid files are firmware.bin or littlefs.bin
" "" "" ""; // spinBLEClient.resetDevices(); - // spinBLEClient.serverScan(true); + spinBLEClient.dontBlockScan = true; + spinBLEClient.scanProcess(DEFAULT_SCAN_DURATION); server.send(200, "text/html", response); }); @@ -333,7 +334,7 @@ void HTTP_Server::start() { if (upload.status == UPLOAD_FILE_START) { SS2K_LOG(HTTP_SERVER_LOG_TAG, "Update: %s", upload.filename.c_str()); if (!Update.begin(UPDATE_SIZE_UNKNOWN, U_SPIFFS)) { // start with max - // available size + // available size Update.printError(Serial); } } else if (upload.status == UPLOAD_FILE_WRITE) { @@ -344,7 +345,7 @@ void HTTP_Server::start() { } else if (upload.status == UPLOAD_FILE_END) { if (Update.end(true)) { // true to set the size to the // current progress - server.send(200, "text/plain", "Spiffs Uploaded Successfully. Rebooting..."); + server.send(200, "text/plain", "Littlefs Uploaded Successfully. Rebooting..."); userConfig.saveToLittleFS(); userPWC.saveToLittleFS(); vTaskDelay(100); @@ -615,8 +616,6 @@ void HTTP_Server::settingsProcessor() { "Selections Saved!

"; - // spinBLEClient.resetDevices(); - // spinBLEClient.serverScan(true); } else if (wasSettingsUpdate) { // Special Settings Page update response response += "Network settings will be applied at next reboot.
Everything " @@ -688,7 +687,7 @@ void HTTP_Server::FirmwareUpdate() { Version availableVer(payload.c_str()); Version currentVer(FIRMWARE_VERSION); - if (((availableVer > currentVer) && (userConfig.getAutoUpdate())) || (updateAnyway)) { + if (((availableVer > currentVer) && (userConfig.getAutoUpdate())) || (updateAnyway)) { SS2K_LOG(HTTP_SERVER_LOG_TAG, "New firmware detected!"); SS2K_LOG(HTTP_SERVER_LOG_TAG, "Upgrading from %s to %s", FIRMWARE_VERSION, payload.c_str()); diff --git a/src/SmartSpin_parameters.cpp b/src/SmartSpin_parameters.cpp index cc2d45f4..4c754703 100644 --- a/src/SmartSpin_parameters.cpp +++ b/src/SmartSpin_parameters.cpp @@ -60,6 +60,7 @@ void userParameters::setDefaults() { connectedPowerMeter = CONNECTED_POWER_METER; connectedHeartMonitor = CONNECTED_HEART_MONITOR; connectedRemote = CONNECTED_REMOTE; + foundDevices = " "; maxWatts = DEFAULT_MAX_WATTS; minWatts = DEFAULT_MIN_WATTS; stepperDir = true;