From af77912d2d6b426201d75c84e8836d6d5d8c45c5 Mon Sep 17 00:00:00 2001 From: pngu <34752364+itspngu@users.noreply.github.com> Date: Fri, 10 Jan 2020 09:57:49 +0100 Subject: [PATCH] [Keyboard] Changes to support latest release of VIA, moved files to "idb" folder in "keymaps" in preparation of adding more boards, made changes to LAYOUT_ macros (#7798) * make vendor folder for idb keyboards * set default debounce to eager_pk, clean up vendor/product ID * refactoring for VIA * made changes to support latest release of VIA, added default keymap that's in line with the most popular configuration * Made suggested formatting changes * rebase to get rid of lufa files * removed idb_60.json that's only meant for via itself * Update keyboards/idb/idb_60/keymaps/via/rules.mk * Update keyboards/idb/idb_60/readme.md * Update keyboards/idb/idb_60/readme.md * Update keyboards/idb/idb_60/readme.md * Update keyboards/idb/idb_60/rules.mk * Update keyboards/idb/idb_60/config.h * Update keyboards/idb/idb_60/readme.md * made suggested formatting changes * fixing lufa * Update keyboards/idb/idb_60/rules.mk * Update keyboards/idb/idb_60/config.h * made suggested changes --- keyboards/{ => idb}/idb_60/config.h | 10 +- keyboards/{ => idb}/idb_60/idb_60.c | 0 keyboards/idb/idb_60/idb_60.h | 60 ++ keyboards/idb/idb_60/info.json | 648 ++++++++++++++++++ .../idb_60/keymaps/all_keys}/keymap.c | 22 +- keyboards/idb/idb_60/keymaps/default/keymap.c | 46 ++ .../{ => idb}/idb_60/keymaps/pngu/keymap.c | 0 keyboards/idb/idb_60/keymaps/via/keymap.c | 46 ++ keyboards/idb/idb_60/keymaps/via/rules.mk | 2 + keyboards/{ => idb}/idb_60/readme.md | 13 +- keyboards/idb/idb_60/rules.mk | 28 + keyboards/idb_60/idb_60.h | 38 - keyboards/idb_60/info.json | 76 -- keyboards/idb_60/rules.mk | 29 - 14 files changed, 864 insertions(+), 154 deletions(-) rename keyboards/{ => idb}/idb_60/config.h (94%) rename keyboards/{ => idb}/idb_60/idb_60.c (100%) create mode 100644 keyboards/idb/idb_60/idb_60.h create mode 100644 keyboards/idb/idb_60/info.json rename keyboards/{idb_60/keymaps/default => idb/idb_60/keymaps/all_keys}/keymap.c (51%) create mode 100644 keyboards/idb/idb_60/keymaps/default/keymap.c rename keyboards/{ => idb}/idb_60/keymaps/pngu/keymap.c (100%) create mode 100644 keyboards/idb/idb_60/keymaps/via/keymap.c create mode 100644 keyboards/idb/idb_60/keymaps/via/rules.mk rename keyboards/{ => idb}/idb_60/readme.md (72%) create mode 100644 keyboards/idb/idb_60/rules.mk delete mode 100644 keyboards/idb_60/idb_60.h delete mode 100644 keyboards/idb_60/info.json delete mode 100644 keyboards/idb_60/rules.mk diff --git a/keyboards/idb_60/config.h b/keyboards/idb/idb_60/config.h similarity index 94% rename from keyboards/idb_60/config.h rename to keyboards/idb/idb_60/config.h index f5538c291..f7904cf60 100644 --- a/keyboards/idb_60/config.h +++ b/keyboards/idb/idb_60/config.h @@ -20,10 +20,10 @@ along with this program. If not, see . #include "config_common.h" /* USB Device descriptor parameter */ -#define VENDOR_ID 0x6060 // 24672 -#define PRODUCT_ID 0x6060 // 24672 -#define DEVICE_VER 0x0001 -#define MANUFACTURER pngu +#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 #define DESCRIPTION QMK keyboard firmware for idb 60 @@ -48,7 +48,7 @@ along with this program. If not, see . /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +/* Debounce reduces chatter (unintended double-presses) - see https://docs.qmk.fm/#/feature_debounce_type for more information */ #define DEBOUNCE 5 /* define if matrix has ghost (lacks anti-ghosting diodes) */ diff --git a/keyboards/idb_60/idb_60.c b/keyboards/idb/idb_60/idb_60.c similarity index 100% rename from keyboards/idb_60/idb_60.c rename to keyboards/idb/idb_60/idb_60.c diff --git a/keyboards/idb/idb_60/idb_60.h b/keyboards/idb/idb_60/idb_60.h new file mode 100644 index 000000000..c47d6b292 --- /dev/null +++ b/keyboards/idb/idb_60/idb_60.h @@ -0,0 +1,60 @@ +#pragma once + +#include "quantum.h" + +inline void _idb_60_caps_led_on(void) { + writePinLow(C5); +} + +inline void _idb_60_esc_led_on(void) { + writePinLow(C4); +} + +inline void _idb_60_caps_led_off(void) { + writePinLow(C5); +} + +inline void _idb_60_esc_led_off(void) { + writePinLow(C4); +} + +#define LAYOUT( \ + K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07,\ + K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,\ + K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K56,\ + K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76,\ + K80, K90, K81, K93, K95, K86, K96\ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07 }, \ + { K10, K11, K12, K13, K14, K15, K16 }, \ + { K20, K21, K22, K23, K24, K25, K26 }, \ + { K30, K31, K32, K33, K34, K35, K36 }, \ + { K40, K41, K42, K43, K44, K45, KC_NO }, \ + { K50, K51, K52, K53, K54, K55, K56 }, \ + { K60, K61, K62, K63, K64, K65, K66 }, \ + { K70, K71, K72, K73, K74, K75, K76 }, \ + { K80, K81, KC_NO, KC_NO, KC_NO, KC_NO, K86 }, \ + { K90, KC_NO, KC_NO, K93, KC_NO, K95, K96 } \ +} + +#define LAYOUT_all LAYOUT + +#define LAYOUT_default( \ + K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16,\ + K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,\ + K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K56,\ + K60, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76,\ + K80, K81, K93, K95, K96\ +) { \ + { K00, K01, K02, K03, K04, K05, K06, KC_NO }, \ + { K10, K11, K12, K13, K14, K15, K16 }, \ + { K20, K21, K22, K23, K24, K25, K26 }, \ + { K30, K31, K32, K33, K34, K35, K36 }, \ + { K40, K41, K42, K43, K44, K45, KC_NO }, \ + { K50, K51, K52, K53, K54, K55, K56 }, \ + { K60, K61, K62, K63, K64, K65, K66 }, \ + { KC_NO, K71, K72, K73, K74, K75, K76 }, \ + { K80, K81, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ + { KC_NO, KC_NO, KC_NO, K93, KC_NO, K95, K96 } \ +} + diff --git a/keyboards/idb/idb_60/info.json b/keyboards/idb/idb_60/info.json new file mode 100644 index 000000000..a4b5d2332 --- /dev/null +++ b/keyboards/idb/idb_60/info.json @@ -0,0 +1,648 @@ +{ + "keyboard_name":"idb 60", + "url":"https://idb-keyboards.xyz/60", + "maintainer":"pngu", + "width":15, + "height":5, + "layouts":{ + "LAYOUT":{ + "LAYOUT_default":[ + { + "label":"Esc", + "x":0, + "y":0 + }, + { + "label":"!\n1", + "x":1, + "y":0 + }, + { + "label":"@\n2", + "x":2, + "y":0 + }, + { + "label":"#\n3", + "x":3, + "y":0 + }, + { + "label":"$\n4", + "x":4, + "y":0 + }, + { + "label":"%\n5", + "x":5, + "y":0 + }, + { + "label":"^\n6", + "x":6, + "y":0 + }, + { + "label":"&\n7", + "x":7, + "y":0 + }, + { + "label":"*\n8", + "x":8, + "y":0 + }, + { + "label":"(\n9", + "x":9, + "y":0 + }, + { + "label":")\n0", + "x":10, + "y":0 + }, + { + "label":"_\n-", + "x":11, + "y":0 + }, + { + "label":"+\n=", + "x":12, + "y":0 + }, + { + "label":"BS", + "x":13, + "y":0, + "w":2.0 + }, + { + "label":"Tab", + "x":0, + "y":1, + "w":1.5 + }, + { + "label":"Q", + "x":1.5, + "y":1 + }, + { + "label":"W", + "x":2.5, + "y":1 + }, + { + "label":"E", + "x":3.5, + "y":1 + }, + { + "label":"R", + "x":4.5, + "y":1 + }, + { + "label":"T", + "x":5.5, + "y":1 + }, + { + "label":"Y", + "x":6.5, + "y":1 + }, + { + "label":"U", + "x":7.5, + "y":1 + }, + { + "label":"I", + "x":8.5, + "y":1 + }, + { + "label":"O", + "x":9.5, + "y":1 + }, + { + "label":"P", + "x":10.5, + "y":1 + }, + { + "label":"{\n[", + "x":11.5, + "y":1 + }, + { + "label":"}\n]", + "x":12.5, + "y":1 + }, + { + "label":"|\n\\", + "x":13.5, + "y":1, + "w":1.5 + }, + { + "label":"Caps Lock", + "x":0, + "y":2, + "w":1.75 + }, + { + "label":"A", + "x":1.75, + "y":2 + }, + { + "label":"S", + "x":2.75, + "y":2 + }, + { + "label":"D", + "x":3.75, + "y":2 + }, + { + "label":"F", + "x":4.75, + "y":2 + }, + { + "label":"G", + "x":5.75, + "y":2 + }, + { + "label":"H", + "x":6.75, + "y":2 + }, + { + "label":"J", + "x":7.75, + "y":2 + }, + { + "label":"K", + "x":8.75, + "y":2 + }, + { + "label":"L", + "x":9.75, + "y":2 + }, + { + "label":":\n;", + "x":10.75, + "y":2 + }, + { + "label":"\"\n'", + "x":11.75, + "y":2 + }, + { + "label":"Enter", + "x":12.75, + "y":2, + "w":2.25 + }, + { + "label":"Shift", + "x":0, + "y":3, + "w":2.25 + }, + { + "label":"Z", + "x":2.25, + "y":3 + }, + { + "label":"X", + "x":3.25, + "y":3 + }, + { + "label":"C", + "x":4.25, + "y":3 + }, + { + "label":"V", + "x":5.25, + "y":3 + }, + { + "label":"B", + "x":6.25, + "y":3 + }, + { + "label":"N", + "x":7.25, + "y":3 + }, + { + "label":"M", + "x":8.25, + "y":3 + }, + { + "label":"<\n,", + "x":9.25, + "y":3 + }, + { + "label":">\n.", + "x":10.25, + "y":3 + }, + { + "label":"?\n/", + "x":11.25, + "y":3 + }, + { + "label":"Shift", + "x":12.25, + "y":3, + "w":1.75 + }, + { + "label":"Fn", + "x":14, + "y":3 + }, + { + "label":"Ctrl", + "x":0, + "y":4, + "w":1.5 + }, + { + "label":"Alt", + "x":2.5, + "y":4, + "w":1.5 + }, + { + "label":"", + "x":4, + "y":4, + "w":7 + }, + { + "label":"Alt", + "x":11, + "y":4, + "w":1.5 + }, + { + "label":"Ctrl", + "x":13.5, + "y":4, + "w":1.5 + } + ], + "LAYOUT_all":[ + { + "label":"Esc", + "x":0, + "y":0 + }, + { + "label":"!\n1", + "x":1, + "y":0 + }, + { + "label":"@\n2", + "x":2, + "y":0 + }, + { + "label":"#\n3", + "x":3, + "y":0 + }, + { + "label":"$\n4", + "x":4, + "y":0 + }, + { + "label":"%\n5", + "x":5, + "y":0 + }, + { + "label":"^\n6", + "x":6, + "y":0 + }, + { + "label":"&\n7", + "x":7, + "y":0 + }, + { + "label":"*\n8", + "x":8, + "y":0 + }, + { + "label":"(\n9", + "x":9, + "y":0 + }, + { + "label":")\n0", + "x":10, + "y":0 + }, + { + "label":"_\n-", + "x":11, + "y":0 + }, + { + "label":"+\n=", + "x":12, + "y":0 + }, + { + "label":"BS", + "x":13, + "y":0 + }, + { + "label":"~\n`", + "x":14, + "y":0 + }, + { + "label":"Tab", + "x":0, + "y":1, + "w":1.5 + }, + { + "label":"Q", + "x":1.5, + "y":1 + }, + { + "label":"W", + "x":2.5, + "y":1 + }, + { + "label":"E", + "x":3.5, + "y":1 + }, + { + "label":"R", + "x":4.5, + "y":1 + }, + { + "label":"T", + "x":5.5, + "y":1 + }, + { + "label":"Y", + "x":6.5, + "y":1 + }, + { + "label":"U", + "x":7.5, + "y":1 + }, + { + "label":"I", + "x":8.5, + "y":1 + }, + { + "label":"O", + "x":9.5, + "y":1 + }, + { + "label":"P", + "x":10.5, + "y":1 + }, + { + "label":"{\n[", + "x":11.5, + "y":1 + }, + { + "label":"}\n]", + "x":12.5, + "y":1 + }, + { + "label":"|\n\\", + "x":13.5, + "y":1, + "w":1.5 + }, + { + "label":"Caps Lock", + "x":0, + "y":2, + "w":1.75 + }, + { + "label":"A", + "x":1.75, + "y":2 + }, + { + "label":"S", + "x":2.75, + "y":2 + }, + { + "label":"D", + "x":3.75, + "y":2 + }, + { + "label":"F", + "x":4.75, + "y":2 + }, + { + "label":"G", + "x":5.75, + "y":2 + }, + { + "label":"H", + "x":6.75, + "y":2 + }, + { + "label":"J", + "x":7.75, + "y":2 + }, + { + "label":"K", + "x":8.75, + "y":2 + }, + { + "label":"L", + "x":9.75, + "y":2 + }, + { + "label":":\n;", + "x":10.75, + "y":2 + }, + { + "label":"\"\n'", + "x":11.75, + "y":2 + }, + { + "label":"Enter", + "x":12.75, + "y":2, + "w":2.25 + }, + { + "label":"Shift", + "x":0, + "y":3, + "w":1.25 + }, + { + "label":">\n<\n\n|", + "x":1.25, + "y":3 + }, + { + "label":"Z", + "x":2.25, + "y":3 + }, + { + "label":"X", + "x":3.25, + "y":3 + }, + { + "label":"C", + "x":4.25, + "y":3 + }, + { + "label":"V", + "x":5.25, + "y":3 + }, + { + "label":"B", + "x":6.25, + "y":3 + }, + { + "label":"N", + "x":7.25, + "y":3 + }, + { + "label":"M", + "x":8.25, + "y":3 + }, + { + "label":"<\n,", + "x":9.25, + "y":3 + }, + { + "label":">\n.", + "x":10.25, + "y":3 + }, + { + "label":"?\n/", + "x":11.25, + "y":3 + }, + { + "label":"Shift", + "x":12.25, + "y":3, + "w":1.75 + }, + { + "label":"Fn", + "x":14, + "y":3 + }, + { + "label":"Ctrl", + "x":0, + "y":4, + "w":1.5 + }, + { + "label":"Win", + "x":1.5, + "y":4 + }, + { + "label":"Alt", + "x":2.5, + "y":4, + "w":1.5 + }, + { + "label":"", + "x":4, + "y":4, + "w":7 + }, + { + "label":"Alt", + "x":11, + "y":4, + "w":1.5 + }, + { + "label":"Win", + "x":12.5, + "y":4 + }, + { + "label":"Ctrl", + "x":13.5, + "y":4, + "w":1.5 + } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/idb_60/keymaps/default/keymap.c b/keyboards/idb/idb_60/keymaps/all_keys/keymap.c similarity index 51% rename from keyboards/idb_60/keymaps/default/keymap.c rename to keyboards/idb/idb_60/keymaps/all_keys/keymap.c index 48c998774..9f2ef36a1 100644 --- a/keyboards/idb_60/keymaps/default/keymap.c +++ b/keyboards/idb/idb_60/keymaps/all_keys/keymap.c @@ -2,20 +2,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_all( KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NO, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_MENU, KC_RCTL ), - [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, _______, _______, + [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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ) + ), + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______ + ), }; diff --git a/keyboards/idb/idb_60/keymaps/default/keymap.c b/keyboards/idb/idb_60/keymaps/default/keymap.c new file mode 100644 index 000000000..22f208caa --- /dev/null +++ b/keyboards/idb/idb_60/keymaps/default/keymap.c @@ -0,0 +1,46 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_default( + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL + ), + [1] = LAYOUT_default( + 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, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ), + +}; + +// Layer LED indicators + +layer_state_t layer_state_set_user(layer_state_t state) { + if (layer_state_cmp(state, 1)) { + _idb_60_esc_led_on(); + } else { + _idb_60_esc_led_off(); + } + + return state; +} \ No newline at end of file diff --git a/keyboards/idb_60/keymaps/pngu/keymap.c b/keyboards/idb/idb_60/keymaps/pngu/keymap.c similarity index 100% rename from keyboards/idb_60/keymaps/pngu/keymap.c rename to keyboards/idb/idb_60/keymaps/pngu/keymap.c diff --git a/keyboards/idb/idb_60/keymaps/via/keymap.c b/keyboards/idb/idb_60/keymaps/via/keymap.c new file mode 100644 index 000000000..22f208caa --- /dev/null +++ b/keyboards/idb/idb_60/keymaps/via/keymap.c @@ -0,0 +1,46 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_default( + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL + ), + [1] = LAYOUT_default( + 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, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ), + [2] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ), + [3] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______ + ), + +}; + +// Layer LED indicators + +layer_state_t layer_state_set_user(layer_state_t state) { + if (layer_state_cmp(state, 1)) { + _idb_60_esc_led_on(); + } else { + _idb_60_esc_led_off(); + } + + return state; +} \ No newline at end of file diff --git a/keyboards/idb/idb_60/keymaps/via/rules.mk b/keyboards/idb/idb_60/keymaps/via/rules.mk new file mode 100644 index 000000000..36b7ba9cb --- /dev/null +++ b/keyboards/idb/idb_60/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/idb_60/readme.md b/keyboards/idb/idb_60/readme.md similarity index 72% rename from keyboards/idb_60/readme.md rename to keyboards/idb/idb_60/readme.md index e6ed6822b..df25e8778 100644 --- a/keyboards/idb_60/readme.md +++ b/keyboards/idb/idb_60/readme.md @@ -8,10 +8,19 @@ Hardware Availability: [/u/omgitspngu](https://www.reddit.com/user/omgitspngu/) Make example for this keyboard (after setting up your build environment): - make idb_60:default + make idb/idb_60:default Or to make and flash: - make idb_60:default:dfu + make idb/idb_60:default:flash + +To compile VIA firmware: + + make idb/idb_60:via + +LAYOUT_* Macros: + + * *LAYOUT_default*: ANSI WKL with full Backspace + * *LAYOUT_all*: All split keys are available See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/idb/idb_60/rules.mk b/keyboards/idb/idb_60/rules.mk new file mode 100644 index 000000000..289e77f77 --- /dev/null +++ b/keyboards/idb/idb_60/rules.mk @@ -0,0 +1,28 @@ +# MCU name +MCU = atmega32u2 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = atmel-dfu + +# Build Options +# Comment out to disable the options. +BOOTMAGIC_ENABLE = lite +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +KEYBOARD_LOCK_ENABLE = no # Allow locking of keyboard via magic key +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +DEBOUNCE_TYPE = eager_pk # Eager debounce type diff --git a/keyboards/idb_60/idb_60.h b/keyboards/idb_60/idb_60.h deleted file mode 100644 index e9045f664..000000000 --- a/keyboards/idb_60/idb_60.h +++ /dev/null @@ -1,38 +0,0 @@ -#pragma once - -#include "quantum.h" - -inline void _idb_60_caps_led_on(void) { - writePinLow(C5); -} - -inline void _idb_60_esc_led_on(void) { - writePinLow(C4); -} - -inline void _idb_60_caps_led_off(void) { - writePinLow(C5); -} - -inline void _idb_60_esc_led_off(void) { - writePinLow(C4); -} - -#define LAYOUT( \ - K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07,\ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,\ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K56,\ - K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76,\ - K80, K90, K81, K93, K95, K86, K96\ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16 }, \ - { K20, K21, K22, K23, K24, K25, K26 }, \ - { K30, K31, K32, K33, K34, K35, K36 }, \ - { K40, K41, K42, K43, K44, K45, KC_NO }, \ - { K50, K51, K52, K53, K54, K55, K56 }, \ - { K60, K61, K62, K63, K64, K65, K66 }, \ - { K70, K71, K72, K73, K74, K75, K76 }, \ - { K80, K81, KC_NO, KC_NO, KC_NO, KC_NO, K86 }, \ - { K90, KC_NO, KC_NO, K93, KC_NO, K95, K96 } \ -} diff --git a/keyboards/idb_60/info.json b/keyboards/idb_60/info.json deleted file mode 100644 index 9bbe580bf..000000000 --- a/keyboards/idb_60/info.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "keyboard_name": "idb_60", - "url": "https://idb-keyboards.xyz/60", - "maintainer": "pngu", - "width": 15, - "height": 5, - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"Esc","x":0,"y":0}, - {"label":"!\n1","x":1,"y":0}, - {"label":"@\n2","x":2,"y":0}, - {"label":"#\n3","x":3,"y":0}, - {"label":"$\n4","x":4,"y":0}, - {"label":"%\n5","x":5,"y":0}, - {"label":"^\n6","x":6,"y":0}, - {"label":"&\n7","x":7,"y":0}, - {"label":"*\n8","x":8,"y":0}, - {"label":"(\n9","x":9,"y":0}, - {"label":")\n0","x":10,"y":0}, - {"label":"_\n-","x":11,"y":0}, - {"label":"+\n=","x":12,"y":0}, - {"label":"BS","x":13,"y":0}, - {"label":"~\n`","x":14,"y":0}, - {"label":"Tab","x":0,"y":1,"w":1.5}, - {"label":"Q","x":1.5,"y":1}, - {"label":"W","x":2.5,"y":1}, - {"label":"E","x":3.5,"y":1}, - {"label":"R","x":4.5,"y":1}, - {"label":"T","x":5.5,"y":1}, - {"label":"Y","x":6.5,"y":1}, - {"label":"U","x":7.5,"y":1}, - {"label":"I","x":8.5,"y":1}, - {"label":"O","x":9.5,"y":1}, - {"label":"P","x":10.5,"y":1}, - {"label":"{\n[","x":11.5,"y":1}, - {"label":"}\n]","x":12.5,"y":1}, - {"label":"|\n\\","x":13.5,"y":1,"w":1.5}, - {"label":"Caps Lock","x":0,"y":2,"w":1.75}, - {"label":"A","x":1.75,"y":2}, - {"label":"S","x":2.75,"y":2}, - {"label":"D","x":3.75,"y":2}, - {"label":"F","x":4.75,"y":2}, - {"label":"G","x":5.75,"y":2}, - {"label":"H","x":6.75,"y":2}, - {"label":"J","x":7.75,"y":2}, - {"label":"K","x":8.75,"y":2}, - {"label":"L","x":9.75,"y":2}, - {"label":":\n;","x":10.75,"y":2}, - {"label":"\"\n'","x":11.75,"y":2}, - {"label":"Enter","x":12.75,"y":2,"w":2.25}, - {"label":"Shift","x":0,"y":3,"w":1.25}, - {"label":">\n<\n\n|","x":1.25,"y":3}, - {"label":"Z","x":2.25,"y":3}, - {"label":"X","x":3.25,"y":3}, - {"label":"C","x":4.25,"y":3}, - {"label":"V","x":5.25,"y":3}, - {"label":"B","x":6.25,"y":3}, - {"label":"N","x":7.25,"y":3}, - {"label":"M","x":8.25,"y":3}, - {"label":"<\n,","x":9.25,"y":3}, - {"label":">\n.","x":10.25,"y":3}, - {"label":"?\n/","x":11.25,"y":3}, - {"label":"Shift","x":12.25,"y":3,"w":1.75}, - {"label":"Fn","x":14,"y":3}, - {"label":"Ctrl","x":0,"y":4,"w":1.5}, - {"label":"Win","x":1.5,"y":4}, - {"label":"Alt","x":2.5,"y":4,"w":1.5}, - {"label":"","x":4,"y":4,"w":7}, - {"label":"Alt","x":11,"y":4,"w":1.5}, - {"label":"Win","x":12.5,"y":4}, - {"label":"Ctrl","x":13.5,"y":4,"w":1.5} - ] - } - } -} diff --git a/keyboards/idb_60/rules.mk b/keyboards/idb_60/rules.mk deleted file mode 100644 index b57f12db6..000000000 --- a/keyboards/idb_60/rules.mk +++ /dev/null @@ -1,29 +0,0 @@ -# MCU name -MCU = atmega32u2 - -# Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp -BOOTLOADER = atmel-dfu - -# Build Options -# comment out to disable the options. -# -# BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) -# MOUSEKEY_ENABLE = yes # Mouse keys(+4700) -# EXTRAKEY_ENABLE = yes # Audio control and System control(+450) -# CONSOLE_ENABLE = yes # Console for debug(+400) -# COMMAND_ENABLE = yes # Commands for debug and configuration -# KEYBOARD_LOCK_ENABLE = yes # Allow locking of keyboard via magic key -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -# SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend -NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -# MIDI_ENABLE = YES # MIDI controls -# UNICODE_ENABLE = YES # Unicode -# BLUETOOTH_ENABLE = yes # Enable Bluetooth with the Adafruit EZ-Key HID