astyle with current project style guidelines

pull/389/head
Jesse Vincent 8 years ago
parent a49b987d5c
commit 32adec8aa9
No known key found for this signature in database
GPG Key ID: 122F5DF7108E4046

@ -20,39 +20,39 @@
#include <Kaleidoscope-TopsyTurvy.h>
const Key keymaps[][ROWS][COLS] PROGMEM = {
[0] = KEYMAP_STACKED
(
Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey,
Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab,
Key_PageUp, Key_A, Key_S, Key_D, Key_F, Key_G,
Key_PageDown, Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Escape,
Key_LeftControl, Key_Backspace, Key_LeftGui, Key_LeftShift,
Key_skip,
Key_skip, Key_6, Key_7, Key_8, Key_9, Key_0, Key_skip,
Key_Enter, Key_Y, Key_U, Key_I, Key_O, Key_P, Key_Equals,
Key_H, Key_J, Key_K, Key_L, Key_Semicolon, Key_Quote,
Key_skip, Key_N, Key_M, Key_Comma, Key_Period, Key_Slash, Key_Minus,
Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
Key_skip
),
[0] = KEYMAP_STACKED
(
Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey,
Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, Key_Tab,
Key_PageUp, Key_A, Key_S, Key_D, Key_F, Key_G,
Key_PageDown, Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Escape,
Key_LeftControl, Key_Backspace, Key_LeftGui, Key_LeftShift,
Key_skip,
Key_skip, Key_6, Key_7, Key_8, Key_9, Key_0, Key_skip,
Key_Enter, Key_Y, Key_U, Key_I, Key_O, Key_P, Key_Equals,
Key_H, Key_J, Key_K, Key_L, Key_Semicolon, Key_Quote,
Key_skip, Key_N, Key_M, Key_Comma, Key_Period, Key_Slash, Key_Minus,
Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
Key_skip
),
};
static const Key topsyTurvyList[] PROGMEM = {
Key_1, Key_2, Key_3, Key_4, Key_5,
Key_6, Key_7, Key_8, Key_9, Key_0,
Key_NoKey
Key_1, Key_2, Key_3, Key_4, Key_5,
Key_6, Key_7, Key_8, Key_9, Key_0,
Key_NoKey
};
void setup () {
TopsyTurvy.configure (topsyTurvyList);
void setup() {
TopsyTurvy.configure(topsyTurvyList);
Kaleidoscope.setup ();
USE_PLUGINS (&TopsyTurvy);
Kaleidoscope.setup();
USE_PLUGINS(&TopsyTurvy);
}
void loop () {
Kaleidoscope.loop ();
void loop() {
Kaleidoscope.loop();
}

@ -25,69 +25,69 @@ namespace KaleidoscopePlugins {
const Key *TopsyTurvy::topsyTurvyList = NULL;
uint8_t TopsyTurvy::topsyTurvyModState;
TopsyTurvy::TopsyTurvy (void) {
TopsyTurvy::TopsyTurvy(void) {
}
void
TopsyTurvy::begin (void) {
event_handler_hook_use (this->eventHandlerHook);
TopsyTurvy::begin(void) {
event_handler_hook_use(this->eventHandlerHook);
}
void
TopsyTurvy::configure (const Key list[]) {
topsyTurvyList = (const Key *)list;
TopsyTurvy::configure(const Key list[]) {
topsyTurvyList = (const Key *)list;
}
Key
TopsyTurvy::eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState) {
if (keyState & TOPSYTURVY)
return mappedKey;
if (!topsyTurvyList)
return mappedKey;
if (mappedKey.raw == Key_LeftShift.raw)
bitWrite (topsyTurvyModState, 0, key_is_pressed (keyState));
if (mappedKey.raw == Key_RightShift.raw)
bitWrite (topsyTurvyModState, 1, key_is_pressed (keyState));
if (!key_is_pressed (keyState) && !key_was_pressed (keyState))
return mappedKey;
uint8_t idx = 0;
Key newKey;
do {
newKey.raw = pgm_read_word (&(topsyTurvyList[idx].raw));
idx++;
} while (newKey.raw != mappedKey.raw && newKey.raw != Key_NoKey.raw);
if (newKey.raw == Key_NoKey.raw)
return mappedKey;
// invert the shift state
if (!topsyTurvyModState) {
if (key_is_pressed (keyState))
Keyboard.press (Key_LeftShift.keyCode);
handle_keyswitch_event (mappedKey, row, col, keyState | TOPSYTURVY);
Keyboard.sendReport ();
if (key_toggled_off (keyState))
Keyboard.release (Key_LeftShift.keyCode);
} else {
Keyboard.release (Key_LeftShift.keyCode);
Keyboard.release (Key_RightShift.keyCode);
Keyboard.sendReport ();
handle_keyswitch_event (mappedKey, row, col, keyState | TOPSYTURVY);
Keyboard.sendReport ();
if (bitRead (topsyTurvyModState, 0))
Keyboard.press (Key_LeftShift.keyCode);
if (bitRead (topsyTurvyModState, 1))
Keyboard.press (Key_RightShift.keyCode);
}
return Key_NoKey;
TopsyTurvy::eventHandlerHook(Key mappedKey, byte row, byte col, uint8_t keyState) {
if (keyState & TOPSYTURVY)
return mappedKey;
if (!topsyTurvyList)
return mappedKey;
if (mappedKey.raw == Key_LeftShift.raw)
bitWrite(topsyTurvyModState, 0, key_is_pressed(keyState));
if (mappedKey.raw == Key_RightShift.raw)
bitWrite(topsyTurvyModState, 1, key_is_pressed(keyState));
if (!key_is_pressed(keyState) && !key_was_pressed(keyState))
return mappedKey;
uint8_t idx = 0;
Key newKey;
do {
newKey.raw = pgm_read_word(&(topsyTurvyList[idx].raw));
idx++;
} while (newKey.raw != mappedKey.raw && newKey.raw != Key_NoKey.raw);
if (newKey.raw == Key_NoKey.raw)
return mappedKey;
// invert the shift state
if (!topsyTurvyModState) {
if (key_is_pressed(keyState))
Keyboard.press(Key_LeftShift.keyCode);
handle_keyswitch_event(mappedKey, row, col, keyState | TOPSYTURVY);
Keyboard.sendReport();
if (key_toggled_off(keyState))
Keyboard.release(Key_LeftShift.keyCode);
} else {
Keyboard.release(Key_LeftShift.keyCode);
Keyboard.release(Key_RightShift.keyCode);
Keyboard.sendReport();
handle_keyswitch_event(mappedKey, row, col, keyState | TOPSYTURVY);
Keyboard.sendReport();
if (bitRead(topsyTurvyModState, 0))
Keyboard.press(Key_LeftShift.keyCode);
if (bitRead(topsyTurvyModState, 1))
Keyboard.press(Key_RightShift.keyCode);
}
return Key_NoKey;
}
} // namespace KaleidoscopePlugins

@ -22,18 +22,18 @@
namespace KaleidoscopePlugins {
class TopsyTurvy: public KaleidoscopePlugin {
public:
TopsyTurvy (void);
public:
TopsyTurvy(void);
void begin (void) final;
void begin(void) final;
static void configure (const Key topsyTurvyList[]);
static void configure(const Key topsyTurvyList[]);
private:
static const Key *topsyTurvyList;
static uint8_t topsyTurvyModState;
private:
static const Key *topsyTurvyList;
static uint8_t topsyTurvyModState;
static Key eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState);
static Key eventHandlerHook(Key mappedKey, byte row, byte col, uint8_t keyState);
}
} // namespace KaleidoscopePlugins

Loading…
Cancel
Save