Skip to content

Commit

Permalink
Account for differences in minor clang-format versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
gkoh committed Dec 19, 2024
1 parent 820df04 commit 37cc4ba
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion include/FurbleControl.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion include/FurbleGPS.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class GPS {
void update(void);

private:
GPS() {};
GPS(){};

static constexpr const uint32_t BAUD = 9600;
#if FURBLE_GROVE_CORE
Expand Down
4 changes: 2 additions & 2 deletions lib/furble/CanonEOSM6.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions lib/furble/CanonEOSRP.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/FurbleSpinValue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace Furble {
constexpr std::array<const char *, 5> 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};
Expand Down
6 changes: 4 additions & 2 deletions src/FurbleUI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
}
Expand Down

0 comments on commit 37cc4ba

Please sign in to comment.