Merge branch 'dev' into testing-fix-for-timer-slot-miss

2023-01-24 18:15:45 +11:00
parent f3b4abf434 b697647773
commit a84df7b94e
42 changed files with 190 additions and 27 deletions
--- a/source/Core/BSP/Pinecilv2/configuration.h
+++ b/source/Core/BSP/Pinecilv2/configuration.h
@@ -152,7 +152,7 @@
 #define HAS_POWER_DEBUG_MENU
 #define HARDWARE_MAX_WATTAGE_X10 750
 #define TIP_THERMAL_MASS         65 // X10 watts to raise 1 deg C in 1 second
-
+#define BLE_ENABLED
 #define NEEDS_VBUS_PROBE 0

 #endif
--- a/source/Core/BSP/Pinecilv2/postRTOS.cpp
+++ b/source/Core/BSP/Pinecilv2/postRTOS.cpp
@@ -19,7 +19,10 @@ void postRToSInit() {
    hall_effect_present = Si7210::init();
  }
 #endif
-  ble_stack_start();
+
+  if (getSettingValue(SettingsOptions::BLEEnabled)) {
+    ble_stack_start();
+  }
 }
 int16_t getRawHallEffect() {
  if (hall_effect_present) {