summaryrefslogtreecommitdiff
path: root/keyboards/mechkeys/mechmini/v1
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mechkeys/mechmini/v1')
-rw-r--r--keyboards/mechkeys/mechmini/v1/config.h8
-rw-r--r--keyboards/mechkeys/mechmini/v1/info.json172
-rw-r--r--keyboards/mechkeys/mechmini/v1/rules.mk1
-rw-r--r--keyboards/mechkeys/mechmini/v1/v1.c18
-rw-r--r--keyboards/mechkeys/mechmini/v1/v1.h48
5 files changed, 90 insertions, 157 deletions
diff --git a/keyboards/mechkeys/mechmini/v1/config.h b/keyboards/mechkeys/mechmini/v1/config.h
index 3da5747d2b..f76d0f01e1 100644
--- a/keyboards/mechkeys/mechmini/v1/config.h
+++ b/keyboards/mechkeys/mechmini/v1/config.h
@@ -17,14 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define MATRIX_ROW_PINS { B0, B1, B2, B3 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4 }
-#define DIODE_DIRECTION COL2ROW
-
/* RGB underglow */
-// The RGB_DI_PIN value seems to be shared between all PS2AVRGB boards.
-// The same pin is used on the JJ40, at least.
#define RGBLED_NUM 16
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -36,4 +29,3 @@ 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
-#define RGB_DI_PIN E2
diff --git a/keyboards/mechkeys/mechmini/v1/info.json b/keyboards/mechkeys/mechmini/v1/info.json
index 751be56e38..eea1d15feb 100644
--- a/keyboards/mechkeys/mechmini/v1/info.json
+++ b/keyboards/mechkeys/mechmini/v1/info.json
@@ -8,106 +8,114 @@
"pid": "0xCA40",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4"],
+ "rows": ["B0", "B1", "B2", "B3"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "D4"
},
+ "ws2812": {
+ "driver": "i2c"
+ },
"processor": "atmega32a",
"bootloader": "bootloadhid",
"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":10, "y":0},
- {"x":11, "y":0},
+ {"matrix": [3, 0], "x": 0, "y": 0},
+ {"matrix": [3, 1], "x": 1, "y": 0},
+ {"matrix": [3, 2], "x": 2, "y": 0},
+ {"matrix": [3, 3], "x": 3, "y": 0},
+ {"matrix": [3, 4], "x": 4, "y": 0},
+ {"matrix": [3, 5], "x": 5, "y": 0},
+ {"matrix": [3, 6], "x": 6, "y": 0},
+ {"matrix": [3, 7], "x": 7, "y": 0},
+ {"matrix": [3, 8], "x": 8, "y": 0},
+ {"matrix": [3, 9], "x": 9, "y": 0},
+ {"matrix": [3, 10], "x": 10, "y": 0},
+ {"matrix": [3, 11], "x": 11, "y": 0},
- {"x":0, "y":1, "w":1.25},
- {"x":1.25, "y":1},
- {"x":2.25, "y":1},
- {"x":3.25, "y":1},
- {"x":4.25, "y":1},
- {"x":5.25, "y":1},
- {"x":6.25, "y":1},
- {"x":7.25, "y":1},
- {"x":8.25, "y":1},
- {"x":9.25, "y":1},
- {"x":10.25, "y":1, "w":1.75},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 1},
+ {"matrix": [2, 2], "x": 2.25, "y": 1},
+ {"matrix": [2, 3], "x": 3.25, "y": 1},
+ {"matrix": [2, 4], "x": 4.25, "y": 1},
+ {"matrix": [2, 5], "x": 5.25, "y": 1},
+ {"matrix": [2, 6], "x": 6.25, "y": 1},
+ {"matrix": [2, 7], "x": 7.25, "y": 1},
+ {"matrix": [2, 8], "x": 8.25, "y": 1},
+ {"matrix": [2, 9], "x": 9.25, "y": 1},
+ {"matrix": [2, 10], "x": 10.25, "y": 1, "w": 1.75},
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2, "w":1.25},
- {"x":11, "y":2},
+ {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [1, 1], "x": 1.75, "y": 2},
+ {"matrix": [1, 2], "x": 2.75, "y": 2},
+ {"matrix": [1, 3], "x": 3.75, "y": 2},
+ {"matrix": [1, 4], "x": 4.75, "y": 2},
+ {"matrix": [1, 5], "x": 5.75, "y": 2},
+ {"matrix": [1, 6], "x": 6.75, "y": 2},
+ {"matrix": [1, 7], "x": 7.75, "y": 2},
+ {"matrix": [1, 8], "x": 8.75, "y": 2},
+ {"matrix": [1, 9], "x": 9.75, "y": 2, "w": 1.25},
+ {"matrix": [1, 10], "x": 11, "y": 2},
- {"x":0, "y":3, "w":1.25},
- {"x":1.25, "y":3},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3, "w":6.25},
- {"x":9.5, "y":3, "w":1.25},
- {"x":10.75, "y":3, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [0, 1], "x": 1.25, "y": 3},
+ {"matrix": [0, 2], "x": 2.25, "y": 3},
+ {"matrix": [0, 5], "x": 3.25, "y": 3, "w": 6.25},
+ {"matrix": [0, 9], "x": 9.5, "y": 3, "w": 1.25},
+ {"matrix": [0, 10], "x": 10.75, "y": 3, "w": 1.25}
]
},
"LAYOUT_split_space": {
"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":10, "y":0},
- {"x":11, "y":0},
+ {"matrix": [3, 0], "x": 0, "y": 0},
+ {"matrix": [3, 1], "x": 1, "y": 0},
+ {"matrix": [3, 2], "x": 2, "y": 0},
+ {"matrix": [3, 3], "x": 3, "y": 0},
+ {"matrix": [3, 4], "x": 4, "y": 0},
+ {"matrix": [3, 5], "x": 5, "y": 0},
+ {"matrix": [3, 6], "x": 6, "y": 0},
+ {"matrix": [3, 7], "x": 7, "y": 0},
+ {"matrix": [3, 8], "x": 8, "y": 0},
+ {"matrix": [3, 9], "x": 9, "y": 0},
+ {"matrix": [3, 10], "x": 10, "y": 0},
+ {"matrix": [3, 11], "x": 11, "y": 0},
- {"x":0, "y":1, "w":1.25},
- {"x":1.25, "y":1},
- {"x":2.25, "y":1},
- {"x":3.25, "y":1},
- {"x":4.25, "y":1},
- {"x":5.25, "y":1},
- {"x":6.25, "y":1},
- {"x":7.25, "y":1},
- {"x":8.25, "y":1},
- {"x":9.25, "y":1},
- {"x":10.25, "y":1, "w":1.75},
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 1},
+ {"matrix": [2, 2], "x": 2.25, "y": 1},
+ {"matrix": [2, 3], "x": 3.25, "y": 1},
+ {"matrix": [2, 4], "x": 4.25, "y": 1},
+ {"matrix": [2, 5], "x": 5.25, "y": 1},
+ {"matrix": [2, 6], "x": 6.25, "y": 1},
+ {"matrix": [2, 7], "x": 7.25, "y": 1},
+ {"matrix": [2, 8], "x": 8.25, "y": 1},
+ {"matrix": [2, 9], "x": 9.25, "y": 1},
+ {"matrix": [2, 10], "x": 10.25, "y": 1, "w": 1.75},
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2, "w":1.25},
- {"x":11, "y":2},
+ {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [1, 1], "x": 1.75, "y": 2},
+ {"matrix": [1, 2], "x": 2.75, "y": 2},
+ {"matrix": [1, 3], "x": 3.75, "y": 2},
+ {"matrix": [1, 4], "x": 4.75, "y": 2},
+ {"matrix": [1, 5], "x": 5.75, "y": 2},
+ {"matrix": [1, 6], "x": 6.75, "y": 2},
+ {"matrix": [1, 7], "x": 7.75, "y": 2},
+ {"matrix": [1, 8], "x": 8.75, "y": 2},
+ {"matrix": [1, 9], "x": 9.75, "y": 2, "w": 1.25},
+ {"matrix": [1, 10], "x": 11, "y": 2},
- {"x":0, "y":3, "w":1.25},
- {"x":1.25, "y":3},
- {"x":2.25, "y":3, "w":1.25},
- {"x":3.5, "y":3, "w":2.75},
- {"x":6.25, "y":3, "w":2.25},
- {"x":8.5, "y":3, "w":1.25},
- {"x":9.75, "y":3},
- {"x":10.75, "y":3, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [0, 1], "x": 1.25, "y": 3},
+ {"matrix": [0, 2], "x": 2.25, "y": 3, "w": 1.25},
+ {"matrix": [0, 3], "x": 3.5, "y": 3, "w": 2.75},
+ {"matrix": [0, 6], "x": 6.25, "y": 3, "w": 2.25},
+ {"matrix": [0, 8], "x": 8.5, "y": 3, "w": 1.25},
+ {"matrix": [0, 9], "x": 9.75, "y": 3},
+ {"matrix": [0, 10], "x": 10.75, "y": 3, "w": 1.25}
]
}
}
diff --git a/keyboards/mechkeys/mechmini/v1/rules.mk b/keyboards/mechkeys/mechmini/v1/rules.mk
index 1829f64e67..e1dfc31721 100644
--- a/keyboards/mechkeys/mechmini/v1/rules.mk
+++ b/keyboards/mechkeys/mechmini/v1/rules.mk
@@ -8,4 +8,3 @@ CONSOLE_ENABLE = no
COMMAND_ENABLE = yes
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = i2c
diff --git a/keyboards/mechkeys/mechmini/v1/v1.c b/keyboards/mechkeys/mechmini/v1/v1.c
deleted file mode 100644
index ba0e095209..0000000000
--- a/keyboards/mechkeys/mechmini/v1/v1.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-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 "v1.h"
diff --git a/keyboards/mechkeys/mechmini/v1/v1.h b/keyboards/mechkeys/mechmini/v1/v1.h
deleted file mode 100644
index 07d1e683f7..0000000000
--- a/keyboards/mechkeys/mechmini/v1/v1.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-
-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 "../mechmini.h"
-
-#define ___ KC_NO
-
-#define LAYOUT( \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K00, K01, K02, K05, K09, K0A \
-) \
-{ \
- { K00, K01, K02, ___, ___, K05, ___, ___, ___, K09, K0A, ___ }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, ___ }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, ___ }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B } \
-}
-
-#define LAYOUT_split_space( \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
- K00, K01, K02, K03, K06, K08, K09, K0A \
-) \
-{ \
- { K00, K01, K02, K03, ___, ___, K06, ___, K08, K09, K0A, ___ }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, ___ }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, ___ }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B } \
-}