keyToggledO* camelcasing

pull/389/head
Jesse Vincent 8 years ago
parent cfbb587710
commit 842fa737d6
No known key found for this signature in database
GPG Key ID: 122F5DF7108E4046

@ -66,7 +66,7 @@ to use a macro, as in the example below:
#include <Kaleidoscope-Macros.h> #include <Kaleidoscope-Macros.h>
const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) { const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
if (macroIndex == 0 && key_toggled_off(keyState)) { if (macroIndex == 0 && keyToggledOff(keyState)) {
EEPROMKeymapProgrammer.activate(); EEPROMKeymapProgrammer.activate();
} }

@ -42,7 +42,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = {
}; };
const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) { const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
if (macroIndex == 0 && key_toggled_off(keyState)) { if (macroIndex == 0 && keyToggledOff(keyState)) {
EEPROMKeymapProgrammer.activate(); EEPROMKeymapProgrammer.activate();
} }

@ -61,10 +61,10 @@ Key EEPROMKeymapProgrammer::eventHandlerHook(Key mapped_key, byte row, byte col,
return mapped_key; return mapped_key;
if (state_ == WAIT_FOR_KEY) { if (state_ == WAIT_FOR_KEY) {
if (key_toggled_on(key_state)) { if (keyToggledOn(key_state)) {
update_position_ = Layer.top() * ROWS * COLS + row * COLS + col; update_position_ = Layer.top() * ROWS * COLS + row * COLS + col;
} }
if (key_toggled_off(key_state)) { if (keyToggledOff(key_state)) {
if ((uint16_t)(Layer.top() * ROWS * COLS + row * COLS + col) == update_position_) if ((uint16_t)(Layer.top() * ROWS * COLS + row * COLS + col) == update_position_)
nextState(); nextState();
} }
@ -72,10 +72,10 @@ Key EEPROMKeymapProgrammer::eventHandlerHook(Key mapped_key, byte row, byte col,
} }
if (state_ == WAIT_FOR_SOURCE_KEY) { if (state_ == WAIT_FOR_SOURCE_KEY) {
if (key_toggled_on(key_state)) { if (keyToggledOn(key_state)) {
new_key_ = Layer.getKeyFromPROGMEM(Layer.top(), row, col); new_key_ = Layer.getKeyFromPROGMEM(Layer.top(), row, col);
} }
if (key_toggled_off(key_state)) { if (keyToggledOff(key_state)) {
if (new_key_ == Layer.getKeyFromPROGMEM(Layer.top(), row, col)) if (new_key_ == Layer.getKeyFromPROGMEM(Layer.top(), row, col))
nextState(); nextState();
} }
@ -87,7 +87,7 @@ Key EEPROMKeymapProgrammer::eventHandlerHook(Key mapped_key, byte row, byte col,
if (mapped_key < Key_1 || mapped_key > Key_0) if (mapped_key < Key_1 || mapped_key > Key_0)
return mapped_key; return mapped_key;
if (!key_toggled_on(key_state)) if (!keyToggledOn(key_state))
return Key_NoKey; return Key_NoKey;
uint8_t n; uint8_t n;

Loading…
Cancel
Save