From 5146b65f72e470000dc0ce6afea33d9edb456258 Mon Sep 17 00:00:00 2001 From: GOB Date: Tue, 13 Aug 2024 13:38:56 +0900 Subject: [PATCH] Cosmetic change --- src/unit/unit_PaHub.hpp | 8 +++----- test/embedded/embedded_main.cpp | 12 +++++------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/unit/unit_PaHub.hpp b/src/unit/unit_PaHub.hpp index 7e0543b..ea7aaa4 100644 --- a/src/unit/unit_PaHub.hpp +++ b/src/unit/unit_PaHub.hpp @@ -34,13 +34,11 @@ class UnitPaHub : public Component { protected: virtual Adapter* ensure_adapter(const uint8_t ch) override; - virtual m5::hal::error::error_t select_channel( - const uint8_t ch = 8) override; + virtual m5::hal::error::error_t select_channel(const uint8_t ch = 8) override; protected: - std::array, +MAX_CHANNEL> - _adapters{}; // For children - uint8_t _current{}; // current channel 0 ~ MAX_CHANNEL + std::array, +MAX_CHANNEL> _adapters{}; // For children + uint8_t _current{}; // current channel 0 ~ MAX_CHANNEL }; } // namespace unit diff --git a/test/embedded/embedded_main.cpp b/test/embedded/embedded_main.cpp index a17c0d7..f8f695e 100644 --- a/test/embedded/embedded_main.cpp +++ b/test/embedded/embedded_main.cpp @@ -15,9 +15,8 @@ #if __has_include() #include #else // esp_idf_version.h has been introduced in Arduino 1.0.5 (ESP-IDF3.3) -#define ESP_IDF_VERSION_VAL(major, minor, patch) \ - ((major << 16) | (minor << 8) | (patch)) -#define ESP_IDF_VERSION ESP_IDF_VERSION_VAL(3, 2, 0) +#define ESP_IDF_VERSION_VAL(major, minor, patch) ((major << 16) | (minor << 8) | (patch)) +#define ESP_IDF_VERSION ESP_IDF_VERSION_VAL(3, 2, 0) #endif namespace { @@ -25,8 +24,7 @@ auto& lcd = M5.Display; } // namespace void test() { - lcd.fillRect(0, 0, lcd.width() >> 1, lcd.height(), - RUN_ALL_TESTS() ? TFT_RED : TFT_GREEN); + lcd.fillRect(0, 0, lcd.width() >> 1, lcd.height(), RUN_ALL_TESTS() ? TFT_RED : TFT_GREEN); } void setup() { @@ -35,8 +33,8 @@ void setup() { M5.begin(); M5_LOGI("CPP %ld", __cplusplus); - M5_LOGI("ESP-IDF Version %d.%d.%d", (ESP_IDF_VERSION >> 16) & 0xFF, - (ESP_IDF_VERSION >> 8) & 0xFF, ESP_IDF_VERSION & 0xFF); + M5_LOGI("ESP-IDF Version %d.%d.%d", (ESP_IDF_VERSION >> 16) & 0xFF, (ESP_IDF_VERSION >> 8) & 0xFF, + ESP_IDF_VERSION & 0xFF); M5_LOGI("BOARD:%X", M5.getBoard()); M5_LOGI("Heap: %u", esp_get_free_heap_size());