From 37cc4ba9991514e54e010b6bda05c2cb02d501a5 Mon Sep 17 00:00:00 2001 From: Guo-Rong <5484552+gkoh@users.noreply.github.com> Date: Thu, 19 Dec 2024 15:03:56 +1030 Subject: [PATCH] Account for differences in minor clang-format versions. --- include/FurbleControl.h | 2 +- include/FurbleGPS.h | 2 +- lib/furble/CanonEOSM6.h | 4 ++-- lib/furble/CanonEOSRP.h | 4 ++-- src/FurbleSpinValue.cpp | 2 +- src/FurbleUI.cpp | 6 ++++-- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/include/FurbleControl.h b/include/FurbleControl.h index c5d09a5..1a1dfe8 100644 --- a/include/FurbleControl.h +++ b/include/FurbleControl.h @@ -120,7 +120,7 @@ class Control { void setPower(esp_power_level_t power); private: - Control() {}; + Control(){}; /** Iterate over cameras and attempt connection. */ state_t connectAll(void); diff --git a/include/FurbleGPS.h b/include/FurbleGPS.h index 333db69..ce7041b 100644 --- a/include/FurbleGPS.h +++ b/include/FurbleGPS.h @@ -26,7 +26,7 @@ class GPS { void update(void); private: - GPS() {}; + GPS(){}; static constexpr const uint32_t BAUD = 9600; #if FURBLE_GROVE_CORE diff --git a/lib/furble/CanonEOSM6.h b/lib/furble/CanonEOSM6.h index 7e5d2f5..a4e9a9e 100644 --- a/lib/furble/CanonEOSM6.h +++ b/lib/furble/CanonEOSM6.h @@ -9,8 +9,8 @@ namespace Furble { */ class CanonEOSM6: public CanonEOS { public: - CanonEOSM6(const void *data, size_t len) : CanonEOS(Type::CANON_EOS_M6, data, len) {}; - CanonEOSM6(const NimBLEAdvertisedDevice *pDevice) : CanonEOS(Type::CANON_EOS_M6, pDevice) {}; + CanonEOSM6(const void *data, size_t len) : CanonEOS(Type::CANON_EOS_M6, data, len){}; + CanonEOSM6(const NimBLEAdvertisedDevice *pDevice) : CanonEOS(Type::CANON_EOS_M6, pDevice){}; /** * Determine if the advertised BLE device is a Canon EOS M6. diff --git a/lib/furble/CanonEOSRP.h b/lib/furble/CanonEOSRP.h index d50e741..a657b60 100644 --- a/lib/furble/CanonEOSRP.h +++ b/lib/furble/CanonEOSRP.h @@ -9,8 +9,8 @@ namespace Furble { */ class CanonEOSRP: public CanonEOS { public: - CanonEOSRP(const void *data, size_t len) : CanonEOS(Type::CANON_EOS_RP, data, len) {}; - CanonEOSRP(const NimBLEAdvertisedDevice *pDevice) : CanonEOS(Type::CANON_EOS_RP, pDevice) {}; + CanonEOSRP(const void *data, size_t len) : CanonEOS(Type::CANON_EOS_RP, data, len){}; + CanonEOSRP(const NimBLEAdvertisedDevice *pDevice) : CanonEOS(Type::CANON_EOS_RP, pDevice){}; /** * Determine if the advertised BLE device is a Canon EOS RP. diff --git a/src/FurbleSpinValue.cpp b/src/FurbleSpinValue.cpp index d8733aa..dec5b1d 100644 --- a/src/FurbleSpinValue.cpp +++ b/src/FurbleSpinValue.cpp @@ -3,7 +3,7 @@ namespace Furble { constexpr std::array SpinValue::m_UnitMap; -SpinValue::SpinValue(nvs_t &nvs) : m_Value(nvs.value), m_Unit(nvs.unit) {}; +SpinValue::SpinValue(nvs_t &nvs) : m_Value(nvs.value), m_Unit(nvs.unit){}; SpinValue::nvs_t SpinValue::toNVS(void) { return (nvs_t){m_Value, m_Unit}; diff --git a/src/FurbleUI.cpp b/src/FurbleUI.cpp index cc9d1ea..31f3f21 100644 --- a/src/FurbleUI.cpp +++ b/src/FurbleUI.cpp @@ -1228,7 +1228,8 @@ void UI::addDeleteMenu(void) { menu_t &menu = addMenu(m_DeleteStr, LV_SYMBOL_TRASH); // refresh connection list every time - lv_obj_add_event_cb(menu.button, [](lv_event_t *e) { refreshDelete(); }, LV_EVENT_CLICKED, NULL); + lv_obj_add_event_cb( + menu.button, [](lv_event_t *e) { refreshDelete(); }, LV_EVENT_CLICKED, NULL); lv_menu_set_load_page_event(menu.main, menu.button, menu.page); } @@ -1608,7 +1609,8 @@ void UI::addThemeMenu(const menu_t &parent) { // add restart button lv_obj_t *restart = addMenuItem(menu, NULL, "Restart"); - lv_obj_add_event_cb(restart, [](lv_event_t *e) { esp_restart(); }, LV_EVENT_CLICKED, NULL); + lv_obj_add_event_cb( + restart, [](lv_event_t *e) { esp_restart(); }, LV_EVENT_CLICKED, NULL); lv_menu_set_load_page_event(menu.main, menu.button, menu.page); }