summaryrefslogtreecommitdiff
path: root/keyboards/misonoworks
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/misonoworks')
-rw-r--r--keyboards/misonoworks/chocolatebar/chocolatebar.c2
-rw-r--r--keyboards/misonoworks/chocolatebar/chocolatebar.h32
-rw-r--r--keyboards/misonoworks/chocolatebar/config.h11
-rw-r--r--keyboards/misonoworks/chocolatebar/info.json124
-rw-r--r--keyboards/misonoworks/karina/config.h11
-rw-r--r--keyboards/misonoworks/karina/info.json87
-rw-r--r--keyboards/misonoworks/karina/karina.c18
-rw-r--r--keyboards/misonoworks/karina/karina.h33
8 files changed, 118 insertions, 200 deletions
diff --git a/keyboards/misonoworks/chocolatebar/chocolatebar.c b/keyboards/misonoworks/chocolatebar/chocolatebar.c
index dc9a251df4..ea30292b86 100644
--- a/keyboards/misonoworks/chocolatebar/chocolatebar.c
+++ b/keyboards/misonoworks/chocolatebar/chocolatebar.c
@@ -15,7 +15,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 "chocolatebar.h"
+#include "quantum.h"
#ifdef OLED_ENABLE
oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
diff --git a/keyboards/misonoworks/chocolatebar/chocolatebar.h b/keyboards/misonoworks/chocolatebar/chocolatebar.h
deleted file mode 100644
index badebdb73b..0000000000
--- a/keyboards/misonoworks/chocolatebar/chocolatebar.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2021 MisonoWorks
-
-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, K010, K011, K013, K014, K015, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K111, K113, K114, K115, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K211, K212, K213, K214, K215, \
- K300, K301, K302, K303, K305, K306, K308, K311, K312, K313, K314, K315 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, KC_NO, K013, K014, K015 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, KC_NO, K111, KC_NO, K113, K114, K115 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, KC_NO, KC_NO, K211, K212, K213, K214, K215 }, \
- { K300, K301, K302, K303, KC_NO, K305, K306, KC_NO, K308, KC_NO, KC_NO, K311, K312, K313, K314, K315 } \
-}
diff --git a/keyboards/misonoworks/chocolatebar/config.h b/keyboards/misonoworks/chocolatebar/config.h
index e5768a480d..c50e01bbe0 100644
--- a/keyboards/misonoworks/chocolatebar/config.h
+++ b/keyboards/misonoworks/chocolatebar/config.h
@@ -17,18 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B0, B7, D2, D3 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, B3, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define FORCE_NKRO
-#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -40,4 +30,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
-#endif
diff --git a/keyboards/misonoworks/chocolatebar/info.json b/keyboards/misonoworks/chocolatebar/info.json
index bc577e22fe..abb58f29f5 100644
--- a/keyboards/misonoworks/chocolatebar/info.json
+++ b/keyboards/misonoworks/chocolatebar/info.json
@@ -8,69 +8,83 @@
"pid": "0xC456",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "B1"
+ },
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B3", "B2"],
+ "rows": ["B0", "B7", "D2", "D3"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"Q", "x":1, "y":0},
- {"label":"W", "x":2, "y":0},
- {"label":"E", "x":3, "y":0},
- {"label":"R", "x":4, "y":0},
- {"label":"T", "x":5, "y":0},
- {"label":"Y", "x":6, "y":0},
- {"label":"U", "x":7, "y":0},
- {"label":"I", "x":8, "y":0},
- {"label":"O", "x":9, "y":0},
- {"label":"P", "x":10, "y":0},
- {"label":"Back Space", "x":11, "y":0},
- {"label":"7", "x":13, "y":0},
- {"label":"8", "x":14, "y":0},
- {"label":"9", "x":15, "y":0},
+ {"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": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 13], "x": 13, "y": 1},
+ {"matrix": [1, 14], "x": 14, "y": 1},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 2},
+ {"matrix": [2, 1], "x": 2, "y": 2},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [2, 11], "x": 10, "y": 2, "w": 1.5},
+
+ {"matrix": [2, 12], "x": 11.75, "y": 2.25},
+
+ {"matrix": [2, 13], "x": 13, "y": 2},
+ {"matrix": [2, 14], "x": 14, "y": 2},
+ {"matrix": [2, 15], "x": 15, "y": 2},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"A", "x":1.5, "y":1},
- {"label":"S", "x":2.5, "y":1},
- {"label":"D", "x":3.5, "y":1},
- {"label":"F", "x":4.5, "y":1},
- {"label":"G", "x":5.5, "y":1},
- {"label":"H", "x":6.5, "y":1},
- {"label":"J", "x":7.5, "y":1},
- {"label":"K", "x":8.5, "y":1},
- {"label":"L", "x":9.5, "y":1},
- {"label":"Enter", "x":10.5, "y":1, "w":1.5},
- {"label":"4", "x":13, "y":1},
- {"label":"5", "x":14, "y":1},
- {"label":"6", "x":15, "y":1},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.5},
+ {"matrix": [3, 2], "x": 3, "y": 3},
+ {"matrix": [3, 3], "x": 4, "y": 3, "w": 2},
+ {"matrix": [3, 5], "x": 6, "y": 3, "w": 2},
+ {"matrix": [3, 6], "x": 8, "y": 3},
+ {"matrix": [3, 8], "x": 9, "y": 3, "w": 1.5},
- {"label":"Shift", "x":0, "y":2, "w":2},
- {"label":"Z", "x":2, "y":2},
- {"label":"X", "x":3, "y":2},
- {"label":"C", "x":4, "y":2},
- {"label":"V", "x":5, "y":2},
- {"label":"B", "x":6, "y":2},
- {"label":"N", "x":7, "y":2},
- {"label":"M", "x":8, "y":2},
- {"label":", <", "x":9, "y":2},
- {"label":"Shift", "x":10, "y":2, "w":1.5},
- {"label":"Up", "x":11.75, "y":2.25},
- {"label":"1", "x":13, "y":2},
- {"label":"2", "x":14, "y":2},
- {"label":"3", "x":15, "y":2},
+ {"matrix": [3, 11], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 12], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25},
- {"label":"Ctrl", "x":0, "y":3, "w":1.5},
- {"label":"Alt", "x":1.5, "y":3, "w":1.5},
- {"label":"Meta", "x":3, "y":3},
- {"x":4, "y":3, "w":2},
- {"x":6, "y":3, "w":2},
- {"label":"Super", "x":8, "y":3},
- {"label":"Ctrl", "x":9, "y":3, "w":1.5},
- {"label":"Left", "x":10.75, "y":3.25},
- {"label":"Down", "x":11.75, "y":3.25},
- {"label":"Right", "x":12.75, "y":3.25},
- {"label":"0", "x":14, "y":3},
- {"label":"Calc", "x":15, "y":3}
+ {"matrix": [3, 14], "x": 14, "y": 3},
+ {"matrix": [3, 15], "x": 15, "y": 3}
]
}
}
diff --git a/keyboards/misonoworks/karina/config.h b/keyboards/misonoworks/karina/config.h
index 2c71926b81..0b1dbb4c57 100644
--- a/keyboards/misonoworks/karina/config.h
+++ b/keyboards/misonoworks/karina/config.h
@@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// pins
-#define MATRIX_ROW_PINS { D2, D3, D5, F0 }
-#define MATRIX_COL_PINS { B3, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6}
-
-// diode mode
-#define DIODE_DIRECTION COL2ROW
-
#define FORCE_NKRO
#define MK_3_SPEED
#define TERMINAL_HELP
@@ -32,8 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGB_DI_PIN D1
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 19
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -45,4 +35,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
-#endif
diff --git a/keyboards/misonoworks/karina/info.json b/keyboards/misonoworks/karina/info.json
index 922e4117e6..5ebaf68692 100644
--- a/keyboards/misonoworks/karina/info.json
+++ b/keyboards/misonoworks/karina/info.json
@@ -8,6 +8,14 @@
"pid": "0xC456",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D1"
+ },
+ "matrix_pins": {
+ "cols": ["B3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6"],
+ "rows": ["D2", "D3", "D5", "F0"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B2", "pin_b": "B1", "resolution": 3},
@@ -19,49 +27,50 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Encoder 1", "x":0, "y":0},
- {"label":"Encoder 2", "x":10, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [2, 10], "x": 10, "y": 0},
- {"label":"Q", "x":0.5, "y":1},
- {"label":"W", "x":1.5, "y":1},
- {"label":"E", "x":2.5, "y":1},
- {"label":"R", "x":3.5, "y":1},
- {"label":"T", "x":4.5, "y":1},
- {"label":"Y", "x":5.5, "y":1},
- {"label":"U", "x":6.5, "y":1},
- {"label":"I", "x":7.5, "y":1},
- {"label":"O", "x":8.5, "y":1},
- {"label":"P", "x":9.5, "y":1},
+ {"matrix": [0, 1], "x": 0.5, "y": 1},
+ {"matrix": [0, 2], "x": 1.5, "y": 1},
+ {"matrix": [0, 3], "x": 2.5, "y": 1},
+ {"matrix": [0, 4], "x": 3.5, "y": 1},
+ {"matrix": [0, 5], "x": 4.5, "y": 1},
+ {"matrix": [0, 6], "x": 5.5, "y": 1},
+ {"matrix": [0, 7], "x": 6.5, "y": 1},
+ {"matrix": [0, 8], "x": 7.5, "y": 1},
+ {"matrix": [0, 9], "x": 8.5, "y": 1},
+ {"matrix": [0, 10], "x": 9.5, "y": 1},
- {"label":"Tab", "x":0, "y":2},
- {"label":"A", "x":1, "y":2},
- {"label":"S", "x":2, "y":2},
- {"label":"D", "x":3, "y":2},
- {"label":"F", "x":4, "y":2},
- {"label":"G", "x":5, "y":2},
- {"label":"H", "x":6, "y":2},
- {"label":"J", "x":7, "y":2},
- {"label":"K", "x":8, "y":2},
- {"label":"L", "x":9, "y":2},
- {"label":"Enter", "x":10, "y":2},
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 2},
+ {"matrix": [1, 4], "x": 4, "y": 2},
+ {"matrix": [1, 5], "x": 5, "y": 2},
+ {"matrix": [1, 6], "x": 6, "y": 2},
+ {"matrix": [1, 7], "x": 7, "y": 2},
+ {"matrix": [1, 8], "x": 8, "y": 2},
+ {"matrix": [1, 9], "x": 9, "y": 2},
+ {"matrix": [1, 10], "x": 10, "y": 2},
- {"label":"Shift", "x":0, "y":3, "w":1.5},
- {"label":"Z", "x":1.5, "y":3},
- {"label":"X", "x":2.5, "y":3},
- {"label":"C", "x":3.5, "y":3},
- {"label":"V", "x":4.5, "y":3},
- {"label":"B", "x":5.5, "y":3},
- {"label":"N", "x":6.5, "y":3},
- {"label":"M", "x":7.5, "y":3},
- {"label":"<", "x":8.5, "y":3},
- {"label":">", "x":9.5, "y":3, "w":1.5},
+ {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 3},
+ {"matrix": [2, 2], "x": 2.5, "y": 3},
+ {"matrix": [2, 3], "x": 3.5, "y": 3},
+ {"matrix": [2, 4], "x": 4.5, "y": 3},
+ {"matrix": [2, 5], "x": 5.5, "y": 3},
+ {"matrix": [2, 6], "x": 6.5, "y": 3},
+ {"matrix": [2, 7], "x": 7.5, "y": 3},
+ {"matrix": [2, 8], "x": 8.5, "y": 3},
+ {"matrix": [2, 9], "x": 9.5, "y": 3, "w": 1.5},
- {"label":"Alt", "x":0, "y":4, "w":1.75},
- {"label":"MO(1)", "x":1.75, "y":4, "w":1.25},
- {"label":"Space", "x":3, "y":4, "w":2.75},
- {"label":"Backspace", "x":5.75, "y":4, "w":2.25},
- {"label":"MO(2)", "x":8, "y":4, "w":1.25},
- {"label":"Control", "x":9.25, "y":4, "w":1.75}
+ {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 4, "w": 1.25},
+ {"matrix": [3, 3], "x": 3, "y": 4, "w": 2.75},
+ {"matrix": [3, 6], "x": 5.75, "y": 4, "w": 2.25},
+ {"matrix": [3, 8], "x": 8, "y": 4, "w": 1.25},
+ {"matrix": [3, 9], "x": 9.25, "y": 4, "w": 1.75}
]
}
}
diff --git a/keyboards/misonoworks/karina/karina.c b/keyboards/misonoworks/karina/karina.c
deleted file mode 100644
index f621e3f452..0000000000
--- a/keyboards/misonoworks/karina/karina.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 MisonoWorks
-
-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 "karina.h"
diff --git a/keyboards/misonoworks/karina/karina.h b/keyboards/misonoworks/karina/karina.h
deleted file mode 100644
index 2baeb5db5c..0000000000
--- a/keyboards/misonoworks/karina/karina.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright 2020 MisonoWorks
-
-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, K210, \
- K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, \
- K300, K301, K303, K306, K308, K309 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \
- { K300, K301, KC_NO, K303, KC_NO, KC_NO, K306, KC_NO, K308, K309, KC_NO } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 01:03:36 +0000