summaryrefslogtreecommitdiff
path: root/keyboards/dtisaac/dosa40rgb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/dtisaac/dosa40rgb')
-rw-r--r--keyboards/dtisaac/dosa40rgb/config.h18
-rw-r--r--keyboards/dtisaac/dosa40rgb/dosa40rgb.c2
-rw-r--r--keyboards/dtisaac/dosa40rgb/dosa40rgb.h40
-rw-r--r--keyboards/dtisaac/dosa40rgb/info.json98
-rw-r--r--keyboards/dtisaac/dosa40rgb/rules.mk1
5 files changed, 57 insertions, 102 deletions
diff --git a/keyboards/dtisaac/dosa40rgb/config.h b/keyboards/dtisaac/dosa40rgb/config.h
index 12402c7d3f..0ad383a688 100644
--- a/keyboards/dtisaac/dosa40rgb/config.h
+++ b/keyboards/dtisaac/dosa40rgb/config.h
@@ -17,25 +17,7 @@ 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 { B7, D7, F1, F0 }
-#define MATRIX_COL_PINS { D1, D6, D3, D2, B6, C6, C7, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#ifdef RGB_MATRIX_ENABLE
-#define RGB_DI_PIN D0
#define RGB_MATRIX_LED_COUNT 42
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
#define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
diff --git a/keyboards/dtisaac/dosa40rgb/dosa40rgb.c b/keyboards/dtisaac/dosa40rgb/dosa40rgb.c
index c46bfc291d..35ae8eb018 100644
--- a/keyboards/dtisaac/dosa40rgb/dosa40rgb.c
+++ b/keyboards/dtisaac/dosa40rgb/dosa40rgb.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "dosa40rgb.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/dtisaac/dosa40rgb/dosa40rgb.h b/keyboards/dtisaac/dosa40rgb/dosa40rgb.h
deleted file mode 100644
index 659e42f8f2..0000000000
--- a/keyboards/dtisaac/dosa40rgb/dosa40rgb.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2021 DTIsaac
- *
- * 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"
-
-/* 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( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k41, \
- 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 \
-) \
-{ \
- {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, KC_NO,k36, KC_NO, k37, k38, k39, k40, k41}, \
-}
diff --git a/keyboards/dtisaac/dosa40rgb/info.json b/keyboards/dtisaac/dosa40rgb/info.json
index 286396776e..63243c494d 100644
--- a/keyboards/dtisaac/dosa40rgb/info.json
+++ b/keyboards/dtisaac/dosa40rgb/info.json
@@ -8,53 +8,67 @@
"pid": "0x4973",
"device_version": "0.0.4"
},
+ "ws2812": {
+ "pin": "D0"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["D1", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"],
+ "rows": ["B7", "D7", "F1", "F0"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "lufa-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":"BSPC", "x":11, "y":0},
- {"label":"Caps Lock", "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":"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":".", "x":9.75, "y":2},
- {"label":"Shift", "x":10.75, "y":2, "w":1.25},
- {"label":"Ctrl", "x":0, "y":3, "w":1.25},
- {"label":"Win", "x":1.25, "y":3, "w":1},
- {"label":"Alt", "x":2.25, "y":3, "w":1.25},
- {"label":"Space", "x":3.5, "y":3, "w":2.25},
- {"label":"Space", "x":5.75, "y":3, "w":2.75},
- {"label":"App", "x":8.5, "y":3, "w":1.25},
- {"label":"Fn", "x":9.75, "y":3, "w":1},
- {"label":"Ctrl", "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": [3, 10], "x": 11, "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, 10], "x": 10.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25},
+
+ {"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, 6], "x": 5.75, "y": 3, "w": 2.75},
+ {"matrix": [3, 7], "x": 8.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 8], "x": 9.75, "y": 3},
+ {"matrix": [3, 9], "x": 10.75, "y": 3, "w": 1.25}
]
}
}
diff --git a/keyboards/dtisaac/dosa40rgb/rules.mk b/keyboards/dtisaac/dosa40rgb/rules.mk
index c3b1c4ef11..5cc9ef68e4 100644
--- a/keyboards/dtisaac/dosa40rgb/rules.mk
+++ b/keyboards/dtisaac/dosa40rgb/rules.mk
@@ -13,6 +13,5 @@ AUDIO_ENABLE = no # Audio output
BLUETOOTH_ENABLE = yes # Enable Bluetooth
BLUETOOTH_DRIVER = BluefruitLE
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
LTO_ENABLE = yes
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 08:26:37 +0000