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}, {Key_NoKey, Key_NoKey},
}; };
void setup () { void setup() {
ShapeShifter.configure (shapeShiftDictionary); ShapeShifter.configure(shapeShiftDictionary);
Kaleidoscope.setup (); Kaleidoscope.setup();
USE_PLUGINS (&ShapeShifter); USE_PLUGINS(&ShapeShifter);
} }
void loop () { void loop() {
Kaleidoscope.loop (); Kaleidoscope.loop();
} }

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

@ -27,18 +27,18 @@ class ShapeShifter : public KaleidoscopePlugin {
Key original, replacement; Key original, replacement;
} dictionary_t; } 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: private:
static const dictionary_t *dictionary; static const dictionary_t *dictionary;
static bool modActive; static bool modActive;
static Key eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState); static Key eventHandlerHook(Key mappedKey, byte row, byte col, uint8_t keyState);
static void loopHook (bool postClear); static void loopHook(bool postClear);
}; };
}; };

Loading…
Cancel
Save