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

Kaleidoscope Style Guide conformance

Browse Source 
Also updated to work with the newest `EEPROM-Keymap` API.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
pull/389/head
Gergely Nagy 8 years ago
parent f2ee554ce6
commit 8220369f6f
3 changed files with 114 additions and 120 deletions
Show Stats Download Patch File Download Diff File

12
examples/EEPROM-Keymap-Programmer/EEPROM-Keymap-Programmer.ino
Unescape View File

@ -24,8 +24,7 @@
const Key keymaps[][ROWS][COLS] PROGMEM = {
[0] = KEYMAP_STACKED
(
M(0), Key_1, Key_2, Key_3, Key_4, Key_5, Key_NoKey,
(M(0), 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_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,
@ -39,8 +38,7 @@ const Key keymaps[][ROWS][COLS] PROGMEM = {
Key_skip, Key_N, Key_M, Key_Comma, Key_Period, Key_Slash, Key_Minus,
Key_RightShift, Key_RightAlt, Key_Spacebar, Key_RightControl,
Key_NoKey
),
Key_NoKey),
};
const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
@ -54,13 +52,13 @@ const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
void setup() {
Serial.begin(9600);
Kaleidoscope.setup ();
USE_PLUGINS(&EEPROMKeymapProgrammer, &EEPROMKeymap, &Macros);
Kaleidoscope.setup();
Layer.getKey = EEPROMKeymap.getKey;
EEPROMKeymap.reserveSpace (1);
EEPROMKeymap.max_layers(1);
EEPROMSettings.seal();
}

76
src/Kaleidoscope/EEPROM-Keymap-Programmer.cpp
Unescape View File

@ -18,69 +18,65 @@
#include <Kaleidoscope-EEPROM-Keymap-Programmer.h>
namespace KaleidoscopePlugins {
uint16_t EEPROMKeymapProgrammer::updatePosition;
EEPROMKeymapProgrammer::state_t EEPROMKeymapProgrammer::state;
namespace kaleidoscope {
uint16_t EEPROMKeymapProgrammer::update_position_;
EEPROMKeymapProgrammer::state_t EEPROMKeymapProgrammer::state_;
EEPROMKeymapProgrammer::mode_t EEPROMKeymapProgrammer::mode;
Key EEPROMKeymapProgrammer::newKey;
Key EEPROMKeymapProgrammer::new_key_;
EEPROMKeymapProgrammer::EEPROMKeymapProgrammer(void) {
}
void
EEPROMKeymapProgrammer::begin (void) {
void EEPROMKeymapProgrammer::begin(void) {
event_handler_hook_use(eventHandlerHook);
}
void
EEPROMKeymapProgrammer::nextState (void) {
switch (state) {
void EEPROMKeymapProgrammer::nextState(void) {
switch (state_) {
case INACTIVE:
state = WAIT_FOR_KEY;
state_ = WAIT_FOR_KEY;
break;
case WAIT_FOR_KEY:
if (mode == CODE)
state = WAIT_FOR_CODE;
state_ = WAIT_FOR_CODE;
else
state = WAIT_FOR_SOURCE_KEY;
state_ = WAIT_FOR_SOURCE_KEY;
break;
case WAIT_FOR_CODE:
case WAIT_FOR_SOURCE_KEY:
::EEPROMKeymap.updateKey (updatePosition, newKey);
::EEPROMKeymap.updateKey(update_position_, new_key_);
cancel();
break;
}
}
void
EEPROMKeymapProgrammer::cancel (void) {
updatePosition = 0;
newKey = Key_NoKey;
state = INACTIVE;
void EEPROMKeymapProgrammer::cancel(void) {
update_position_ = 0;
new_key_ = Key_NoKey;
state_ = INACTIVE;
}
Key
EEPROMKeymapProgrammer::eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState) {
if (state == INACTIVE)
return mappedKey;
Key EEPROMKeymapProgrammer::eventHandlerHook(Key mapped_key, byte row, byte col, uint8_t key_state) {
if (state_ == INACTIVE)
return mapped_key;
if (state == WAIT_FOR_KEY) {
if (key_toggled_on (keyState)) {
updatePosition = Layer.top () * ROWS * COLS + row * COLS + col;
if (state_ == WAIT_FOR_KEY) {
if (key_toggled_on(key_state)) {
update_position_ = Layer.top() * ROWS * COLS + row * COLS + col;
}
if (key_toggled_off (keyState)) {
if ((uint16_t)(Layer.top () * ROWS * COLS + row * COLS + col) == updatePosition)
if (key_toggled_off(key_state)) {
if ((uint16_t)(Layer.top() * ROWS * COLS + row * COLS + col) == update_position_)
nextState();
}
return Key_NoKey;
}
if (state == WAIT_FOR_SOURCE_KEY) {
if (key_toggled_on (keyState)) {
newKey = Layer.getKeyFromPROGMEM (Layer.top (), row, col);
if (state_ == WAIT_FOR_SOURCE_KEY) {
if (key_toggled_on(key_state)) {
new_key_ = Layer.getKeyFromPROGMEM(Layer.top(), row, col);
}
if (key_toggled_off (keyState)) {
if (newKey == Layer.getKeyFromPROGMEM (Layer.top (), row, col))
if (key_toggled_off(key_state)) {
if (new_key_ == Layer.getKeyFromPROGMEM(Layer.top(), row, col))
nextState();
}
return Key_NoKey;
@ -88,23 +84,23 @@ EEPROMKeymapProgrammer::eventHandlerHook (Key mappedKey, byte row, byte col, uin
// WAIT_FOR_CODE state
if (mappedKey < Key_1 || mappedKey > Key_0)
return mappedKey;
if (mapped_key < Key_1 || mapped_key > Key_0)
return mapped_key;
if (!key_toggled_on (keyState))
if (!key_toggled_on(key_state))
return Key_NoKey;
uint8_t n;
if (mappedKey.keyCode == Key_0.keyCode)
if (mapped_key.keyCode == Key_0.keyCode)
n = 0;
else
n = mappedKey.keyCode - Key_1.keyCode + 1;
n = mapped_key.keyCode - Key_1.keyCode + 1;
newKey.raw = newKey.raw * 10 + n;
new_key_.raw = new_key_.raw * 10 + n;
return Key_NoKey;
}
};
}
KaleidoscopePlugins::EEPROMKeymapProgrammer EEPROMKeymapProgrammer;
kaleidoscope::EEPROMKeymapProgrammer EEPROMKeymapProgrammer;

16
src/Kaleidoscope/EEPROM-Keymap-Programmer.h
Unescape View File

@ -21,7 +21,7 @@
#include <Kaleidoscope.h>
#include <Kaleidoscope-EEPROM-Keymap.h>
namespace KaleidoscopePlugins {
namespace kaleidoscope {
class EEPROMKeymapProgrammer : public KaleidoscopePlugin {
public:
typedef enum {
@ -32,7 +32,7 @@ class EEPROMKeymapProgrammer : public KaleidoscopePlugin {
EEPROMKeymapProgrammer(void);
virtual void begin (void) final;
void begin(void) final;
static void nextState(void);
static void cancel(void);
@ -44,13 +44,13 @@ class EEPROMKeymapProgrammer : public KaleidoscopePlugin {
WAIT_FOR_CODE,
WAIT_FOR_SOURCE_KEY,
} state_t;
static state_t state;
static state_t state_;
static uint16_t updatePosition; // layer, row, col
static Key newKey;
static uint16_t update_position_; // layer, row, col
static Key new_key_;
static Key eventHandlerHook (Key mappedKey, byte row, byte col, uint8_t keyState);
};
static Key eventHandlerHook(Key mapped_key, byte row, byte col, uint8_t key_state);
};
}
extern KaleidoscopePlugins::EEPROMKeymapProgrammer EEPROMKeymapProgrammer;
extern kaleidoscope::EEPROMKeymapProgrammer EEPROMKeymapProgrammer;

Write Preview
Loading…
Cancel
Save