From d876d70cd4298b2db2adc0a6a1487907c7b8dfda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominic=20H=C3=B6glinger?= Date: Mon, 22 Sep 2025 20:03:34 +0200 Subject: [PATCH] Rebase from main, fix Units --- Tactility/CMakeLists.txt | 1 + Tactility/Include/Tactility/hal/radio/Unit.h | 4 ++-- Tactility/Source/hal/radio/Unit.cpp | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Tactility/CMakeLists.txt b/Tactility/CMakeLists.txt index b13d9cc9..d6d9817f 100644 --- a/Tactility/CMakeLists.txt +++ b/Tactility/CMakeLists.txt @@ -25,6 +25,7 @@ if (DEFINED ENV{ESP_IDF_VERSION}) fatfs lwip ) + if ("${IDF_TARGET}" STREQUAL "esp32s3") list(APPEND REQUIRES_LIST esp_tinyusb) endif () diff --git a/Tactility/Include/Tactility/hal/radio/Unit.h b/Tactility/Include/Tactility/hal/radio/Unit.h index 9efbd88b..f72b7f1d 100644 --- a/Tactility/Include/Tactility/hal/radio/Unit.h +++ b/Tactility/Include/Tactility/hal/radio/Unit.h @@ -40,7 +40,7 @@ public: std::string toString() const; }; -const char* toString(Unit::Prefix prefix); -const char* toString(Unit::Name unit); +const char* toString(const Unit::Prefix prefix); +const char* toString(const Unit::Name unit); } diff --git a/Tactility/Source/hal/radio/Unit.cpp b/Tactility/Source/hal/radio/Unit.cpp index b3591631..a3cbdc1f 100644 --- a/Tactility/Source/hal/radio/Unit.cpp +++ b/Tactility/Source/hal/radio/Unit.cpp @@ -4,10 +4,11 @@ namespace tt::hal::radio { std::string Unit::toString() const { + using tt::hal::radio::toString; return std::string(toString(prefix))+std::string(toString(unit)); } -const char* toString(Unit::Prefix prefix) { +const char* toString(const Unit::Prefix prefix) { using enum Unit::Prefix; switch (prefix) { @@ -36,7 +37,7 @@ const char* toString(Unit::Prefix prefix) { return "?"; } -const char* toString(Unit::Name unit) { +const char* toString(const Unit::Name unit) { using enum Unit::Name; switch (unit) {