diff options
| author | fauxpark <fauxpark@gmail.com> | 2022-08-20 10:55:40 +1000 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2022-08-20 10:55:40 +1000 |
| commit | 61689ae6096f55148fdc4d333c6a74a79486eba3 (patch) | |
| tree | 1258cf3619698326cbbd4f28bd3ee502517821fb /keyboards/ramonimbao/tkl_ff | |
| parent | eceed6c50bb2a6a85da992c206b95be8cf9d3d49 (diff) | |
| parent | 201f1a8f47570c83569d1b0f4851b2fddf996fe7 (diff) | |
| download | qmk_firmware-61689ae6096f55148fdc4d333c6a74a79486eba3.tar.gz qmk_firmware-61689ae6096f55148fdc4d333c6a74a79486eba3.zip | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/ramonimbao/tkl_ff')
| -rw-r--r-- | keyboards/ramonimbao/tkl_ff/config.h | 7 | ||||
| -rw-r--r-- | keyboards/ramonimbao/tkl_ff/info.json | 5 | ||||
| -rw-r--r-- | keyboards/ramonimbao/tkl_ff/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/ramonimbao/tkl_ff/v1/info.json | 5 | ||||
| -rw-r--r-- | keyboards/ramonimbao/tkl_ff/v1/rules.mk | 0 | ||||
| -rw-r--r-- | keyboards/ramonimbao/tkl_ff/v2/config.h | 3 | ||||
| -rw-r--r-- | keyboards/ramonimbao/tkl_ff/v2/info.json | 5 |
7 files changed, 17 insertions, 10 deletions
diff --git a/keyboards/ramonimbao/tkl_ff/config.h b/keyboards/ramonimbao/tkl_ff/config.h index 486956989d..550b2ffee0 100644 --- a/keyboards/ramonimbao/tkl_ff/config.h +++ b/keyboards/ramonimbao/tkl_ff/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 0xB16B -#define PRODUCT_ID 0x00FF -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ramon Imbao -#define PRODUCT TKL FF - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/ramonimbao/tkl_ff/info.json b/keyboards/ramonimbao/tkl_ff/info.json index fd71d3f990..a3a22e34d8 100644 --- a/keyboards/ramonimbao/tkl_ff/info.json +++ b/keyboards/ramonimbao/tkl_ff/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "TKL FF", + "manufacturer": "Ramon Imbao", "url": "", "maintainer": "Ramon Imbao", + "usb": { + "vid": "0xB16B", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_ansi": { "layout": [ diff --git a/keyboards/ramonimbao/tkl_ff/rules.mk b/keyboards/ramonimbao/tkl_ff/rules.mk index 1275531ef6..36c8b4137b 100644 --- a/keyboards/ramonimbao/tkl_ff/rules.mk +++ b/keyboards/ramonimbao/tkl_ff/rules.mk @@ -16,3 +16,5 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output + +DEFAULT_FOLDER = ramonimbao/tkl_ff/v1 diff --git a/keyboards/ramonimbao/tkl_ff/v1/info.json b/keyboards/ramonimbao/tkl_ff/v1/info.json new file mode 100644 index 0000000000..3370446f2d --- /dev/null +++ b/keyboards/ramonimbao/tkl_ff/v1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x00FF" + } +} diff --git a/keyboards/ramonimbao/tkl_ff/v1/rules.mk b/keyboards/ramonimbao/tkl_ff/v1/rules.mk new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/keyboards/ramonimbao/tkl_ff/v1/rules.mk diff --git a/keyboards/ramonimbao/tkl_ff/v2/config.h b/keyboards/ramonimbao/tkl_ff/v2/config.h index a35d1bc599..906f38813a 100644 --- a/keyboards/ramonimbao/tkl_ff/v2/config.h +++ b/keyboards/ramonimbao/tkl_ff/v2/config.h @@ -17,9 +17,6 @@ #include "config_common.h" -#undef PRODUCT_ID -#define PRODUCT_ID 0x10FF - #define RGBLIGHT_LAYERS #define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF diff --git a/keyboards/ramonimbao/tkl_ff/v2/info.json b/keyboards/ramonimbao/tkl_ff/v2/info.json new file mode 100644 index 0000000000..ed70ec408c --- /dev/null +++ b/keyboards/ramonimbao/tkl_ff/v2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "pid": "0x10FF" + } +} |