Merge remote-tracking branch 'origin/master' into develop

zvecr · May 12, 2022 · 6b39a38 · 6b39a38
2 parents a818334 + b26ba52
commit 6b39a38
Show file tree

Hide file tree

Showing 36 changed files with 942 additions and 826 deletions.
diff --git a/keyboards/karlb/kbic65/info.json b/keyboards/karlb/kbic65/info.json
diff --git a/keyboards/karlb/kbic65/kbic65.h b/keyboards/karlb/kbic65/kbic65.h
@@ -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, \
@@ -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} \
+}
diff --git a/keyboards/karlb/kbic65/keymaps/default/keymap.c b/keyboards/karlb/kbic65/keymaps/default/keymap.c
@@ -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,  _______,                      _______,

diff --git a/keyboards/karlb/kbic65/keymaps/default_iso/keymap.c b/keyboards/karlb/kbic65/keymaps/default_iso/keymap.c
@@ -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)
+
+};
diff --git a/keyboards/karlb/kbic65/keymaps/iso/readme.md → ...arlb/kbic65/keymaps/default_iso/readme.md b/keyboards/karlb/kbic65/keymaps/iso/readme.md → ...arlb/kbic65/keymaps/default_iso/readme.md
diff --git a/keyboards/karlb/kbic65/keymaps/default_iso_split_bs/keymap.c b/keyboards/karlb/kbic65/keymaps/default_iso_split_bs/keymap.c
@@ -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)
+
+};
diff --git a/...s/karlb/kbic65/keymaps/iso_full/readme.md → ...65/keymaps/default_iso_split_bs/readme.md b/...s/karlb/kbic65/keymaps/iso_full/readme.md → ...65/keymaps/default_iso_split_bs/readme.md
diff --git a/keyboards/karlb/kbic65/keymaps/iso/keymap.c b/keyboards/karlb/kbic65/keymaps/iso/keymap.c