make astyle

pull/365/head
Jesse Vincent 8 years ago
parent 124b70ec00
commit 26e7e187df
No known key found for this signature in database
GPG Key ID: 122F5DF7108E4046

@ -28,7 +28,8 @@ void magicComboActions (uint8_t comboIndex, uint32_t leftHand, uint32_t rightHan
} }
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}

@ -30,25 +30,25 @@
namespace KaleidoscopePlugins { namespace KaleidoscopePlugins {
const MagicCombo::dictionary_t *MagicCombo::dictionary; 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;
@ -70,7 +70,7 @@ namespace KaleidoscopePlugins {
break; break;
} }
} }
} }
}; };

@ -21,7 +21,7 @@
#include <Kaleidoscope.h> #include <Kaleidoscope.h>
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;
@ -39,7 +39,7 @@ namespace KaleidoscopePlugins {
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);

Loading…
Cancel
Save