summaryrefslogtreecommitdiff
path: root/keyboards/eek
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/eek')
-rw-r--r--keyboards/eek/config.h10
-rw-r--r--keyboards/eek/eek.c2
-rw-r--r--keyboards/eek/eek.h24
-rw-r--r--keyboards/eek/info.json7
-rw-r--r--keyboards/eek/silk_down/info.json51
-rw-r--r--keyboards/eek/silk_down/silk_down.h39
-rw-r--r--keyboards/eek/silk_up/info.json51
-rw-r--r--keyboards/eek/silk_up/silk_up.h39
8 files changed, 109 insertions, 114 deletions
diff --git a/keyboards/eek/config.h b/keyboards/eek/config.h
index b335e5c98c..73004cc215 100644
--- a/keyboards/eek/config.h
+++ b/keyboards/eek/config.h
@@ -17,16 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { D4, C6, B6, B2, B3, B1, F7, F6, F5, F4 }
-
-
-#define DIODE_DIRECTION COL2ROW
-
-
#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 36
#define RGBLIGHT_HUE_STEP 4
#define RGBLIGHT_SAT_STEP 8
@@ -43,7 +34,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
#ifdef RGB_MATRIX_ENABLE
#define RGB_MATRIX_LED_COUNT 36
diff --git a/keyboards/eek/eek.c b/keyboards/eek/eek.c
index 372956257a..8e7a19f820 100644
--- a/keyboards/eek/eek.c
+++ b/keyboards/eek/eek.c
@@ -13,7 +13,7 @@
* 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 "eek.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/eek/eek.h b/keyboards/eek/eek.h
deleted file mode 100644
index 4e4133d884..0000000000
--- a/keyboards/eek/eek.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2020 klackygears
- *
- * 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"
-
-#if defined(KEYBOARD_eek_silk_down)
-# include "silk_down.h"
-#elif defined(KEYBOARD_eek_silk_up)
-# include "silk_up.h"
-#endif
diff --git a/keyboards/eek/info.json b/keyboards/eek/info.json
index df7884ce42..d2d1935a74 100644
--- a/keyboards/eek/info.json
+++ b/keyboards/eek/info.json
@@ -8,6 +8,11 @@
"pid": "0x0002",
"device_version": "0.0.4"
},
+ "matrix_pins": {
+ "cols": ["D4", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+ "rows": ["D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "qmk-dfu",
"community_layouts": ["split_3x5_3"],
@@ -34,7 +39,7 @@
{"x": 6, "y": 1.5},
{"x": 7, "y": 1.38},
- {"x": 8, "y": 1.0},
+ {"x": 8, "y": 1},
{"x": 9, "y": 1.38},
{"x": 10, "y": 1.88},
diff --git a/keyboards/eek/silk_down/info.json b/keyboards/eek/silk_down/info.json
new file mode 100644
index 0000000000..3091643e4f
--- /dev/null
+++ b/keyboards/eek/silk_down/info.json
@@ -0,0 +1,51 @@
+{
+ "layouts": {
+ "LAYOUT_split_3x5_3": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.88},
+ {"matrix": [0, 1], "x": 1, "y": 0.38},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.38},
+ {"matrix": [0, 4], "x": 4, "y": 0.5},
+
+ {"matrix": [0, 5], "x": 6, "y": 0.5},
+ {"matrix": [0, 6], "x": 7, "y": 0.38},
+ {"matrix": [0, 7], "x": 8, "y": 0},
+ {"matrix": [0, 8], "x": 9, "y": 0.38},
+ {"matrix": [0, 9], "x": 10, "y": 0.88},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.88},
+ {"matrix": [1, 1], "x": 1, "y": 1.38},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.38},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+
+ {"matrix": [1, 5], "x": 6, "y": 1.5},
+ {"matrix": [1, 6], "x": 7, "y": 1.38},
+ {"matrix": [1, 7], "x": 8, "y": 1},
+ {"matrix": [1, 8], "x": 9, "y": 1.38},
+ {"matrix": [1, 9], "x": 10, "y": 1.88},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.88},
+ {"matrix": [2, 1], "x": 1, "y": 2.38},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.38},
+ {"matrix": [2, 4], "x": 4, "y": 2.5},
+
+ {"matrix": [2, 5], "x": 6, "y": 2.5},
+ {"matrix": [2, 6], "x": 7, "y": 2.38},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2.38},
+ {"matrix": [2, 9], "x": 10, "y": 2.88},
+
+ {"matrix": [3, 2], "x": 2, "y": 3.25},
+ {"matrix": [3, 3], "x": 3, "y": 3.38},
+ {"matrix": [3, 4], "x": 4, "y": 3.5},
+
+ {"matrix": [3, 5], "x": 6, "y": 3.5},
+ {"matrix": [3, 6], "x": 7, "y": 3.38},
+ {"matrix": [3, 7], "x": 8, "y": 3.25}
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/keyboards/eek/silk_down/silk_down.h b/keyboards/eek/silk_down/silk_down.h
deleted file mode 100644
index c8ececd939..0000000000
--- a/keyboards/eek/silk_down/silk_down.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 klackygears
- *
- * 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 "eek.h"
-
-/* This 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_split_3x5_3( \
- 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, \
- K32, K33, K34, K35, K36, K37 \
-) \
-{ \
- { 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 }, \
- { KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO } \
-}
diff --git a/keyboards/eek/silk_up/info.json b/keyboards/eek/silk_up/info.json
new file mode 100644
index 0000000000..a810549d55
--- /dev/null
+++ b/keyboards/eek/silk_up/info.json
@@ -0,0 +1,51 @@
+{
+ "layouts": {
+ "LAYOUT_split_3x5_3": {
+ "layout": [
+ {"matrix": [0, 9], "x": 0, "y": 0.88},
+ {"matrix": [0, 8], "x": 1, "y": 0.38},
+ {"matrix": [0, 7], "x": 2, "y": 0},
+ {"matrix": [0, 6], "x": 3, "y": 0.38},
+ {"matrix": [0, 5], "x": 4, "y": 0.5},
+
+ {"matrix": [0, 4], "x": 6, "y": 0.5},
+ {"matrix": [0, 3], "x": 7, "y": 0.38},
+ {"matrix": [0, 2], "x": 8, "y": 0},
+ {"matrix": [0, 1], "x": 9, "y": 0.38},
+ {"matrix": [0, 0], "x": 10, "y": 0.88},
+
+ {"matrix": [1, 9], "x": 0, "y": 1.88},
+ {"matrix": [1, 8], "x": 1, "y": 1.38},
+ {"matrix": [1, 7], "x": 2, "y": 1},
+ {"matrix": [1, 6], "x": 3, "y": 1.38},
+ {"matrix": [1, 5], "x": 4, "y": 1.5},
+
+ {"matrix": [1, 4], "x": 6, "y": 1.5},
+ {"matrix": [1, 3], "x": 7, "y": 1.38},
+ {"matrix": [1, 2], "x": 8, "y": 1},
+ {"matrix": [1, 1], "x": 9, "y": 1.38},
+ {"matrix": [1, 0], "x": 10, "y": 1.88},
+
+ {"matrix": [2, 9], "x": 0, "y": 2.88},
+ {"matrix": [2, 8], "x": 1, "y": 2.38},
+ {"matrix": [2, 7], "x": 2, "y": 2},
+ {"matrix": [2, 6], "x": 3, "y": 2.38},
+ {"matrix": [2, 5], "x": 4, "y": 2.5},
+
+ {"matrix": [2, 4], "x": 6, "y": 2.5},
+ {"matrix": [2, 3], "x": 7, "y": 2.38},
+ {"matrix": [2, 2], "x": 8, "y": 2},
+ {"matrix": [2, 1], "x": 9, "y": 2.38},
+ {"matrix": [2, 0], "x": 10, "y": 2.88},
+
+ {"matrix": [3, 7], "x": 2, "y": 3.25},
+ {"matrix": [3, 6], "x": 3, "y": 3.38},
+ {"matrix": [3, 5], "x": 4, "y": 3.5},
+
+ {"matrix": [3, 4], "x": 6, "y": 3.5},
+ {"matrix": [3, 3], "x": 7, "y": 3.38},
+ {"matrix": [3, 2], "x": 8, "y": 3.25}
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/keyboards/eek/silk_up/silk_up.h b/keyboards/eek/silk_up/silk_up.h
deleted file mode 100644
index 8b9fe39596..0000000000
--- a/keyboards/eek/silk_up/silk_up.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2020 klackygears
- *
- * 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 "eek.h"
-
-/* This 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_split_3x5_3( \
- K09, K08, K07, K06, K05, K04, K03, K02, K01, K00, \
- K19, K18, K17, K16, K15, K14, K13, K12, K11, K10, \
- K29, K28, K27, K26, K25, K24, K23, K22, K21, K20, \
- K37, K36, K35, K34, K33, K32 \
-) \
-{ \
- { 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 }, \
- { KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO } \
-}