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/idb | |
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/idb')
-rw-r--r-- | keyboards/idb/idb_60/config.h | 8 | ||||
-rw-r--r-- | keyboards/idb/idb_60/info.json | 6 | ||||
-rw-r--r-- | keyboards/idb/idb_60/keymaps/all_keys/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/idb/idb_60/keymaps/pngu/keymap.c | 2 |
4 files changed, 8 insertions, 10 deletions
diff --git a/keyboards/idb/idb_60/config.h b/keyboards/idb/idb_60/config.h index 81dcfa854e..24960dcbd5 100644 --- a/keyboards/idb/idb_60/config.h +++ b/keyboards/idb/idb_60/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 0x494B // "IB" for idb Keyboards -#define PRODUCT_ID 0x0001 // idb 60 -#define DEVICE_VER 0x0001 -#define MANUFACTURER idb Keyboards -#define PRODUCT idb 60 - /* key matrix size */ #define MATRIX_ROWS 10 #define MATRIX_COLS 8 @@ -42,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #define MATRIX_ROW_PINS { C2, D0, D1, D2, D3, D4, D5, D6, B0, B1 } #define MATRIX_COL_PINS { B2, B3, B4, C6, B6, B7, C7, B5 } -#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/idb/idb_60/info.json b/keyboards/idb/idb_60/info.json index d78c848c6d..675fce4582 100644 --- a/keyboards/idb/idb_60/info.json +++ b/keyboards/idb/idb_60/info.json @@ -1,7 +1,13 @@ { "keyboard_name": "idb 60", + "manufacturer": "idb Keyboards", "url": "https://idb-keyboards.xyz/60", "maintainer": "itspngu", + "usb": { + "vid": "0x494B", + "pid": "0x0001", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT": "LAYOUT_all", "LAYOUT_default": "LAYOUT_60_ansi_wkl_split_rshift" diff --git a/keyboards/idb/idb_60/keymaps/all_keys/keymap.c b/keyboards/idb/idb_60/keymaps/all_keys/keymap.c index 87a6692090..eac16f142a 100644 --- a/keyboards/idb/idb_60/keymaps/all_keys/keymap.c +++ b/keyboards/idb/idb_60/keymaps/all_keys/keymap.c @@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_MENU, KC_RCTL ), [1] = LAYOUT_all( - RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/idb/idb_60/keymaps/pngu/keymap.c b/keyboards/idb/idb_60/keymaps/pngu/keymap.c index c34d1774ea..bda744bef3 100644 --- a/keyboards/idb/idb_60/keymaps/pngu/keymap.c +++ b/keyboards/idb/idb_60/keymaps/pngu/keymap.c @@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_MENU, KC_RGUI ), [1] = LAYOUT( - RESET, 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_DEL, _______, + QK_BOOT, 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_DEL, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |