summaryrefslogtreecommitdiff
path: root/keyboards/contender
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/contender')
-rw-r--r--keyboards/contender/config.h18
-rw-r--r--keyboards/contender/contender.c17
-rw-r--r--keyboards/contender/contender.h43
-rw-r--r--keyboards/contender/info.json65
4 files changed, 39 insertions, 104 deletions
diff --git a/keyboards/contender/config.h b/keyboards/contender/config.h
index e81b8a2094..77d7f36bcc 100644
--- a/keyboards/contender/config.h
+++ b/keyboards/contender/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)
- *
- */
-#define MATRIX_ROW_PINS { D4, D3, B5, B7, B4, B2 }
-#define MATRIX_COL_PINS { C7, D6, B3, B0, B1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN C6
#define RGBLED_NUM 33
#define RGBLIGHT_LED_MAP { \
0, 1, 2, 3, \
diff --git a/keyboards/contender/contender.c b/keyboards/contender/contender.c
deleted file mode 100644
index 5e00516206..0000000000
--- a/keyboards/contender/contender.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 sotoba
- *
- * 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 "contender.h"
diff --git a/keyboards/contender/contender.h b/keyboards/contender/contender.h
deleted file mode 100644
index 4dd71a5d24..0000000000
--- a/keyboards/contender/contender.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright 2020 sotoba
- *
- * 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, \
- k10, k11, k12, k13, \
- k20, k21, k22, k23, \
- k30, k31, k32, k33, k34, \
- k40, k41, k42, k43, k44, \
- k50, k51, k52, k53 \
-) { \
- { KC_NO, k00, k01, k02, k03 }, \
- { KC_NO, k10, k11, k12, k13 }, \
- { KC_NO, k20, k21, k22, k23 }, \
- { k30, k31, k32, k33, k34 }, \
- { k40, k41, k42, k43, k44 }, \
- { k50, k51, k52, k53, KC_NO } \
-}
diff --git a/keyboards/contender/info.json b/keyboards/contender/info.json
index 942963aaee..e8ef7da4a3 100644
--- a/keyboards/contender/info.json
+++ b/keyboards/contender/info.json
@@ -8,37 +8,50 @@
"pid": "0xC010",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "C6"
+ },
+ "matrix_pins": {
+ "cols": ["C7", "D6", "B3", "B0", "B1"],
+ "rows": ["D4", "D3", "B5", "B7", "B4", "B2"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u2",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":1, "y":0},
- {"label":"Tab", "x":2, "y":0},
- {"label":"Shift", "x":3, "y":0},
- {"label":"Back", "x":4, "y":0},
- {"label":"Num", "x":1, "y":1.25},
- {"label":"/", "x":2, "y":1.25},
- {"label":"*", "x":3, "y":1.25},
- {"label":"=", "x":4, "y":1.25},
- {"label":"7", "x":1, "y":2.25},
- {"label":"8", "x":2, "y":2.25},
- {"label":"9", "x":3, "y":2.25},
- {"label":"-", "x":4, "y":2.25},
- {"label":"fn","x":0, "y":3.25},
- {"label":"4", "x":1, "y":3.25},
- {"label":"5", "x":2, "y":3.25},
- {"label":"6", "x":3, "y":3.25},
- {"label":"+", "x":4, "y":3.25},
- {"label":"RGB","x":0, "y":4.25},
- {"label":"1", "x":1, "y":4.25},
- {"label":"2", "x":2, "y":4.25},
- {"label":"3", "x":3, "y":4.25},
- {"label":"Enter", "x":4, "y":4.25, "h":2},
- {"label":"TG","x":0, "y":5.25},
- {"label":"0", "x":1, "y":5.25},
- {"label":"00", "x":2, "y":5.25},
- {"label":".", "x":3, "y":5.25}
+ {"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": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+ {"matrix": [2, 1], "x": 1, "y": 2.25},
+ {"matrix": [2, 2], "x": 2, "y": 2.25},
+ {"matrix": [2, 3], "x": 3, "y": 2.25},
+ {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25},
+ {"matrix": [3, 1], "x": 1, "y": 3.25},
+ {"matrix": [3, 2], "x": 2, "y": 3.25},
+ {"matrix": [3, 3], "x": 3, "y": 3.25},
+ {"matrix": [3, 4], "x": 4, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25},
+ {"matrix": [4, 1], "x": 1, "y": 4.25},
+ {"matrix": [4, 2], "x": 2, "y": 4.25},
+ {"matrix": [4, 3], "x": 3, "y": 4.25},
+ {"matrix": [4, 4], "x": 4, "y": 4.25, "h": 2},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25},
+ {"matrix": [5, 1], "x": 1, "y": 5.25},
+ {"matrix": [5, 2], "x": 2, "y": 5.25},
+ {"matrix": [5, 3], "x": 3, "y": 5.25}
]
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-17 06:03:16 +0000