astyle and lint

pull/389/head^2
Jesse Vincent 8 years ago
parent ae6aeec44d
commit a0db8238ff
No known key found for this signature in database
GPG Key ID: 122F5DF7108E4046

@ -51,13 +51,13 @@ static const KaleidoscopePlugins::ShapeShifter::dictionary_t shapeShiftDictionar
{Key_NoKey, Key_NoKey},
};
void setup () {
ShapeShifter.configure (shapeShiftDictionary);
void setup() {
ShapeShifter.configure(shapeShiftDictionary);
Kaleidoscope.setup ();
USE_PLUGINS (&ShapeShifter);
Kaleidoscope.setup();
USE_PLUGINS(&ShapeShifter);
}
void loop () {
Kaleidoscope.loop ();
void loop() {
Kaleidoscope.loop();
}

@ -23,31 +23,31 @@ namespace KaleidoscopePlugins {
const ShapeShifter::dictionary_t *ShapeShifter::dictionary = NULL;
bool ShapeShifter::modActive;
ShapeShifter::ShapeShifter (void) {
ShapeShifter::ShapeShifter(void) {
}
void
ShapeShifter::begin (void) {
event_handler_hook_use (this->eventHandlerHook);
loop_hook_use (this->loopHook);
ShapeShifter::begin(void) {
event_handler_hook_use(this->eventHandlerHook);
loop_hook_use(this->loopHook);
}
void
ShapeShifter::configure (const dictionary_t dictionary_[]) {
ShapeShifter::configure(const dictionary_t dictionary_[]) {
dictionary = (const dictionary_t *)dictionary_;
}
void
ShapeShifter::loopHook (bool postClear) {
ShapeShifter::loopHook(bool postClear) {
if (postClear)
return;
modActive = Keyboard.isModifierActive (Key_LeftShift.keyCode) ||
Keyboard.isModifierActive (Key_RightShift.keyCode);
modActive = Keyboard.isModifierActive(Key_LeftShift.keyCode) ||
Keyboard.isModifierActive(Key_RightShift.keyCode);
}
Key
ShapeShifter::eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState) {
ShapeShifter::eventHandlerHook(Key mappedKey, byte row, byte col, uint8_t keyState) {
if (!dictionary)
return mappedKey;
@ -60,7 +60,7 @@ ShapeShifter::eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keySt
// Try to find the current key in the dictionary
uint8_t i = 0;
do {
orig.raw = pgm_read_word (&(dictionary[i].original.raw));
orig.raw = pgm_read_word(&(dictionary[i].original.raw));
i++;
} while (orig.raw != Key_NoKey.raw &&
orig.raw != mappedKey.raw);
@ -70,7 +70,7 @@ ShapeShifter::eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keySt
if (orig.raw == Key_NoKey.raw)
return mappedKey;
repl.raw = pgm_read_word (&(dictionary[i].replacement.raw));
repl.raw = pgm_read_word(&(dictionary[i].replacement.raw));
// If found, handle the alternate key instead
return repl;

@ -27,18 +27,18 @@ class ShapeShifter : public KaleidoscopePlugin {
Key original, replacement;
} dictionary_t;
ShapeShifter (void);
ShapeShifter(void);
virtual void begin (void) final;
void begin(void) final;
static void configure (const dictionary_t dictionary[]);
static void configure(const dictionary_t dictionary[]);
private:
static const dictionary_t *dictionary;
static bool modActive;
static Key eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState);
static void loopHook (bool postClear);
static Key eventHandlerHook(Key mappedKey, byte row, byte col, uint8_t keyState);
static void loopHook(bool postClear);
};
};

Loading…
Cancel
Save