diff options
| author | InigoGutierrez <inigogf.95@gmail.com> | 2022-09-25 16:02:54 +0200 |
|---|---|---|
| committer | InigoGutierrez <inigogf.95@gmail.com> | 2022-09-25 16:02:54 +0200 |
| commit | 6afdd9d74da250e47ac64d6690bd19d037045e99 (patch) | |
| tree | 661f6cfb244c02bcd1fbfe8fb9b2bd9242a91394 /keyboards/kiwikeebs | |
| parent | 93a55e61b59d20f7cd842cce02e5b18a63a23612 (diff) | |
| parent | 1bdf4cdc22ae57d111efb2f7d71e405e5c7b3f11 (diff) | |
| download | qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.tar.gz qmk_firmware-6afdd9d74da250e47ac64d6690bd19d037045e99.zip | |
Merge branch 'master' into taamas
Diffstat (limited to 'keyboards/kiwikeebs')
| -rw-r--r-- | keyboards/kiwikeebs/macro/config.h | 8 | ||||
| -rw-r--r-- | keyboards/kiwikeebs/macro/info.json | 8 | ||||
| -rw-r--r-- | keyboards/kiwikeebs/macro_v2/config.h | 8 | ||||
| -rw-r--r-- | keyboards/kiwikeebs/macro_v2/info.json | 8 |
4 files changed, 14 insertions, 18 deletions
diff --git a/keyboards/kiwikeebs/macro/config.h b/keyboards/kiwikeebs/macro/config.h index 47349d0e09..67d02c6396 100644 --- a/keyboards/kiwikeebs/macro/config.h +++ b/keyboards/kiwikeebs/macro/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 0x4B51 -#define PRODUCT_ID 0x4712 -#define DEVICE_VER 0x0001 -#define MANUFACTURER KiwiKeebs -#define PRODUCT MacroBoard v.1.0 - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 4 @@ -42,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #define MATRIX_ROW_PINS { E6, D7 } #define MATRIX_COL_PINS { F7, B1, B3, B2 } -#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/kiwikeebs/macro/info.json b/keyboards/kiwikeebs/macro/info.json index de9ce2f01f..63fedd2484 100644 --- a/keyboards/kiwikeebs/macro/info.json +++ b/keyboards/kiwikeebs/macro/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "KiwiKeebs MacroBoard v1.0", + "keyboard_name": "MacroBoard v.1.0", + "manufacturer": "KiwiKeebs", "url": "https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/", "maintainer": "KiwiKeebs", + "usb": { + "vid": "0x4B51", + "pid": "0x4712", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/kiwikeebs/macro_v2/config.h b/keyboards/kiwikeebs/macro_v2/config.h index a962a9a82a..9a24d57a69 100644 --- a/keyboards/kiwikeebs/macro_v2/config.h +++ b/keyboards/kiwikeebs/macro_v2/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 0x4B51 -#define PRODUCT_ID 0x4712 -#define DEVICE_VER 0x0001 -#define MANUFACTURER KiwiKeebs -#define PRODUCT MacroBoard v.2.0 - /* key matrix size */ #define MATRIX_ROWS 2 #define MATRIX_COLS 4 @@ -42,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #define MATRIX_ROW_PINS { B5, B4 } #define MATRIX_COL_PINS { B6, C6, C7, D4 } -#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/kiwikeebs/macro_v2/info.json b/keyboards/kiwikeebs/macro_v2/info.json index 524e259463..8c76890abd 100644 --- a/keyboards/kiwikeebs/macro_v2/info.json +++ b/keyboards/kiwikeebs/macro_v2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "KiwiKeebs MacroBoard v.2.0", + "keyboard_name": "MacroBoard v.2.0", + "manufacturer": "KiwiKeebs", "url": "https://www.reddit.com/r/mechmarket/comments/ibijrd/ic_kiwikeebs_6key_macroboard_rotary_encoder_diy/", "maintainer": "KiwiKeebs", + "usb": { + "vid": "0x4B51", + "pid": "0x4712", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ |