Merge branch 'rhaberkorn-serial-mouse'

[tmk_firmware.git] / common / keymap.h

diff --git a/common/keymap.h b/common/keymap.h
index f54fea90d231e5607f9cd19029b169ef8728c809..4c3019a364c2dfad5b6194409bf1bacfb71c3a64 100644 (file)
--- a/common/keymap.h
+++ b/common/keymap.h
@@ -23,23 +23,49 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "action.h"
 
 
-/* layer used currently */
-extern uint8_t current_layer;
-/* layer to return or start with */
-extern uint8_t default_layer;
+#ifdef BOOTMAGIC_ENABLE
+/* NOTE: Not portable. Bit field order depends on implementation */
+typedef union {
+    uint8_t raw;
+    struct {
+        bool swap_control_capslock:1;
+        bool capslock_to_control:1;
+        bool swap_lalt_lgui:1;
+        bool swap_ralt_rgui:1;
+        bool no_gui:1;
+        bool swap_grave_esc:1;
+        bool swap_backslash_backspace:1;
+        bool nkro:1;
+    };
+} keymap_config_t;
+keymap_config_t keymap_config;
+#endif
+
+
+/* translates key to keycode */
+uint8_t keymap_key_to_keycode(uint8_t layer, key_t key);
+
+/* translates Fn keycode to action */
+action_t keymap_fn_to_action(uint8_t keycode);
+
+
 
+#ifdef USE_LEGACY_KEYMAP
 /* 
- * legacy keymap interface: keycode
+ * Legacy keymap
+ *      Consider using new keymap API above instead.
  */
+/* keycode of key */
+__attribute__ ((deprecated))
 uint8_t keymap_get_keycode(uint8_t layer, uint8_t row, uint8_t col);
+
 /* layer to move during press Fn key */
+__attribute__ ((deprecated))
 uint8_t keymap_fn_layer(uint8_t fn_bits);
+
 /* keycode to send when release Fn key without using */
+__attribute__ ((deprecated))
 uint8_t keymap_fn_keycode(uint8_t fn_bits);
-
-/* 
- * new keymap interface: action
- */
-action_t keymap_get_action(uint8_t layer, uint8_t row, uint8_t col);
+#endif
 
 #endif