summaryrefslogtreecommitdiffstats
path: root/keyboards/keebio/dsp40
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keebio/dsp40')
-rw-r--r--keyboards/keebio/dsp40/dsp40.c17
-rw-r--r--keyboards/keebio/dsp40/dsp40.h21
-rw-r--r--keyboards/keebio/dsp40/rev1/config.h9
-rw-r--r--keyboards/keebio/dsp40/rev1/info.json197
-rw-r--r--keyboards/keebio/dsp40/rev1/rev1.c14
-rw-r--r--keyboards/keebio/dsp40/rev1/rev1.h47
6 files changed, 108 insertions, 197 deletions
diff --git a/keyboards/keebio/dsp40/dsp40.c b/keyboards/keebio/dsp40/dsp40.c
deleted file mode 100644
index 745cd386d4..0000000000
--- a/keyboards/keebio/dsp40/dsp40.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-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 "dsp40.h"
diff --git a/keyboards/keebio/dsp40/dsp40.h b/keyboards/keebio/dsp40/dsp40.h
deleted file mode 100644
index ec5e5fbbcb..0000000000
--- a/keyboards/keebio/dsp40/dsp40.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-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_keebio_dsp40_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/keebio/dsp40/rev1/config.h b/keyboards/keebio/dsp40/rev1/config.h
index 0f69303ca8..3d715a473b 100644
--- a/keyboards/keebio/dsp40/rev1/config.h
+++ b/keyboards/keebio/dsp40/rev1/config.h
@@ -16,20 +16,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* Keyboard Matrix Assignments */
-#define MATRIX_ROW_PINS { B9, A9, A8, B15 }
-#define MATRIX_COL_PINS { B10, B2, A3, A4, B7, B6, A10, C13, C14, C15, F0, F1 }
-
#define TAP_CODE_DELAY 10
-#define DIODE_DIRECTION COL2ROW
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 4
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -46,7 +38,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/keebio/dsp40/rev1/info.json b/keyboards/keebio/dsp40/rev1/info.json
index c5ce2f5a17..efb1bc9551 100644
--- a/keyboards/keebio/dsp40/rev1/info.json
+++ b/keyboards/keebio/dsp40/rev1/info.json
@@ -8,6 +8,11 @@
"pid": "0x144C",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["B10", "B2", "A3", "A4", "B7", "B6", "A10", "C13", "C14", "C15", "F0", "F1"],
+ "rows": ["B9", "A9", "A8", "B15"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "A1", "pin_b": "A2"}
@@ -17,105 +22,117 @@
"pin": "A6",
"levels": 7
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
+ "layout_aliases": {
+ "LAYOUT_40_staggered": "LAYOUT"
+ },
"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<br>Space", "x": 11, "y": 0 },
- { "label": "Tab", "x": 0, "y": 1, "w": 1.25 },
- { "label": "A", "x": 1.25, "y": 1 },
- { "label": "S", "x": 2.25, "y": 1 },
- { "label": "D", "x": 3.25, "y": 1 },
- { "label": "F", "x": 4.25, "y": 1 },
- { "label": "G", "x": 5.25, "y": 1 },
- { "label": "H", "x": 6.25, "y": 1 },
- { "label": "J", "x": 7.25, "y": 1 },
- { "label": "K", "x": 8.25, "y": 1 },
- { "label": "L", "x": 9.25, "y": 1 },
- { "label": "Enter", "x": 10.25, "y": 1, "w": 1.75 },
- { "label": "Shift", "x": 0, "y": 2, "w": 1.75 },
- { "label": "Z", "x": 1.75, "y": 2 },
- { "label": "X", "x": 2.75, "y": 2 },
- { "label": "C", "x": 3.75, "y": 2 },
- { "label": "V", "x": 4.75, "y": 2 },
- { "label": "B", "x": 5.75, "y": 2 },
- { "label": "N", "x": 6.75, "y": 2 },
- { "label": "M", "x": 7.75, "y": 2 },
- { "label": "<", "x": 8.75, "y": 2 },
- { "label": "Shift", "x": 9.75, "y": 2, "w": 1.25 },
- { "label": "Fn", "x": 11, "y": 2 },
- { "label": "Hyper", "x": 0, "y": 3, "w": 1.25 },
- { "label": "Super", "x": 1.25, "y": 3 },
- { "label": "Meta", "x": 2.25, "y": 3, "w": 1.25 },
- { "x": 3.5, "y": 3, "w": 2.25 },
- { "x": 5.75, "y": 3, "w": 2.75 },
- { "label": "Super", "x": 8.5, "y": 3, "w": 1.25 },
- { "label": "Meta", "x": 9.75, "y": 3 },
- { "label": "Super", "x": 10.75, "y": 3, "w": 1.25 }
+ {"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": [1, 0], "x": 0, "y": 1, "w": 1.25},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+ {"matrix": [1, 7], "x": 7.25, "y": 1},
+ {"matrix": [1, 8], "x": 8.25, "y": 1},
+ {"matrix": [1, 9], "x": 9.25, "y": 1},
+ {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25},
+ {"matrix": [3, 7], "x": 5.75, "y": 3, "w": 2.75},
+ {"matrix": [3, 9], "x": 8.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 10], "x": 9.75, "y": 3},
+ {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
]
},
"LAYOUT_ortho_4x12": {
"layout": [
- { "label": "Tab", "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": "Esc", "x": 0, "y": 1 },
- { "label": "A", "x": 1, "y": 1 },
- { "label": "S", "x": 2, "y": 1 },
- { "label": "D", "x": 3, "y": 1 },
- { "label": "F", "x": 4, "y": 1 },
- { "label": "G", "x": 5, "y": 1 },
- { "label": "H", "x": 6, "y": 1 },
- { "label": "J", "x": 7, "y": 1 },
- { "label": "K", "x": 8, "y": 1 },
- { "label": "L", "x": 9, "y": 1 },
- { "label": ";", "x": 10, "y": 1 },
- { "label": "'", "x": 11, "y": 1 },
- { "label": "Shift", "x": 0, "y": 2 },
- { "label": "Z", "x": 1, "y": 2 },
- { "label": "X", "x": 2, "y": 2 },
- { "label": "C", "x": 3, "y": 2 },
- { "label": "V", "x": 4, "y": 2 },
- { "label": "B", "x": 5, "y": 2 },
- { "label": "N", "x": 6, "y": 2 },
- { "label": "M", "x": 7, "y": 2 },
- { "label": ",", "x": 8, "y": 2 },
- { "label": ".", "x": 9, "y": 2 },
- { "label": "/", "x": 10, "y": 2 },
- { "label": "Enter", "x": 11, "y": 2 },
- { "x": 0, "y": 3 },
- { "label": "Ctrl", "x": 1, "y": 3 },
- { "label": "Alt", "x": 2, "y": 3 },
- { "label": "Super", "x": 3, "y": 3 },
- { "label": "Lower", "x": 4, "y": 3 },
- { "label": "Space", "x": 5, "y": 3 },
- { "label": "Space", "x": 6, "y": 3 },
- { "label": "Raise", "x": 7, "y": 3 },
- { "label": "Left", "x": 8, "y": 3 },
- { "label": "Down", "x": 9, "y": 3 },
- { "label": "Up", "x": 10, "y": 3 },
- { "label": "Right", "x": 11, "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": [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": [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": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "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": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3}
]
}
}
diff --git a/keyboards/keebio/dsp40/rev1/rev1.c b/keyboards/keebio/dsp40/rev1/rev1.c
index 41187b90b6..091cfc1523 100644
--- a/keyboards/keebio/dsp40/rev1/rev1.c
+++ b/keyboards/keebio/dsp40/rev1/rev1.c
@@ -14,7 +14,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 "rev1.h"
+#include "quantum.h"
void eeconfig_init_kb(void) {
#ifdef BACKLIGHT_ENABLE
@@ -24,15 +24,3 @@ void eeconfig_init_kb(void) {
eeconfig_update_kb(0);
eeconfig_init_user();
}
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index, clockwise)) { return false; }
- if (index == 0) {
- if (clockwise) {
- tap_code(KC_VOLU);
- } else {
- tap_code(KC_VOLD);
- }
- }
- return false;
-}
diff --git a/keyboards/keebio/dsp40/rev1/rev1.h b/keyboards/keebio/dsp40/rev1/rev1.h
deleted file mode 100644
index f03792175e..0000000000
--- a/keyboards/keebio/dsp40/rev1/rev1.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
- *
- * 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 "dsp40.h"
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x12( \
- KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8, KA9, KA10, KA11, KA12, \
- KB1, KB2, KB3, KB4, KB5, KB6, KB7, KB8, KB9, KB10, KB11, KB12, \
- KC1, KC2, KC3, KC4, KC5, KC6, KC7, KC8, KC9, KC10, KC11, KC12, \
- KD1, KD2, KD3, KD4, KD5, KD6, KD7, KD8, KD9, KD10, KD11, KD12 \
-) \
-{ \
- { KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8, KA9, KA10, KA11, KA12 }, \
- { KB1, KB2, KB3, KB4, KB5, KB6, KB7, KB8, KB9, KB10, KB11, KB12 }, \
- { KC1, KC2, KC3, KC4, KC5, KC6, KC7, KC8, KC9, KC10, KC11, KC12 }, \
- { KD1, KD2, KD3, KD4, KD5, KD6, KD7, KD8, KD9, KD10, KD11, KD12 } \
-}
-
-#define LAYOUT( \
- KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8, KA9, KA10, KA11, KA12, \
- KB1, KB2, KB3, KB4, KB5, KB6, KB7, KB8, KB9, KB10, KB12, \
- KC2, KC3, KC4, KC5, KC6, KC7, KC8, KC9, KC10, KC11, KC12, \
- KD1, KD2, KD3, KD5, KD8, KD10, KD11, KD12 \
-) \
-{ \
- { KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8, KA9, KA10, KA11, KA12 }, \
- { KB1, KB2, KB3, KB4, KB5, KB6, KB7, KB8, KB9, KB10, KC_NO, KB12 }, \
- { KC_NO, KC2, KC3, KC4, KC5, KC6, KC7, KC8, KC9, KC10, KC11, KC12 }, \
- { KD1, KD2, KD3, KC_NO, KD5, KC_NO, KC_NO, KD8, KC_NO, KD10, KD11, KD12 } \
-}
-
-#define LAYOUT_40_staggered LAYOUT
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-01 22:08:06 +0000