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

astyle with current project style guidelines

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

66
examples/MagicCombo/MagicCombo.ino
Unescape View File

@ -19,53 +19,53 @@
#include <Kaleidoscope.h> #include <Kaleidoscope.h>
#include <Kaleidoscope-MagicCombo.h> #include <Kaleidoscope-MagicCombo.h>
void magicComboActions (uint8_t comboIndex, uint32_t leftHand, uint32_t rightHand) { void magicComboActions(uint8_t comboIndex, uint32_t leftHand, uint32_t rightHand) {
switch (comboIndex) { switch (comboIndex) {
case 0: case 0:
Serial.println ("It's a kind of magic!"); Serial.println("It's a kind of magic!");
break; break;
} }
} }
static const KaleidoscopePlugins::MagicCombo::dictionary_t dictionary[] PROGMEM = { static const KaleidoscopePlugins::MagicCombo::dictionary_t dictionary[] PROGMEM = {
{ {
R1C3 | R2C1 | R2C4 | R2C7, // left hand, R1C3 | R2C1 | R2C4 | R2C7, // left hand,
R0C11 | R1C12 | R2C14 //right hand R0C11 | R1C12 | R2C14 //right hand
}, },
{0, 0} {0, 0}
}; };
const Key keymaps[][ROWS][COLS] PROGMEM = { const Key keymaps[][ROWS][COLS] PROGMEM = {
[0] = KEYMAP_STACKED [0] = KEYMAP_STACKED
( (
Key_NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey, 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_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_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_PageDown, Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Escape,
Key_LeftControl, Key_Backspace, Key_LeftGui, Key_LeftShift, Key_LeftControl, Key_Backspace, Key_LeftGui, Key_LeftShift,
Key_NoKey, Key_NoKey,
Key_skip, Key_6, Key_7, Key_8, Key_9, Key_0, 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_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_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_skip, Key_N, Key_M, Key_Comma, Key_Period, Key_Slash, Key_Minus,
Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl, Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
Key_NoKey Key_NoKey
), ),
}; };
void setup () { void setup() {
Serial.begin (9600); Serial.begin(9600);
MagicCombo.configure (dictionary); MagicCombo.configure(dictionary);
Kaleidoscope.setup (KEYMAP_SIZE); Kaleidoscope.setup(KEYMAP_SIZE);
Kaleidoscope.use (&MagicCombo, NULL); Kaleidoscope.use(&MagicCombo, NULL);
} }
void loop () { void loop() {
Kaleidoscope.loop (); Kaleidoscope.loop();
} }

54
src/Kaleidoscope/MagicCombo.cpp
Unescape View File

@ -34,49 +34,49 @@ const MagicCombo::dictionary_t *MagicCombo::dictionary;
uint16_t MagicCombo::minInterval = 500; uint16_t MagicCombo::minInterval = 500;
uint32_t MagicCombo::endTime; uint32_t MagicCombo::endTime;
MagicCombo::MagicCombo (void) { MagicCombo::MagicCombo(void) {
} }
void void
MagicCombo::begin (void) { MagicCombo::begin(void) {
loop_hook_use (this->loopHook); loop_hook_use(this->loopHook);
} }
void void
MagicCombo::configure (const MagicCombo::dictionary_t dictionary_[]) { MagicCombo::configure(const MagicCombo::dictionary_t dictionary_[]) {
dictionary = (dictionary_t *)dictionary_; dictionary = (dictionary_t *)dictionary_;
} }
void void
MagicCombo::loopHook (bool postClear) { MagicCombo::loopHook(bool postClear) {
if (!dictionary || postClear) if (!dictionary || postClear)
return; return;
for (byte i = 0;; i++) { for (byte i = 0;; i++) {
dictionary_t combo; dictionary_t combo;
combo.leftHand = pgm_read_dword (&(dictionary[i].leftHand)); combo.leftHand = pgm_read_dword(&(dictionary[i].leftHand));
combo.rightHand = pgm_read_dword (&(dictionary[i].rightHand)); combo.rightHand = pgm_read_dword(&(dictionary[i].rightHand));
if (combo.leftHand == 0 && combo.rightHand == 0) if (combo.leftHand == 0 && combo.rightHand == 0)
break; break;
if (LEFTHANDSTATE.all == combo.leftHand && if (LEFTHANDSTATE.all == combo.leftHand &&
RIGHTHANDSTATE.all == combo.rightHand) { RIGHTHANDSTATE.all == combo.rightHand) {
if (millis () >= endTime) { if (millis() >= endTime) {
magicComboActions (i, combo.leftHand, combo.rightHand); magicComboActions(i, combo.leftHand, combo.rightHand);
endTime = millis () + minInterval; endTime = millis() + minInterval;
} }
break; break;
}
} }
}
} }
}; };
__attribute__((weak)) __attribute__((weak))
void void
magicComboActions (uint8_t comboIndex, uint32_t leftHand, uint32_t rightHand) { magicComboActions(uint8_t comboIndex, uint32_t leftHand, uint32_t rightHand) {
} }
KaleidoscopePlugins::MagicCombo MagicCombo; KaleidoscopePlugins::MagicCombo MagicCombo;

26
src/Kaleidoscope/MagicCombo.h
Unescape View File

@ -22,26 +22,26 @@
namespace KaleidoscopePlugins { namespace KaleidoscopePlugins {
class MagicCombo : public KaleidoscopePlugin { class MagicCombo : public KaleidoscopePlugin {
public: public:
typedef struct { typedef struct {
uint32_t leftHand, rightHand; uint32_t leftHand, rightHand;
} dictionary_t; } dictionary_t;
MagicCombo (void); MagicCombo(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 uint16_t minInterval; static uint16_t minInterval;
private: private:
static const dictionary_t *dictionary; static const dictionary_t *dictionary;
static uint32_t endTime; static uint32_t endTime;
static void loopHook (bool postClear); static void loopHook(bool postClear);
}; };
}; };
void magicComboActions (uint8_t comboIndex, uint32_t leftHand, uint32_t rightHand); void magicComboActions(uint8_t comboIndex, uint32_t leftHand, uint32_t rightHand);
extern KaleidoscopePlugins::MagicCombo MagicCombo; extern KaleidoscopePlugins::MagicCombo MagicCombo;

Write Preview
Loading…
Cancel
Save