summaryrefslogtreecommitdiff
path: root/keyboards/amjkeyboard/amjpad
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/amjkeyboard/amjpad')
-rw-r--r--keyboards/amjkeyboard/amjpad/config.h7
-rw-r--r--keyboards/amjkeyboard/amjpad/info.json1
-rw-r--r--keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c20
-rw-r--r--keyboards/amjkeyboard/amjpad/keymaps/ortho_left/keymap.c20
-rw-r--r--keyboards/amjkeyboard/amjpad/keymaps/ortho_right/keymap.c20
-rw-r--r--keyboards/amjkeyboard/amjpad/rules.mk2
6 files changed, 31 insertions, 39 deletions
diff --git a/keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h
index 966962f240..c455057a7c 100644
--- a/keyboards/amjkeyboard/amjpad/config.h
+++ b/keyboards/amjkeyboard/amjpad/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "config_common.h"
/* key matrix size */
#define MATRIX_ROWS 6
@@ -33,12 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/amjkeyboard/amjpad/info.json b/keyboards/amjkeyboard/amjpad/info.json
index 456b90e049..1b447027ef 100644
--- a/keyboards/amjkeyboard/amjpad/info.json
+++ b/keyboards/amjkeyboard/amjpad/info.json
@@ -8,6 +8,7 @@
"pid": "0x6060",
"device_version": "0.0.3"
},
+ "community_layouts": ["numpad_6x4", "ortho_6x4"],
"layouts": {
"LAYOUT_numpad_6x4": {
"layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}, {"label":"k23", "x":3, "y":2, "h":2}, {"label":"k40", "x":0, "y":4}, {"label":"k41", "x":1, "y":4}, {"label":"k42", "x":2, "y":4}, {"label":"k50", "x":0, "y":5, "w":2}, {"label":"k52", "x":2, "y":5}, {"label":"k43", "x":3, "y":4, "h":2}]
diff --git a/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c
index a4f3b234e4..8b6fd4da51 100644
--- a/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c
+++ b/keyboards/amjkeyboard/amjpad/keymaps/max/keymap.c
@@ -29,11 +29,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_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_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
),
@@ -53,11 +53,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-------------------'
*/
[_FL] = LAYOUT_ortho_6x4(
- KC_ESC, KC_TAB, KC_BSPC, KC_PEQL, \
- KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, \
- KC_P7, KC_P8, KC_P9, QK_BOOT, \
- KC_P4, KC_P5, KC_P6, KC_PENT, \
- KC_P1, KC_P2, KC_P3, KC_PENT, \
+ KC_ESC, KC_TAB, KC_BSPC, KC_PEQL,
+ KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ KC_P7, KC_P8, KC_P9, QK_BOOT,
+ KC_P4, KC_P5, KC_P6, KC_PENT,
+ KC_P1, KC_P2, KC_P3, KC_PENT,
KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT
),
};
diff --git a/keyboards/amjkeyboard/amjpad/keymaps/ortho_left/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/ortho_left/keymap.c
index 9f82b49558..e177b3a71a 100644
--- a/keyboards/amjkeyboard/amjpad/keymaps/ortho_left/keymap.c
+++ b/keyboards/amjkeyboard/amjpad/keymaps/ortho_left/keymap.c
@@ -29,11 +29,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_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_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_LSFT, MO(1)
),
@@ -53,11 +53,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-------------------'
*/
[_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_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/amjkeyboard/amjpad/keymaps/ortho_right/keymap.c b/keyboards/amjkeyboard/amjpad/keymaps/ortho_right/keymap.c
index cbb81a2eab..84adc96691 100644
--- a/keyboards/amjkeyboard/amjpad/keymaps/ortho_right/keymap.c
+++ b/keyboards/amjkeyboard/amjpad/keymaps/ortho_right/keymap.c
@@ -28,11 +28,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-------------------'
*/
[_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_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
),
@@ -52,11 +52,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-------------------'
*/
[_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_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
),
};
diff --git a/keyboards/amjkeyboard/amjpad/rules.mk b/keyboards/amjkeyboard/amjpad/rules.mk
index c56fff39b3..503f5fac8d 100644
--- a/keyboards/amjkeyboard/amjpad/rules.mk
+++ b/keyboards/amjkeyboard/amjpad/rules.mk
@@ -16,5 +16,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
RGBLIGHT_ENABLE = no # Enable keyboard underlight functionality
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
AUDIO_ENABLE = no
-
-LAYOUTS = numpad_6x4 ortho_6x4