summaryrefslogtreecommitdiff
path: root/keyboards/tg4x
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/tg4x')
-rw-r--r--keyboards/tg4x/config.h21
-rw-r--r--keyboards/tg4x/info.json68
-rw-r--r--keyboards/tg4x/tg4x.c16
-rw-r--r--keyboards/tg4x/tg4x.h21
4 files changed, 63 insertions, 63 deletions
diff --git a/keyboards/tg4x/config.h b/keyboards/tg4x/config.h
index 448c8de24e..e758612272 100644
--- a/keyboards/tg4x/config.h
+++ b/keyboards/tg4x/config.h
@@ -17,26 +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
-#define MATRIX_ROW_PINS { B5, B4, E6, D7, C6, D4, D0, D1 }
-#define MATRIX_COL_PINS { D3, B3, B1, F7, F6, F5, F4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 7
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -53,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/tg4x/info.json b/keyboards/tg4x/info.json
index 775367c426..a3e464a110 100644
--- a/keyboards/tg4x/info.json
+++ b/keyboards/tg4x/info.json
@@ -1,18 +1,76 @@
{
- "keyboard_name": "TG4x",
+ "keyboard_name": "TG4x",
"manufacturer": "MythosMann",
- "url": "",
- "maintainer": "qmk",
+ "url": "",
+ "maintainer": "qmk",
"usb": {
"vid": "0x4D4D",
"pid": "0x0458",
"device_version": "0.2.1"
},
+ "ws2812": {
+ "pin": "D2"
+ },
+ "matrix_pins": {
+ "cols": ["D3", "B3", "B1", "F7", "F6", "F5", "F4"],
+ "rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
- "layouts": {
+ "layouts": {
"LAYOUT": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":2.25}, {"x":6, "y":3, "w":2.75}, {"x":8.75, "y":3, "w":1.25}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}]
+ "layout": [
+ {"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": [4, 0], "x": 7, "y": 0},
+ {"matrix": [4, 1], "x": 8, "y": 0},
+ {"matrix": [4, 2], "x": 9, "y": 0},
+ {"matrix": [4, 3], "x": 10, "y": 0},
+ {"matrix": [4, 4], "x": 11, "y": 0},
+ {"matrix": [4, 5], "x": 12, "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": [5, 0], "x": 7.25, "y": 1},
+ {"matrix": [5, 1], "x": 8.25, "y": 1},
+ {"matrix": [5, 2], "x": 9.25, "y": 1},
+ {"matrix": [5, 3], "x": 10.25, "y": 1},
+ {"matrix": [5, 4], "x": 11.25, "y": 1, "w": 1.75},
+
+ {"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": [6, 0], "x": 7.75, "y": 2},
+ {"matrix": [6, 1], "x": 8.75, "y": 2},
+ {"matrix": [6, 2], "x": 9.75, "y": 2},
+ {"matrix": [6, 3], "x": 10.75, "y": 2},
+ {"matrix": [6, 4], "x": 11.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25},
+ {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 5], "x": 6, "y": 3, "w": 2.75},
+ {"matrix": [7, 1], "x": 8.75, "y": 3, "w": 1.25},
+ {"matrix": [7, 2], "x": 10, "y": 3},
+ {"matrix": [7, 3], "x": 11, "y": 3},
+ {"matrix": [7, 4], "x": 12, "y": 3}
+ ]
}
}
}
diff --git a/keyboards/tg4x/tg4x.c b/keyboards/tg4x/tg4x.c
deleted file mode 100644
index fa7a970d5e..0000000000
--- a/keyboards/tg4x/tg4x.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 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 "tg4x.h"
diff --git a/keyboards/tg4x/tg4x.h b/keyboards/tg4x/tg4x.h
deleted file mode 100644
index 80dc40238f..0000000000
--- a/keyboards/tg4x/tg4x.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define ___ KC_NO
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k40, k41, k42, k43, k44, k45, \
- k10, k11, k12, k13, k14, k15, k16, k50, k51, k52, k53, k54, \
- k20, k21, k22, k23, k24, k25, k26, k60, k61, k62, k63, k64, \
- k30, k31, k32, k34, k35, k71, k72, k73, k74 \
-){ \
- { k00, k01, k02, k03, k04, k05, k06 }, \
- { k10, k11, k12, k13, k14, k15, k16 }, \
- { k20, k21, k22, k23, k24, k25, k26 }, \
- { k30, k31, k32, ___, k34, k35, ___ }, \
- { k40, k41, k42, k43, k44, k45, ___ }, \
- { k50, k51, k52, k53, k54, ___, ___ }, \
- { k60, k61, k62, k63, k64, ___, ___ }, \
- { ___, k71, k72, k73, k74, ___, ___ } \
-}