summaryrefslogtreecommitdiff
path: root/keyboards/dtisaac
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/dtisaac')
-rw-r--r--keyboards/dtisaac/cg108/cg108.c17
-rw-r--r--keyboards/dtisaac/cg108/config.h18
-rw-r--r--keyboards/dtisaac/cg108/info.json5
-rw-r--r--keyboards/dtisaac/dosa40rgb/config.h18
-rw-r--r--keyboards/dtisaac/dosa40rgb/info.json15
-rw-r--r--keyboards/dtisaac/dosa40rgb/rules.mk1
-rw-r--r--keyboards/dtisaac/dtisaac01/config.h35
-rw-r--r--keyboards/dtisaac/dtisaac01/dtisaac01.c17
-rw-r--r--keyboards/dtisaac/dtisaac01/info.json5
9 files changed, 23 insertions, 108 deletions
diff --git a/keyboards/dtisaac/cg108/cg108.c b/keyboards/dtisaac/cg108/cg108.c
deleted file mode 100644
index c2a7254aa8..0000000000
--- a/keyboards/dtisaac/cg108/cg108.c
+++ /dev/null
@@ -1,17 +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/>.
- */
-
-#include "cg108.h"
diff --git a/keyboards/dtisaac/cg108/config.h b/keyboards/dtisaac/cg108/config.h
index fb60cba345..d39c818a73 100644
--- a/keyboards/dtisaac/cg108/config.h
+++ b/keyboards/dtisaac/cg108/config.h
@@ -17,24 +17,6 @@ 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)
- *
- */
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F1, F0, F5, F6, F7, D4, D5, D3, D2, D0 }
-#define MATRIX_COL_PINS { C7, C6, B4, D7, B3, B2, B0, E6, B1, D1, D6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/dtisaac/cg108/info.json b/keyboards/dtisaac/cg108/info.json
index d386e9148a..4da08a7a74 100644
--- a/keyboards/dtisaac/cg108/info.json
+++ b/keyboards/dtisaac/cg108/info.json
@@ -8,6 +8,11 @@
"pid": "0x4973",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["C7", "C6", "B4", "D7", "B3", "B2", "B0", "E6", "B1", "D1", "D6"],
+ "rows": ["F4", "F1", "F0", "F5", "F6", "F7", "D4", "D5", "D3", "D2", "D0"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B6",
"num_lock": "B5",
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/info.json b/keyboards/dtisaac/dosa40rgb/info.json
index 286396776e..b9f02c3470 100644
--- a/keyboards/dtisaac/dosa40rgb/info.json
+++ b/keyboards/dtisaac/dosa40rgb/info.json
@@ -8,6 +8,17 @@
"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": {
@@ -48,12 +59,12 @@
{"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":"Win", "x":1.25, "y":3},
{"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":"Fn", "x":9.75, "y":3},
{"label":"Ctrl", "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
diff --git a/keyboards/dtisaac/dtisaac01/config.h b/keyboards/dtisaac/dtisaac01/config.h
deleted file mode 100644
index aa0f99f104..0000000000
--- a/keyboards/dtisaac/dtisaac01/config.h
+++ /dev/null
@@ -1,35 +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
-
-
-/*
- * 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 { F7, F6, F5, F4, F1, B4, D2, B2, B1, B3, D4, D6 }
-#define MATRIX_COL_PINS { C7, C6, D0, B5, F0, D7, B0, B7, D1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
diff --git a/keyboards/dtisaac/dtisaac01/dtisaac01.c b/keyboards/dtisaac/dtisaac01/dtisaac01.c
deleted file mode 100644
index b11920280f..0000000000
--- a/keyboards/dtisaac/dtisaac01/dtisaac01.c
+++ /dev/null
@@ -1,17 +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/>.
- */
-
-#include "dtisaac01.h"
diff --git a/keyboards/dtisaac/dtisaac01/info.json b/keyboards/dtisaac/dtisaac01/info.json
index bbbc5ede5d..1d762fd1db 100644
--- a/keyboards/dtisaac/dtisaac01/info.json
+++ b/keyboards/dtisaac/dtisaac01/info.json
@@ -8,6 +8,11 @@
"pid": "0x4973",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C7", "C6", "D0", "B5", "F0", "D7", "B0", "B7", "D1"],
+ "rows": ["F7", "F6", "F5", "F4", "F1", "B4", "D2", "B2", "B1", "B3", "D4", "D6"]
+ },
+ "diode_direction": "ROW2COL",
"backlight": {
"pin": "B6",
"breathing": true
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 12:57:22 +0000