X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common%2Fkeymap.h;h=e1a6f992e64cf47e0201790ddce1b8f069c6c06a;hb=b4e4f599dfe1b3ecff69ab248866e7b801c35f1e;hp=0c483483fb89f6daf6204555abd93a042d879a73;hpb=38bbe976e00a9a7bf6f8157016717e80503bf6a9;p=tmk_firmware.git

diff --git a/common/keymap.h b/common/keymap.h
index 0c48348..e1a6f99 100644
--- a/common/keymap.h
+++ b/common/keymap.h
@@ -23,24 +23,48 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "action.h"
 
 
-#ifdef USE_KEYMAP_V2
-/* translates key to keycode
- *      layer:  0-15 for base layers
- *              16-31 for overlays
- */
-uint8_t keymap_key_to_keycode(uint8_t layer, key_t key);
+#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, keypos_t key);
+
 /* translates Fn keycode to action */
 action_t keymap_fn_to_action(uint8_t keycode);
-#else
-#warning "You are using LEGACY KEYAMP. Consider using NEW KEYMAP."
+
+
+
+#ifdef USE_LEGACY_KEYMAP
 /* 
- * legacy keymap support
+ * 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);
 #endif