aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/xd60/keymaps/iso/keymap.c
diff options
context:
space:
mode:
authorErez Zukerman <bulk@ezuk.org>2018-05-15 10:50:24 -0400
committerErez Zukerman <bulk@ezuk.org>2018-05-15 10:50:24 -0400
commit5272218ac9cff7ce5af8cfda9129dc03b7aafa49 (patch)
tree61ad3987770684afd55cbdd12bca48a221d83713 /keyboards/xd60/keymaps/iso/keymap.c
parent0592d23b74142a554c9e36d2da7bf525fbe3a4c0 (diff)
parente41147da929afd15c1088226893cc02537650284 (diff)
downloadfirmware-5272218ac9cff7ce5af8cfda9129dc03b7aafa49.tar.gz
firmware-5272218ac9cff7ce5af8cfda9129dc03b7aafa49.tar.bz2
firmware-5272218ac9cff7ce5af8cfda9129dc03b7aafa49.zip
Merge branch 'master' into hf/shinydox
Diffstat (limited to 'keyboards/xd60/keymaps/iso/keymap.c')
-rw-r--r--keyboards/xd60/keymaps/iso/keymap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/keyboards/xd60/keymaps/iso/keymap.c b/keyboards/xd60/keymaps/iso/keymap.c
index 2d8824017..2ca2ea807 100644
--- a/keyboards/xd60/keymaps/iso/keymap.c
+++ b/keyboards/xd60/keymaps/iso/keymap.c
@@ -1,4 +1,4 @@
-#include "xd60.h"
+#include QMK_KEYBOARD_H
#include "action_layer.h"
#define _BL 0
@@ -7,7 +7,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// 0: Base Layer
- [_BL] = LAYOUT_ALL(
+ [_BL] = LAYOUT_all(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NO, \
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_NO, \
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, \
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RGUI, F(0), KC_LEFT, KC_DOWN, KC_RIGHT),
// 1: Function Layer
- [_FL] = LAYOUT_ALL(
+ [_FL] = LAYOUT_all(
RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_NO, \
KC_NO, KC_VOLD, KC_MUTE, KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, BL_TOGG, BL_DEC, BL_INC, KC_NO, \
KC_NO, KC_MPLY, KC_MSTP, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ENT, \