sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-22 19:53:46 +01:00
Code Issues Releases Wiki Activity

[debug] Replace std::map with struct array for ESP32 chip features (#11307)

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-17 08:20:31 -10:00
committed by GitHub
parent 6d09e68b2e
commit f5774cc138
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
esphome/components/debug/debug_esp32.cpp
View File

@@ -11,8 +11,6 @@
#include <esp_chip_info.h> #include <esp_chip_info.h>
#include <esp_partition.h> #include <esp_partition.h>
#include <map>
#ifdef USE_ARDUINO #ifdef USE_ARDUINO
#include <Esp.h> #include <Esp.h>
#endif #endif
@@ -125,7 +123,12 @@ void DebugComponent::log_partition_info_() {
uint32_t DebugComponent::get_free_heap_() { return heap_caps_get_free_size(MALLOC_CAP_INTERNAL); } uint32_t DebugComponent::get_free_heap_() { return heap_caps_get_free_size(MALLOC_CAP_INTERNAL); }
static const std::map<int, const char *> CHIP_FEATURES = { struct ChipFeature {
int bit;
const char *name;
};
static constexpr ChipFeature CHIP_FEATURES[] = {
{CHIP_FEATURE_BLE, "BLE"}, {CHIP_FEATURE_BLE, "BLE"},
{CHIP_FEATURE_BT, "BT"}, {CHIP_FEATURE_BT, "BT"},
{CHIP_FEATURE_EMB_FLASH, "EMB Flash"}, {CHIP_FEATURE_EMB_FLASH, "EMB Flash"},
@@ -170,11 +173,13 @@ void DebugComponent::get_device_info_(std::string &device_info) {
esp_chip_info(&info); esp_chip_info(&info);
const char *model = ESPHOME_VARIANT; const char *model = ESPHOME_VARIANT;
std::string features; std::string features;
for (auto feature : CHIP_FEATURES) {
if (info.features & feature.first) { // Check each known feature bit
features += feature.second; for (const auto &feature : CHIP_FEATURES) {
if (info.features & feature.bit) {
features += feature.name;
features += ", "; features += ", ";
info.features &= ~feature.first; info.features &= ~feature.bit;
} }
} }
if (info.features != 0) if (info.features != 0)