summaryrefslogtreecommitdiff
path: root/keyboards/cannonkeys/tmov2
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/cannonkeys/tmov2')
-rw-r--r--keyboards/cannonkeys/tmov2/config.h5
-rw-r--r--keyboards/cannonkeys/tmov2/info.json70
-rw-r--r--keyboards/cannonkeys/tmov2/rules.mk1
-rw-r--r--keyboards/cannonkeys/tmov2/tmov2.c1
-rw-r--r--keyboards/cannonkeys/tmov2/tmov2.h15
5 files changed, 69 insertions, 23 deletions
diff --git a/keyboards/cannonkeys/tmov2/config.h b/keyboards/cannonkeys/tmov2/config.h
index 8722ba8d54..d344ffaee6 100644
--- a/keyboards/cannonkeys/tmov2/config.h
+++ b/keyboards/cannonkeys/tmov2/config.h
@@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define MATRIX_COL_PINS { B14, A14, B1, C13, C14, C15, F0, F1, B9, B8, B7, B6, B5, B4, B3, A15 }
-#define MATRIX_ROW_PINS { A10, A9, A8, B12 }
-#define DIODE_DIRECTION COL2ROW
-
#define BACKLIGHT_PWM_DRIVER PWMD3
#define BACKLIGHT_PWM_CHANNEL 1
#define BACKLIGHT_PAL_MODE 1
@@ -41,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGB_DI_PIN B15
#define RGBLED_NUM 22
#define WS2812_SPI SPID2
#define WS2812_SPI_MOSI_PAL_MODE 0
diff --git a/keyboards/cannonkeys/tmov2/info.json b/keyboards/cannonkeys/tmov2/info.json
index bdb6cd7453..4d5d564e66 100644
--- a/keyboards/cannonkeys/tmov2/info.json
+++ b/keyboards/cannonkeys/tmov2/info.json
@@ -8,16 +8,84 @@
"pid": "0x70F2",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B14", "A14", "B1", "C13", "C14", "C15", "F0", "F1", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"],
+ "rows": ["A10", "A9", "A8", "B12"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "A6",
"levels": 6,
"breathing": true
},
+ "ws2812": {
+ "pin": "B15",
+ "driver": "spi"
+ },
"processor": "STM32F072",
"bootloader": "stm32-dfu",
"layouts": {
"LAYOUT_default": {
- "layout": [{"x":0, "y":0}, {"label":"Tab", "x":1.25, "y":0, "w":1.5}, {"label":"Q", "x":2.75, "y":0}, {"label":"W", "x":3.75, "y":0}, {"label":"E", "x":4.75, "y":0}, {"label":"R", "x":5.75, "y":0}, {"label":"T", "x":6.75, "y":0}, {"label":"Y", "x":7.75, "y":0}, {"label":"U", "x":8.75, "y":0}, {"label":"I", "x":9.75, "y":0}, {"label":"O", "x":10.75, "y":0}, {"label":"P", "x":11.75, "y":0}, {"label":"{", "x":12.75, "y":0}, {"label":"}", "x":13.75, "y":0}, {"label":"Backspace", "x":14.75, "y":0}, {"x":0, "y":1}, {"label":"Caps Lock", "x":1.25, "y":1, "w":1.75}, {"label":"A", "x":3, "y":1}, {"label":"S", "x":4, "y":1}, {"label":"D", "x":5, "y":1}, {"label":"F", "x":6, "y":1}, {"label":"G", "x":7, "y":1}, {"label":"H", "x":8, "y":1}, {"label":"J", "x":9, "y":1}, {"label":"K", "x":10, "y":1}, {"label":"L", "x":11, "y":1}, {"label":":", "x":12, "y":1}, {"label":"\"", "x":13, "y":1}, {"label":"Enter", "x":14, "y":1, "w":1.75}, {"x":0, "y":2}, {"label":"Shift", "x":1.25, "y":2, "w":1.25}, {"label":"ISO \\", "x":2.5, "y":2}, {"label":"Z", "x":3.5, "y":2}, {"label":"X", "x":4.5, "y":2}, {"label":"C", "x":5.5, "y":2}, {"label":"V", "x":6.5, "y":2}, {"label":"B", "x":7.5, "y":2}, {"label":"N", "x":8.5, "y":2}, {"label":"M", "x":9.5, "y":2}, {"label":"<", "x":10.5, "y":2}, {"label":">", "x":11.5, "y":2}, {"label":"?", "x":12.5, "y":2}, {"label":"Shift", "x":13.5, "y":2, "w":1.25}, {"x":14.75, "y":2}, {"x":0, "y":3}, {"label":"Win", "x":3.25, "y":3}, {"label":"Alt", "x":4.25, "y":3, "w":1.5}, {"x":5.75, "y":3, "w":2.25}, {"x":8, "y":3, "w":2.75}, {"label":"Alt", "x":10.75, "y":3, "w":1.5}, {"label":"Menu", "x":12.25, "y":3}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0, "w": 1.5},
+ {"matrix": [0, 3], "x": 2.75, "y": 0},
+ {"matrix": [0, 4], "x": 3.75, "y": 0},
+ {"matrix": [0, 5], "x": 4.75, "y": 0},
+ {"matrix": [0, 6], "x": 5.75, "y": 0},
+ {"matrix": [0, 7], "x": 6.75, "y": 0},
+ {"matrix": [0, 8], "x": 7.75, "y": 0},
+ {"matrix": [0, 9], "x": 8.75, "y": 0},
+ {"matrix": [0, 10], "x": 9.75, "y": 0},
+ {"matrix": [0, 11], "x": 10.75, "y": 0},
+ {"matrix": [0, 12], "x": 11.75, "y": 0},
+ {"matrix": [0, 13], "x": 12.75, "y": 0},
+ {"matrix": [0, 14], "x": 13.75, "y": 0},
+ {"matrix": [0, 15], "x": 14.75, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+
+ {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.75},
+ {"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": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1},
+ {"matrix": [1, 14], "x": 14, "y": 1, "w": 1.75},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.25},
+ {"matrix": [2, 14], "x": 14.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3, "w": 1.5},
+ {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 8], "x": 8, "y": 3, "w": 2.75},
+ {"matrix": [3, 10], "x": 10.75, "y": 3, "w": 1.5},
+ {"matrix": [3, 11], "x": 12.25, "y": 3}
+ ]
}
}
}
diff --git a/keyboards/cannonkeys/tmov2/rules.mk b/keyboards/cannonkeys/tmov2/rules.mk
index 8b82556130..b7ab91a339 100644
--- a/keyboards/cannonkeys/tmov2/rules.mk
+++ b/keyboards/cannonkeys/tmov2/rules.mk
@@ -12,7 +12,6 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes
RGBLIGHT_ENABLE = yes
-WS2812_DRIVER = spi
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/cannonkeys/tmov2/tmov2.c b/keyboards/cannonkeys/tmov2/tmov2.c
deleted file mode 100644
index 47295ac270..0000000000
--- a/keyboards/cannonkeys/tmov2/tmov2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "tmov2.h"
diff --git a/keyboards/cannonkeys/tmov2/tmov2.h b/keyboards/cannonkeys/tmov2/tmov2.h
deleted file mode 100644
index f1f3920403..0000000000
--- a/keyboards/cannonkeys/tmov2/tmov2.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( \
- K000, K001, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
- K100, K101, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
- K300, K303, K304, K306, K308, K310, K311 \
-) { \
- { K000, K001, KC_NO, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \
- { K100, K101, KC_NO, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, KC_NO }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, KC_NO }, \
- { K300, KC_NO, KC_NO, K303, K304, KC_NO, K306, KC_NO, K308, KC_NO, K310, K311, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-28 22:49:46 +0000