mirror of
https://github.com/torlando-tech/pyxis.git
synced 2026-08-14 14:50:01 +00:00
fix: actually stage the M-files for the bluedroid drop
Companion to 21b0e96 which deleted BluedroidPlatform.{cpp,h} but
missed staging the three edited files that complete the cleanup:
- platformio.ini: remove the [env:tdeck-bluedroid] env block.
- .github/workflows/build-check.yml: drop tdeck-bluedroid from
the CI matrix.
- lib/ble_interface/BLEPlatform.cpp: drop the
USE_BLUEDROID-gated factory branches.
Same `git add` short-arg trap as the eridanus mishap earlier today
— specifying non-existent paths aborts the add before reaching the
M-file paths. Mental-model fix: stage M-files in a separate `git add`
from the staged-deletes.
This commit is contained in:
@@ -11,10 +11,6 @@
|
||||
#include "platforms/NimBLEPlatform.h"
|
||||
#endif
|
||||
|
||||
#if defined(ESP32) && defined(USE_BLUEDROID)
|
||||
#include "platforms/BluedroidPlatform.h"
|
||||
#endif
|
||||
|
||||
#if defined(ZEPHYR) || defined(CONFIG_BT)
|
||||
// Future: #include "platforms/ZephyrPlatform.h"
|
||||
#endif
|
||||
@@ -33,12 +29,6 @@ IBLEPlatform::Ptr BLEPlatformFactory::create(PlatformType type) {
|
||||
return std::make_shared<NimBLEPlatform>();
|
||||
#endif
|
||||
|
||||
#if defined(ESP32) && defined(USE_BLUEDROID)
|
||||
case PlatformType::ESP_IDF:
|
||||
INFO("BLEPlatformFactory: Creating Bluedroid platform");
|
||||
return std::make_shared<BluedroidPlatform>();
|
||||
#endif
|
||||
|
||||
#if defined(ZEPHYR) || defined(CONFIG_BT)
|
||||
case PlatformType::ZEPHYR:
|
||||
// Future: return std::make_shared<ZephyrPlatform>();
|
||||
@@ -54,10 +44,7 @@ IBLEPlatform::Ptr BLEPlatformFactory::create(PlatformType type) {
|
||||
}
|
||||
|
||||
PlatformType BLEPlatformFactory::getDetectedPlatform() {
|
||||
#if defined(ESP32) && defined(USE_BLUEDROID)
|
||||
// Bluedroid takes priority when explicitly selected
|
||||
return PlatformType::ESP_IDF;
|
||||
#elif defined(ESP32) && (defined(USE_NIMBLE) || defined(CONFIG_BT_NIMBLE_ENABLED))
|
||||
#if defined(ESP32) && (defined(USE_NIMBLE) || defined(CONFIG_BT_NIMBLE_ENABLED))
|
||||
return PlatformType::NIMBLE_ARDUINO;
|
||||
#elif defined(ZEPHYR) || defined(CONFIG_BT)
|
||||
return PlatformType::ZEPHYR;
|
||||
|
||||
Reference in New Issue
Block a user