trunk roundhouse kick

src/input/InputBroker.cpp

@@ -3,9 +3,7 @@
 
 InputBroker *inputBroker;
 
-InputBroker::InputBroker()
-{
-};
+InputBroker::InputBroker(){};
 
 void InputBroker::registerSource(Observable<const InputEvent *> *source)
 {
@@ -14,7 +12,7 @@ void InputBroker::registerSource(Observable<const InputEvent *> *source)
 
 int InputBroker::handleInputEvent(const InputEvent *event)
 {
-  powerFSM.trigger(EVENT_INPUT);
-  this->notifyObservers(event);
-  return 0;
+    powerFSM.trigger(EVENT_INPUT);
+    this->notifyObservers(event);
+    return 0;
 }

src/input/InputBroker.h

@@ -5,12 +5,11 @@
 #define MATRIXKEY 0xFE
 
 typedef struct _InputEvent {
-    const char* source;
+    const char *source;
     char inputEvent;
     char kbchar;
 } InputEvent;
-class InputBroker :
-    public Observable<const InputEvent *>
+class InputBroker : public Observable<const InputEvent *>
 {
     CallbackObserver<InputBroker, const InputEvent *> inputEventObserver =
         CallbackObserver<InputBroker, const InputEvent *>(this, &InputBroker::handleInputEvent);

src/input/RotaryEncoderInterruptImpl1.h

@@ -8,8 +8,7 @@
  *      to your device as you wish, but you always need to have separate event
  *      handlers, thus you need to have a RotaryEncoderInterrupt implementation.
  */
-class RotaryEncoderInterruptImpl1 :
-    public RotaryEncoderInterruptBase
+class RotaryEncoderInterruptImpl1 : public RotaryEncoderInterruptBase
 {
   public:
     RotaryEncoderInterruptImpl1();

src/input/UpDownInterruptBase.cpp

@@ -1,16 +1,13 @@
-#include "configuration.h"
 #include "UpDownInterruptBase.h"
+#include "configuration.h"
 
-UpDownInterruptBase::UpDownInterruptBase(
-    const char *name)
+UpDownInterruptBase::UpDownInterruptBase(const char *name)
 {
     this->_originName = name;
 }
 
-void UpDownInterruptBase::init(
-    uint8_t pinDown, uint8_t pinUp, uint8_t pinPress,
-    char eventDown, char eventUp, char eventPressed,
-    void (*onIntDown)(), void (*onIntUp)(), void (*onIntPress)())
+void UpDownInterruptBase::init(uint8_t pinDown, uint8_t pinUp, uint8_t pinPress, char eventDown, char eventUp, char eventPressed,
+                               void (*onIntDown)(), void (*onIntUp)(), void (*onIntPress)())
 {
     this->_pinDown = pinDown;
     this->_pinUp = pinUp;
@@ -26,8 +23,7 @@ void UpDownInterruptBase::init(
     attachInterrupt(this->_pinDown, onIntDown, RISING);
     attachInterrupt(this->_pinUp, onIntUp, RISING);
 
-    LOG_DEBUG("GPIO initialized (%d, %d, %d)\n",
-        this->_pinDown, this->_pinUp, pinPress);
+    LOG_DEBUG("GPIO initialized (%d, %d, %d)\n", this->_pinDown, this->_pinUp, pinPress);
 }
 
 void UpDownInterruptBase::intPressHandler()

src/input/UpDownInterruptImpl1.h

@@ -1,8 +1,7 @@
 #pragma once
 #include "UpDownInterruptBase.h"
 
-class UpDownInterruptImpl1 :
-    public UpDownInterruptBase
+class UpDownInterruptImpl1 : public UpDownInterruptBase
 {
   public:
     UpDownInterruptImpl1();

src/input/cardKbI2cImpl.cpp

@@ -3,15 +3,11 @@
 
 CardKbI2cImpl *cardKbI2cImpl;
 
-CardKbI2cImpl::CardKbI2cImpl() :
-    KbI2cBase("cardKB")
-{
-}
+CardKbI2cImpl::CardKbI2cImpl() : KbI2cBase("cardKB") {}
 
 void CardKbI2cImpl::init()
 {
-    if (cardkb_found != CARDKB_ADDR)
-    {
+    if (cardkb_found != CARDKB_ADDR) {
         disable();
         return;
     }

src/input/cardKbI2cImpl.h

@@ -9,8 +9,7 @@
  *      to your device as you wish, but you always need to have separate event
  *      handlers, thus you need to have a RotaryEncoderInterrupt implementation.
  */
-class CardKbI2cImpl :
-    public KbI2cBase
+class CardKbI2cImpl : public KbI2cBase
 {
   public:
     CardKbI2cImpl();

src/input/kbI2cBase.cpp

@@ -12,32 +12,32 @@ KbI2cBase::KbI2cBase(const char *name) : concurrency::OSThread(name)
 
 uint8_t read_from_14004(uint8_t reg, uint8_t *data, uint8_t length)
 {
-  uint8_t readflag = 0;
-  Wire.beginTransmission(CARDKB_ADDR);
-  Wire.write(reg);
-  Wire.endTransmission();    // stop transmitting
-  delay(20);
-  Wire.requestFrom(CARDKB_ADDR, (int)length);
-  int i = 0;
-  while ( Wire.available() ) // slave may send less than requested
-  {
-    data[i++] = Wire.read(); // receive a byte as a proper uint8_t
-    readflag = 1;
-  }
-  return readflag;
+    uint8_t readflag = 0;
+    Wire.beginTransmission(CARDKB_ADDR);
+    Wire.write(reg);
+    Wire.endTransmission(); // stop transmitting
+    delay(20);
+    Wire.requestFrom(CARDKB_ADDR, (int)length);
+    int i = 0;
+    while (Wire.available()) // slave may send less than requested
+    {
+        data[i++] = Wire.read(); // receive a byte as a proper uint8_t
+        readflag = 1;
+    }
+    return readflag;
 }
 
 void write_to_14004(uint8_t reg, uint8_t data)
 {
-  Wire.beginTransmission(CARDKB_ADDR);
-  Wire.write(reg);
-  Wire.write(data);
-  Wire.endTransmission();    // stop transmitting
+    Wire.beginTransmission(CARDKB_ADDR);
+    Wire.write(reg);
+    Wire.write(data);
+    Wire.endTransmission(); // stop transmitting
 }
 
 int32_t KbI2cBase::runOnce()
 {
-    if (cardkb_found != CARDKB_ADDR){
+    if (cardkb_found != CARDKB_ADDR) {
         // Input device is not detected.
         return INT32_MAX;
     }
@@ -48,7 +48,7 @@ int32_t KbI2cBase::runOnce()
         uint8_t PrintDataBuf = 0;
         if (read_from_14004(0x01, rDataBuf, 0x04) == 1) {
             for (uint8_t aCount = 0; aCount < 0x04; aCount++) {
-                for (uint8_t bCount = 0; bCount < 0x04; bCount++ ) {
+                for (uint8_t bCount = 0; bCount < 0x04; bCount++) {
                     if (((rDataBuf[aCount] >> bCount) & 0x01) == 0x01) {
                         PrintDataBuf = aCount * 0x04 + bCount + 1;
                     }
@@ -97,7 +97,7 @@ int32_t KbI2cBase::runOnce()
             case 0x0d: // Enter
                 e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_SELECT;
                 break;
-            case 0x00: //nopress
+            case 0x00: // nopress
                 e.inputEvent = ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
                 break;
             default: // all other keys

src/input/kbI2cBase.h

@@ -1,11 +1,9 @@
 #pragma once
 
-#include "SinglePortModule.h" // TODO: what header file to include?
 #include "InputBroker.h"
+#include "SinglePortModule.h" // TODO: what header file to include?
 
-class KbI2cBase :
-    public Observable<const InputEvent *>,
-    public concurrency::OSThread
+class KbI2cBase : public Observable<const InputEvent *>, public concurrency::OSThread
 {
   public:
     explicit KbI2cBase(const char *name);