alpha
/
Kaleidoscope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

astyle to get us closer to cpplint-clean

Browse Source
pull/389/head
Jesse Vincent 8 years ago
parent a16411ff93
commit 3097fd0745
No known key found for this signature in database
GPG Key ID: 122F5DF7108E4046
3 changed files with 228 additions and 225 deletions
Show Stats Download Patch File Download Diff File

10
examples/OneShot/OneShot.ino
Unescape View File

@ -60,12 +60,12 @@ const Key keymaps[][ROWS][COLS] PROGMEM = {
}; };
void setup () { void setup() {
Kaleidoscope.setup (); Kaleidoscope.setup();
USE_PLUGINS (&OneShot); USE_PLUGINS(&OneShot);
} }
void loop () { void loop() {
Kaleidoscope.loop (); Kaleidoscope.loop();
} }

155
src/Kaleidoscope/OneShot.cpp
Unescape View File

@ -60,7 +60,7 @@ bool OneShot::shouldCancelStickies = false;
// ---- OneShot stuff ---- // ---- OneShot stuff ----
void void
OneShot::injectNormalKey (uint8_t idx, uint8_t keyState) { OneShot::injectNormalKey(uint8_t idx, uint8_t keyState) {
Key key; Key key;
if (idx < 8) { if (idx < 8) {
@ -71,68 +71,71 @@ OneShot::injectNormalKey (uint8_t idx, uint8_t keyState) {
key.keyCode = MOMENTARY_OFFSET + idx - 8; key.keyCode = MOMENTARY_OFFSET + idx - 8;
} }
handle_keyswitch_event (key, UNKNOWN_KEYSWITCH_LOCATION, keyState | INJECTED); handle_keyswitch_event(key, UNKNOWN_KEYSWITCH_LOCATION, keyState | INJECTED);
} }
void void
OneShot::activateOneShot (uint8_t idx) { OneShot::activateOneShot(uint8_t idx) {
injectNormalKey (idx, IS_PRESSED); injectNormalKey(idx, IS_PRESSED);
} }
void void
OneShot::cancelOneShot (uint8_t idx) { OneShot::cancelOneShot(uint8_t idx) {
clearOneShot (idx); clearOneShot(idx);
injectNormalKey (idx, WAS_PRESSED); injectNormalKey(idx, WAS_PRESSED);
} }
void void
OneShot::mask (byte row, byte col) { OneShot::mask(byte row, byte col) {
if (row >= ROWS || col >= COLS) if (row >= ROWS || col >= COLS)
return; return;
if (col >= 8) { if (col >= 8) {
col = col - 8; col = col - 8;
rightMask |= SCANBIT (row, col); rightMask |= SCANBIT(row, col);
} else } else {
leftMask |= SCANBIT (row, col); leftMask |= SCANBIT(row, col);
}
} }
void void
OneShot::unmask (byte row, byte col) { OneShot::unmask(byte row, byte col) {
if (row >= ROWS || col >= COLS) if (row >= ROWS || col >= COLS)
return; return;
if (col >= 8) { if (col >= 8) {
col = col - 8; col = col - 8;
rightMask &= ~(SCANBIT (row, col)); rightMask &= ~(SCANBIT(row, col));
} else } else {
leftMask &= ~(SCANBIT (row, col)); leftMask &= ~(SCANBIT(row, col));
}
} }
bool bool
OneShot::isMasked (byte row, byte col) { OneShot::isMasked(byte row, byte col) {
if (row >= ROWS || col >= COLS) if (row >= ROWS || col >= COLS)
return false; return false;
if (col >= 8) { if (col >= 8) {
col = col - 8; col = col - 8;
return rightMask & SCANBIT (row, col); return rightMask & SCANBIT(row, col);
} else } else {
return leftMask & SCANBIT (row, col); return leftMask & SCANBIT(row, col);
}
} }
Key Key
OneShot::eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState) { OneShot::eventHandlerHook(Key mappedKey, byte row, byte col, uint8_t keyState) {
uint8_t idx; uint8_t idx;
if (keyState & INJECTED) if (keyState & INJECTED)
return mappedKey; return mappedKey;
if (!State.all) { if (!State.all) {
if (!isOS (mappedKey)) { if (!isOS(mappedKey)) {
if (isMasked (row, col)) { if (isMasked(row, col)) {
if (key_toggled_off (keyState)) if (key_toggled_off(keyState))
unmask (row, col); unmask(row, col);
return Key_NoKey; return Key_NoKey;
} }
@ -140,53 +143,53 @@ OneShot::eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState)
} }
idx = mappedKey.raw - OS_FIRST; idx = mappedKey.raw - OS_FIRST;
if (key_toggled_off (keyState)) { if (key_toggled_off(keyState)) {
clearPressed (idx); clearPressed(idx);
} else if (key_toggled_on (keyState)) { } else if (key_toggled_on(keyState)) {
startTime = millis (); startTime = millis();
setPressed (idx); setPressed(idx);
setOneShot (idx); setOneShot(idx);
saveAsPrevious (mappedKey); saveAsPrevious(mappedKey);
activateOneShot (idx); activateOneShot(idx);
} }
return Key_NoKey; return Key_NoKey;
} }
if (!key_is_pressed (keyState) && !key_was_pressed (keyState)) if (!key_is_pressed(keyState) && !key_was_pressed(keyState))
return mappedKey; return mappedKey;
if (isOS (mappedKey)) { if (isOS(mappedKey)) {
idx = mappedKey.raw - OS_FIRST; idx = mappedKey.raw - OS_FIRST;
if (isSticky (idx)) { if (isSticky(idx)) {
if (key_toggled_on (keyState)) { // maybe on _off instead? if (key_toggled_on(keyState)) { // maybe on _off instead?
saveAsPrevious (mappedKey); saveAsPrevious(mappedKey);
clearSticky (idx); clearSticky(idx);
cancelOneShot (idx); cancelOneShot(idx);
} }
} else { } else {
if (key_toggled_off (keyState)) { if (key_toggled_off(keyState)) {
clearPressed (idx); clearPressed(idx);
if ((millis () - startTime) >= holdTimeOut) { if ((millis() - startTime) >= holdTimeOut) {
cancelOneShot (idx); cancelOneShot(idx);
} }
} }
if (key_toggled_on (keyState)) { if (key_toggled_on(keyState)) {
setPressed (idx); setPressed(idx);
if (isSameAsPrevious (mappedKey)) { if (isSameAsPrevious(mappedKey)) {
setSticky (idx); setSticky(idx);
saveAsPrevious (mappedKey); saveAsPrevious(mappedKey);
} else { } else {
startTime = millis (); startTime = millis();
setOneShot (idx); setOneShot(idx);
saveAsPrevious (mappedKey); saveAsPrevious(mappedKey);
activateOneShot (idx); activateOneShot(idx);
} }
} }
} }
@ -196,9 +199,9 @@ OneShot::eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState)
// ordinary key here, with some event // ordinary key here, with some event
if (key_is_pressed (keyState)) { if (key_is_pressed(keyState)) {
mask (row, col); mask(row, col);
saveAsPrevious (mappedKey); saveAsPrevious(mappedKey);
shouldCancel = true; shouldCancel = true;
} }
@ -206,22 +209,22 @@ OneShot::eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState)
} }
void void
OneShot::loopHook (bool postClear) { OneShot::loopHook(bool postClear) {
if (!State.all) if (!State.all)
return; return;
if (postClear) { if (postClear) {
if (hasTimedOut ()) if (hasTimedOut())
cancel (); cancel();
for (uint8_t i = 0; i < 32; i++) { for (uint8_t i = 0; i < 32; i++) {
if (shouldCancel) { if (shouldCancel) {
if (isSticky (i)) { if (isSticky(i)) {
if (shouldCancelStickies) { if (shouldCancelStickies) {
clearSticky (i); clearSticky(i);
} }
} else if (isOneShot (i) && !isPressed (i)) { } else if (isOneShot(i) && !isPressed(i)) {
cancelOneShot (i); cancelOneShot(i);
} }
} }
} }
@ -232,8 +235,8 @@ OneShot::loopHook (bool postClear) {
} }
} else { } else {
for (uint8_t i = 0; i < 8; i++) { for (uint8_t i = 0; i < 8; i++) {
if (isOneShot (i)) { if (isOneShot(i)) {
activateOneShot (i); activateOneShot(i);
} }
} }
} }
@ -241,37 +244,37 @@ OneShot::loopHook (bool postClear) {
// --- glue code --- // --- glue code ---
OneShot::OneShot (void) { OneShot::OneShot(void) {
} }
void void
OneShot::begin (void) { OneShot::begin(void) {
event_handler_hook_use (eventHandlerHook); event_handler_hook_use(eventHandlerHook);
loop_hook_use (loopHook); loop_hook_use(loopHook);
} }
bool bool
OneShot::isActive (void) { OneShot::isActive(void) {
return (State.all && !hasTimedOut ()); return (State.all && !hasTimedOut());
} }
bool bool
OneShot::isModifierActive (Key key) { OneShot::isModifierActive(Key key) {
if (key.raw < Key_LeftControl.raw || key.raw > Key_RightGui.raw) if (key.raw < Key_LeftControl.raw || key.raw > Key_RightGui.raw)
return false; return false;
return isOneShot (key.keyCode - Key_LeftControl.keyCode); return isOneShot(key.keyCode - Key_LeftControl.keyCode);
} }
void void
OneShot::cancel (bool withStickies) { OneShot::cancel(bool withStickies) {
shouldCancel = true; shouldCancel = true;
shouldCancelStickies = withStickies; shouldCancelStickies = withStickies;
} }
void void
OneShot::inject (Key key, uint8_t keyState) { OneShot::inject(Key key, uint8_t keyState) {
eventHandlerHook (key, 255, 255, keyState); eventHandlerHook(key, 255, 255, keyState);
} }
}; };

34
src/Kaleidoscope/OneShot.h
Unescape View File

@ -27,21 +27,21 @@
namespace KaleidoscopePlugins { namespace KaleidoscopePlugins {
class OneShot : public KaleidoscopePlugin { class OneShot : public KaleidoscopePlugin {
public: public:
OneShot (void); OneShot(void);
virtual void begin (void) final; void begin(void) final;
static bool isActive (void); static bool isActive(void);
static void cancel (bool withStickies); static void cancel(bool withStickies);
static void cancel (void) { static void cancel(void) {
cancel (false); cancel(false);
}; }
static uint16_t timeOut; static uint16_t timeOut;
static uint16_t holdTimeOut; static uint16_t holdTimeOut;
static bool isModifierActive (Key key); static bool isModifierActive(Key key);
void inject (Key key, uint8_t keyState); void inject(Key key, uint8_t keyState);
private: private:
typedef union { typedef union {
@ -61,16 +61,16 @@ class OneShot : public KaleidoscopePlugin {
static bool shouldCancel; static bool shouldCancel;
static bool shouldCancelStickies; static bool shouldCancelStickies;
static void injectNormalKey (uint8_t idx, uint8_t keyState); static void injectNormalKey(uint8_t idx, uint8_t keyState);
static void activateOneShot (uint8_t idx); static void activateOneShot(uint8_t idx);
static void cancelOneShot (uint8_t idx); static void cancelOneShot(uint8_t idx);
static void mask (byte row, byte col); static void mask(byte row, byte col);
static void unmask (byte row, byte col); static void unmask(byte row, byte col);
static bool isMasked (byte row, byte col); static bool isMasked(byte row, byte col);
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);
}; };
}; };

Write Preview
Loading…
Cancel
Save