From 1fd8d5c322a8686baab627f7e56f6de5d44a0810 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 4 Aug 2022 08:52:24 +1000 Subject: Move keyboard USB IDs and strings to data driven: V (#17901) --- keyboards/vitamins_included/config.h | 6 ------ keyboards/vitamins_included/info.json | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'keyboards/vitamins_included') diff --git a/keyboards/vitamins_included/config.h b/keyboards/vitamins_included/config.h index 9939167315..013bf0d4e8 100644 --- a/keyboards/vitamins_included/config.h +++ b/keyboards/vitamins_included/config.h @@ -19,10 +19,4 @@ along with this program. If not, see . #pragma once //#define USE_I2C -/* Common USB Device descriptor parameters */ -#define VENDOR_ID 0x1209 -#define PRODUCT_ID 0xBEE5 -#define MANUFACTURER Duckle29 -#define PRODUCT Vitamins included - #include "config_common.h" diff --git a/keyboards/vitamins_included/info.json b/keyboards/vitamins_included/info.json index ee7dadead4..acfacd6dca 100644 --- a/keyboards/vitamins_included/info.json +++ b/keyboards/vitamins_included/info.json @@ -1,7 +1,12 @@ { "keyboard_name": "Vitamins Included", + "manufacturer": "Duckle29", "url": "", "maintainer": "Duckle29", + "usb": { + "vid": "0x1209", + "pid": "0xBEE5" + }, "layouts": { "LAYOUT": { "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}] -- cgit v1.2.1 From b0eda7701a372e820264c6a78afa1f8c410845f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 22 Aug 2022 08:08:50 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 3 (#18111) --- keyboards/vitamins_included/rev1/config.h | 3 --- keyboards/vitamins_included/rev1/info.json | 5 +++++ keyboards/vitamins_included/rev2/config.h | 3 --- keyboards/vitamins_included/rev2/info.json | 5 +++++ 4 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 keyboards/vitamins_included/rev1/info.json create mode 100644 keyboards/vitamins_included/rev2/info.json (limited to 'keyboards/vitamins_included') diff --git a/keyboards/vitamins_included/rev1/config.h b/keyboards/vitamins_included/rev1/config.h index 675dae1044..0a32ba8c47 100644 --- a/keyboards/vitamins_included/rev1/config.h +++ b/keyboards/vitamins_included/rev1/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . #define EE_HANDS #define SOFT_SERIAL_PIN D0 -/* USB Device descriptor parameters */ -#define DEVICE_VER 0x0001 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/vitamins_included/rev1/info.json b/keyboards/vitamins_included/rev1/info.json new file mode 100644 index 0000000000..90ac25f360 --- /dev/null +++ b/keyboards/vitamins_included/rev1/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.1" + } +} diff --git a/keyboards/vitamins_included/rev2/config.h b/keyboards/vitamins_included/rev2/config.h index 6ea80ec05a..fff3e9cccf 100644 --- a/keyboards/vitamins_included/rev2/config.h +++ b/keyboards/vitamins_included/rev2/config.h @@ -24,9 +24,6 @@ along with this program. If not, see . #define SPLIT_HAND_PIN B4 #define SOFT_SERIAL_PIN D0 -/* USB Device descriptor parameter */ -#define DEVICE_VER 0x0002 - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 diff --git a/keyboards/vitamins_included/rev2/info.json b/keyboards/vitamins_included/rev2/info.json new file mode 100644 index 0000000000..e557e4d307 --- /dev/null +++ b/keyboards/vitamins_included/rev2/info.json @@ -0,0 +1,5 @@ +{ + "usb": { + "device_version": "0.0.2" + } +} -- cgit v1.2.1 From bbc3bc55f2d52b90881470695ee132f5a57bfaa3 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 21 Aug 2022 23:55:30 +0100 Subject: RESET -> QK_BOOT user keymaps (#17940) --- keyboards/vitamins_included/keymaps/numpad/keymap.c | 4 ++-- keyboards/vitamins_included/keymaps/vitavim/keymap.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/vitamins_included') diff --git a/keyboards/vitamins_included/keymaps/numpad/keymap.c b/keyboards/vitamins_included/keymaps/numpad/keymap.c index 5bff826145..03cfafda11 100644 --- a/keyboards/vitamins_included/keymaps/numpad/keymap.c +++ b/keyboards/vitamins_included/keymaps/numpad/keymap.c @@ -42,14 +42,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * |------+------+------+------+------+------|------+------+------+------+------+------| * | | | | | | | | | | | | | * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | RESET RESET | | | | |RGBMOD| + * | | | | | | QK_BOOT QK_BOOT | | | | |RGBMOD| * `-----------------------------------------------------------------------------------' */ [_ADJUST] = LAYOUT_ortho_4x12( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, RESET, RESET, _______, _______, _______, _______, RGB_MOD + _______, _______, _______, _______, _______, QK_BOOT, QK_BOOT, _______, _______, _______, _______, RGB_MOD ) diff --git a/keyboards/vitamins_included/keymaps/vitavim/keymap.c b/keyboards/vitamins_included/keymaps/vitavim/keymap.c index e90f0e076e..d59ff88029 100644 --- a/keyboards/vitamins_included/keymaps/vitavim/keymap.c +++ b/keyboards/vitamins_included/keymaps/vitavim/keymap.c @@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `--------------------------------------------------------------------------------------' */ [_VIM] = LAYOUT_ortho_4x12( - KC_TAB, KC_QUOT, KC_B, KC_W, KC_E, KC_D, KC_Y, KC_VOLD, KC_VOLU, TO(0), TG(2), RESET, + KC_TAB, KC_QUOT, KC_B, KC_W, KC_E, KC_D, KC_Y, KC_VOLD, KC_VOLU, TO(0), TG(2), QK_BOOT, LCTL_T(KC_ESC), KC_HOME, KC_HOME, KC_PGUP, KC_PGDN, KC_END, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, LT(2,KC_SCLN), KC_ENT, KC_LSFT, KC_SCLN, KC_Q, KC_CIRC, KC_DLR, KC_X, RALT(KC_EQL), RCTL(KC_PLUS), RCTL(KC_PMNS), KC_NO, KC_NO, KC_TRNS, KC_LCTL, KC_LGUI, KC_LALT, KC_LSFT, LSFT(KC_LCTL), KC_SPC, KC_DEL, KC_BSPC, KC_NO, KC_NO, KC_NO, KC_TRNS -- cgit v1.2.1