aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/amjpad/keymaps/ortho_right/keymap.c
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2018-06-12 10:59:35 -0400
committerJack Humbert <jack.humb@gmail.com>2018-06-12 10:59:35 -0400
commit998ddbb122c9d3e2a77bd4e88c881b225ca0d569 (patch)
treeca91ff7ad3c4866555d1e623fe9ea05276397e1c /keyboards/amjpad/keymaps/ortho_right/keymap.c
parentc0095710a7c7e9bd94aa9f4dd814dc28d718c731 (diff)
parent06487daaddf923d635e8a528d1eb644b875a73f6 (diff)
downloadfirmware-998ddbb122c9d3e2a77bd4e88c881b225ca0d569.tar.gz
firmware-998ddbb122c9d3e2a77bd4e88c881b225ca0d569.tar.bz2
firmware-998ddbb122c9d3e2a77bd4e88c881b225ca0d569.zip
Merge branch 'master' of github.com:qmk/qmk_firmware into hf/shinydox
Diffstat (limited to 'keyboards/amjpad/keymaps/ortho_right/keymap.c')
-rw-r--r--keyboards/amjpad/keymaps/ortho_right/keymap.c35
1 files changed, 17 insertions, 18 deletions
diff --git a/keyboards/amjpad/keymaps/ortho_right/keymap.c b/keyboards/amjpad/keymaps/ortho_right/keymap.c
index 33e599abd..52e93524b 100644
--- a/keyboards/amjpad/keymaps/ortho_right/keymap.c
+++ b/keyboards/amjpad/keymaps/ortho_right/keymap.c
@@ -1,4 +1,4 @@
-#include "amjpad.h"
+#include QMK_KEYBOARD_H
#ifdef RGBLIGHT_ENABLE
#include "rgblight.h"
@@ -29,15 +29,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |Rght| Ret| " |Bspc|
* `-------------------'
*/
-
-[_BL] = MAXKEYMAP(
-
- KC_SPACE, KC_N, KC_H, KC_Y, \
- MO(1), KC_M, KC_J, KC_U, \
- KC_LEFT, KC_COMM, KC_K, KC_I, \
- KC_DOWN, KC_DOT, KC_L, KC_O, \
- KC_UP, KC_SLASH, KC_SCLN, KC_P, \
- KC_RIGHT, KC_ENT, KC_QUOT, KC_BSPC),
+ [_BL] = LAYOUT_ortho_6x4(
+ KC_SPACE, KC_N, KC_H, KC_Y, \
+ MO(1), KC_M, KC_J, KC_U, \
+ KC_LEFT, KC_COMM, KC_K, KC_I, \
+ KC_DOWN, KC_DOT, KC_L, KC_O, \
+ KC_UP, KC_SLASH, KC_SCLN, KC_P, \
+ KC_RIGHT, KC_ENT, KC_QUOT, KC_BSPC
+ ),
/* Keymap _FL: Function Layer
* ,-------------------.
@@ -54,12 +53,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |Rght| Ret| \ | Del|
* `-------------------'
*/
-[_FL] = MAXKEYMAP(
-
- _______, KC_F12, KC_F6, KC_6, \
- _______, _______, KC_MINS, KC_7, \
- _______, _______, KC_EQL, KC_8, \
- _______, _______, KC_LBRC, KC_9, \
- _______, _______, KC_RBRC, KC_0, \
- _______, _______, KC_BSLS, KC_DEL),
+ [_FL] = LAYOUT_ortho_6x4(
+ _______, KC_F12, KC_F6, KC_6, \
+ _______, _______, KC_MINS, KC_7, \
+ _______, _______, KC_EQL, KC_8, \
+ _______, _______, KC_LBRC, KC_9, \
+ _______, _______, KC_RBRC, KC_0, \
+ _______, _______, KC_BSLS, KC_DEL
+ ),
};