summaryrefslogtreecommitdiff
path: root/keyboards/meson
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/meson')
-rw-r--r--keyboards/meson/config.h10
-rw-r--r--keyboards/meson/info.json205
-rw-r--r--keyboards/meson/meson.c16
-rw-r--r--keyboards/meson/meson.h56
4 files changed, 113 insertions, 174 deletions
diff --git a/keyboards/meson/config.h b/keyboards/meson/config.h
index a0df182439..9e64ab48a6 100644
--- a/keyboards/meson/config.h
+++ b/keyboards/meson/config.h
@@ -17,17 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define MATRIX_ROW_PINS { F7, C6, F6, F5 }
-#define MATRIX_COL_PINS { D4, D7, E6, B3, B2, B6, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define USE_I2C
-#define RGB_DI_PIN B5
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 10
#define RGBLIGHT_SPLIT
#define RGBLED_SPLIT { 5, 5 }
@@ -46,7 +37,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
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/meson/info.json b/keyboards/meson/info.json
index 869a2ccb7a..62aa154c0b 100644
--- a/keyboards/meson/info.json
+++ b/keyboards/meson/info.json
@@ -7,108 +7,129 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D4", "D7", "E6", "B3", "B2", "B6", "F4"],
+ "rows": ["F7", "C6", "F6", "F5"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},
+ "ws2812": {
+ "pin": "B5"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "", "x": 0, "y": 0},
- {"label": "", "x": 1, "y": 0},
- {"label": "", "x": 2, "y": 0},
- {"label": "", "x": 3, "y": 0},
- {"label": "", "x": 4, "y": 0},
- {"label": "", "x": 5, "y": 0},
- {"label": "", "x": 6, "y": 0},
- {"label": "", "x": 8.5, "y": 0},
- {"label": "", "x": 9.5, "y": 0},
- {"label": "", "x": 10.5, "y": 0},
- {"label": "", "x": 11.5, "y": 0},
- {"label": "", "x": 12.5, "y": 0},
- {"label": "", "x": 13.5, "y": 0},
- {"label": "", "x": 14.5, "y": 0},
- {"label": "", "x": 0, "y": 1},
- {"label": "", "x": 1, "y": 1},
- {"label": "", "x": 2, "y": 1},
- {"label": "", "x": 3, "y": 1},
- {"label": "", "x": 4, "y": 1},
- {"label": "", "x": 5, "y": 1},
- {"label": "", "x": 6, "y": 1},
- {"label": "", "x": 8.5, "y": 1},
- {"label": "", "x": 9.5, "y": 1},
- {"label": "", "x": 10.5, "y": 1},
- {"label": "", "x": 11.5, "y": 1},
- {"label": "", "x": 12.5, "y": 1},
- {"label": "", "x": 13.5, "y": 1},
- {"label": "", "x": 14.5, "y": 1},
- {"label": "", "x": 0, "y": 2},
- {"label": "", "x": 1, "y": 2},
- {"label": "", "x": 2, "y": 2},
- {"label": "", "x": 3, "y": 2},
- {"label": "", "x": 4, "y": 2},
- {"label": "", "x": 5, "y": 2},
- {"label": "", "x": 6, "y": 2},
- {"label": "", "x": 8.5, "y": 2},
- {"label": "", "x": 9.5, "y": 2},
- {"label": "", "x": 10.5, "y": 2},
- {"label": "", "x": 11.5, "y": 2},
- {"label": "", "x": 12.5, "y": 2},
- {"label": "", "x": 13.5, "y": 2},
- {"label": "", "x": 14.5, "y": 2},
- {"label": "", "x": 4, "y": 3},
- {"label": "", "x": 5, "y": 3},
- {"label": "", "x": 9.5, "y": 3},
- {"label": "", "x": 10.5, "y": 3}
+ {"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": [4, 6], "x": 8.5, "y": 0},
+ {"matrix": [4, 5], "x": 9.5, "y": 0},
+ {"matrix": [4, 4], "x": 10.5, "y": 0},
+ {"matrix": [4, 3], "x": 11.5, "y": 0},
+ {"matrix": [4, 2], "x": 12.5, "y": 0},
+ {"matrix": [4, 1], "x": 13.5, "y": 0},
+ {"matrix": [4, 0], "x": 14.5, "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": [5, 6], "x": 8.5, "y": 1},
+ {"matrix": [5, 5], "x": 9.5, "y": 1},
+ {"matrix": [5, 4], "x": 10.5, "y": 1},
+ {"matrix": [5, 3], "x": 11.5, "y": 1},
+ {"matrix": [5, 2], "x": 12.5, "y": 1},
+ {"matrix": [5, 1], "x": 13.5, "y": 1},
+ {"matrix": [5, 0], "x": 14.5, "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": [6, 6], "x": 8.5, "y": 2},
+ {"matrix": [6, 5], "x": 9.5, "y": 2},
+ {"matrix": [6, 4], "x": 10.5, "y": 2},
+ {"matrix": [6, 3], "x": 11.5, "y": 2},
+ {"matrix": [6, 2], "x": 12.5, "y": 2},
+ {"matrix": [6, 1], "x": 13.5, "y": 2},
+ {"matrix": [6, 0], "x": 14.5, "y": 2},
+
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [7, 5], "x": 9.5, "y": 3},
+ {"matrix": [7, 4], "x": 10.5, "y": 3}
]
- },
- "LAYOUT_2u": {
+ },
+ "LAYOUT_2u": {
"layout": [
- {"label": "", "x": 0, "y": 0},
- {"label": "", "x": 1, "y": 0},
- {"label": "", "x": 2, "y": 0},
- {"label": "", "x": 3, "y": 0},
- {"label": "", "x": 4, "y": 0},
- {"label": "", "x": 5, "y": 0},
- {"label": "", "x": 6, "y": 0},
- {"label": "", "x": 8.5, "y": 0},
- {"label": "", "x": 9.5, "y": 0},
- {"label": "", "x": 10.5, "y": 0},
- {"label": "", "x": 11.5, "y": 0},
- {"label": "", "x": 12.5, "y": 0},
- {"label": "", "x": 13.5, "y": 0},
- {"label": "", "x": 14.5, "y": 0},
- {"label": "", "x": 0, "y": 1},
- {"label": "", "x": 1, "y": 1},
- {"label": "", "x": 2, "y": 1},
- {"label": "", "x": 3, "y": 1},
- {"label": "", "x": 4, "y": 1},
- {"label": "", "x": 5, "y": 1},
- {"label": "", "x": 6, "y": 1},
- {"label": "", "x": 8.5, "y": 1},
- {"label": "", "x": 9.5, "y": 1},
- {"label": "", "x": 10.5, "y": 1},
- {"label": "", "x": 11.5, "y": 1},
- {"label": "", "x": 12.5, "y": 1},
- {"label": "", "x": 13.5, "y": 1},
- {"label": "", "x": 14.5, "y": 1},
- {"label": "", "x": 0, "y": 2},
- {"label": "", "x": 1, "y": 2},
- {"label": "", "x": 2, "y": 2},
- {"label": "", "x": 3, "y": 2},
- {"label": "", "x": 4, "y": 2},
- {"label": "", "x": 5, "y": 2},
- {"label": "", "x": 6, "y": 2},
- {"label": "", "x": 8.5, "y": 2},
- {"label": "", "x": 9.5, "y": 2},
- {"label": "", "x": 10.5, "y": 2},
- {"label": "", "x": 11.5, "y": 2},
- {"label": "", "x": 12.5, "y": 2},
- {"label": "", "x": 13.5, "y": 2},
- {"label": "", "x": 14.5, "y": 2},
- {"label": "", "x": 4, "y": 3, "w": 2},
- {"label": "", "x": 9.5, "y": 3, "w": 2}
+ {"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": [4, 6], "x": 8.5, "y": 0},
+ {"matrix": [4, 5], "x": 9.5, "y": 0},
+ {"matrix": [4, 4], "x": 10.5, "y": 0},
+ {"matrix": [4, 3], "x": 11.5, "y": 0},
+ {"matrix": [4, 2], "x": 12.5, "y": 0},
+ {"matrix": [4, 1], "x": 13.5, "y": 0},
+ {"matrix": [4, 0], "x": 14.5, "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": [5, 6], "x": 8.5, "y": 1},
+ {"matrix": [5, 5], "x": 9.5, "y": 1},
+ {"matrix": [5, 4], "x": 10.5, "y": 1},
+ {"matrix": [5, 3], "x": 11.5, "y": 1},
+ {"matrix": [5, 2], "x": 12.5, "y": 1},
+ {"matrix": [5, 1], "x": 13.5, "y": 1},
+ {"matrix": [5, 0], "x": 14.5, "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": [6, 6], "x": 8.5, "y": 2},
+ {"matrix": [6, 5], "x": 9.5, "y": 2},
+ {"matrix": [6, 4], "x": 10.5, "y": 2},
+ {"matrix": [6, 3], "x": 11.5, "y": 2},
+ {"matrix": [6, 2], "x": 12.5, "y": 2},
+ {"matrix": [6, 1], "x": 13.5, "y": 2},
+ {"matrix": [6, 0], "x": 14.5, "y": 2},
+
+ {"matrix": [3, 4], "x": 4, "y": 3, "w": 2},
+
+ {"matrix": [7, 4], "x": 9.5, "y": 3, "w": 2}
]
}
}
diff --git a/keyboards/meson/meson.c b/keyboards/meson/meson.c
deleted file mode 100644
index 4b777633b1..0000000000
--- a/keyboards/meson/meson.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Luciano M
- *
- * 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 "meson.h"
diff --git a/keyboards/meson/meson.h b/keyboards/meson/meson.h
deleted file mode 100644
index 5344d5410c..0000000000
--- a/keyboards/meson/meson.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright 2019 Luciano M
- *
- * 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 ___ KC_NO
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \
- L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \
- L30, L31, R31, R30 \
-) \
-{ \
- { L00, L01, L02, L03, L04, L05, L06}, \
- { L10, L11, L12, L13, L14, L15, L16}, \
- { L20, L21, L22, L23, L24, L25, L26}, \
- { ___, ___, ___, ___, L30, L31, ___}, \
- { R00, R01, R02, R03, R04, R05, R06}, \
- { R10, R11, R12, R13, R14, R15, R16}, \
- { R20, R21, R22, R23, R24, R25, R26}, \
- { ___, ___, ___, ___, R30, R31, ___}, \
-}
-
-// 2u SPACEBAR LAYOUT, DON'T FORGET TO CHANGE NAME OF LAYOUTS IN KEYMAP.C
-
-#define LAYOUT_2u( \
- L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \
- L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \
- L30, R30 \
-) \
-{ \
- { L00, L01, L02, L03, L04, L05, L06}, \
- { L10, L11, L12, L13, L14, L15, L16}, \
- { L20, L21, L22, L23, L24, L25, L26}, \
- { ___, ___, ___, ___, L30, ___, ___},\
- { R00, R01, R02, R03, R04, R05, R06}, \
- { R10, R11, R12, R13, R14, R15, R16}, \
- { R20, R21, R22, R23, R24, R25, R26}, \
- { ___, ___, ___, ___, R30, ___, ___},\
-}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-01 17:55:50 +0000