Merge d8e838fe4d into dee3e26ac0

variants/heltec_tracker/platformio.ini

@@ -179,6 +179,7 @@ build_flags =
   -D ADMIN_PASSWORD='"password"'
   -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
+;  -D BLE_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_tracker_base.build_src_filter}
   +<helpers/ui/ST7735Display.cpp>

variants/rpi_picow/platformio.ini

@@ -27,6 +27,15 @@ build_src_filter = ${rp2040_base.build_src_filter}
   +<PicoWBoard.cpp>
   +<../variants/rpi_picow>
 lib_deps = ${rp2040_base.lib_deps}
+; Use chain+ so the LDF evaluates preprocessor conditions when scanning for
+; library dependencies. Without this, the LDF (in default 'deep' mode) ignores
+; #ifdef guards and follows all #include directives unconditionally. That causes
+; it to find #include <BLEDevice.h> inside the #ifdef ESP32 block in
+; esp32/BLELogInterface.h, pulling in the Arduino-Pico BLE library. That
+; library only compiles correctly when PIO_FRAMEWORK_ARDUINO_ENABLE_BLUETOOTH is
+; set (which enables the required BTstack defines), so without that flag the
+; build fails. chain+ prevents this by honouring the #ifdef ESP32 guard.
+lib_ldf_mode = chain+
 
 [env:PicoW_repeater]
 extends = rpi_picow

variants/sensecap_solar/platformio.ini

@@ -47,6 +47,7 @@ build_flags =
   -D ADMIN_PASSWORD='"password"'
   -D MAX_NEIGHBOURS=50
 ;  -D MESH_PACKET_LOGGING=1
+;  -D BLE_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${SenseCap_Solar.build_src_filter}
   +<../examples/simple_repeater/*.cpp>