summaryrefslogtreecommitdiffstats
path: root/keyboards/amjkeyboard/amj96
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/amjkeyboard/amj96')
-rw-r--r--keyboards/amjkeyboard/amj96/amj96.c16
-rw-r--r--keyboards/amjkeyboard/amj96/amj96.h38
-rw-r--r--keyboards/amjkeyboard/amj96/config.h3
-rw-r--r--keyboards/amjkeyboard/amj96/info.json209
4 files changed, 106 insertions, 160 deletions
diff --git a/keyboards/amjkeyboard/amj96/amj96.c b/keyboards/amjkeyboard/amj96/amj96.c
deleted file mode 100644
index 65fca6f12a..0000000000
--- a/keyboards/amjkeyboard/amj96/amj96.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2017 MechMerlin
-
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "amj96.h"
diff --git a/keyboards/amjkeyboard/amj96/amj96.h b/keyboards/amjkeyboard/amj96/amj96.h
deleted file mode 100644
index bd4e688360..0000000000
--- a/keyboards/amjkeyboard/amj96/amj96.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2017 MechMerlin
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K09, K0A, K0C, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K0B, K0F, K6F, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K0D, K6D, \
- K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K6E, \
- K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F, K0E, K07, \
- K60, K61, K62, K63, K64, K65, K66, K68, K69, K6A, K6B, K6C \
-) { \
- { XXX, XXX, XXX, XXX, XXX, XXX, XXX, K07, XXX, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \
- { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \
- { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \
- { K60, K61, K62, K63, K64, K65, K66, XXX, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F } \
-}
diff --git a/keyboards/amjkeyboard/amj96/config.h b/keyboards/amjkeyboard/amj96/config.h
index 8511574b04..86a73b0eaf 100644
--- a/keyboards/amjkeyboard/amj96/config.h
+++ b/keyboards/amjkeyboard/amj96/config.h
@@ -36,8 +36,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
//# define RGBLIGHT_HUE_STEP 8
//# define RGBLIGHT_SAT_STEP 8
@@ -54,7 +52,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/amjkeyboard/amj96/info.json b/keyboards/amjkeyboard/amj96/info.json
index eacc490221..23bfedd721 100644
--- a/keyboards/amjkeyboard/amj96/info.json
+++ b/keyboards/amjkeyboard/amj96/info.json
@@ -8,6 +8,9 @@
"pid": "0x6074",
"device_version": "0.0.2"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
@@ -16,114 +19,114 @@
"layouts": {
"LAYOUT_all": {
"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},
+ {"matrix": [1, 0], "x": 0, "y": 0},
+ {"matrix": [1, 1], "x": 1, "y": 0},
+ {"matrix": [1, 2], "x": 2, "y": 0},
+ {"matrix": [1, 3], "x": 3, "y": 0},
+ {"matrix": [1, 4], "x": 4, "y": 0},
+ {"matrix": [1, 5], "x": 5, "y": 0},
+ {"matrix": [1, 6], "x": 6, "y": 0},
+ {"matrix": [1, 7], "x": 7, "y": 0},
+ {"matrix": [1, 8], "x": 8, "y": 0},
+ {"matrix": [1, 9], "x": 9, "y": 0},
+ {"matrix": [1, 10], "x": 10, "y": 0},
+ {"matrix": [1, 11], "x": 11, "y": 0},
+ {"matrix": [1, 12], "x": 12, "y": 0},
+ {"matrix": [1, 13], "x": 13, "y": 0},
+ {"matrix": [1, 14], "x": 14, "y": 0},
+ {"matrix": [1, 15], "x": 15, "y": 0},
+ {"matrix": [0, 9], "x": 16, "y": 0},
+ {"matrix": [0, 10], "x": 17, "y": 0},
+ {"matrix": [0, 12], "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},
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [2, 1], "x": 1, "y": 1},
+ {"matrix": [2, 2], "x": 2, "y": 1},
+ {"matrix": [2, 3], "x": 3, "y": 1},
+ {"matrix": [2, 4], "x": 4, "y": 1},
+ {"matrix": [2, 5], "x": 5, "y": 1},
+ {"matrix": [2, 6], "x": 6, "y": 1},
+ {"matrix": [2, 7], "x": 7, "y": 1},
+ {"matrix": [2, 8], "x": 8, "y": 1},
+ {"matrix": [2, 9], "x": 9, "y": 1},
+ {"matrix": [2, 10], "x": 10, "y": 1},
+ {"matrix": [2, 11], "x": 11, "y": 1},
+ {"matrix": [2, 12], "x": 12, "y": 1},
+ {"matrix": [2, 13], "x": 13, "y": 1},
+ {"matrix": [2, 14], "x": 14, "y": 1},
+ {"matrix": [2, 15], "x": 15, "y": 1},
+ {"matrix": [0, 11], "x": 16, "y": 1},
+ {"matrix": [0, 15], "x": 17, "y": 1},
+ {"matrix": [6, 15], "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},
+ {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 2},
+ {"matrix": [3, 2], "x": 2.5, "y": 2},
+ {"matrix": [3, 3], "x": 3.5, "y": 2},
+ {"matrix": [3, 4], "x": 4.5, "y": 2},
+ {"matrix": [3, 5], "x": 5.5, "y": 2},
+ {"matrix": [3, 6], "x": 6.5, "y": 2},
+ {"matrix": [3, 7], "x": 7.5, "y": 2},
+ {"matrix": [3, 8], "x": 8.5, "y": 2},
+ {"matrix": [3, 9], "x": 9.5, "y": 2},
+ {"matrix": [3, 10], "x": 10.5, "y": 2},
+ {"matrix": [3, 11], "x": 11.5, "y": 2},
+ {"matrix": [3, 12], "x": 12.5, "y": 2},
+ {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [3, 14], "x": 15, "y": 2},
+ {"matrix": [3, 15], "x": 16, "y": 2},
+ {"matrix": [0, 13], "x": 17, "y": 2},
+ {"matrix": [6, 13], "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},
+ {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [4, 1], "x": 1.75, "y": 3},
+ {"matrix": [4, 2], "x": 2.75, "y": 3},
+ {"matrix": [4, 3], "x": 3.75, "y": 3},
+ {"matrix": [4, 4], "x": 4.75, "y": 3},
+ {"matrix": [4, 5], "x": 5.75, "y": 3},
+ {"matrix": [4, 6], "x": 6.75, "y": 3},
+ {"matrix": [4, 7], "x": 7.75, "y": 3},
+ {"matrix": [4, 8], "x": 8.75, "y": 3},
+ {"matrix": [4, 9], "x": 9.75, "y": 3},
+ {"matrix": [4, 10], "x": 10.75, "y": 3},
+ {"matrix": [4, 11], "x": 11.75, "y": 3},
+ {"matrix": [4, 12], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [4, 13], "x": 15, "y": 3},
+ {"matrix": [4, 14], "x": 16, "y": 3},
+ {"matrix": [4, 15], "x": 17, "y": 3},
+ {"matrix": [6, 14], "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},
+ {"matrix": [5, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 4},
+ {"matrix": [5, 2], "x": 2.25, "y": 4},
+ {"matrix": [5, 3], "x": 3.25, "y": 4},
+ {"matrix": [5, 4], "x": 4.25, "y": 4},
+ {"matrix": [5, 5], "x": 5.25, "y": 4},
+ {"matrix": [5, 6], "x": 6.25, "y": 4},
+ {"matrix": [5, 7], "x": 7.25, "y": 4},
+ {"matrix": [5, 8], "x": 8.25, "y": 4},
+ {"matrix": [5, 9], "x": 9.25, "y": 4},
+ {"matrix": [5, 10], "x": 10.25, "y": 4},
+ {"matrix": [5, 11], "x": 11.25, "y": 4},
+ {"matrix": [5, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [5, 13], "x": 14, "y": 4},
+ {"matrix": [5, 14], "x": 15, "y": 4},
+ {"matrix": [5, 15], "x": 16, "y": 4},
+ {"matrix": [0, 14], "x": 17, "y": 4},
+ {"matrix": [0, 7], "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}
+ {"matrix": [6, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [6, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [6, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [6, 3], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [6, 4], "x": 10, "y": 5, "w": 1.5},
+ {"matrix": [6, 5], "x": 11.5, "y": 5, "w": 1.5},
+ {"matrix": [6, 6], "x": 13, "y": 5},
+ {"matrix": [6, 8], "x": 14, "y": 5},
+ {"matrix": [6, 9], "x": 15, "y": 5},
+ {"matrix": [6, 10], "x": 16, "y": 5},
+ {"matrix": [6, 11], "x": 17, "y": 5},
+ {"matrix": [6, 12], "x": 18, "y": 5}
]
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-06 22:20:01 +0000