summaryrefslogtreecommitdiff
path: root/keyboards/rainkeebs
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/rainkeebs')
-rw-r--r--keyboards/rainkeebs/delilah/config.h12
-rw-r--r--keyboards/rainkeebs/delilah/info.json14
-rw-r--r--keyboards/rainkeebs/rainkeeb/config.h8
-rw-r--r--keyboards/rainkeebs/rainkeeb/info.json95
-rw-r--r--keyboards/rainkeebs/rainkeeb/rainkeeb.c16
-rw-r--r--keyboards/rainkeebs/rainkeeb/rainkeeb.h34
-rw-r--r--keyboards/rainkeebs/yasui/config.h15
-rw-r--r--keyboards/rainkeebs/yasui/info.json54
-rw-r--r--keyboards/rainkeebs/yasui/yasui.c16
-rw-r--r--keyboards/rainkeebs/yasui/yasui.h30
10 files changed, 118 insertions, 176 deletions
diff --git a/keyboards/rainkeebs/delilah/config.h b/keyboards/rainkeebs/delilah/config.h
index 5dc90ee6e3..3f9d574f77 100644
--- a/keyboards/rainkeebs/delilah/config.h
+++ b/keyboards/rainkeebs/delilah/config.h
@@ -15,23 +15,12 @@
*/
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B5, B6, C6, C7 }
-#define MATRIX_COL_PINS { F7, F6, F5, F4, F0, E6, D5, D3, D4, D6, D7, B4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-
-#define RGB_DI_PIN B3
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -46,4 +35,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/rainkeebs/delilah/info.json b/keyboards/rainkeebs/delilah/info.json
index f9e876b548..fe8d6f9286 100644
--- a/keyboards/rainkeebs/delilah/info.json
+++ b/keyboards/rainkeebs/delilah/info.json
@@ -8,6 +8,14 @@
"pid": "0x645C",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "B3"
+ },
+ "matrix_pins": {
+ "cols": ["F7", "F6", "F5", "F4", "F0", "E6", "D5", "D3", "D4", "D6", "D7", "B4"],
+ "rows": ["B5", "B6", "C6", "C7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
@@ -56,9 +64,9 @@
{"x":2.25, "y":3, "matrix": [3, 2]},
{"x":3.25, "y":3, "w":2.25, "matrix": [3, 3]},
{"x":5.5, "y":3, "w":2.75, "matrix": [3, 6]},
- {"x":9.0, "y":3, "matrix": [3, 8]},
- {"x":10.0, "y":3, "matrix": [3, 9]},
- {"x":11.0, "y":3, "w":1.25, "matrix": [3, 11]}
+ {"x":9, "y":3, "matrix": [3, 8]},
+ {"x":10, "y":3, "matrix": [3, 9]},
+ {"x":11, "y":3, "w":1.25, "matrix": [3, 11]}
]
}
}
diff --git a/keyboards/rainkeebs/rainkeeb/config.h b/keyboards/rainkeebs/rainkeeb/config.h
index d26c7024d9..f01175abd8 100644
--- a/keyboards/rainkeebs/rainkeeb/config.h
+++ b/keyboards/rainkeebs/rainkeeb/config.h
@@ -15,14 +15,6 @@
*/
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D3, D2, D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/rainkeebs/rainkeeb/info.json b/keyboards/rainkeebs/rainkeeb/info.json
index bddacf6ddb..2b05e06f4c 100644
--- a/keyboards/rainkeebs/rainkeeb/info.json
+++ b/keyboards/rainkeebs/rainkeeb/info.json
@@ -8,6 +8,11 @@
"pid": "0x726B",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3"],
+ "rows": ["D3", "D2", "D4", "C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B2", "pin_b": "B6"}
@@ -18,47 +23,55 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"k00", "x":0, "y":0},
- {"label":"k01", "x":1, "y":0},
- {"label":"k02", "x":2, "y":0},
- {"label":"k03", "x":3, "y":0},
- {"label":"k04", "x":4, "y":0},
- {"label":"k05", "x":7, "y":0},
- {"label":"k06", "x":8, "y":0},
- {"label":"k07", "x":9, "y":0},
- {"label":"k08", "x":10, "y":0},
- {"label":"k09", "x":11, "y":0},
- {"label":"k10", "x":0, "y":1},
- {"label":"k11", "x":1, "y":1},
- {"label":"k12", "x":2, "y":1},
- {"label":"k13", "x":3, "y":1},
- {"label":"k14", "x":4, "y":1},
- {"label":"k15", "x":5.5, "y":1},
- {"label":"k16", "x":7, "y":1},
- {"label":"k17", "x":8, "y":1},
- {"label":"k18", "x":9, "y":1},
- {"label":"k19", "x":10, "y":1},
- {"label":"k1a", "x":11, "y":1},
- {"label":"k20", "x":0, "y":2},
- {"label":"k21", "x":1, "y":2},
- {"label":"k22", "x":2, "y":2},
- {"label":"k23", "x":3, "y":2},
- {"label":"k24", "x":4, "y":2},
- {"label":"k25", "x":5.5, "y":2},
- {"label":"k26", "x":7, "y":2},
- {"label":"k27", "x":8, "y":2},
- {"label":"k28", "x":9, "y":2},
- {"label":"k29", "x":10, "y":2},
- {"label":"k2a", "x":11, "y":2},
- {"label":"k30", "x":0, "y":3},
- {"label":"k31", "x":1, "y":3},
- {"label":"k32", "x":2, "y":3},
- {"label":"k33", "x":3, "y":3, "w":2},
- {"label":"k34", "x":5, "y":3, "w":2},
- {"label":"k35", "x":7, "y":3, "w":2},
- {"label":"k36", "x":9, "y":3},
- {"label":"k37", "x":10, "y":3},
- {"label":"k38", "x":11, "y":3}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+
+ {"matrix": [1, 3], "x": 7, "y": 0},
+ {"matrix": [0, 3], "x": 8, "y": 0},
+ {"matrix": [1, 4], "x": 9, "y": 0},
+ {"matrix": [0, 4], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1},
+ {"matrix": [3, 0], "x": 1, "y": 1},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1},
+ {"matrix": [2, 2], "x": 4, "y": 1},
+
+ {"matrix": [3, 2], "x": 5.5, "y": 1},
+
+ {"matrix": [2, 3], "x": 7, "y": 1},
+ {"matrix": [3, 3], "x": 8, "y": 1},
+ {"matrix": [2, 4], "x": 9, "y": 1},
+ {"matrix": [3, 4], "x": 10, "y": 1},
+ {"matrix": [2, 5], "x": 11, "y": 1},
+
+ {"matrix": [4, 0], "x": 0, "y": 2},
+ {"matrix": [5, 0], "x": 1, "y": 2},
+ {"matrix": [4, 1], "x": 2, "y": 2},
+ {"matrix": [5, 1], "x": 3, "y": 2},
+ {"matrix": [4, 2], "x": 4, "y": 2},
+
+ {"matrix": [5, 2], "x": 5.5, "y": 2},
+
+ {"matrix": [4, 3], "x": 7, "y": 2},
+ {"matrix": [5, 3], "x": 8, "y": 2},
+ {"matrix": [4, 4], "x": 9, "y": 2},
+ {"matrix": [5, 4], "x": 10, "y": 2},
+ {"matrix": [4, 5], "x": 11, "y": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3},
+ {"matrix": [7, 0], "x": 1, "y": 3},
+ {"matrix": [6, 1], "x": 2, "y": 3},
+ {"matrix": [7, 2], "x": 3, "y": 3, "w": 2},
+ {"matrix": [6, 2], "x": 5, "y": 3, "w": 2},
+ {"matrix": [7, 3], "x": 7, "y": 3, "w": 2},
+ {"matrix": [6, 4], "x": 9, "y": 3},
+ {"matrix": [7, 4], "x": 10, "y": 3},
+ {"matrix": [6, 5], "x": 11, "y": 3}
]
}
}
diff --git a/keyboards/rainkeebs/rainkeeb/rainkeeb.c b/keyboards/rainkeebs/rainkeeb/rainkeeb.c
deleted file mode 100644
index b13ecb2483..0000000000
--- a/keyboards/rainkeebs/rainkeeb/rainkeeb.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2020 Regan Palmer
- *
- * 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 "rainkeeb.h" \ No newline at end of file
diff --git a/keyboards/rainkeebs/rainkeeb/rainkeeb.h b/keyboards/rainkeebs/rainkeeb/rainkeeb.h
deleted file mode 100644
index f0179f087c..0000000000
--- a/keyboards/rainkeebs/rainkeeb/rainkeeb.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 Regan Palmer
- *
- * 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 LAYOUT( \
- K00, K10, K01, K11, K02, K13, K03, K14, K04, K15, \
- K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, \
- K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, \
- K60, K70, K61, K72, K62, K73, K64, K74, K65 \
-) { \
- { K00, K01, K02, K03, K04, KC_NO }, \
- { K10, K11, KC_NO, K13, K14, K15 }, \
- { K20, K21, K22, K23, K24, K25 }, \
- { K30, K31, K32, K33, K34, KC_NO }, \
- { K40, K41, K42, K43, K44, K45 }, \
- { K50, K51, K52, K53, K54, KC_NO }, \
- { K60, K61, K62, KC_NO, K64, K65 }, \
- { K70, KC_NO, K72, K73, K74, KC_NO } \
-}
diff --git a/keyboards/rainkeebs/yasui/config.h b/keyboards/rainkeebs/yasui/config.h
index 9bb2cbcb5f..5033c1ceac 100644
--- a/keyboards/rainkeebs/yasui/config.h
+++ b/keyboards/rainkeebs/yasui/config.h
@@ -15,26 +15,12 @@
*/
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D4, C6, B5, E6 }
-#define MATRIX_COL_PINS { D7, B4, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCING 5
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGB_DI_PIN D1
-
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -49,4 +35,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/rainkeebs/yasui/info.json b/keyboards/rainkeebs/yasui/info.json
index ea7d883995..c1c874c77b 100644
--- a/keyboards/rainkeebs/yasui/info.json
+++ b/keyboards/rainkeebs/yasui/info.json
@@ -8,11 +8,63 @@
"pid": "0x7973",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D1"
+ },
+ "matrix_pins": {
+ "cols": ["D7", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+ "rows": ["D4", "C6", "B5", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"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":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "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":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "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":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "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":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}]
+ "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": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "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": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "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": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "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": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3}
+ ]
}
}
}
diff --git a/keyboards/rainkeebs/yasui/yasui.c b/keyboards/rainkeebs/yasui/yasui.c
deleted file mode 100644
index a87f7482a0..0000000000
--- a/keyboards/rainkeebs/yasui/yasui.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 Regan Palmer
- *
- * 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 "yasui.h"
diff --git a/keyboards/rainkeebs/yasui/yasui.h b/keyboards/rainkeebs/yasui/yasui.h
deleted file mode 100644
index 387b9a5ac8..0000000000
--- a/keyboards/rainkeebs/yasui/yasui.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2021 Regan Palmer
- *
- * 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 LAYOUT( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309 } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 00:27:26 +0000