Merge pull request #115 from algernon/f/layers/pluggable-lookup

Make the lookup of a key pluggable

src/layers.cpp

@@ -5,6 +5,7 @@ static uint32_t LayerState;
 
 uint8_t Layer_::highestLayer;
 uint8_t Layer_::keyMap[ROWS][COLS];
+Key (*Layer_::getKey)(uint8_t layer, byte row, byte col) = Layer.getKeyFromPROGMEM;
 
 static void handle_keymap_key_event(Key keymapEntry, uint8_t keyState) {
     if (keymapEntry.keyCode >= MOMENTARY_OFFSET) {
@@ -51,6 +52,15 @@ Layer_::Layer_ (void) {
     defaultLayer (0);
 }
 
+Key
+Layer_::getKeyFromPROGMEM (uint8_t layer, byte row, byte col) {
+    Key key;
+
+    key.raw = pgm_read_word(&(keymaps[layer][row][col]));
+
+    return key;
+}
+
 void
 Layer_::mergeLayers(void) {
 
@@ -65,9 +75,7 @@ Layer_::mergeLayers(void) {
 
             while (layer > DefaultLayer) {
                 if (Layer.isOn (layer)) {
-                    Key mappedKey;
+                    Key mappedKey = (*getKey)(layer, r, c);
-
-                    mappedKey.raw = pgm_read_word(&(keymaps[layer][r][c]));
 
                     if (mappedKey != Key_Transparent) {
                         keyMap[r][c] = layer;
@@ -82,10 +90,8 @@ Layer_::mergeLayers(void) {
 
 Key Layer_::lookup(byte row, byte col) {
     uint8_t layer = keyMap[row][col];
-    Key mappedKey;
-    mappedKey.raw = pgm_read_word(&(keymaps[layer][row][col]));
 
-    return mappedKey;
+    return (*getKey)(layer, row, col);
 }
 
 uint8_t Layer_::top (void) {

src/layers.h

@@ -26,6 +26,10 @@ class Layer_ {
 
     static Key eventHandler(Key mappedKey, byte row, byte col, uint8_t keyState);
 
+    static Key (*getKey)(uint8_t layer, byte row, byte col);
+
+    static Key getKeyFromPROGMEM(uint8_t layer, byte row, byte col);
+
  private:
     static uint8_t highestLayer;
     static uint8_t keyMap[ROWS][COLS];
@@ -33,4 +37,6 @@ class Layer_ {
     static void mergeLayers(void);
 };
 
+Key layer_getKey (uint8_t layer, uint8_t r, uint8_t c);
+
 extern Layer_ Layer;