summaryrefslogtreecommitdiffstats
path: root/keyboards/amjpad/keymaps
diff options
context:
space:
mode:
authornoroadsleft <18669334+noroadsleft@users.noreply.github.com>2018-05-27 19:19:09 -0700
committerDrashna Jaelre <drashna@live.com>2018-05-27 19:19:09 -0700
commita677d8a00dc7bb42c1d9ba29455d24f6d8bfaef6 (patch)
treeb26303950a2b0914b7eb5eaa874c4618d088ebe1 /keyboards/amjpad/keymaps
parent3b1ddd12a53356196b565235c54d19e45bb17980 (diff)
Refactor and Configurator updates for AMJ Pad (#3060)
* Refactor for AMJ Pad * Configurator update for AMJ Pad * Add hardware agnostic layouts numpad_6x4 and ortho_6x4 * Add agnostic layouts to rules.mk * Refactor AMJ Pad to use new hardware agnostic layouts
Diffstat (limited to 'keyboards/amjpad/keymaps')
-rw-r--r--keyboards/amjpad/keymaps/default/keymap.c33
-rw-r--r--keyboards/amjpad/keymaps/max/keymap.c34
-rw-r--r--keyboards/amjpad/keymaps/ortho_left/keymap.c34
-rw-r--r--keyboards/amjpad/keymaps/ortho_right/keymap.c35
4 files changed, 68 insertions, 68 deletions
diff --git a/keyboards/amjpad/keymaps/default/keymap.c b/keyboards/amjpad/keymaps/default/keymap.c
index 362afd1079..1ec81e6db8 100644
--- a/keyboards/amjpad/keymaps/default/keymap.c
+++ b/keyboards/amjpad/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include "amjpad.h"
+#include QMK_KEYBOARD_H
#ifdef RGBLIGHT_ENABLE
#include "rgblight.h"
@@ -33,13 +33,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-------------------'
*/
-[_BL] = KEYMAP(
- KC_ESC,KC_TAB,KC_BSPC,KC_PEQL, \
- KC_NLCK,KC_PSLS,KC_PAST,KC_PMNS, \
- KC_P7, KC_P8, KC_P9, KC_PPLS, \
- KC_P4, KC_P5, KC_P6, \
- KC_P1, KC_P2, KC_P3, KC_PENT, \
- KC_P0, LT(_FL,KC_PDOT)),
+ [_BL] = LAYOUT_numpad_6x4(
+ KC_ESC, KC_TAB, KC_BSPC, KC_PEQL, \
+ KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
+ KC_P7, KC_P8, KC_P9, \
+ KC_P4, KC_P5, KC_P6, KC_PPLS, \
+ KC_P1, KC_P2, KC_P3, \
+ KC_P0, LT(_FL,KC_PDOT), KC_PENT \
+ ),
/* Keymap _FL: Function Layer
* ,-------------------.
@@ -56,14 +57,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | 0 |./FN| |
* `-------------------'
*/
-[_FL] = KEYMAP(
-
- KC_ESC,KC_TAB,KC_BSPC,KC_PEQL, \
- KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
- KC_P7, KC_P8, KC_P9, RESET, \
- KC_P4, KC_P5, KC_P6, \
- KC_P1, KC_P2, KC_P3, KC_PENT, \
- KC_P0, LT(_FL,KC_PDOT)),
+ [_FL] = LAYOUT_numpad_6x4(
+ KC_ESC, KC_TAB, KC_BSPC, KC_PEQL, \
+ KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
+ KC_P7, KC_P8, KC_P9, \
+ KC_P4, KC_P5, KC_P6, RESET, \
+ KC_P1, KC_P2, KC_P3, \
+ KC_P0, LT(_FL,KC_PDOT), KC_PENT \
+ ),
};
enum function_id {
diff --git a/keyboards/amjpad/keymaps/max/keymap.c b/keyboards/amjpad/keymaps/max/keymap.c
index 926a494a90..463a265de1 100644
--- a/keyboards/amjpad/keymaps/max/keymap.c
+++ b/keyboards/amjpad/keymaps/max/keymap.c
@@ -1,4 +1,4 @@
-#include "amjpad.h"
+#include QMK_KEYBOARD_H
#ifdef RGBLIGHT_ENABLE
#include "rgblight.h"
@@ -33,14 +33,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-------------------'
*/
-[_BL] = MAXKEYMAP(
-
- KC_ESC, KC_TAB, KC_MINS,KC_EQL, \
- KC_F1, KC_F2, KC_F3, KC_F4, \
- KC_P7, KC_P8, KC_P9, KC_PMNS, \
- KC_P4, KC_P5, KC_P6, KC_PENT, \
- KC_P1, KC_P2, KC_P3, KC_BSLS, \
- KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT),
+ [_BL] = LAYOUT_ortho_6x4(
+ KC_ESC, KC_TAB, KC_MINS,KC_EQL, \
+ KC_F1, KC_F2, KC_F3, KC_F4, \
+ KC_P7, KC_P8, KC_P9, KC_PMNS, \
+ KC_P4, KC_P5, KC_P6, KC_PENT, \
+ KC_P1, KC_P2, KC_P3, KC_BSLS, \
+ KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
+ ),
/* Keymap _FL: Function Layer
* ,-------------------.
@@ -57,14 +57,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | 0 |./FN| |
* `-------------------'
*/
-[_FL] = MAXKEYMAP(
-
- KC_ESC,KC_TAB,KC_BSPC,KC_PEQL, \
- KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
- KC_P7, KC_P8, KC_P9, RESET, \
- KC_P4, KC_P5, KC_P6, KC_PENT, \
- KC_P1, KC_P2, KC_P3, KC_PENT, \
- KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT),
+ [_FL] = LAYOUT_ortho_6x4(
+ KC_ESC, KC_TAB, KC_BSPC, KC_PEQL, \
+ KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \
+ KC_P7, KC_P8, KC_P9, RESET, \
+ KC_P4, KC_P5, KC_P6, KC_PENT, \
+ KC_P1, KC_P2, KC_P3, KC_PENT, \
+ KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
+ ),
};
enum function_id {
diff --git a/keyboards/amjpad/keymaps/ortho_left/keymap.c b/keyboards/amjpad/keymaps/ortho_left/keymap.c
index d3e4d9944b..5245138bd1 100644
--- a/keyboards/amjpad/keymaps/ortho_left/keymap.c
+++ b/keyboards/amjpad/keymaps/ortho_left/keymap.c
@@ -1,4 +1,4 @@
-#include "amjpad.h"
+#include QMK_KEYBOARD_H
#ifdef RGBLIGHT_ENABLE
#include "rgblight.h"
@@ -30,14 +30,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-------------------'
*/
-[_BL] = MAXKEYMAP(
-
- KC_T, KC_G, KC_B, KC_SPACE,\
- KC_R, KC_F, KC_V, MO(1), \
- KC_E, KC_D, KC_C, KC_LGUI, \
- KC_W, KC_S, KC_X, KC_LALT, \
- KC_Q, KC_A, KC_Z, KC_LCTL, \
- KC_TAB, KC_ESC, KC_LSHIFT, MO(1)),
+ [_BL] = LAYOUT_ortho_6x4(
+ KC_T, KC_G, KC_B, KC_SPACE,\
+ KC_R, KC_F, KC_V, MO(1), \
+ KC_E, KC_D, KC_C, KC_LGUI, \
+ KC_W, KC_S, KC_X, KC_LALT, \
+ KC_Q, KC_A, KC_Z, KC_LCTL, \
+ KC_TAB, KC_ESC, KC_LSHIFT, MO(1)
+ ),
/* Keymap _FL: Function Layer
* ,-------------------.
@@ -54,12 +54,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* | ` | Del|Shft| |
* `-------------------'
*/
-[_FL] = MAXKEYMAP(
-
- KC_5, KC_F5, KC_F11, _______, \
- KC_4, KC_F4, KC_F10, _______, \
- KC_3, KC_F3, KC_F9, _______, \
- KC_2, KC_F2, KC_F8, _______, \
- KC_1, KC_F1, KC_F7, _______, \
- KC_GRV,KC_DEL, _______, _______),
+ [_FL] = LAYOUT_ortho_6x4(
+ KC_5, KC_F5, KC_F11, _______, \
+ KC_4, KC_F4, KC_F10, _______, \
+ KC_3, KC_F3, KC_F9, _______, \
+ KC_2, KC_F2, KC_F8, _______, \
+ KC_1, KC_F1, KC_F7, _______, \
+ KC_GRV,KC_DEL, _______, _______
+ ),
};
diff --git a/keyboards/amjpad/keymaps/ortho_right/keymap.c b/keyboards/amjpad/keymaps/ortho_right/keymap.c
index 33e599abdc..52e93524b5 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
+ ),
};