X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=common%2Fkeymap.c;h=ddc321052479756f2b0ec3333966048ced9568e3;hb=79b1f129085425c72b72bee28ed065bf243c0a0b;hp=8302c2704694952c010a50dc324bd86e8fed4b88;hpb=8c80deb775ac151001dc1592a2e94e8677b49964;p=max%2Ftmk_keyboard.git

diff --git a/common/keymap.c b/common/keymap.c
index 8302c270..ddc32105 100644
--- a/common/keymap.c
+++ b/common/keymap.c
@@ -14,60 +14,98 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+#include <avr/pgmspace.h>
 #include "keymap.h"
 #include "report.h"
 #include "keycode.h"
+#include "layer_switch.h"
+#include "action.h"
+#include "debug.h"
 
 
-/* layer */
-uint8_t default_layer = 0;
-uint8_t current_layer = 0;
+static action_t keycode_to_action(uint8_t keycode);
 
+#ifdef USE_KEYMAP_V2
+/* converts key to action */
+action_t action_for_key(uint8_t layer, key_t key)
+{
+    uint8_t keycode = keymap_key_to_keycode(layer, key);
+    switch (keycode) {
+        case KC_FN0 ... KC_FN31:
+            return keymap_fn_to_action(keycode);
+        default:
+            return keycode_to_action(keycode);
+    }
+}
 
-#ifndef NO_LEGACY_KEYMAP_SUPPORT
-/* legacy support with weak reference */
 __attribute__ ((weak))
-action_t keymap_get_action(uint8_t layer, uint8_t row, uint8_t col)
+void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+}
+#else
+/* 
+ * legacy keymap support
+ */
+/* translation for legacy keymap */
+action_t action_for_key(uint8_t layer, key_t key)
 {
     /* convert from legacy keycode to action */
-    uint8_t key = keymap_get_keycode(layer, row, col);
+    /* layer 16-31 indicate 'overlay' but not supported in legacy keymap */
+    uint8_t keycode = keymap_get_keycode((layer & OVERLAY_MASK), key.row, key.col);
     action_t action;
-    switch (key) {
+    switch (keycode) {
+        case KC_FN0 ... KC_FN31:
+            {
+                uint8_t layer = keymap_fn_layer(FN_INDEX(keycode));
+                uint8_t key = keymap_fn_keycode(FN_INDEX(keycode));
+                if (key) {
+                    action.code = ACTION_KEYMAP_TAP_KEY(layer, key);
+                } else {
+                    action.code = ACTION_KEYMAP_MOMENTARY(layer);
+                }
+            }
+            return action;
+        default:
+            return keycode_to_action(keycode);
+    }
+}
+/* not used for legacy keymap */
+void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+}
+#endif
+
+
+
+/* translates keycode to action */
+static action_t keycode_to_action(uint8_t keycode)
+{
+    action_t action;
+    switch (keycode) {
         case KC_A ... KC_EXSEL:
-            action.code = ACTION_KEY(key);
+            action.code = ACTION_KEY(keycode);
             break;
         case KC_LCTRL ... KC_LGUI:
-            action.code = ACTION_LMOD(key);
+            action.code = ACTION_LMOD(keycode);
             break;
         case KC_RCTRL ... KC_RGUI:
-            action.code = ACTION_RMOD(key);
+            action.code = ACTION_RMOD(keycode);
             break;
         case KC_SYSTEM_POWER ... KC_SYSTEM_WAKE:
-            action.code = ACTION_USAGE_SYSTEM(KEYCODE2SYSTEM(key));
+            action.code = ACTION_USAGE_SYSTEM(KEYCODE2SYSTEM(keycode));
             break;
         case KC_AUDIO_MUTE ... KC_WWW_FAVORITES:
-            action.code = ACTION_USAGE_CONSUMER(KEYCODE2CONSUMER(key));
+            action.code = ACTION_USAGE_CONSUMER(KEYCODE2CONSUMER(keycode));
             break;
         case KC_MS_UP ... KC_MS_ACCEL2:
-            action.code = ACTION_MOUSEKEY(key);
+            action.code = ACTION_MOUSEKEY(keycode);
             break;
-        case KC_FN0 ... KC_FN31:
-            {
-                uint8_t layer = keymap_fn_layer(FN_INDEX(key));
-                uint8_t code = keymap_fn_keycode(FN_INDEX(key));
-                action.code = ACTION_LAYER_SET_TAP_KEY(layer, code);
-            }
+        case KC_TRNS:
+            action.code = ACTION_TRANSPARENT;
             break;
-        case KC_NO ... KC_UNDEFINED:
         default:
             action.code = ACTION_NO;
             break;
     }
     return action;
 }
-#endif
-
-__attribute__ ((weak))
-void keymap_call_function(keyrecord_t *event, uint8_t id, uint8_t opt)
-{
-}