summaryrefslogtreecommitdiffstats
path: root/keyboards/adm42
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/adm42')
-rw-r--r--keyboards/adm42/adm42.c17
-rw-r--r--keyboards/adm42/adm42.h31
-rw-r--r--keyboards/adm42/config.h3
-rw-r--r--keyboards/adm42/info.json99
-rw-r--r--keyboards/adm42/rev4/config.h5
-rw-r--r--keyboards/adm42/rev4/rev4.c2
-rw-r--r--keyboards/adm42/rev4/rules.mk1
7 files changed, 58 insertions, 100 deletions
diff --git a/keyboards/adm42/adm42.c b/keyboards/adm42/adm42.c
deleted file mode 100644
index 0cae6c9ab5..0000000000
--- a/keyboards/adm42/adm42.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020-2022 Lorenzo Leonini
- * SPDX-License-Identifier: GPL-2.0-only
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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 "adm42.h"
diff --git a/keyboards/adm42/adm42.h b/keyboards/adm42/adm42.h
deleted file mode 100644
index 536fb51da5..0000000000
--- a/keyboards/adm42/adm42.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright 2020-2022 Lorenzo Leonini
- * SPDX-License-Identifier: GPL-2.0-only
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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 LAYOUT( \
- K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, \
- K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
- K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
- K404, K405, K406, K407, K408, K409 \
-) { \
- { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112 }, \
- { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212 }, \
- { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312 }, \
- { KC_NO, KC_NO, KC_NO, K404, K405, K407, K406, K408, K409, KC_NO, KC_NO, KC_NO } \
-}
diff --git a/keyboards/adm42/config.h b/keyboards/adm42/config.h
index 03749906e8..af23da4c66 100644
--- a/keyboards/adm42/config.h
+++ b/keyboards/adm42/config.h
@@ -16,9 +16,6 @@
#pragma once
-
-#define DIODE_DIRECTION ROW2COL
-
#define TAP_CODE_DELAY 1
#if defined(CONSOLE_ENABLE)
diff --git a/keyboards/adm42/info.json b/keyboards/adm42/info.json
index 3596cdb446..0ffebff135 100644
--- a/keyboards/adm42/info.json
+++ b/keyboards/adm42/info.json
@@ -9,6 +9,17 @@
"pid": "0xE873",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "B7"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "F0", "F1", "F4", "F5", "F6", "F7"],
+ "rows": ["C7", "D5", "D3", "D2"]
+ },
+ "diode_direction": "ROW2COL",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
@@ -17,51 +28,55 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"GUI/`~", "x":0, "y":0.8},
- {"label":"Q", "x":1, "y":0.8},
- {"label":"W", "x":2, "y":0},
- {"label":"E", "x":3, "y":0},
- {"label":"R", "x":4, "y":0.5},
- {"label":"T", "x":5, "y":0.5},
- {"label":"Y", "x":7.5, "y":0.5},
- {"label":"U", "x":8.5, "y":0.5},
- {"label":"I", "x":9.5, "y":0},
- {"label":"O", "x":10.5, "y":0},
- {"label":"P", "x":11.5, "y":0.8},
- {"label":"GUI/=+", "x":12.5, "y":0.8},
+ {"matrix": [0, 0], "x": 0, "y": 0.8},
+ {"matrix": [0, 1], "x": 1, "y": 0.8},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0.5},
+ {"matrix": [0, 5], "x": 5, "y": 0.5},
+
+ {"matrix": [0, 6], "x": 7.5, "y": 0.5},
+ {"matrix": [0, 7], "x": 8.5, "y": 0.5},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0.8},
+ {"matrix": [0, 11], "x": 12.5, "y": 0.8},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.8},
+ {"matrix": [1, 1], "x": 1, "y": 1.8},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+
+ {"matrix": [1, 6], "x": 7.5, "y": 1.5},
+ {"matrix": [1, 7], "x": 8.5, "y": 1.5},
+ {"matrix": [1, 8], "x": 9.5, "y": 1},
+ {"matrix": [1, 9], "x": 10.5, "y": 1},
+ {"matrix": [1, 10], "x": 11.5, "y": 1.8},
+ {"matrix": [1, 11], "x": 12.5, "y": 1.8},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.8},
+ {"matrix": [2, 1], "x": 1, "y": 2.8},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2.5},
+ {"matrix": [2, 5], "x": 5, "y": 2.5},
- {"label":"Ctrl/Tab", "x":0, "y":1.8},
- {"label":"A", "x":1, "y":1.8},
- {"label":"S", "x":2, "y":1},
- {"label":"D", "x":3, "y":1},
- {"label":"F", "x":4, "y":1.5},
- {"label":"G", "x":5, "y":1.5},
- {"label":"H", "x":7.5, "y":1.5},
- {"label":"J", "x":8.5, "y":1.5},
- {"label":"K", "x":9.5, "y":1},
- {"label":"L", "x":10.5, "y":1},
- {"label":";:", "x":11.5, "y":1.8},
- {"label":"Ctrl/'\"", "x":12.5, "y":1.8},
+ {"matrix": [2, 6], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 9.5, "y": 2},
+ {"matrix": [2, 9], "x": 10.5, "y": 2},
+ {"matrix": [2, 10], "x": 11.5, "y": 2.8},
+ {"matrix": [2, 11], "x": 12.5, "y": 2.8},
- {"label":"Alt", "x":0, "y":2.8},
- {"label":"Z", "x":1, "y":2.8},
- {"label":"X", "x":2, "y":2},
- {"label":"C", "x":3, "y":2},
- {"label":"V", "x":4, "y":2.5},
- {"label":"B", "x":5, "y":2.5},
- {"label":"N", "x":7.5, "y":2.5},
- {"label":"M", "x":8.5, "y":2.5},
- {"label":",<", "x":9.5, "y":2},
- {"label":".>", "x":10.5, "y":2},
- {"label":"/?", "x":11.5, "y":2.8},
- {"label":"Alt", "x":12.5, "y":2.8},
+ {"matrix": [3, 3], "x": 4.25, "y": 3.55},
+ {"matrix": [3, 4], "x": 5.25, "y": 3.65},
+ {"matrix": [3, 6], "x": 6.25, "y": 1.875, "h": 1.25},
- {"label":"Special/Esc", "x":4.25, "y":3.55},
- {"label":"Shift/Backspace", "x":5.25, "y":3.65},
- {"label":"Adm/Delete", "x":6.25, "y":1.875, "h":1.25},
- {"label":"Extra/Enter", "x":6.25, "y":4.05},
- {"label":"Shift/Space", "x":7.25, "y":3.65},
- {"label":"Special/Alt", "x":8.25, "y":3.55}
+ {"matrix": [3, 5], "x": 6.25, "y": 4.05},
+ {"matrix": [3, 7], "x": 7.25, "y": 3.65},
+ {"matrix": [3, 8], "x": 8.25, "y": 3.55}
]
}
}
diff --git a/keyboards/adm42/rev4/config.h b/keyboards/adm42/rev4/config.h
index fa2bcb3e43..fbf2e300ef 100644
--- a/keyboards/adm42/rev4/config.h
+++ b/keyboards/adm42/rev4/config.h
@@ -16,13 +16,8 @@
#pragma once
-#define MATRIX_COL_PINS { C6, B6, B5, B4, D7, D6, F0, F1, F4, F5, F6, F7 }
-#define MATRIX_ROW_PINS { C7, D5, D3, D2 }
-
#define ADM42_LED E6
-#define RGB_DI_PIN B7
-
#define RGB_MATRIX_LED_COUNT 42
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/adm42/rev4/rev4.c b/keyboards/adm42/rev4/rev4.c
index 2e22004f96..623b5cb5a3 100644
--- a/keyboards/adm42/rev4/rev4.c
+++ b/keyboards/adm42/rev4/rev4.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include QMK_KEYBOARD_H
+#include "quantum.h"
led_config_t g_led_config = {
{
diff --git a/keyboards/adm42/rev4/rules.mk b/keyboards/adm42/rev4/rules.mk
index 9be57067bb..aad92997d0 100644
--- a/keyboards/adm42/rev4/rules.mk
+++ b/keyboards/adm42/rev4/rules.mk
@@ -1,2 +1 @@
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-09 00:11:42 +0000