summaryrefslogtreecommitdiff
path: root/keyboards/delikeeb/vanana
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/delikeeb/vanana')
-rw-r--r--keyboards/delikeeb/vanana/info.json7
-rw-r--r--keyboards/delikeeb/vanana/rev1/config.h19
-rw-r--r--keyboards/delikeeb/vanana/rev1/info.json85
-rw-r--r--keyboards/delikeeb/vanana/rev1/rev1.c17
-rw-r--r--keyboards/delikeeb/vanana/rev1/rev1.h40
-rw-r--r--keyboards/delikeeb/vanana/rev2/config.h19
-rw-r--r--keyboards/delikeeb/vanana/rev2/info.json85
-rw-r--r--keyboards/delikeeb/vanana/rev2/rev2.c17
-rw-r--r--keyboards/delikeeb/vanana/rev2/rev2.h41
9 files changed, 171 insertions, 159 deletions
diff --git a/keyboards/delikeeb/vanana/info.json b/keyboards/delikeeb/vanana/info.json
index 3f65027746..520cd92b09 100644
--- a/keyboards/delikeeb/vanana/info.json
+++ b/keyboards/delikeeb/vanana/info.json
@@ -7,10 +7,5 @@
"pid": "0x0013"
},
"processor": "atmega32u4",
- "bootloader": "atmel-dfu",
- "layouts": {
- "LAYOUT": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":1.5}, {"x":8.25, "y":4, "w":1.5}, {"x":9.75, "y":4, "w":1.25}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}]
- }
- }
+ "bootloader": "atmel-dfu"
}
diff --git a/keyboards/delikeeb/vanana/rev1/config.h b/keyboards/delikeeb/vanana/rev1/config.h
index d8a6d95c9b..7da3d5e24c 100644
--- a/keyboards/delikeeb/vanana/rev1/config.h
+++ b/keyboards/delikeeb/vanana/rev1/config.h
@@ -17,26 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/*
- * 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 { D2, D7, B4, B5, B6 }
-#define MATRIX_COL_PINS { B2, B3, B1, F7, F5, F6, D3, D1, D0, D4, C6, E6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define B7_AUDIO
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -52,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
//# define RGBLIGHT_EFFECT_RGB_TEST
//# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/delikeeb/vanana/rev1/info.json b/keyboards/delikeeb/vanana/rev1/info.json
index 4434ba95d7..4a7d4c7718 100644
--- a/keyboards/delikeeb/vanana/rev1/info.json
+++ b/keyboards/delikeeb/vanana/rev1/info.json
@@ -3,10 +3,95 @@
"usb": {
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "F0"
+ },
+ "matrix_pins": {
+ "cols": ["B2", "B3", "B1", "F7", "F5", "F6", "D3", "D1", "D0", "D4", "C6", "E6"],
+ "rows": ["D2", "D7", "B4", "B5", "B6"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "C7", "pin_b": "D5"},
{"pin_a": "F1", "pin_b": "F0"}
]
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [0, 6], "x": 9, "y": 0},
+ {"matrix": [0, 7], "x": 10, "y": 0},
+ {"matrix": [0, 8], "x": 11, "y": 0},
+ {"matrix": [0, 9], "x": 12, "y": 0},
+ {"matrix": [0, 10], "x": 13, "y": 0},
+ {"matrix": [0, 11], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [1, 6], "x": 9, "y": 1},
+ {"matrix": [1, 7], "x": 10, "y": 1},
+ {"matrix": [1, 8], "x": 11, "y": 1},
+ {"matrix": [1, 9], "x": 12, "y": 1},
+ {"matrix": [1, 10], "x": 13, "y": 1},
+ {"matrix": [1, 11], "x": 14, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [4, 0], "x": 7, "y": 2},
+
+ {"matrix": [2, 6], "x": 9, "y": 2},
+ {"matrix": [2, 7], "x": 10, "y": 2},
+ {"matrix": [2, 8], "x": 11, "y": 2},
+ {"matrix": [2, 9], "x": 12, "y": 2},
+ {"matrix": [2, 10], "x": 13, "y": 2},
+ {"matrix": [2, 11], "x": 14, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+
+ {"matrix": [4, 11], "x": 7, "y": 3},
+
+ {"matrix": [3, 6], "x": 9, "y": 3},
+ {"matrix": [3, 7], "x": 10, "y": 3},
+ {"matrix": [3, 8], "x": 11, "y": 3},
+ {"matrix": [3, 9], "x": 12, "y": 3},
+ {"matrix": [3, 10], "x": 13, "y": 3},
+ {"matrix": [3, 11], "x": 14, "y": 3},
+
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [4, 3], "x": 3, "y": 4},
+ {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 6], "x": 8.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 9.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 11, "y": 4},
+ {"matrix": [4, 9], "x": 12, "y": 4},
+ {"matrix": [4, 10], "x": 13, "y": 4}
+ ]
+ }
}
}
diff --git a/keyboards/delikeeb/vanana/rev1/rev1.c b/keyboards/delikeeb/vanana/rev1/rev1.c
deleted file mode 100644
index 73b5039eb8..0000000000
--- a/keyboards/delikeeb/vanana/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 noclew
- *
- * 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 "rev1.h"
diff --git a/keyboards/delikeeb/vanana/rev1/rev1.h b/keyboards/delikeeb/vanana/rev1/rev1.h
deleted file mode 100644
index 3b125b3ca8..0000000000
--- a/keyboards/delikeeb/vanana/rev1/rev1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2020 noclew
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- 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, k30, k49, k31, k32, k33, k34, k35, k36, \
- k37, k38, k39, k40, k41, k42, k60, k43, k44, k45, k46, k47, k48, \
- k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 \
-) { \
- { 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, k30, k31, k32, k33, k34, k35, k36 }, \
- { k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
- { k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60 } \
-}
diff --git a/keyboards/delikeeb/vanana/rev2/config.h b/keyboards/delikeeb/vanana/rev2/config.h
index e28d974b78..7da3d5e24c 100644
--- a/keyboards/delikeeb/vanana/rev2/config.h
+++ b/keyboards/delikeeb/vanana/rev2/config.h
@@ -17,26 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/*
- * 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 { D1, C6, E6, B4, B5, F5}
-#define MATRIX_COL_PINS { B3, B1, F7, F6, F4, D2, D3, D0, D4, D7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define B7_AUDIO
-#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -52,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
//# define RGBLIGHT_EFFECT_RGB_TEST
//# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/delikeeb/vanana/rev2/info.json b/keyboards/delikeeb/vanana/rev2/info.json
index 589c8c5089..e8ff47d855 100644
--- a/keyboards/delikeeb/vanana/rev2/info.json
+++ b/keyboards/delikeeb/vanana/rev2/info.json
@@ -3,10 +3,95 @@
"usb": {
"device_version": "0.0.2"
},
+ "ws2812": {
+ "pin": "C7"
+ },
+ "matrix_pins": {
+ "cols": ["B3", "B1", "F7", "F6", "F4", "D2", "D3", "D0", "D4", "D7"],
+ "rows": ["D1", "C6", "E6", "B4", "B5", "F5"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B6", "pin_b": "B2"},
{"pin_a": "F0", "pin_b": "F1"}
]
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [5, 4], "x": 5, "y": 0},
+
+ {"matrix": [5, 9], "x": 9, "y": 0},
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [0, 6], "x": 11, "y": 0},
+ {"matrix": [0, 7], "x": 12, "y": 0},
+ {"matrix": [0, 8], "x": 13, "y": 0},
+ {"matrix": [0, 9], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [5, 3], "x": 5, "y": 1},
+
+ {"matrix": [5, 8], "x": 9, "y": 1},
+ {"matrix": [1, 5], "x": 10, "y": 1},
+ {"matrix": [1, 6], "x": 11, "y": 1},
+ {"matrix": [1, 7], "x": 12, "y": 1},
+ {"matrix": [1, 8], "x": 13, "y": 1},
+ {"matrix": [1, 9], "x": 14, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [5, 2], "x": 5, "y": 2},
+
+ {"matrix": [5, 5], "x": 7, "y": 2},
+
+ {"matrix": [5, 7], "x": 9, "y": 2},
+ {"matrix": [2, 5], "x": 10, "y": 2},
+ {"matrix": [2, 6], "x": 11, "y": 2},
+ {"matrix": [2, 7], "x": 12, "y": 2},
+ {"matrix": [2, 8], "x": 13, "y": 2},
+ {"matrix": [2, 9], "x": 14, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [5, 1], "x": 5, "y": 3},
+
+ {"matrix": [5, 0], "x": 7, "y": 3},
+
+ {"matrix": [5, 6], "x": 9, "y": 3},
+ {"matrix": [3, 5], "x": 10, "y": 3},
+ {"matrix": [3, 6], "x": 11, "y": 3},
+ {"matrix": [3, 7], "x": 12, "y": 3},
+ {"matrix": [3, 8], "x": 13, "y": 3},
+ {"matrix": [3, 9], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 1, "y": 4},
+ {"matrix": [4, 1], "x": 2, "y": 4},
+ {"matrix": [4, 2], "x": 3, "y": 4},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 5], "x": 8.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 9.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 7], "x": 11, "y": 4},
+ {"matrix": [4, 8], "x": 12, "y": 4},
+ {"matrix": [4, 9], "x": 13, "y": 4}
+ ]
+ }
}
}
diff --git a/keyboards/delikeeb/vanana/rev2/rev2.c b/keyboards/delikeeb/vanana/rev2/rev2.c
deleted file mode 100644
index 8f2a259921..0000000000
--- a/keyboards/delikeeb/vanana/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 noclew
- *
- * 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 "rev2.h"
diff --git a/keyboards/delikeeb/vanana/rev2/rev2.h b/keyboards/delikeeb/vanana/rev2/rev2.h
deleted file mode 100644
index 7f8d16b57f..0000000000
--- a/keyboards/delikeeb/vanana/rev2/rev2.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2020 noclew
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- k01, k02, k03, k04, k05, k55, k60, k06, k07, k08, k09, k10, \
- k11, k12, k13, k14, k15, k54, k59, k16, k17, k18, k19, k20, \
- k21, k22, k23, k24, k25, k53, k56, k58, k26, k27, k28, k29, k30, \
- k31, k32, k33, k34, k35, k52, k51, k57, k36, k37, k38, k39, k40, \
- k41, k42, k43, k44, k45, k46, k47, k48, k49, k50 \
-) { \
- { 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, k30 }, \
- { k31, k32, k33, k34, k35, k36, k37, k38, k39, k40 }, \
- { k41, k42, k43, k44, k45, k46, k47, k48, k49, k50 }, \
- { k51, k52, k53, k54, k55, k56, k57, k58, k59, k60 } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 00:03:59 +0000