summaryrefslogtreecommitdiff
path: root/keyboards/mechwild/obe
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mechwild/obe')
-rw-r--r--keyboards/mechwild/obe/config.h20
-rw-r--r--keyboards/mechwild/obe/info.json160
-rw-r--r--keyboards/mechwild/obe/obe.c33
-rw-r--r--keyboards/mechwild/obe/obe.h47
4 files changed, 90 insertions, 170 deletions
diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h
index 72efdae1e2..b01fcda5ef 100644
--- a/keyboards/mechwild/obe/config.h
+++ b/keyboards/mechwild/obe/config.h
@@ -17,28 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A8, B15, B14, B13, B12, A15, B3 }
-#define MATRIX_COL_PINS { B10, B1, B0, A7, A6, A5, A4, A3, A2, A1 }
-
#define TAP_CODE_DELAY 10
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* RGB settings, uncomment this define to enable RGB */
-#define RGB_DI_PIN A0
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 10
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -55,7 +36,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/mechwild/obe/info.json b/keyboards/mechwild/obe/info.json
index cbe9f7cfa8..f529efd1e6 100644
--- a/keyboards/mechwild/obe/info.json
+++ b/keyboards/mechwild/obe/info.json
@@ -8,6 +8,11 @@
"pid": "0x1707",
"device_version": "2.0.1"
},
+ "matrix_pins": {
+ "cols": ["B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1"],
+ "rows": ["A8", "B15", "B14", "B13", "B12", "A15", "B3"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B5", "pin_b": "B4"}
@@ -20,79 +25,94 @@
"bootmagic": {
"matrix": [5, 4]
},
+ "ws2812": {
+ "pin": "A0"
+ },
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "k55", "x": 0.3, "y": 0},
- {"label": "k54", "x": 1.72, "y": 0},
- {"label": "k53", "x": 2.72, "y": 0},
- {"label": "k52", "x": 4.00, "y": 0},
- {"label": "k51", "x": 5, "y": 0},
- {"label": "k50", "x": 6, "y": 0},
- {"label": "k00", "x": 7, "y": 0},
- {"label": "k01", "x": 8, "y": 0},
- {"label": "k02", "x": 10.75, "y": 0},
- {"label": "k03", "x": 11.75, "y": 0},
- {"label": "k04", "x": 12.75, "y": 0},
- {"label": "k05", "x": 13.75, "y": 0},
- {"label": "k06", "x": 15, "y": 0},
- {"label": "k07", "x": 16, "y": 0},
- {"label": "k08", "x": 17, "y": 0},
- {"label": "k09", "x": 18, "y": 0},
- {"label": "k65", "x": 0.2, "y": 1},
- {"label": "k59", "x": 1.47, "y": 1, "w": 1.5},
- {"label": "k58", "x": 2.97, "y": 1},
- {"label": "k57", "x": 4.50, "y": 1},
- {"label": "k56", "x": 5.5, "y": 1},
- {"label": "k10", "x": 6.5, "y": 1},
- {"label": "k11", "x": 7.5, "y": 1},
- {"label": "k12", "x": 10.25, "y": 1},
- {"label": "k13", "x": 11.25, "y": 1},
- {"label": "k14", "x": 12.25, "y": 1},
- {"label": "k15", "x": 13.25, "y": 1},
- {"label": "k16", "x": 14.75, "y": 1},
- {"label": "k17", "x": 15.75, "y": 1},
- {"label": "k18", "x": 16.75, "y": 1},
- {"label": "k19", "x": 17.75, "y": 1, "w": 1.5},
- {"label": "k64", "x": 0.1, "y": 2},
- {"label": "k69", "x": 1.40, "y": 2, "w": 1.75},
- {"label": "k68", "x": 3.12, "y": 2},
- {"label": "k63", "x": 4.75, "y": 2},
- {"label": "k20", "x": 5.75, "y": 2},
- {"label": "k21", "x": 6.75, "y": 2},
- {"label": "k22", "x": 7.75, "y": 2},
- {"label": "k23", "x": 10.5, "y": 2},
- {"label": "k24", "x": 11.5, "y": 2},
- {"label": "k25", "x": 12.5, "y": 2},
- {"label": "k26", "x": 13.5, "y": 2},
- {"label": "k27", "x": 15.1, "y": 2},
- {"label": "k28", "x": 16.1, "y": 2},
- {"label": "k29", "x": 17.1, "y": 2, "w": 2.25},
- {"label": "k62", "x": 1.22, "y": 3, "w": 2.25},
- {"label": "k60", "x": 3.47, "y": 3},
- {"label": "k67", "x": 5.25, "y": 3},
- {"label": "k66", "x": 6.25, "y": 3},
- {"label": "k30", "x": 7.25, "y": 3},
- {"label": "k31", "x": 8.25, "y": 3},
- {"label": "k32", "x": 10, "y": 3},
- {"label": "k33", "x": 11, "y": 3},
- {"label": "k34", "x": 12, "y": 3},
- {"label": "k35", "x": 13, "y": 3},
- {"label": "k36", "x": 14.75, "y": 3},
- {"label": "k37", "x": 15.75, "y": 3},
- {"label": "k38", "x": 16.75, "y": 3},
- {"label": "k39", "x": 17.75, "y": 3, "w": 1.75},
- {"label": "k61", "x": 1.25, "y": 4, "w": 1.25},
- {"label": "k40", "x": 2.72, "y": 4, "w": 1.25},
- {"label": "k41", "x": 5.25, "y": 4, "w": 1.25},
- {"label": "k42", "x": 6.50, "y": 4, "w": 2.25},
- {"label": "k43", "x": 8.75, "y": 4},
- {"label": "k44", "x": 10, "y": 4, "w": 2.75},
- {"label": "k45", "x": 12.75, "y": 4},
- {"label": "k46", "x": 14.75, "y": 4},
- {"label": "k47", "x": 15.75, "y": 4},
- {"label": "k48", "x": 16.75, "y": 4},
- {"label": "k49", "x": 17.75, "y": 4}
+ {"matrix": [5, 5], "x": 0.2, "y": 0},
+
+ {"matrix": [5, 4], "x": 1.62, "y": 0},
+ {"matrix": [5, 3], "x": 2.62, "y": 0},
+ {"matrix": [5, 2], "x": 3.9, "y": 0},
+ {"matrix": [5, 1], "x": 4.9, "y": 0},
+ {"matrix": [5, 0], "x": 5.9, "y": 0},
+ {"matrix": [0, 0], "x": 6.9, "y": 0},
+ {"matrix": [0, 1], "x": 7.9, "y": 0},
+
+ {"matrix": [0, 2], "x": 10.65, "y": 0},
+ {"matrix": [0, 3], "x": 11.65, "y": 0},
+ {"matrix": [0, 4], "x": 12.65, "y": 0},
+ {"matrix": [0, 5], "x": 13.65, "y": 0},
+ {"matrix": [0, 6], "x": 14.9, "y": 0},
+ {"matrix": [0, 7], "x": 15.9, "y": 0},
+ {"matrix": [0, 8], "x": 16.9, "y": 0},
+ {"matrix": [0, 9], "x": 17.9, "y": 0},
+
+ {"matrix": [6, 5], "x": 0.1, "y": 1},
+
+ {"matrix": [5, 9], "x": 1.37, "y": 1, "w": 1.5},
+ {"matrix": [5, 8], "x": 2.87, "y": 1},
+ {"matrix": [5, 7], "x": 4.4, "y": 1},
+ {"matrix": [5, 6], "x": 5.4, "y": 1},
+ {"matrix": [1, 0], "x": 6.4, "y": 1},
+ {"matrix": [1, 1], "x": 7.4, "y": 1},
+
+ {"matrix": [1, 2], "x": 10.15, "y": 1},
+ {"matrix": [1, 3], "x": 11.15, "y": 1},
+ {"matrix": [1, 4], "x": 12.15, "y": 1},
+ {"matrix": [1, 5], "x": 13.15, "y": 1},
+ {"matrix": [1, 6], "x": 14.65, "y": 1},
+ {"matrix": [1, 7], "x": 15.65, "y": 1},
+ {"matrix": [1, 8], "x": 16.65, "y": 1},
+ {"matrix": [1, 9], "x": 17.65, "y": 1, "w": 1.5},
+
+ {"matrix": [6, 4], "x": 0, "y": 2},
+
+ {"matrix": [6, 9], "x": 1.3, "y": 2, "w": 1.75},
+ {"matrix": [6, 8], "x": 3.02, "y": 2},
+ {"matrix": [6, 3], "x": 4.65, "y": 2},
+ {"matrix": [2, 0], "x": 5.65, "y": 2},
+ {"matrix": [2, 1], "x": 6.65, "y": 2},
+ {"matrix": [2, 2], "x": 7.65, "y": 2},
+
+ {"matrix": [2, 3], "x": 10.4, "y": 2},
+ {"matrix": [2, 4], "x": 11.4, "y": 2},
+ {"matrix": [2, 5], "x": 12.4, "y": 2},
+ {"matrix": [2, 6], "x": 13.4, "y": 2},
+ {"matrix": [2, 7], "x": 15, "y": 2},
+ {"matrix": [2, 8], "x": 16, "y": 2},
+ {"matrix": [2, 9], "x": 17, "y": 2, "w": 2.25},
+
+ {"matrix": [6, 2], "x": 1.12, "y": 3, "w": 2.25},
+ {"matrix": [6, 0], "x": 3.37, "y": 3},
+ {"matrix": [6, 7], "x": 5.15, "y": 3},
+ {"matrix": [6, 6], "x": 6.15, "y": 3},
+ {"matrix": [3, 0], "x": 7.15, "y": 3},
+ {"matrix": [3, 1], "x": 8.15, "y": 3},
+
+ {"matrix": [3, 2], "x": 9.9, "y": 3},
+ {"matrix": [3, 3], "x": 10.9, "y": 3},
+ {"matrix": [3, 4], "x": 11.9, "y": 3},
+ {"matrix": [3, 5], "x": 12.9, "y": 3},
+ {"matrix": [3, 6], "x": 14.65, "y": 3},
+ {"matrix": [3, 7], "x": 15.65, "y": 3},
+ {"matrix": [3, 8], "x": 16.65, "y": 3},
+ {"matrix": [3, 9], "x": 17.65, "y": 3, "w": 1.75},
+
+ {"matrix": [6, 1], "x": 1.15, "y": 4, "w": 1.25},
+ {"matrix": [4, 0], "x": 2.62, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 5.15, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 6.4, "y": 4, "w": 2.25},
+ {"matrix": [4, 3], "x": 8.65, "y": 4},
+
+ {"matrix": [4, 4], "x": 9.9, "y": 4, "w": 2.75},
+ {"matrix": [4, 5], "x": 12.65, "y": 4},
+ {"matrix": [4, 6], "x": 14.65, "y": 4},
+ {"matrix": [4, 7], "x": 15.65, "y": 4},
+ {"matrix": [4, 8], "x": 16.65, "y": 4},
+ {"matrix": [4, 9], "x": 17.65, "y": 4}
]
}
}
diff --git a/keyboards/mechwild/obe/obe.c b/keyboards/mechwild/obe/obe.c
deleted file mode 100644
index 195d4a7679..0000000000
--- a/keyboards/mechwild/obe/obe.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Kyle McCreery
- *
- * 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 "obe.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) { return false; }
- switch (index) {
- case 0:
- if (clockwise) {
- tap_code(KC_VOLU);
- } else {
- tap_code(KC_VOLD);
- }
- break;
- }
- return true;
-}
-#endif
diff --git a/keyboards/mechwild/obe/obe.h b/keyboards/mechwild/obe/obe.h
deleted file mode 100644
index b2b22b37e3..0000000000
--- a/keyboards/mechwild/obe/obe.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2021 Kyle McCreery
- *
- * 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
-
-//#ifdef KEYBOARD_mechwild_obe_eeprom
-//# include "eeprom.h"
-//#endif
-
-#include "quantum.h"
-
-/* This is 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( \
- k55, k54, k53, k52, k51, k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
- k65, k59, k58, k57, k56, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
- k64, k69, k68, k63, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
- k62, k60, k67, k66, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, \
- k61, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 \
-) { \
- { 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 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \
- { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
- { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-13 19:32:15 +0000