From 6e0af97574644493fccf5610f28bff6759ea29fd Mon Sep 17 00:00:00 2001 From: Magnus Persson Date: Sat, 15 Oct 2022 17:41:17 +0200 Subject: [PATCH] Disable BLE for ESP32S2 --- src/ble.cpp | 4 ++-- src/ble.hpp | 4 ++-- src/main.cpp | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ble.cpp b/src/ble.cpp index a70ce3a..1844c43 100644 --- a/src/ble.cpp +++ b/src/ble.cpp @@ -21,7 +21,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#if defined(ESP32) +#if defined(ESP32) && !defined(ESP32S2) #include #include @@ -99,4 +99,4 @@ void BleSender::sendData(float tempF, float gravSG) { delay(100); } -#endif // ESP32 +#endif // ESP32 && !ESP32S2 diff --git a/src/ble.hpp b/src/ble.hpp index 57d1657..66c535a 100644 --- a/src/ble.hpp +++ b/src/ble.hpp @@ -24,7 +24,7 @@ SOFTWARE. #ifndef SRC_BLE_HPP_ #define SRC_BLE_HPP_ -#if defined(ESP32) +#if defined(ESP32) && !defined(ESP32S2) #include #include @@ -43,5 +43,5 @@ class BleSender { void sendData(float tempF, float gravSG); }; -#endif // ESP32 +#endif // ESP32 && !ESP32S2 #endif // SRC_BLE_HPP_ diff --git a/src/main.cpp b/src/main.cpp index 2c051fb..f73adc0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -159,7 +159,7 @@ void setup() { LOG_PERF_START("main-config-load"); myConfig.checkFileSystem(); - checkResetReason(); + //checkResetReason(); myConfig.loadFile(); myWifi.init(); myAdvancedConfig.loadFile(); @@ -310,13 +310,13 @@ bool loopReadGravity() { pushMillis = millis(); LOG_PERF_START("loop-push"); -#if defined(ESP32) +#if defined(ESP32) && !defined(ESP32S2) if (myConfig.isBLEActive()) { BleSender ble(myConfig.getColorBLE()); ble.sendData(convertCtoF(tempC), gravitySG); Log.notice(F("MAIN: Broadcast data over bluetooth." CR)); } -#endif +#endif // ESP32 && !ESP32S2 if (myWifi.isConnected()) { // no need to try if there is no wifi // connection.