summaryrefslogtreecommitdiffstats
path: root/keyboards/matrix/falcon
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/matrix/falcon
parentfa207545a9759c50b9f230eb608d86a9085801d4 (diff)
parentf46379f308783994b8178f95adc686f4b4c3ebd8 (diff)
merge upstream master
Diffstat (limited to 'keyboards/matrix/falcon')
-rw-r--r--keyboards/matrix/falcon/config.h8
-rw-r--r--keyboards/matrix/falcon/info.json8
-rw-r--r--keyboards/matrix/falcon/readme.md2
3 files changed, 8 insertions, 10 deletions
diff --git a/keyboards/matrix/falcon/config.h b/keyboards/matrix/falcon/config.h
index afd0b5d3ef..d25668115c 100644
--- a/keyboards/matrix/falcon/config.h
+++ b/keyboards/matrix/falcon/config.h
@@ -17,13 +17,6 @@
#include "config_common.h"
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x4D58
-#define PRODUCT_ID 0x474E
-#define DEVICE_VER 0x0001
-#define MANUFACTURER Matrix Lab
-#define PRODUCT Falcon
-
/* key matrix size */
#define MATRIX_ROWS 5
#define MATRIX_COLS 13
@@ -31,7 +24,6 @@
#define MATRIX_ROW_PINS { F1, B7, F7, F5, F4}
#define MATRIX_COL_PINS { F6, B3, B2, B1, B0, C7, C6, B6, B5, B4, D7, D6, D4}
-#define UNUSED_PINS
#define DIODE_DIRECTION ROW2COL
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
diff --git a/keyboards/matrix/falcon/info.json b/keyboards/matrix/falcon/info.json
index aeaaa7f9f2..f1b7267681 100644
--- a/keyboards/matrix/falcon/info.json
+++ b/keyboards/matrix/falcon/info.json
@@ -1,7 +1,13 @@
{
- "keyboard_name": "Matrix Lab Falcon",
+ "keyboard_name": "Falcon",
+ "manufacturer": "Matrix Lab",
"url": "",
"maintainer": "yulei (Astro)",
+ "usb": {
+ "vid": "0x4D58",
+ "pid": "0x474E",
+ "device_version": "0.0.1"
+ },
"layouts": {
"LAYOUT_60_hhkb": {
"layout": [
diff --git a/keyboards/matrix/falcon/readme.md b/keyboards/matrix/falcon/readme.md
index c283650fcf..a2ceb82163 100644
--- a/keyboards/matrix/falcon/readme.md
+++ b/keyboards/matrix/falcon/readme.md
@@ -22,4 +22,4 @@ Enter the bootloader in 3 ways:
* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard.
* **Physical reset button**: Briefly short cut the *RST* pin with the *GND* pin (pin at the topside of the *RST*) on the back of the PCB.
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available. \ No newline at end of file
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. \ No newline at end of file