From bcb8600a31843304ab51e67dfc7c9ad555739714 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 29 Jul 2022 22:40:16 +1000 Subject: Move keyboard USB IDs and strings to data driven: I (#17836) --- keyboards/ibnuda/alicia_cook/config.h | 7 ------- keyboards/ibnuda/alicia_cook/info.json | 6 ++++++ keyboards/ibnuda/gurindam/config.h | 7 ------- keyboards/ibnuda/gurindam/info.json | 8 +++++++- 4 files changed, 13 insertions(+), 15 deletions(-) (limited to 'keyboards/ibnuda') diff --git a/keyboards/ibnuda/alicia_cook/config.h b/keyboards/ibnuda/alicia_cook/config.h index 28db5f3420..04f368dce6 100644 --- a/keyboards/ibnuda/alicia_cook/config.h +++ b/keyboards/ibnuda/alicia_cook/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x6955 -#define DEVICE_VER 0x0899 -#define MANUFACTURER Ibnu D. Aji -#define PRODUCT Alicia Cook - /* key matrix size */ #define MATRIX_ROWS 4 #define MATRIX_COLS 13 diff --git a/keyboards/ibnuda/alicia_cook/info.json b/keyboards/ibnuda/alicia_cook/info.json index c07be77190..3ce8256003 100644 --- a/keyboards/ibnuda/alicia_cook/info.json +++ b/keyboards/ibnuda/alicia_cook/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "Alicia Cook", + "manufacturer": "Ibnu D. Aji", "url": "https://github.com/ibnuda/alicia-cook", "maintainer": "ibnuda", + "usb": { + "vid": "0xFEED", + "pid": "0x6955", + "device_version": "8.9.9" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/ibnuda/gurindam/config.h b/keyboards/ibnuda/gurindam/config.h index a79ea6c5db..da86f8557e 100644 --- a/keyboards/ibnuda/gurindam/config.h +++ b/keyboards/ibnuda/gurindam/config.h @@ -19,13 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x1209 -#define PRODUCT_ID 0x6974 -#define DEVICE_VER 0x0001 -#define MANUFACTURER Ibnu D. Aji -#define PRODUCT Gurindam - /* key matrix size */ #define MATRIX_ROWS 9 #define MATRIX_COLS 8 diff --git a/keyboards/ibnuda/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json index a196f066e0..4c7db56fd9 100644 --- a/keyboards/ibnuda/gurindam/info.json +++ b/keyboards/ibnuda/gurindam/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "gurindam", + "keyboard_name": "Gurindam", + "manufacturer": "Ibnu D. Aji", "url": "https://github.com/ibnuda/gurindam", "maintainer": "Ibnu D. Aji", + "usb": { + "vid": "0x1209", + "pid": "0x6974", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ -- cgit v1.2.1 From 154d35ac146422bef938ed9756f6e0012baa83a2 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 6 Aug 2022 23:23:35 +1000 Subject: Remove `UNUSED_PINS` (#17931) --- keyboards/ibnuda/alicia_cook/config.h | 1 - keyboards/ibnuda/gurindam/config.h | 1 - 2 files changed, 2 deletions(-) (limited to 'keyboards/ibnuda') diff --git a/keyboards/ibnuda/alicia_cook/config.h b/keyboards/ibnuda/alicia_cook/config.h index 04f368dce6..8e8c46b694 100644 --- a/keyboards/ibnuda/alicia_cook/config.h +++ b/keyboards/ibnuda/alicia_cook/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . */ #define MATRIX_ROW_PINS { D2, D3, F4, F5 } #define MATRIX_COL_PINS { B5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1 } -#define UNUSED_PINS /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/ibnuda/gurindam/config.h b/keyboards/ibnuda/gurindam/config.h index da86f8557e..ec281a7c56 100644 --- a/keyboards/ibnuda/gurindam/config.h +++ b/keyboards/ibnuda/gurindam/config.h @@ -35,7 +35,6 @@ along with this program. If not, see . */ #define MATRIX_ROW_PINS { B5, B4, E6, D7, C6, D4, D0, D1, D2} #define MATRIX_COL_PINS { F6, F5, F4, F7, B1, B3, B2, B6 } -#define UNUSED_PINS /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -- cgit v1.2.1 From 1027aed83a264d03cf3bbfd4a85ca7d240217b0f Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 15 Aug 2022 11:53:19 +1000 Subject: Move keyboard USB IDs and strings to data driven, pass 2: F-I (#17958) --- keyboards/ibnuda/squiggle/config.h | 6 ------ keyboards/ibnuda/squiggle/rev1/config.h | 2 -- keyboards/ibnuda/squiggle/rev1/info.json | 6 ++++++ 3 files changed, 6 insertions(+), 8 deletions(-) (limited to 'keyboards/ibnuda') diff --git a/keyboards/ibnuda/squiggle/config.h b/keyboards/ibnuda/squiggle/config.h index d9a144aca7..9e4c4f71bc 100644 --- a/keyboards/ibnuda/squiggle/config.h +++ b/keyboards/ibnuda/squiggle/config.h @@ -19,12 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x1209 -#define PRODUCT_ID 0x6969 -#define MANUFACTURER ibnuda -#define PRODUCT squiggle - #define USE_SERIAL /* diff --git a/keyboards/ibnuda/squiggle/rev1/config.h b/keyboards/ibnuda/squiggle/rev1/config.h index 9dec7e30f5..3d2752c8d4 100644 --- a/keyboards/ibnuda/squiggle/rev1/config.h +++ b/keyboards/ibnuda/squiggle/rev1/config.h @@ -1,7 +1,5 @@ #pragma once -#define DEVICE_VER 0x0001 - /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 5 diff --git a/keyboards/ibnuda/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json index 754164e5d7..0b32e42620 100644 --- a/keyboards/ibnuda/squiggle/rev1/info.json +++ b/keyboards/ibnuda/squiggle/rev1/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "squiggle", + "manufacturer": "ibnuda", "url": "https://github.com/ibnuda/squiggle", "maintainer": "Ibnu D. Aji", + "usb": { + "vid": "0x1209", + "pid": "0x6969", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT": { "layout": [ -- cgit v1.2.1 From d2accb48e784030637f5517dfec66b13f1eab609 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 20 Aug 2022 11:34:17 +0100 Subject: RESET -> QK_BOOT keyboard readme (#18110) --- keyboards/ibnuda/squiggle/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/ibnuda') diff --git a/keyboards/ibnuda/squiggle/readme.md b/keyboards/ibnuda/squiggle/readme.md index 95204ade57..20998844c9 100644 --- a/keyboards/ibnuda/squiggle/readme.md +++ b/keyboards/ibnuda/squiggle/readme.md @@ -21,4 +21,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to To enter to the bootloader you need to: -* Press the key mapped to `RESET` +* Press the key mapped to `QK_BOOT` -- 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/ibnuda/alicia_cook/keymaps/rick/keymap.c | 2 +- keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c | 2 +- keyboards/ibnuda/squiggle/keymaps/rick/keymap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/ibnuda') diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c b/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c index 35e0e1db97..909b1035c5 100644 --- a/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c +++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c @@ -240,7 +240,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT_all( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_LCTL,KC_EXLM,KC_AT, KC_HASH,KC_DLR, KC_PERC, KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN, KC_SCLN, - KC_LSFT,KC_Z, KC_X, KC_C, KC_V, RESET, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,MO(1), + KC_LSFT,KC_Z, KC_X, KC_C, KC_V, QK_BOOT, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,MO(1), KC_LGUI,KC_LALT, KC_LGUI,LW_E, SF_BSPC, AL_ENT, RS_SPC, KC_LALT, KC_RGUI,KC_RCTL ), }; diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c index eb5853e90e..66973a32ed 100644 --- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c +++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c @@ -175,7 +175,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT_complicated( _______,EXPLR, KC_UP, PRVTAB, PRVWIN, NXTWIN, NXTTAB, _______,_______,LCKGUI, TSKMGR, KC_LEFT,KC_DOWN,KC_RGHT,UPTAB, DNTAB, KC_ENT, KC_LGUI,_______,CALDL, - _______,CLSGUI, _______,CONPST, RESET, _______,_______,_______,_______,_______, + _______,CLSGUI, _______,CONPST, QK_BOOT, _______,_______,_______,_______,_______, _______,_______, _______,_______, _______,_______, _______,_______ ), diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c index 7dddeb4089..3e61839b14 100644 --- a/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c +++ b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c @@ -172,7 +172,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_ADJUST] = LAYOUT( _______,EXPLR, KC_UP, PRVTAB, PRVWIN, NXTWIN, NXTTAB, _______,_______,LCKGUI, TSKMGR, KC_LEFT,KC_DOWN,KC_RGHT,UPTAB, DNTAB, KC_ENT, KC_LGUI,_______,CALDL, - _______,CLSGUI, _______,CONPST, RESET, _______,_______,_______,_______,_______, + _______,CLSGUI, _______,CONPST, QK_BOOT, _______,_______,_______,_______,_______, _______,_______, _______,_______ ), }; -- cgit v1.2.1