summaryrefslogtreecommitdiffstats
path: root/keyboards/sixkeyboard
diff options
context:
space:
mode:
authorlokher <lokher@gmail.com>2022-09-13 11:13:00 +0800
committerlokher <lokher@gmail.com>2022-09-13 11:13:00 +0800
commitfe13cedf8c09fa34d5cec4e4c624738095176625 (patch)
tree818436626d49c7f22f325632b2053edba10d4358 /keyboards/sixkeyboard
parentfa207545a9759c50b9f230eb608d86a9085801d4 (diff)
parentf46379f308783994b8178f95adc686f4b4c3ebd8 (diff)
merge upstream master
Diffstat (limited to 'keyboards/sixkeyboard')
-rw-r--r--keyboards/sixkeyboard/config.h7
-rw-r--r--keyboards/sixkeyboard/info.json8
2 files changed, 7 insertions, 8 deletions
diff --git a/keyboards/sixkeyboard/config.h b/keyboards/sixkeyboard/config.h
index a4d19a5ca1..f9379f5720 100644
--- a/keyboards/sixkeyboard/config.h
+++ b/keyboards/sixkeyboard/config.h
@@ -19,13 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x746B
-#define PRODUCT_ID 0x736B
-#define DEVICE_VER 0x0001
-#define MANUFACTURER techkeys.us
-#define PRODUCT sixkeykeyboard
-
/* key matrix size */
#define MATRIX_ROWS 2
#define MATRIX_COLS 3
diff --git a/keyboards/sixkeyboard/info.json b/keyboards/sixkeyboard/info.json
index 9f8ffa4879..2c9206fcbf 100644
--- a/keyboards/sixkeyboard/info.json
+++ b/keyboards/sixkeyboard/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "Techkeys SixKeyBoard",
+ "keyboard_name": "SixKeyBoard",
+ "manufacturer": "TechKeys",
"url": "",
"maintainer": "qmk",
+ "usb": {
+ "vid": "0x746B",
+ "pid": "0x736B",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_ortho_2x3": {
"layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}]