aboutsummaryrefslogtreecommitdiff
path: root/keyboards/amj96
diff options
context:
space:
mode:
authorDrashna Jael're <drashna@live.com>2021-09-24 12:21:32 -0700
committerDrashna Jael're <drashna@live.com>2021-09-24 12:21:32 -0700
commit675c5a5e12f5c5efe59a0d0b30b17a41a398c74e (patch)
tree43850408dbd4afef92b26b16137e62548a8048fe /keyboards/amj96
parentfcb7c7b04fc822e04ac0d2ba9ba8d2483d838b80 (diff)
parent4493a05b74d8852222faa776d140233745114c53 (diff)
downloadqmk_firmware-675c5a5e12f5c5efe59a0d0b30b17a41a398c74e.tar.gz
qmk_firmware-675c5a5e12f5c5efe59a0d0b30b17a41a398c74e.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/amj96')
-rw-r--r--keyboards/amj96/amj96.h19
-rw-r--r--keyboards/amj96/config.h88
-rw-r--r--keyboards/amj96/info.json126
-rw-r--r--keyboards/amj96/keymaps/default/config.h20
-rw-r--r--keyboards/amj96/keymaps/default/keymap.c34
-rw-r--r--keyboards/amj96/keymaps/default/readme.md1
-rw-r--r--keyboards/amj96/readme.md14
-rw-r--r--keyboards/amj96/rules.mk4
8 files changed, 188 insertions, 118 deletions
diff --git a/keyboards/amj96/amj96.h b/keyboards/amj96/amj96.h
index 81abd6bf9..c50f6d17f 100644
--- a/keyboards/amj96/amj96.h
+++ b/keyboards/amj96/amj96.h
@@ -18,20 +18,15 @@
18 18
19#include "quantum.h" 19#include "quantum.h"
20 20
21// readability
22#define XXX KC_NO 21#define XXX KC_NO
23 22
24// This a shortcut to help you visually see your layout. 23#define LAYOUT_all( \
25// The following is an example using the Planck MIT layout 24 K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K09, K0A, K0C, \
26// The first section contains all of the arguments 25 K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K0B, K0F, K6F, \
27// The second converts the arguments into a two-dimensional array 26 K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K0D, K6D, \
28#define LAYOUT( \ 27 K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K6E, \
29 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k09, k0A, k0C, \ 28 K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F, K0E, K07, \
30 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k0B, k0F, k6F, \ 29 K60, K61, K62, K63, K64, K65, K66, K68, K69, K6A, K6B, K6C \
31 k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k0D, k6D, \
32 k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k6E, \
33 k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k0E, k07, \
34 k60, k61, k62, k63, k64, k65, k66, k68, k69, k6A, k6B, k6C \
35) { \ 30) { \
36 { XXX, XXX, XXX, XXX, XXX, XXX, XXX, k07, XXX, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ 31 { XXX, XXX, XXX, XXX, XXX, XXX, XXX, k07, XXX, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \
37 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ 32 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \
diff --git a/keyboards/amj96/config.h b/keyboards/amj96/config.h
index 4a0eef0d9..5de56683a 100644
--- a/keyboards/amj96/config.h
+++ b/keyboards/amj96/config.h
@@ -39,20 +39,50 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
39 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) 39 * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
40 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) 40 * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
41 * 41 *
42*/ 42 */
43#define UNUSED_PINS 43#define UNUSED_PINS
44 44
45/* COL2ROW, ROW2COL*/ 45/* COL2ROW, ROW2COL*/
46#define DIODE_DIRECTION COL2ROW 46#define DIODE_DIRECTION COL2ROW
47 47
48//#define BACKLIGHT_PIN B7
49//#define BACKLIGHT_LEVELS 3
50//#define BACKLIGHT_BREATHING
51
52#define RGB_DI_PIN D3
53#ifdef RGB_DI_PIN
54# define RGBLED_NUM 16
55//# define RGBLIGHT_HUE_STEP 8
56//# define RGBLIGHT_SAT_STEP 8
57//# define RGBLIGHT_VAL_STEP 8
58//# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
59//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
60/*== all animations enable ==*/
61# define RGBLIGHT_ANIMATIONS
62/*== or choose animations ==*/
63//# define RGBLIGHT_EFFECT_BREATHING
64//# define RGBLIGHT_EFFECT_RAINBOW_MOOD
65//# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
66//# define RGBLIGHT_EFFECT_SNAKE
67//# define RGBLIGHT_EFFECT_KNIGHT
68//# define RGBLIGHT_EFFECT_CHRISTMAS
69//# define RGBLIGHT_EFFECT_STATIC_GRADIENT
70//# define RGBLIGHT_EFFECT_RGB_TEST
71//# define RGBLIGHT_EFFECT_ALTERNATING
72/*== customize breathing effect ==*/
73/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
74//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64
75/*==== use exp() and sin() ====*/
76//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7
77//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255
78#endif
79
48/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ 80/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
49#define DEBOUNCE 5 81#define DEBOUNCE 5
50 82
51/* define if matrix has ghost (lacks anti-ghosting diodes) */ 83/* define if matrix has ghost (lacks anti-ghosting diodes) */
52//#define MATRIX_HAS_GHOST 84//#define MATRIX_HAS_GHOST
53 85
54/* number of backlight levels */
55
56/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ 86/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
57#define LOCKING_SUPPORT_ENABLE 87#define LOCKING_SUPPORT_ENABLE
58/* Locking resynchronize hack */ 88/* Locking resynchronize hack */
@@ -85,54 +115,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
85//#define FORCE_NKRO 115//#define FORCE_NKRO
86 116
87/* 117/*
88 * Magic Key Options
89 *
90 * Magic keys are hotkey commands that allow control over firmware functions of
91 * the keyboard. They are best used in combination with the HID Listen program,
92 * found here: https://www.pjrc.com/teensy/hid_listen.html
93 *
94 * The options below allow the magic key functionality to be changed. This is
95 * useful if your keyboard/keypad is missing keys and you want magic key support.
96 *
97 */
98
99/* control how magic key switches layers */
100//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
101//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS true
102//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
103
104/* override magic key keymap */
105//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
106//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
107//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
108//#define MAGIC_KEY_HELP1 H
109//#define MAGIC_KEY_HELP2 SLASH
110//#define MAGIC_KEY_DEBUG D
111//#define MAGIC_KEY_DEBUG_MATRIX X
112//#define MAGIC_KEY_DEBUG_KBD K
113//#define MAGIC_KEY_DEBUG_MOUSE M
114//#define MAGIC_KEY_VERSION V
115//#define MAGIC_KEY_STATUS S
116//#define MAGIC_KEY_CONSOLE C
117//#define MAGIC_KEY_LAYER0_ALT1 ESC
118//#define MAGIC_KEY_LAYER0_ALT2 GRAVE
119//#define MAGIC_KEY_LAYER0 0
120//#define MAGIC_KEY_LAYER1 1
121//#define MAGIC_KEY_LAYER2 2
122//#define MAGIC_KEY_LAYER3 3
123//#define MAGIC_KEY_LAYER4 4
124//#define MAGIC_KEY_LAYER5 5
125//#define MAGIC_KEY_LAYER6 6
126//#define MAGIC_KEY_LAYER7 7
127//#define MAGIC_KEY_LAYER8 8
128//#define MAGIC_KEY_LAYER9 9
129//#define MAGIC_KEY_BOOTLOADER PAUSE
130//#define MAGIC_KEY_LOCK CAPS
131//#define MAGIC_KEY_EEPROM E
132//#define MAGIC_KEY_NKRO N
133//#define MAGIC_KEY_SLEEP_LED Z
134
135/*
136 * Feature disable options 118 * Feature disable options
137 * These options are also useful to firmware size reduction. 119 * These options are also useful to firmware size reduction.
138 */ 120 */
@@ -149,7 +131,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
149//#define NO_ACTION_ONESHOT 131//#define NO_ACTION_ONESHOT
150#define NO_ACTION_MACRO 132#define NO_ACTION_MACRO
151#define NO_ACTION_FUNCTION 133#define NO_ACTION_FUNCTION
152
153#define RGBLIGHT_ANIMATIONS
154#define RGBLED_NUM 16
155#define RGB_DI_PIN D3
diff --git a/keyboards/amj96/info.json b/keyboards/amj96/info.json
index 18328b123..b2aac215c 100644
--- a/keyboards/amj96/info.json
+++ b/keyboards/amj96/info.json
@@ -1,10 +1,122 @@
1{ 1{
2 "keyboard_name": "AMJ96", 2 "keyboard_name": "AMJ96",
3 "url": "", 3 "url": "",
4 "maintainer": "qmk", 4 "maintainer": "qmk",
5 "layouts": { 5 "layout_aliases": {
6 "LAYOUT": { 6 "LAYOUT": "LAYOUT_all"
7 "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"Print Screen", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"Ins", "x":15, "y":0}, {"label":"Del", "x":16, "y":0}, {"label":"Page Up", "x":17, "y":0}, {"label":"Page Down", "x":18, "y":0}, {"label":"` ~", "x":0, "y":1}, {"label":"1 !", "x":1, "y":1}, {"label":"2 @", "x":2, "y":1}, {"label":"3 #", "x":3, "y":1}, {"label":"4 $", "x":4, "y":1}, {"label":"5 %", "x":5, "y":1}, {"label":"6 ^", "x":6, "y":1}, {"label":"7 &", "x":7, "y":1}, {"label":"8 *", "x":8, "y":1}, {"label":"9 (", "x":9, "y":1}, {"label":"0 )", "x":10, "y":1}, {"label":"- _", "x":11, "y":1}, {"label":"= +", "x":12, "y":1}, {"label":"Back Space", "x":13, "y":1}, {"label":"Back Space 2", "x":14, "y":1}, {"label":"Num Lock", "x":15, "y":1}, {"label":"/", "x":16, "y":1}, {"label":"*", "x":17, "y":1}, {"label":"-", "x":18, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"[ {", "x":11.5, "y":2}, {"label":"] }", "x":12.5, "y":2}, {"label":"\\ |", "x":13.5, "y":2, "w":1.5}, {"label":"7", "x":15, "y":2}, {"label":"8", "x":16, "y":2}, {"label":"9", "x":17, "y":2}, {"label":"+", "x":18, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":"; :", "x":10.75, "y":3}, {"label":"' \"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"4", "x":15, "y":3}, {"label":"5", "x":16, "y":3}, {"label":"6", "x":17, "y":3}, {"label":"+", "x":18, "y":3}, {"label":"Shift", "x":0, "y":4, "w":1.25}, {"label":"ISO \\", "x":1.25, "y":4}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":", <", "x":9.25, "y":4}, {"label":". >", "x":10.25, "y":4}, {"label":"/ ?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"Up", "x":14, "y":4}, {"label":"1", "x":15, "y":4}, {"label":"2", "x":16, "y":4}, {"label":"3", "x":17, "y":4}, {"label":"Enter", "x":18, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"GUI", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"label":"Space", "x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5, "w":1.5}, {"label":"Fn", "x":11.5, "y":5, "w":1.5}, {"label":"Left", "x":13, "y":5}, {"label":"Down", "x":14, "y":5}, {"label":"Right", "x":15, "y":5}, {"label":"0", "x":16, "y":5}, {"label":".", "x":17, "y":5}, {"label":"Enter", "x":18, "y":5}] 7 },
8 "layouts": {
9 "LAYOUT_all": {
10 "layout": [
11 {"label":"Esc", "x":0, "y":0},
12 {"label":"F1", "x":1, "y":0},
13 {"label":"F2", "x":2, "y":0},
14 {"label":"F3", "x":3, "y":0},
15 {"label":"F4", "x":4, "y":0},
16 {"label":"F5", "x":5, "y":0},
17 {"label":"F6", "x":6, "y":0},
18 {"label":"F7", "x":7, "y":0},
19 {"label":"F8", "x":8, "y":0},
20 {"label":"F9", "x":9, "y":0},
21 {"label":"F10", "x":10, "y":0},
22 {"label":"F11", "x":11, "y":0},
23 {"label":"F12", "x":12, "y":0},
24 {"label":"Print Screen", "x":13, "y":0},
25 {"label":"Pause", "x":14, "y":0},
26 {"label":"Ins", "x":15, "y":0},
27 {"label":"Del", "x":16, "y":0},
28 {"label":"Page Up", "x":17, "y":0},
29 {"label":"Page Down", "x":18, "y":0},
30
31 {"label":"` ~", "x":0, "y":1},
32 {"label":"1 !", "x":1, "y":1},
33 {"label":"2 @", "x":2, "y":1},
34 {"label":"3 #", "x":3, "y":1},
35 {"label":"4 $", "x":4, "y":1},
36 {"label":"5 %", "x":5, "y":1},
37 {"label":"6 ^", "x":6, "y":1},
38 {"label":"7 &", "x":7, "y":1},
39 {"label":"8 *", "x":8, "y":1},
40 {"label":"9 (", "x":9, "y":1},
41 {"label":"0 )", "x":10, "y":1},
42 {"label":"- _", "x":11, "y":1},
43 {"label":"= +", "x":12, "y":1},
44 {"label":"Back Space", "x":13, "y":1},
45 {"label":"Back Space 2", "x":14, "y":1},
46 {"label":"Num Lock", "x":15, "y":1},
47 {"label":"/", "x":16, "y":1},
48 {"label":"*", "x":17, "y":1},
49 {"label":"-", "x":18, "y":1},
50
51 {"label":"Tab", "x":0, "y":2, "w":1.5},
52 {"label":"Q", "x":1.5, "y":2},
53 {"label":"W", "x":2.5, "y":2},
54 {"label":"E", "x":3.5, "y":2},
55 {"label":"R", "x":4.5, "y":2},
56 {"label":"T", "x":5.5, "y":2},
57 {"label":"Y", "x":6.5, "y":2},
58 {"label":"U", "x":7.5, "y":2},
59 {"label":"I", "x":8.5, "y":2},
60 {"label":"O", "x":9.5, "y":2},
61 {"label":"P", "x":10.5, "y":2},
62 {"label":"[ {", "x":11.5, "y":2},
63 {"label":"] }", "x":12.5, "y":2},
64 {"label":"\\ |", "x":13.5, "y":2, "w":1.5},
65 {"label":"7", "x":15, "y":2},
66 {"label":"8", "x":16, "y":2},
67 {"label":"9", "x":17, "y":2},
68 {"label":"+", "x":18, "y":2},
69
70 {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
71 {"label":"A", "x":1.75, "y":3},
72 {"label":"S", "x":2.75, "y":3},
73 {"label":"D", "x":3.75, "y":3},
74 {"label":"F", "x":4.75, "y":3},
75 {"label":"G", "x":5.75, "y":3},
76 {"label":"H", "x":6.75, "y":3},
77 {"label":"J", "x":7.75, "y":3},
78 {"label":"K", "x":8.75, "y":3},
79 {"label":"L", "x":9.75, "y":3},
80 {"label":"; :", "x":10.75, "y":3},
81 {"label":"' \"", "x":11.75, "y":3},
82 {"label":"Enter", "x":12.75, "y":3, "w":2.25},
83 {"label":"4", "x":15, "y":3},
84 {"label":"5", "x":16, "y":3},
85 {"label":"6", "x":17, "y":3},
86 {"label":"+", "x":18, "y":3},
87
88 {"label":"Shift", "x":0, "y":4, "w":1.25},
89 {"label":"ISO \\", "x":1.25, "y":4},
90 {"label":"Z", "x":2.25, "y":4},
91 {"label":"X", "x":3.25, "y":4},
92 {"label":"C", "x":4.25, "y":4},
93 {"label":"V", "x":5.25, "y":4},
94 {"label":"B", "x":6.25, "y":4},
95 {"label":"N", "x":7.25, "y":4},
96 {"label":"M", "x":8.25, "y":4},
97 {"label":", <", "x":9.25, "y":4},
98 {"label":". >", "x":10.25, "y":4},
99 {"label":"/ ?", "x":11.25, "y":4},
100 {"label":"Shift", "x":12.25, "y":4, "w":1.75},
101 {"label":"Up", "x":14, "y":4},
102 {"label":"1", "x":15, "y":4},
103 {"label":"2", "x":16, "y":4},
104 {"label":"3", "x":17, "y":4},
105 {"label":"Enter", "x":18, "y":4},
106
107 {"label":"Ctrl", "x":0, "y":5, "w":1.25},
108 {"label":"GUI", "x":1.25, "y":5, "w":1.25},
109 {"label":"Alt", "x":2.5, "y":5, "w":1.25},
110 {"label":"Space", "x":3.75, "y":5, "w":6.25},
111 {"label":"Alt", "x":10, "y":5, "w":1.5},
112 {"label":"Fn", "x":11.5, "y":5, "w":1.5},
113 {"label":"Left", "x":13, "y":5},
114 {"label":"Down", "x":14, "y":5},
115 {"label":"Right", "x":15, "y":5},
116 {"label":"0", "x":16, "y":5},
117 {"label":".", "x":17, "y":5},
118 {"label":"Enter", "x":18, "y":5}
119 ]
120 }
8 } 121 }
9 }
10} 122}
diff --git a/keyboards/amj96/keymaps/default/config.h b/keyboards/amj96/keymaps/default/config.h
deleted file mode 100644
index 0c01a8559..000000000
--- a/keyboards/amj96/keymaps/default/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
1/* Copyright 2017 MechMerlin
2
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19
20// place overrides here
diff --git a/keyboards/amj96/keymaps/default/keymap.c b/keyboards/amj96/keymaps/default/keymap.c
index f670b3c4f..baa4bef9d 100644
--- a/keyboards/amj96/keymaps/default/keymap.c
+++ b/keyboards/amj96/keymaps/default/keymap.c
@@ -1,4 +1,5 @@
1/* Copyright 2017 MechMerlin 1/* Copyright 2017 MechMerlin
2 * 2021 QMK/James Young (@noroadsleft)
2 * 3 *
3 * This program is free software: you can redistribute it and/or modify 4 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by 5 * it under the terms of the GNU General Public License as published by
@@ -17,21 +18,22 @@
17 18
18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
19 20
20 [0] = LAYOUT( 21 [0] = LAYOUT_all(
21 KC_ESC, 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_PSCR, KC_PAUS, KC_INS, KC_DEL, KC_PGUP, KC_PGDN, \ 22 KC_ESC, 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_PSCR, KC_PAUS, KC_INS, KC_DEL, KC_PGUP, KC_PGDN,
22 KC_GRV, 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_NLCK, KC_PSLS, KC_PAST, KC_PMNS, \ 23 KC_GRV, 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, XXXXXXX, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
23 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_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS, \ 24 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_BSLS, KC_P7, KC_P8, KC_P9, KC_PPLS,
24 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_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, \ 25 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_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS,
25 KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT, \ 26 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3, KC_PENT,
26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_FN0, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT \ 27 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT
27 ), 28 ),
29
30 [1] = LAYOUT_all(
31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
33 _______, _______, _______, _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
34 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
35 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
36 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
37 )
28 38
29 [1] = LAYOUT(
30 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
31 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, _______, _______, _______, \
32 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
33 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
34 _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
35 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
36 )
37}; 39};
diff --git a/keyboards/amj96/keymaps/default/readme.md b/keyboards/amj96/keymaps/default/readme.md
deleted file mode 100644
index 478ab9966..000000000
--- a/keyboards/amj96/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
1# The default keymap for amj96
diff --git a/keyboards/amj96/readme.md b/keyboards/amj96/readme.md
index f13130047..8cd4ea94a 100644
--- a/keyboards/amj96/readme.md
+++ b/keyboards/amj96/readme.md
@@ -2,15 +2,19 @@
2 2
3The AMD96 is a 96 key custom keyboard with anodized aluminum case, twin usb ports, and support for backlight LEDs and RGB underglow via SMD LEDs. 3The AMD96 is a 96 key custom keyboard with anodized aluminum case, twin usb ports, and support for backlight LEDs and RGB underglow via SMD LEDs.
4 4
5Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin) 5* Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)
6Hardware Supported: AMJ96 6* Hardware Supported: AMJ96
7Hardware Availability: Was previously available on a GB via [Flashquark](https://flashquark.com/product/amj96/) 7* Hardware Availability: [~~Flashquark~~](https://flashquark.com/product/amj96/) (no longer available)
8 8
9Make example for this keyboard (after setting up your build environment): 9Make example for this keyboard (after setting up your build environment):
10 10
11 make amj96:default 11 make amj96:default
12 12
13See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. 13Flashing example for this keyboard:
14
15 make amj96:default:flash
16
17See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
14 18
15## Notes 19## Notes
16- In-switch and underglow LEDs currently not supported. 20- In-switch and underglow LEDs currently not supported.
diff --git a/keyboards/amj96/rules.mk b/keyboards/amj96/rules.mk
index c19a156ff..f780706a0 100644
--- a/keyboards/amj96/rules.mk
+++ b/keyboards/amj96/rules.mk
@@ -17,8 +17,8 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work 17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
18NKRO_ENABLE = yes # USB Nkey Rollover 18NKRO_ENABLE = yes # USB Nkey Rollover
19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality 19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = yes 20RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
21UNICODE_ENABLE = no # Unicode
22AUDIO_ENABLE = no # Audio output 21AUDIO_ENABLE = no # Audio output
22
23CUSTOM_MATRIX = yes 23CUSTOM_MATRIX = yes
24SRC += matrix.c 24SRC += matrix.c
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-03 04:25:07 +0000