diff options
author | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
---|---|---|
committer | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
commit | bacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch) | |
tree | d4e3e57aac1a829a191831efd2e62c8a43217885 /keyboards/tweetydabird | |
parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/tweetydabird')
-rw-r--r-- | keyboards/tweetydabird/lbs4/config.h | 10 | ||||
-rw-r--r-- | keyboards/tweetydabird/lbs4/info.json | 2 | ||||
-rw-r--r-- | keyboards/tweetydabird/lbs6/config.h | 10 | ||||
-rw-r--r-- | keyboards/tweetydabird/lbs6/info.json | 5 |
4 files changed, 3 insertions, 24 deletions
diff --git a/keyboards/tweetydabird/lbs4/config.h b/keyboards/tweetydabird/lbs4/config.h deleted file mode 100644 index 91df795bae..0000000000 --- a/keyboards/tweetydabird/lbs4/config.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2022 Markus Knutsson (@TweetyDaBird) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once -#include "config_common.h" - -// Bootmagic Lite key configuration -// Not yet supported in info.json ? -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0
\ No newline at end of file diff --git a/keyboards/tweetydabird/lbs4/info.json b/keyboards/tweetydabird/lbs4/info.json index ef96714671..2f194d658b 100644 --- a/keyboards/tweetydabird/lbs4/info.json +++ b/keyboards/tweetydabird/lbs4/info.json @@ -22,8 +22,6 @@ "lto": true }, - "debounce": 5, - "usb": { "vid": "0xFEED", "pid": "0x23B0", diff --git a/keyboards/tweetydabird/lbs6/config.h b/keyboards/tweetydabird/lbs6/config.h deleted file mode 100644 index ed8d2caa5b..0000000000 --- a/keyboards/tweetydabird/lbs6/config.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2022 Markus Knutsson (@TweetyDaBird) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once -#include "config_common.h" - -// Bootmagic Lite key configuration -// Not yet supported in info.json ? -#define BOOTMAGIC_LITE_ROW 2 -#define BOOTMAGIC_LITE_COLUMN 2 diff --git a/keyboards/tweetydabird/lbs6/info.json b/keyboards/tweetydabird/lbs6/info.json index a35f78b6c9..a0612fabd6 100644 --- a/keyboards/tweetydabird/lbs6/info.json +++ b/keyboards/tweetydabird/lbs6/info.json @@ -26,8 +26,9 @@ "pid": "0x23B0", "device_version": "1.1.0" }, - - "debounce": 5, + "bootmagic": { + "matrix": [2, 2] + }, "matrix_pins": { "direct": [ |