From 2c6414827ea6dc482211a910de7c99916f7f1a5c Mon Sep 17 00:00:00 2001 From: WillyJL Date: Fri, 19 Sep 2025 23:43:54 +0200 Subject: [PATCH] Format --- src/input/TCA8418KeyboardBase.cpp | 9 +++------ src/input/TCA8418KeyboardBase.h | 4 ++-- src/input/TDeckProKeyboard.cpp | 3 ++- src/input/TDeckProKeyboard.h | 2 +- src/input/TLoraPagerKeyboard.cpp | 3 ++- src/input/TLoraPagerKeyboard.h | 2 +- src/input/kbInterrupt.h | 4 ++-- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/input/TCA8418KeyboardBase.cpp b/src/input/TCA8418KeyboardBase.cpp index 47c4cfbb0..4932ead80 100644 --- a/src/input/TCA8418KeyboardBase.cpp +++ b/src/input/TCA8418KeyboardBase.cpp @@ -32,8 +32,7 @@ #define _TCA8418_REG_LCK_EC_KLEC_0 0x01 // Key event count bit 0 TCA8418KeyboardBase::TCA8418KeyboardBase(uint8_t rows, uint8_t columns) - : rows(rows), columns(columns), queue(""), m_wire(nullptr), m_addr(0), readCallback(nullptr), - writeCallback(nullptr) + : rows(rows), columns(columns), queue(""), m_wire(nullptr), m_addr(0), readCallback(nullptr), writeCallback(nullptr) { } @@ -46,9 +45,7 @@ void TCA8418KeyboardBase::begin(uint8_t addr, TwoWire *wire) #ifdef KB_INT interruptInstance = this; - auto interruptHandler = []() { - interruptInstance->notifyObservers(interruptInstance); - }; + auto interruptHandler = []() { interruptInstance->notifyObservers(interruptInstance); }; ::pinMode(KB_INT, INPUT_PULLUP); attachInterrupt(KB_INT, interruptHandler, FALLING); @@ -309,7 +306,7 @@ void TCA8418KeyboardBase::disableInterrupts() writeRegister(TCA8418_REG_CFG, value); }; -TCA8418KeyboardBase* TCA8418KeyboardBase::interruptInstance; +TCA8418KeyboardBase *TCA8418KeyboardBase::interruptInstance; void TCA8418KeyboardBase::enableMatrixOverflow() { diff --git a/src/input/TCA8418KeyboardBase.h b/src/input/TCA8418KeyboardBase.h index 83527f9dc..3bec766a1 100644 --- a/src/input/TCA8418KeyboardBase.h +++ b/src/input/TCA8418KeyboardBase.h @@ -1,7 +1,7 @@ // Based on the MPR121 Keyboard and Adafruit TCA8418 library #include "configuration.h" -#include #include "kbInterrupt.h" +#include /** * @brief TCA8418KeyboardBase is the base class for TCA8418 keyboard handling. @@ -143,7 +143,7 @@ class TCA8418KeyboardBase : public KbInterruptObservable // enable / disable interrupts for matrix and GPI pins void enableInterrupts(); void disableInterrupts(); - static TCA8418KeyboardBase* interruptInstance; + static TCA8418KeyboardBase *interruptInstance; // ignore key events when FIFO buffer is full or not. void enableMatrixOverflow(); diff --git a/src/input/TDeckProKeyboard.cpp b/src/input/TDeckProKeyboard.cpp index e99af8b8d..b4893bb16 100644 --- a/src/input/TDeckProKeyboard.cpp +++ b/src/input/TDeckProKeyboard.cpp @@ -62,7 +62,8 @@ static const uint8_t TDeckProTapMap[_TCA8418_NUM_KEYS][5] = { static bool TDeckProHeldMap[_TCA8418_NUM_KEYS] = {}; TDeckProKeyboard::TDeckProKeyboard() - : TCA8418KeyboardBase(_TCA8418_ROWS, _TCA8418_COLS), modifierFlag(0), pressedKeysCount(0), onlyOneModifierPressed(false), persistedPreviousModifier(false) + : TCA8418KeyboardBase(_TCA8418_ROWS, _TCA8418_COLS), modifierFlag(0), pressedKeysCount(0), onlyOneModifierPressed(false), + persistedPreviousModifier(false) { } diff --git a/src/input/TDeckProKeyboard.h b/src/input/TDeckProKeyboard.h index 74a5df0a8..b10b93edf 100644 --- a/src/input/TDeckProKeyboard.h +++ b/src/input/TDeckProKeyboard.h @@ -17,7 +17,7 @@ class TDeckProKeyboard : public TCA8418KeyboardBase void toggleBacklight(void); private: - uint8_t modifierFlag; // Flag to indicate if a modifier key is pressed + uint8_t modifierFlag; // Flag to indicate if a modifier key is pressed uint8_t pressedKeysCount; bool onlyOneModifierPressed; bool persistedPreviousModifier; diff --git a/src/input/TLoraPagerKeyboard.cpp b/src/input/TLoraPagerKeyboard.cpp index f1ec14695..0386f90ce 100644 --- a/src/input/TLoraPagerKeyboard.cpp +++ b/src/input/TLoraPagerKeyboard.cpp @@ -67,7 +67,8 @@ static const uint8_t TLoraPagerTapMap[_TCA8418_NUM_KEYS][3] = { static bool TLoraPagerHeldMap[_TCA8418_NUM_KEYS] = {}; TLoraPagerKeyboard::TLoraPagerKeyboard() - : TCA8418KeyboardBase(_TCA8418_ROWS, _TCA8418_COLS), modifierFlag(0), pressedKeysCount(0), onlyOneModifierPressed(false), persistedPreviousModifier(false) + : TCA8418KeyboardBase(_TCA8418_ROWS, _TCA8418_COLS), modifierFlag(0), pressedKeysCount(0), onlyOneModifierPressed(false), + persistedPreviousModifier(false) { #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0) ledcAttach(KB_BL_PIN, LEDC_BACKLIGHT_FREQ, LEDC_BACKLIGHT_BIT_WIDTH); diff --git a/src/input/TLoraPagerKeyboard.h b/src/input/TLoraPagerKeyboard.h index 6b4001c21..6adba9d0b 100644 --- a/src/input/TLoraPagerKeyboard.h +++ b/src/input/TLoraPagerKeyboard.h @@ -19,7 +19,7 @@ class TLoraPagerKeyboard : public TCA8418KeyboardBase void toggleBacklight(bool off = false); private: - uint8_t modifierFlag; // Flag to indicate if a modifier key is pressed + uint8_t modifierFlag; // Flag to indicate if a modifier key is pressed uint8_t pressedKeysCount; bool onlyOneModifierPressed; bool persistedPreviousModifier; diff --git a/src/input/kbInterrupt.h b/src/input/kbInterrupt.h index dc63ed338..2f6c84a9f 100644 --- a/src/input/kbInterrupt.h +++ b/src/input/kbInterrupt.h @@ -2,10 +2,10 @@ #include "Observer.h" -class KbInterruptObservable : public Observable +class KbInterruptObservable : public Observable { }; -class KbInterruptObserver : public Observer +class KbInterruptObserver : public Observer { }; \ No newline at end of file