Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KBIC65 Refactor #17066

Merged
merged 18 commits into from
May 12, 2022
Merged

KBIC65 Refactor #17066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
cbba3d3
info.json: apply friendly formatting
noroadsleft May 11, 2022
ae11966
info.json: correct key sequence; update key labels
noroadsleft May 11, 2022
670fe16
kbic65.h: use ___ for KC_NO
noroadsleft May 11, 2022
231a081
add LAYOUT_65_iso macro
noroadsleft May 11, 2022
e81cc72
refactor iso keymap
noroadsleft May 11, 2022
e9339c4
add LAYOUT_65_iso_split_bs macro
noroadsleft May 11, 2022
8aea5ce
refactor iso_full keymap
noroadsleft May 11, 2022
84c72c5
add LAYOUT_65_ansi macro
noroadsleft May 11, 2022
88879d0
add LAYOUT_65_ansi_split_bs macro
noroadsleft May 11, 2022
e364641
add LAYOUT_65_iso_blocker macro
noroadsleft May 11, 2022
d7201db
add LAYOUT_65_iso_blocker_split_bs macro
noroadsleft May 11, 2022
970d775
add LAYOUT_65_ansi_blocker macro
noroadsleft May 11, 2022
2e8d6ce
add LAYOUT_65_ansi_blocker_split_bs macro
noroadsleft May 11, 2022
29b196f
rename iso keymap to default_iso
noroadsleft May 11, 2022
3c0733f
rename iso_full keymap to default_iso_split_bs
noroadsleft May 11, 2022
06e008f
enable Community Layout Support
noroadsleft May 12, 2022
f1b7775
rename LAYOUT macro to LAYOUT_all
noroadsleft May 12, 2022
6797a2d
kbic65.h: add matrix diagram
noroadsleft May 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,051 changes: 690 additions & 361 deletions keyboards/karlb/kbic65/info.json
View file
Open in desktop

Large diffs are not rendered by default.

170 changes: 167 additions & 3 deletions keyboards/karlb/kbic65/kbic65.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,31 @@

#include "quantum.h"

#define ___ KC_NO

/*
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┐ ┌───────┐
* │10 │00 │11 │01 │12 │02 │13 │03 │14 │04 │15 │05 │16 │06 │17 │ │07 │ │06 │ 2u Backspace
* ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┤ └─┬─────┤
* │30 │20 │31 │21 │32 │22 │33 │23 │34 │24 │35 │25 │36 │26 │ │37 │ │ │
* 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤ ┌──┴┐26 │ ISO Enter
* LShift │50 │40 │51 │41 │52 │42 │53 │43 │54 │44 │55 │45 │56 │ │47 │ │56 │ │
* ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤ └───┴────┘
* │70 │ │70 │60 │71 │61 │72 │62 │73 │63 │74 │64 │75 │65 │76 │┌───┐│57 │
* └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│66 │└───┘
* │80 │81 │82 │83 │84 │85 │86 │┌───┼───┼───┐
* └────┴────┴────┴────────────────────────┴───┴───┴───┘│87 │77 │67 │
* └───┴───┴───┘
* K83+K84 can be 6.25u/1u or 6u/1.25u
* ┌────┬────┬────┬────────────────────────┬────┬────┐
* │80 │81 │82 │83 │84 │85 │ 65% with Blocker
* └────┴────┴────┴────────────────────────┴────┴────┘
*/

// This a shortcut to help you visually see your layout.
// The first section contains all of the arguements
// The second converts the arguments into a two-dimensional array
#define LAYOUT( \
#define LAYOUT_all( \
K10, K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K05, K16, K06, K17, K07, \
K30, K20, K31, K21, K32, K22, K33, K23, K34, K24, K35, K25, K36, K26, K37, \
K50, K40, K51, K41, K52, K42, K53, K43, K54, K44, K55, K45, K56, K47, \
Expand All @@ -17,12 +38,155 @@
) { \
{K00, K01, K02, K03, K04, K05, K06, K07}, \
{K10, K11, K12, K13, K14, K15, K16, K17}, \
{K20, K21, K22, K23, K24, K25, K26, KC_NO}, \
{K20, K21, K22, K23, K24, K25, K26, ___}, \
{K30, K31, K32, K33, K34, K35, K36, K37}, \
{K40, K41, K42, K43, K44, K45, ___, K47}, \
{K50, K51, K52, K53, K54, K55, K56, K57}, \
{K60, K61, K62, K63, K64, K65, K66, K67}, \
{K70, K71, K72, K73, K74, K75, K76, K77}, \
{K80, K81, K82, K83, K84, K85, K86, K87} \
}

#define LAYOUT_65_iso( \
K10, K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K05, K16, K06, K07, \
K30, K20, K31, K21, K32, K22, K33, K23, K34, K24, K35, K25, K36, K37, \
K50, K40, K51, K41, K52, K42, K53, K43, K54, K44, K55, K45, K56, K26, K47, \
K70, K60, K71, K61, K72, K62, K73, K63, K74, K64, K75, K65, K76, K66, K57, \
K80, K81, K82, K83, K84, K85, K86, K87, K77, K67 \
) { \
{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, K37}, \
{K40, K41, K42, K43, K44, K45, KC_NO, K47}, \
{K40, K41, K42, K43, K44, K45, ___, K47}, \
{K50, K51, K52, K53, K54, K55, K56, K57}, \
{K60, K61, K62, K63, K64, K65, K66, K67}, \
{K70, K71, K72, K73, K74, K75, K76, K77}, \
{K80, K81, K82, K83, K84, K85, K86, K87} \
}

#define LAYOUT_65_iso_split_bs( \
K10, K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K05, K16, K06, K17, K07, \
K30, K20, K31, K21, K32, K22, K33, K23, K34, K24, K35, K25, K36, K37, \
K50, K40, K51, K41, K52, K42, K53, K43, K54, K44, K55, K45, K56, K26, K47, \
K70, K60, K71, K61, K72, K62, K73, K63, K74, K64, K75, K65, K76, K66, K57, \
K80, K81, K82, K83, K84, K85, K86, K87, K77, K67 \
) { \
{K00, K01, K02, K03, K04, K05, K06, K07}, \
{K10, K11, K12, K13, K14, K15, K16, K17}, \
{K20, K21, K22, K23, K24, K25, K26, ___}, \
{K30, K31, K32, K33, K34, K35, K36, K37}, \
{K40, K41, K42, K43, K44, K45, ___, K47}, \
{K50, K51, K52, K53, K54, K55, K56, K57}, \
{K60, K61, K62, K63, K64, K65, K66, K67}, \
{K70, K71, K72, K73, K74, K75, K76, K77}, \
{K80, K81, K82, K83, K84, K85, K86, K87} \
}

#define LAYOUT_65_iso_blocker( \
K10, K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K05, K16, K06, K07, \
K30, K20, K31, K21, K32, K22, K33, K23, K34, K24, K35, K25, K36, K37, \
K50, K40, K51, K41, K52, K42, K53, K43, K54, K44, K55, K45, K56, K26, K47, \
K70, K60, K71, K61, K72, K62, K73, K63, K74, K64, K75, K65, K76, K66, K57, \
K80, K81, K82, K83, K84, K85, K87, K77, K67 \
) { \
{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, K37}, \
{K40, K41, K42, K43, K44, K45, ___, K47}, \
{K50, K51, K52, K53, K54, K55, K56, K57}, \
{K60, K61, K62, K63, K64, K65, K66, K67}, \
{K70, K71, K72, K73, K74, K75, K76, K77}, \
{K80, K81, K82, K83, K84, K85, ___, K87} \
}

#define LAYOUT_65_iso_blocker_split_bs( \
K10, K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K05, K16, K06, K17, K07, \
K30, K20, K31, K21, K32, K22, K33, K23, K34, K24, K35, K25, K36, K37, \
K50, K40, K51, K41, K52, K42, K53, K43, K54, K44, K55, K45, K56, K26, K47, \
K70, K60, K71, K61, K72, K62, K73, K63, K74, K64, K75, K65, K76, K66, K57, \
K80, K81, K82, K83, K84, K85, K87, K77, K67 \
) { \
{K00, K01, K02, K03, K04, K05, K06, K07}, \
{K10, K11, K12, K13, K14, K15, K16, K17}, \
{K20, K21, K22, K23, K24, K25, K26, ___}, \
{K30, K31, K32, K33, K34, K35, K36, K37}, \
{K40, K41, K42, K43, K44, K45, ___, K47}, \
{K50, K51, K52, K53, K54, K55, K56, K57}, \
{K60, K61, K62, K63, K64, K65, K66, K67}, \
{K70, K71, K72, K73, K74, K75, K76, K77}, \
{K80, K81, K82, K83, K84, K85, ___, K87} \
}

#define LAYOUT_65_ansi( \
K10, K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K05, K16, K06, K07, \
K30, K20, K31, K21, K32, K22, K33, K23, K34, K24, K35, K25, K36, K26, K37, \
K50, K40, K51, K41, K52, K42, K53, K43, K54, K44, K55, K45, K56, K47, \
K70, K71, K61, K72, K62, K73, K63, K74, K64, K75, K65, K76, K66, K57, \
K80, K81, K82, K83, K84, K85, K86, K87, K77, K67 \
) { \
{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, K37}, \
{K40, K41, K42, K43, K44, K45, ___, K47}, \
{K50, K51, K52, K53, K54, K55, K56, K57}, \
{___, K61, K62, K63, K64, K65, K66, K67}, \
{K70, K71, K72, K73, K74, K75, K76, K77}, \
{K80, K81, K82, K83, K84, K85, K86, K87} \
}

#define LAYOUT_65_ansi_split_bs( \
K10, K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K05, K16, K06, K17, K07, \
K30, K20, K31, K21, K32, K22, K33, K23, K34, K24, K35, K25, K36, K26, K37, \
K50, K40, K51, K41, K52, K42, K53, K43, K54, K44, K55, K45, K56, K47, \
K70, K71, K61, K72, K62, K73, K63, K74, K64, K75, K65, K76, K66, K57, \
K80, K81, K82, K83, K84, K85, K86, K87, K77, K67 \
) { \
{K00, K01, K02, K03, K04, K05, K06, K07}, \
{K10, K11, K12, K13, K14, K15, K16, K17}, \
{K20, K21, K22, K23, K24, K25, K26, ___}, \
{K30, K31, K32, K33, K34, K35, K36, K37}, \
{K40, K41, K42, K43, K44, K45, ___, K47}, \
{K50, K51, K52, K53, K54, K55, K56, K57}, \
{___, K61, K62, K63, K64, K65, K66, K67}, \
{K70, K71, K72, K73, K74, K75, K76, K77}, \
{K80, K81, K82, K83, K84, K85, K86, K87} \
}

#define LAYOUT_65_ansi_blocker( \
K10, K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K05, K16, K06, K07, \
K30, K20, K31, K21, K32, K22, K33, K23, K34, K24, K35, K25, K36, K26, K37, \
K50, K40, K51, K41, K52, K42, K53, K43, K54, K44, K55, K45, K56, K47, \
K70, K71, K61, K72, K62, K73, K63, K74, K64, K75, K65, K76, K66, K57, \
K80, K81, K82, K83, K84, K85, K87, K77, K67 \
) { \
{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, K37}, \
{K40, K41, K42, K43, K44, K45, ___, K47}, \
{K50, K51, K52, K53, K54, K55, K56, K57}, \
{___, K61, K62, K63, K64, K65, K66, K67}, \
{K70, K71, K72, K73, K74, K75, K76, K77}, \
{K80, K81, K82, K83, K84, K85, ___, K87} \
}

#define LAYOUT_65_ansi_blocker_split_bs( \
K10, K00, K11, K01, K12, K02, K13, K03, K14, K04, K15, K05, K16, K06, K17, K07, \
K30, K20, K31, K21, K32, K22, K33, K23, K34, K24, K35, K25, K36, K26, K37, \
K50, K40, K51, K41, K52, K42, K53, K43, K54, K44, K55, K45, K56, K47, \
K70, K71, K61, K72, K62, K73, K63, K74, K64, K75, K65, K76, K66, K57, \
K80, K81, K82, K83, K84, K85, K87, K77, K67 \
) { \
{K00, K01, K02, K03, K04, K05, K06, K07}, \
{K10, K11, K12, K13, K14, K15, K16, K17}, \
{K20, K21, K22, K23, K24, K25, K26, ___}, \
{K30, K31, K32, K33, K34, K35, K36, K37}, \
{K40, K41, K42, K43, K44, K45, ___, K47}, \
{K50, K51, K52, K53, K54, K55, K56, K57}, \
{___, K61, K62, K63, K64, K65, K66, K67}, \
{K70, K71, K72, K73, K74, K75, K76, K77}, \
{K80, K81, K82, K83, K84, K85, ___, K87} \
}
4 changes: 2 additions & 2 deletions keyboards/karlb/kbic65/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

// Default ANSI keymap
[0] = LAYOUT(
[0] = LAYOUT_all(
KC_ESC, 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_HOME,
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_PGUP,
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_PGDN,
KC_LSFT, _______, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),

[1] = LAYOUT(
[1] = LAYOUT_all(
KC_GRV, 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_INS,
_______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______, _______,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______,
Expand Down
23 changes: 23 additions & 0 deletions keyboards/karlb/kbic65/keymaps/default_iso/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright 2021 Karl Berggren <@bkarl>
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

// ISO keymap
[0] = LAYOUT_65_iso(
KC_ESC, 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_HOME,
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_PGUP,
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_NUHS, KC_ENT, KC_PGDN,
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, KC_UP, KC_END,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),

[1] = LAYOUT_65_iso(
KC_GRV, 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_INS,
_______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, _______,
_______, _______, _______, _______, _______, _______, RESET, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, KC_PGUP, _______,
_______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END)

};
0 keyboards/karlb/kbic65/keymaps/iso/readme.md → ...arlb/kbic65/keymaps/default_iso/readme.md
View file
Open in desktop
File renamed without changes.
23 changes: 23 additions & 0 deletions keyboards/karlb/kbic65/keymaps/default_iso_split_bs/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright 2021 Karl Berggren <@bkarl>
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

// ISO keymap
[0] = LAYOUT_65_iso_split_bs(
KC_ESC, 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_DEL, KC_HOME,
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_PGUP,
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_NUHS, KC_ENT, KC_PGDN,
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, KC_UP, KC_END,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),

[1] = LAYOUT_65_iso_split_bs(
KC_GRV, 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_INS,
_______, _______, KC_UP, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, _______,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, _______, _______,
_______, _______, _______, _______, _______, _______, RESET, _______, _______, KC_END, KC_PGDN, KC_DOWN, _______, KC_PGUP, _______,
_______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END)

};
0 ...s/karlb/kbic65/keymaps/iso_full/readme.md → ...65/keymaps/default_iso_split_bs/readme.md
View file
Open in desktop
File renamed without changes.
22 changes: 0 additions & 22 deletions keyboards/karlb/kbic65/keymaps/iso/keymap.c
View file
Open in desktop

This file was deleted.

Loading