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

"make astyle

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

54
examples/EEPROM-Keymap/EEPROM-Keymap.ino
Unescape View File

@ -21,45 +21,45 @@
#include <Kaleidoscope-Focus.h> #include <Kaleidoscope-Focus.h>
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_skip, Key_skip,
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_skip Key_skip
), ),
}; };
void setup () { void setup () {
Serial.begin (9600); Serial.begin (9600);
Kaleidoscope.setup (); Kaleidoscope.setup ();
USE_PLUGINS (&EEPROMKeymap, &Focus); USE_PLUGINS (&EEPROMKeymap, &Focus);
Focus.addHook (FOCUS_HOOK_SETTINGS); Focus.addHook (FOCUS_HOOK_SETTINGS);
Focus.addHook (FOCUS_HOOK_KEYMAP); Focus.addHook (FOCUS_HOOK_KEYMAP);
Focus.addHook (FOCUS_HOOK_KEYMAP_TRANSFER); Focus.addHook (FOCUS_HOOK_KEYMAP_TRANSFER);
Focus.addHook (FOCUS_HOOK_HELP); Focus.addHook (FOCUS_HOOK_HELP);
Focus.addHook (FOCUS_HOOK_VERSION); Focus.addHook (FOCUS_HOOK_VERSION);
Layer.getKey = EEPROMKeymap.getKeyOverride; Layer.getKey = EEPROMKeymap.getKeyOverride;
EEPROMKeymap.reserveSpace (1); EEPROMKeymap.reserveSpace (1);
EEPROMSettings.seal (); EEPROMSettings.seal ();
} }
void loop () { void loop () {
Kaleidoscope.loop (); Kaleidoscope.loop ();
} }

116
src/Kaleidoscope/EEPROM-Keymap.cpp
Unescape View File

@ -21,29 +21,29 @@
#include <Kaleidoscope-Focus.h> #include <Kaleidoscope-Focus.h>
namespace KaleidoscopePlugins { namespace KaleidoscopePlugins {
uint16_t EEPROMKeymap::keymapBase; uint16_t EEPROMKeymap::keymapBase;
uint8_t EEPROMKeymap::maxLayers; uint8_t EEPROMKeymap::maxLayers;
EEPROMKeymap::EEPROMKeymap (void) { EEPROMKeymap::EEPROMKeymap (void) {
} }
void void
EEPROMKeymap::begin (void) { EEPROMKeymap::begin (void) {
USE_PLUGINS (&::EEPROMSettings); USE_PLUGINS (&::EEPROMSettings);
} }
void void
EEPROMKeymap::reserveSpace (uint8_t layers) { EEPROMKeymap::reserveSpace (uint8_t layers) {
maxLayers = layers; maxLayers = layers;
keymapBase = ::EEPROMSettings.requestSlice (maxLayers * ROWS * COLS * 2); keymapBase = ::EEPROMSettings.requestSlice (maxLayers * ROWS * COLS * 2);
} }
Key Key
EEPROMKeymap::getKey (uint8_t layer, byte row, byte col) { EEPROMKeymap::getKey (uint8_t layer, byte row, byte col) {
Key key; Key key;
if (layer >= maxLayers) if (layer >= maxLayers)
return Key_NoKey; return Key_NoKey;
uint16_t pos = ((layer * ROWS * COLS) + (row * COLS) + col) * 2; uint16_t pos = ((layer * ROWS * COLS) + (row * COLS) + col) * 2;
@ -51,89 +51,89 @@ namespace KaleidoscopePlugins {
key.keyCode = EEPROM.read (keymapBase + pos + 1); key.keyCode = EEPROM.read (keymapBase + pos + 1);
return key; return key;
} }
Key Key
EEPROMKeymap::getKeyOverride (uint8_t layer, byte row, byte col) { EEPROMKeymap::getKeyOverride (uint8_t layer, byte row, byte col) {
Key key; Key key;
key = getKey (layer, row, col); key = getKey (layer, row, col);
if (key == Key_Transparent) if (key == Key_Transparent)
key = Layer.getKeyFromPROGMEM (layer, row, col); key = Layer.getKeyFromPROGMEM (layer, row, col);
return key; return key;
} }
uint16_t uint16_t
EEPROMKeymap::base (void) { EEPROMKeymap::base (void) {
return keymapBase; return keymapBase;
} }
void void
EEPROMKeymap::updateKey (uint16_t basePos, Key key) { EEPROMKeymap::updateKey (uint16_t basePos, Key key) {
EEPROM.update (keymapBase + basePos * 2, key.flags); EEPROM.update (keymapBase + basePos * 2, key.flags);
EEPROM.update (keymapBase + basePos * 2 + 1, key.keyCode); EEPROM.update (keymapBase + basePos * 2 + 1, key.keyCode);
} }
Key Key
EEPROMKeymap::parseKey (void) { EEPROMKeymap::parseKey (void) {
Key key; Key key;
key.raw = Serial.parseInt (); key.raw = Serial.parseInt ();
return key; return key;
} }
void void
EEPROMKeymap::printKey (Key k) { EEPROMKeymap::printKey (Key k) {
::Focus.printNumber (k.raw); ::Focus.printNumber (k.raw);
} }
bool bool
EEPROMKeymap::focusKeymap (const char *command) { EEPROMKeymap::focusKeymap (const char *command) {
if (strcmp_P (command, PSTR ("keymap.map")) != 0) if (strcmp_P (command, PSTR ("keymap.map")) != 0)
return false; return false;
if (Serial.peek () == '\n') { if (Serial.peek () == '\n') {
for (uint8_t layer = 0; layer < maxLayers; layer++) { for (uint8_t layer = 0; layer < maxLayers; layer++) {
for (uint8_t row = 0; row < ROWS; row++) { for (uint8_t row = 0; row < ROWS; row++) {
for (uint8_t col = 0; col < COLS; col++) { for (uint8_t col = 0; col < COLS; col++) {
Key k = getKey (layer, row, col); Key k = getKey (layer, row, col);
printKey (k); printKey (k);
::Focus.printSpace (); ::Focus.printSpace ();
} }
}
} }
} Serial.println ();
Serial.println ();
} else { } else {
uint16_t i = 0; uint16_t i = 0;
while ((Serial.peek () != '\n') && (i < ROWS * COLS * maxLayers)) { while ((Serial.peek () != '\n') && (i < ROWS * COLS * maxLayers)) {
updateKey (i, parseKey ()); updateKey (i, parseKey ());
i++; i++;
} }
} }
return true; return true;
} }
bool bool
EEPROMKeymap::focusKeymapTransfer (const char *command) { EEPROMKeymap::focusKeymapTransfer (const char *command) {
if (strcmp_P (command, PSTR ("keymap.transfer")) != 0) if (strcmp_P (command, PSTR ("keymap.transfer")) != 0)
return false; return false;
uint8_t layer = Serial.parseInt (); uint8_t layer = Serial.parseInt ();
for (uint8_t row = 0; row < ROWS; row++) { for (uint8_t row = 0; row < ROWS; row++) {
for (uint8_t col = 0; col < COLS; col++) { for (uint8_t col = 0; col < COLS; col++) {
Key k = Layer.getKeyFromPROGMEM (layer, row, col); Key k = Layer.getKeyFromPROGMEM (layer, row, col);
uint16_t pos = ((layer * ROWS * COLS) + (row * COLS) + col); uint16_t pos = ((layer * ROWS * COLS) + (row * COLS) + col);
updateKey (pos, k); updateKey (pos, k);
} }
} }
return true; return true;
} }
}; };

4
src/Kaleidoscope/EEPROM-Keymap.h
Unescape View File

@ -22,7 +22,7 @@
#include <Kaleidoscope-EEPROM-Settings.h> #include <Kaleidoscope-EEPROM-Settings.h>
namespace KaleidoscopePlugins { namespace KaleidoscopePlugins {
class EEPROMKeymap : public KaleidoscopePlugin { class EEPROMKeymap : public KaleidoscopePlugin {
public: public:
EEPROMKeymap (void); EEPROMKeymap (void);
@ -45,7 +45,7 @@ namespace KaleidoscopePlugins {
static Key parseKey (void); static Key parseKey (void);
static void printKey (Key key); static void printKey (Key key);
}; };
}; };
extern KaleidoscopePlugins::EEPROMKeymap EEPROMKeymap; extern KaleidoscopePlugins::EEPROMKeymap EEPROMKeymap;

Write Preview
Loading…
Cancel
Save