summaryrefslogtreecommitdiff
path: root/keyboards/acekeyboard/titan60
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/acekeyboard/titan60')
-rw-r--r--keyboards/acekeyboard/titan60/config.h23
-rw-r--r--keyboards/acekeyboard/titan60/info.json8
-rw-r--r--keyboards/acekeyboard/titan60/titan60.c18
3 files changed, 8 insertions, 41 deletions
diff --git a/keyboards/acekeyboard/titan60/config.h b/keyboards/acekeyboard/titan60/config.h
index 07378f5e3d..23f7172ea7 100644
--- a/keyboards/acekeyboard/titan60/config.h
+++ b/keyboards/acekeyboard/titan60/config.h
@@ -17,28 +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)
- *
- */
-
-
-// 0 1 2 3 4 5 6 7 8 9 A B C D
-#define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 }
-#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 6
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -55,7 +33,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/acekeyboard/titan60/info.json b/keyboards/acekeyboard/titan60/info.json
index 00629035c0..008c2e37d9 100644
--- a/keyboards/acekeyboard/titan60/info.json
+++ b/keyboards/acekeyboard/titan60/info.json
@@ -8,10 +8,18 @@
"pid": "0x5449",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F7", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3"],
+ "rows": ["B1", "B2", "B3", "F0", "F1"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"breathing": true
},
+ "ws2812": {
+ "pin": "D0"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/acekeyboard/titan60/titan60.c b/keyboards/acekeyboard/titan60/titan60.c
deleted file mode 100644
index 64479f31c8..0000000000
--- a/keyboards/acekeyboard/titan60/titan60.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 MechMerlin
-
-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 "titan60.h"