astyle with current project style guidelines

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

@ -19,10 +19,10 @@
#include <Kaleidoscope.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) {
case 0:
Serial.println ("It's a kind of magic!");
Serial.println("It's a kind of magic!");
break;
}
}
@ -57,15 +57,15 @@ const Key keymaps[][ROWS][COLS] PROGMEM = {
),
};
void setup () {
Serial.begin (9600);
void setup() {
Serial.begin(9600);
MagicCombo.configure (dictionary);
MagicCombo.configure(dictionary);
Kaleidoscope.setup (KEYMAP_SIZE);
Kaleidoscope.use (&MagicCombo, NULL);
Kaleidoscope.setup(KEYMAP_SIZE);
Kaleidoscope.use(&MagicCombo, NULL);
}
void loop () {
Kaleidoscope.loop ();
void loop() {
Kaleidoscope.loop();
}

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

@ -27,21 +27,21 @@ class MagicCombo : public KaleidoscopePlugin {
uint32_t leftHand, rightHand;
} 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;
private:
static const dictionary_t *dictionary;
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;

Loading…
Cancel
Save