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

astyle with current project style guidelines

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

22
examples/Leader/Leader.ino
Unescape View File

@ -40,12 +40,12 @@ const Key keymaps[][ROWS][COLS] PROGMEM = {
), ),
}; };
static void leaderTestA (uint8_t seqIndex) { static void leaderTestA(uint8_t seqIndex) {
Serial.println (F("leaderTestA")); Serial.println(F("leaderTestA"));
} }
static void leaderTestAA (uint8_t seqIndex) { static void leaderTestAA(uint8_t seqIndex) {
Serial.println (F("leaderTestAA")); Serial.println(F("leaderTestAA"));
} }
static const KaleidoscopePlugins::Leader::dictionary_t leaderDictionary[] PROGMEM = LEADER_DICT static const KaleidoscopePlugins::Leader::dictionary_t leaderDictionary[] PROGMEM = LEADER_DICT
@ -54,15 +54,15 @@ static const KaleidoscopePlugins::Leader::dictionary_t leaderDictionary[] PROGME
{LEADER_SEQ(LEAD(0), Key_A, Key_A), leaderTestAA} {LEADER_SEQ(LEAD(0), Key_A, Key_A), leaderTestAA}
); );
void setup () { void setup() {
Serial.begin (9600); Serial.begin(9600);
Leader.configure (leaderDictionary); Leader.configure(leaderDictionary);
Kaleidoscope.setup (KEYMAP_SIZE); Kaleidoscope.setup(KEYMAP_SIZE);
Kaleidoscope.use (&Leader, NULL); Kaleidoscope.use(&Leader, NULL);
} }
void loop () { void loop() {
Kaleidoscope.loop (); Kaleidoscope.loop();
} }

64
src/Kaleidoscope/Leader.cpp
Unescape View File

@ -38,18 +38,18 @@ const Leader::dictionary_t *Leader::dictionary;
// --- actions --- // --- actions ---
int8_t int8_t
Leader::lookup (void) { Leader::lookup(void) {
bool match; bool match;
for (uint8_t seqIndex = 0; ; seqIndex++) { for (uint8_t seqIndex = 0; ; seqIndex++) {
match = true; match = true;
if (pgm_read_word (&(dictionary[seqIndex].sequence[0].raw)) == Key_NoKey.raw) if (pgm_read_word(&(dictionary[seqIndex].sequence[0].raw)) == Key_NoKey.raw)
break; break;
Key seqKey; Key seqKey;
for (uint8_t i = 0; i <= sequencePos; i++) { for (uint8_t i = 0; i <= sequencePos; i++) {
seqKey.raw = pgm_read_word (&(dictionary[seqIndex].sequence[i].raw)); seqKey.raw = pgm_read_word(&(dictionary[seqIndex].sequence[i].raw));
if (sequence[i].raw != seqKey.raw) { if (sequence[i].raw != seqKey.raw) {
match = false; match = false;
@ -60,7 +60,7 @@ Leader::lookup (void) {
if (!match) if (!match)
continue; continue;
seqKey.raw = pgm_read_word (&(dictionary[seqIndex].sequence[sequencePos + 1].raw)); seqKey.raw = pgm_read_word(&(dictionary[seqIndex].sequence[sequencePos + 1].raw));
if (seqKey.raw == Key_NoKey.raw) { if (seqKey.raw == Key_NoKey.raw) {
return seqIndex; return seqIndex;
} else { } else {
@ -73,52 +73,52 @@ Leader::lookup (void) {
// --- api --- // --- api ---
Leader::Leader (void) { Leader::Leader(void) {
} }
void void
Leader::begin (void) { Leader::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
Leader::configure (const Leader::dictionary_t dictionary_[]) { Leader::configure(const Leader::dictionary_t dictionary_[]) {
dictionary = dictionary_; dictionary = dictionary_;
} }
void void
Leader::reset (void) { Leader::reset(void) {
sequencePos = 0; sequencePos = 0;
sequence[0].raw = Key_NoKey.raw; sequence[0].raw = Key_NoKey.raw;
} }
void void
Leader::inject (Key key, uint8_t keyState) { Leader::inject(Key key, uint8_t keyState) {
eventHandlerHook (key, 255, 255, keyState); eventHandlerHook(key, 255, 255, keyState);
} }
// --- hooks --- // --- hooks ---
Key Key
Leader::eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState) { Leader::eventHandlerHook(Key mappedKey, byte row, byte col, uint8_t keyState) {
if (keyState & INJECTED) if (keyState & INJECTED)
return mappedKey; return mappedKey;
if (!key_is_pressed (keyState) && !key_was_pressed (keyState)) { if (!key_is_pressed(keyState) && !key_was_pressed(keyState)) {
if (isLeader (mappedKey)) if (isLeader(mappedKey))
return Key_NoKey; return Key_NoKey;
return mappedKey; return mappedKey;
} }
if (!isActive () && !isLeader (mappedKey)) if (!isActive() && !isLeader(mappedKey))
return mappedKey; return mappedKey;
if (!isActive ()) { if (!isActive()) {
// Must be a leader key! // Must be a leader key!
if (key_toggled_off (keyState)) { if (key_toggled_off(keyState)) {
// not active, but a leader key = start the sequence on key release! // not active, but a leader key = start the sequence on key release!
endTime = millis () + timeOut; endTime = millis() + timeOut;
sequencePos = 0; sequencePos = 0;
sequence[sequencePos].raw = mappedKey.raw; sequence[sequencePos].raw = mappedKey.raw;
} }
@ -128,49 +128,49 @@ Leader::eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState) {
} }
// active // active
int8_t actionIndex = lookup (); int8_t actionIndex = lookup();
if (key_toggled_on (keyState)) { if (key_toggled_on(keyState)) {
sequencePos++; sequencePos++;
if (sequencePos > LEADER_MAX_SEQUENCE_LENGTH) { if (sequencePos > LEADER_MAX_SEQUENCE_LENGTH) {
reset (); reset();
return mappedKey; return mappedKey;
} }
endTime = millis () + timeOut; endTime = millis() + timeOut;
sequence[sequencePos].raw = mappedKey.raw; sequence[sequencePos].raw = mappedKey.raw;
actionIndex = lookup (); actionIndex = lookup();
if (actionIndex >= 0) if (actionIndex >= 0)
return Key_NoKey; return Key_NoKey;
} else if (key_is_pressed (keyState)) { } else if (key_is_pressed(keyState)) {
// held, no need for anything here. // held, no need for anything here.
return Key_NoKey; return Key_NoKey;
} }
if (actionIndex == NO_MATCH) { if (actionIndex == NO_MATCH) {
reset (); reset();
return mappedKey; return mappedKey;
} }
if (actionIndex == PARTIAL_MATCH) { if (actionIndex == PARTIAL_MATCH) {
return Key_NoKey; return Key_NoKey;
} }
action_t leaderAction = (action_t) pgm_read_ptr (&(dictionary[actionIndex].action)); action_t leaderAction = (action_t) pgm_read_ptr(&(dictionary[actionIndex].action));
(*leaderAction) (actionIndex); (*leaderAction)(actionIndex);
return Key_NoKey; return Key_NoKey;
} }
void void
Leader::loopHook (bool postClear) { Leader::loopHook(bool postClear) {
if (!postClear) if (!postClear)
return; return;
if (!isActive ()) if (!isActive())
return; return;
if (millis () >= endTime) if (millis() >= endTime)
reset (); reset();
} }
}; };

18
src/Kaleidoscope/Leader.h
Unescape View File

@ -31,21 +31,21 @@
namespace KaleidoscopePlugins { namespace KaleidoscopePlugins {
class Leader : public KaleidoscopePlugin { class Leader : public KaleidoscopePlugin {
public: public:
typedef void (*action_t) (uint8_t seqIndex); typedef void (*action_t)(uint8_t seqIndex);
typedef struct { typedef struct {
Key sequence[LEADER_MAX_SEQUENCE_LENGTH + 1]; Key sequence[LEADER_MAX_SEQUENCE_LENGTH + 1];
action_t action; action_t action;
} dictionary_t; } dictionary_t;
Leader (void); Leader(void);
virtual void begin (void) final; virtual void begin(void) final;
static void configure (const dictionary_t dictionary[]); static void configure(const dictionary_t dictionary[]);
static void reset (void); static void reset(void);
static uint16_t timeOut; static uint16_t timeOut;
void inject (Key key, uint8_t keyState); void inject(Key key, uint8_t keyState);
private: private:
static Key sequence[LEADER_MAX_SEQUENCE_LENGTH + 1]; static Key sequence[LEADER_MAX_SEQUENCE_LENGTH + 1];
@ -53,9 +53,9 @@ class Leader : public KaleidoscopePlugin {
static uint32_t endTime; static uint32_t endTime;
static const Leader::dictionary_t *dictionary; static const Leader::dictionary_t *dictionary;
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);
static int8_t lookup (void); static int8_t lookup(void);
}; };
}; };

Write Preview
Loading…
Cancel
Save