summaryrefslogtreecommitdiff
path: root/keyboards/keyboardio
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keyboardio')
-rw-r--r--keyboards/keyboardio/atreus/atreus.c17
-rw-r--r--keyboards/keyboardio/atreus/atreus.h32
-rw-r--r--keyboards/keyboardio/atreus/config.h17
-rw-r--r--keyboards/keyboardio/atreus/info.json100
-rw-r--r--keyboards/keyboardio/atreus/keymaps/kkokdae/config.h1
-rw-r--r--keyboards/keyboardio/model01/info.json3
-rw-r--r--keyboards/keyboardio/model01/rules.mk1
7 files changed, 59 insertions, 112 deletions
diff --git a/keyboards/keyboardio/atreus/atreus.c b/keyboards/keyboardio/atreus/atreus.c
deleted file mode 100644
index 0ad7156581..0000000000
--- a/keyboards/keyboardio/atreus/atreus.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright (C) 2019, 2020 Keyboard.io, Inc
- *
- * 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 "atreus.h"
diff --git a/keyboards/keyboardio/atreus/atreus.h b/keyboards/keyboardio/atreus/atreus.h
deleted file mode 100644
index b03276ff60..0000000000
--- a/keyboards/keyboardio/atreus/atreus.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright (C) 2019, 2020 Keyboard.io, Inc
- *
- * 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( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
- { k00, k01, k02, k03, k04, XXX, XXX, k05, k06, k07, k08, k09 }, \
- { k10, k11, k12, k13, k14, XXX, XXX, k15, k16, k17, k18, k19 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
diff --git a/keyboards/keyboardio/atreus/config.h b/keyboards/keyboardio/atreus/config.h
index 8380614fde..5766657a6a 100644
--- a/keyboards/keyboardio/atreus/config.h
+++ b/keyboards/keyboardio/atreus/config.h
@@ -22,23 +22,6 @@
#define LOCKING_RESYNC_ENABLE
/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-
-#define MATRIX_ROW_PINS { F6, F5, F4, F1 }
-#define MATRIX_COL_PINS { F7, E2, C7, C6, B6, B5, D7, D6, D4, D5, D3, D2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/
diff --git a/keyboards/keyboardio/atreus/info.json b/keyboards/keyboardio/atreus/info.json
index 1e31d8578a..b251151be4 100644
--- a/keyboards/keyboardio/atreus/info.json
+++ b/keyboards/keyboardio/atreus/info.json
@@ -8,55 +8,67 @@
"pid": "0x2303",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F7", "E2", "C7", "C6", "B6", "B5", "D7", "D6", "D4", "D5", "D3", "D2"],
+ "rows": ["F6", "F5", "F4", "F1"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Q", "x":0, "y":0.6},
- {"label":"W", "x":1, "y":0.35},
- {"label":"E", "x":2, "y":0},
- {"label":"R", "x":3, "y":0.35},
- {"label":"T", "x":4, "y":0.7},
- {"label":"Y", "x":8, "y":0.7},
- {"label":"U", "x":9, "y":0.35},
- {"label":"I", "x":10, "y":0},
- {"label":"O", "x":11, "y":0.35},
- {"label":"P", "x":12, "y":0.6},
- {"label":"A", "x":0, "y":1.6},
- {"label":"S", "x":1, "y":1.35},
- {"label":"D", "x":2, "y":1},
- {"label":"F", "x":3, "y":1.35},
- {"label":"G", "x":4, "y":1.7},
- {"label":"H", "x":8, "y":1.7},
- {"label":"J", "x":9, "y":1.35},
- {"label":"K", "x":10, "y":1},
- {"label":"L", "x":11, "y":1.35},
- {"label":";", "x":12, "y":1.6},
- {"label":"Z", "x":0, "y":2.6},
- {"label":"X", "x":1, "y":2.35},
- {"label":"C", "x":2, "y":2},
- {"label":"V", "x":3, "y":2.35},
- {"label":"B", "x":4, "y":2.7},
- {"label":"`", "x":5, "y":2.54},
- {"label":"\\", "x":7, "y":2.54},
- {"label":"N", "x":8, "y":2.7},
- {"label":"M", "x":9, "y":2.35},
- {"label":",", "x":10, "y":2},
- {"label":".", "x":11, "y":2.35},
- {"label":"/", "x":12, "y":2.6},
- {"label":"Esc", "x":0, "y":3.6},
- {"label":"Tab", "x":1, "y":3.35},
- {"label":"Super", "x":2, "y":3},
- {"label":"Shift", "x":3, "y":3.35},
- {"label":"Bksp", "x":4, "y":3.7},
- {"label":"Ctrl", "x":5, "y":3.54},
- {"label":"Alt", "x":7, "y":3.54},
- {"label":"Space", "x":8, "y":3.7},
- {"label":"Fun", "x":9, "y":3.35},
- {"label":"-", "x":10, "y":3},
- {"label":"'", "x":11, "y":3.35},
- {"label":"Enter", "x":12,"y":3.6}
+ {"matrix": [0, 0], "x": 0, "y": 0.6},
+ {"matrix": [0, 1], "x": 1, "y": 0.35},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.35},
+ {"matrix": [0, 4], "x": 4, "y": 0.7},
+
+ {"matrix": [0, 7], "x": 8, "y": 0.7},
+ {"matrix": [0, 8], "x": 9, "y": 0.35},
+ {"matrix": [0, 9], "x": 10, "y": 0},
+ {"matrix": [0, 10], "x": 11, "y": 0.35},
+ {"matrix": [0, 11], "x": 12, "y": 0.6},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.6},
+ {"matrix": [1, 1], "x": 1, "y": 1.35},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.35},
+ {"matrix": [1, 4], "x": 4, "y": 1.7},
+
+ {"matrix": [1, 7], "x": 8, "y": 1.7},
+ {"matrix": [1, 8], "x": 9, "y": 1.35},
+ {"matrix": [1, 9], "x": 10, "y": 1},
+ {"matrix": [1, 10], "x": 11, "y": 1.35},
+ {"matrix": [1, 11], "x": 12, "y": 1.6},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.6},
+ {"matrix": [2, 1], "x": 1, "y": 2.35},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.35},
+ {"matrix": [2, 4], "x": 4, "y": 2.7},
+ {"matrix": [2, 5], "x": 5, "y": 2.54},
+
+ {"matrix": [2, 6], "x": 7, "y": 2.54},
+ {"matrix": [2, 7], "x": 8, "y": 2.7},
+ {"matrix": [2, 8], "x": 9, "y": 2.35},
+ {"matrix": [2, 9], "x": 10, "y": 2},
+ {"matrix": [2, 10], "x": 11, "y": 2.35},
+ {"matrix": [2, 11], "x": 12, "y": 2.6},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.6},
+ {"matrix": [3, 1], "x": 1, "y": 3.35},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3.35},
+ {"matrix": [3, 4], "x": 4, "y": 3.7},
+ {"matrix": [3, 5], "x": 5, "y": 3.54},
+
+ {"matrix": [3, 6], "x": 7, "y": 3.54},
+ {"matrix": [3, 7], "x": 8, "y": 3.7},
+ {"matrix": [3, 8], "x": 9, "y": 3.35},
+ {"matrix": [3, 9], "x": 10, "y": 3},
+ {"matrix": [3, 10], "x": 11, "y": 3.35},
+ {"matrix": [3, 11], "x": 12, "y": 3.6}
]
}
}
diff --git a/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h b/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h
index f66f840bfd..c34fa270b4 100644
--- a/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h
+++ b/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h
@@ -16,7 +16,6 @@
#pragma once
//#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 200
#define ONESHOT_TAP_TOGGLE 5
#define ONESHOT_TIMEOUT 5000
diff --git a/keyboards/keyboardio/model01/info.json b/keyboards/keyboardio/model01/info.json
index c00c016173..bc24c214f7 100644
--- a/keyboards/keyboardio/model01/info.json
+++ b/keyboards/keyboardio/model01/info.json
@@ -8,6 +8,9 @@
"pid": "0x2301",
"device_version": "0.0.1"
},
+ "rgb_matrix": {
+ "driver": "custom"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"debounce": 0,
diff --git a/keyboards/keyboardio/model01/rules.mk b/keyboards/keyboardio/model01/rules.mk
index 7edcc5ff77..e653ec5f73 100644
--- a/keyboards/keyboardio/model01/rules.mk
+++ b/keyboards/keyboardio/model01/rules.mk
@@ -15,4 +15,3 @@ SRC += leds.c \
# You can set RGB_MATRIX_ENABLE = no in your rules.mk to disable this and save the Flash
RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects.
-RGB_MATRIX_DRIVER = custom
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 16:49:18 +0000