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

Co-authored-by: Joel Challis <git@zvecr.com>

keyboards/boardsource/lulu/keymaps/davidrambo/config.h

@@ -0,0 +1,31 @@
+/* Copyright 2022 Cole Smith <cole@boardsource.xyz>
+ * Copyright 2022 David Rambo <davidrambo@mailfence.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define MASTER_RIGHT
+#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD
+#define CAPS_WORD_IDLE_TIMEOUT 3000  // 3 seconds.
+
+#define TAPPING_TERM 210
+/*#define PERMISSIVE_HOLD*/
+#define IGNORE_MOD_TAP_INTERRUPT
+#define TAPPING_FORCE_HOLD
+
+#ifdef RGB_MATRIX_ENABLE
+    #define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended
+#endif

keyboards/boardsource/lulu/keymaps/davidrambo/keymap.c

@@ -0,0 +1,201 @@
+/* Copyright 2022 Cole Smith <cole@boardsource.xyz>
+ * Copyright 2022 David Rambo <davidrambo@mailfence.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum custom_layers {
+    _COLEMAK,
+    _GAME,
+    _SYMBOL,
+    _NAVIGATION,
+    _FKEYS,
+};
+
+//keycode shorthands
+#define SYM  MO(2)
+#define NAV  LT(3, KC_ESC)
+#define FKEY MO(4)
+
+//aliases for clarity in layering
+#define SftEnt  SFT_T(KC_ENT)   // Shift when held, Enter when tapped
+#define BSCTL   LCTL_T(KC_BSPC) // Ctrl when held, Backspace when tapped
+
+//aliases for clarity in layering
+#define C_TAB   LCTL(KC_TAB)
+#define A_TAB   LALT(KC_TAB)
+#define G_TAB   LGUI(KC_TAB)    // Mac: switch applications
+
+#define CBSPC   LCTL(KC_BSPC)  // delete whole word
+#define G_LEFT  LGUI(KC_LEFT)
+#define G_RGHT  LGUI(KC_RGHT)
+#define CRGHT   LCTL(KC_RGHT)
+#define CLEFT   LCTL(KC_LEFT)
+
+// Left-hand home row mods
+#define HOME_A LALT_T(KC_A)
+#define HOME_R LGUI_T(KC_R)
+#define HOME_S LSFT_T(KC_S)
+#define HOME_T LCTL_T(KC_T)
+
+// Right-hand home row mods
+#define HOME_N RCTL_T(KC_N)
+#define HOME_E RSFT_T(KC_E)
+#define HOME_I LGUI_T(KC_I)
+#define HOME_O LALT_T(KC_O)
+
+//internet browser tab shortcuts and window swapping
+#define CTLPGDN LCTL(KC_PGDN)
+#define CTLPGUP LCTL(KC_PGUP)
+
+#define G_GRV   LGUI(KC_GRV)
+#define SftEnt  SFT_T(KC_ENT)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* QWERTY
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |  `~  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  =   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   F  |   P  |   G  |                    |   J  |   L  |   U  |   Y  |   :  | BSP  |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |EscNAV|   A  |   R  |   S  |   T  |   D  |-------.    ,-------|   H  |   N  |   E  |   I  |   O  |  '   |
+ * |------+------+------+------+------+------|   NO  |    |   NO  |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   K  |   M  |   ,  |   .  |   /  |EntSft|
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | Del  | LGUI | LALT | /LCTL/BS/       \Space \  | SYM  | FKEY | RALT |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+
+ [_COLEMAK] = LAYOUT(
+  KC_GRV,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  KC_TAB,   KC_Q,   KC_W,    KC_F,    KC_P,    KC_G,                     KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
+  NAV,      HOME_A, HOME_R,  HOME_S,  HOME_T,  KC_D,                     KC_H,    HOME_N,  HOME_E,  HOME_I,  HOME_O,  KC_QUOT,
+  KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,   KC_MUTE,   KC_NO, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SftEnt,
+                     MEH_T(KC_DEL), KC_LALT, KC_LGUI, BSCTL,          KC_SPC,   SYM,   FKEY, KC_RALT
+),
+
+/* Gaming Layer
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |  ESC |  T   |  Q   |  W   |  E   |  R   |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |  TAB | LSFT |  S   |  A   |  D   |  F   |-------.    ,-------|      |      |      |      |      |      |
+ * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+ * | LALT | LCTL |  Z   |  X   |  C   |  V   |-------|    |-------|      |      |      |      |      |      |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   |      |      |      | /       /       \      \  |      |      |      |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+
+[_GAME] = LAYOUT(
+  _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, TO(0),
+  KC_ESC , KC_T   , KC_Q   , KC_W   , KC_E   , KC_R   ,                      _______, _______, _______, _______, _______, _______,
+  KC_TAB , KC_LSFT, KC_A   , KC_S   , KC_D   , KC_F   ,                      _______, _______, _______, _______, _______, _______,
+  KC_LALT, KC_LCTL, KC_Z   , KC_X   , KC_C   , KC_V   ,  _______,  _______,  _______, _______, _______, _______, _______, _______,
+                               KC_M,    KC_I,    KC_B,  KC_SPC ,    _______,  _______, _______, _______
+),
+
+/* Symbol Layer
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |  F12 |  F1  |  F2  |  F3  |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  | F10  | F11  |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |   [  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |   ]  |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |  \|  |   !  |   @  |   #  |   $  |   %  |-------.    ,-------|   ^  |   &  |   *  |   (  |   )  |   -  |
+ * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+ * |      | HOME |  END |   [  |   ]  |      |-------|    |-------|  `~  |   _  | PGUP |   {  |   }  |   |  |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | ____ | ____ | ____ | / ____  /       \ ____ \  |RAISE | PGDN | ____ |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+[_SYMBOL] = LAYOUT(
+  KC_F12 , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  ,                    KC_F6  , KC_F7  , KC_F8  , KC_F9 ,  KC_F10 , KC_F11 ,
+  KC_LBRC, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,                    KC_6   , KC_7   , KC_8   , KC_9  ,  KC_0   , KC_RBRC,
+  KC_BSLS, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                    KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_EQL ,
+  _______, KC_HOME, KC_END , KC_LBRC, KC_RBRC, _______, _______,  _______, KC_GRV , KC_MINS, KC_PGUP, _______, _______, _______,
+                            _______, _______, _______, _______,    _______, _______, KC_PGDN, _______
+),
+/* Navigation
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |                    |      |      |  UP  |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------.    ,-------|      | LEFT | DOWN |RIGHT |      |      |
+ * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------|    |-------|      |      |      |      |      |      |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   |      |      |      | /       /       \      \  |      |      |      |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+
+[_NAVIGATION] = LAYOUT(
+  _______, _______, _______, _______, _______, _______,                      _______, _______, _______, _______, _______, _______,
+  _______, _______, KC_BTN2, KC_MS_U, KC_BTN1, _______,                      C_TAB  , CLEFT  ,  KC_UP , CRGHT  , KC_DEL , _______,
+  _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______,                      CTLPGUP, KC_LEFT, KC_DOWN, KC_RGHT, CTLPGDN, _______,
+  _______, _______, _______, KC_WH_U, KC_WH_D, _______,  _______,  _______,  A_TAB  , CBSPC  , _______, _______, G_GRV  , _______,
+                            _______, _______, _______,  _______,    _______,  _______, _______, _______
+),
+/* Function Keys
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * | BOOT |      |      |      |      |      |                    | LALT<-->LGUI|      |      |      | BOOT |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |BRGHT-| SAT- | HUE- |BRGHT+|                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |RGBMOD| SAT+ | HUE+ |RGBTOG|-------.    ,-------|      |      |      |      |      |      |
+ * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+ * |      |      |      |VOL UP|VOL DN| PLAY |    |-------|      |      |      |      |      |      |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   |      |      |      | /       /       \      \  |      |      |      |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+
+[_FKEYS] = LAYOUT(
+  QK_BOOT, _______, _______, _______, _______, _______,                      LAG_SWP, LAG_NRM, _______, _______, _______, QK_BOOT,
+  _______, _______, RGB_VAD, RGB_SAD, RGB_HUD, RGB_VAI,                      _______, _______, _______, _______, _______, TO(1)  ,
+  _______, _______, RGB_MOD, RGB_SAI, RGB_HUI, RGB_TOG,                      _______, _______, _______, _______, _______, TO(0)  ,
+  _______, _______, _______, KC_VOLD, KC_VOLU, KC_MPLY,  _______,  _______,  _______, _______, _______, _______, _______, _______,
+                            _______, _______, _______,  _______,    _______,  _______, _______, _______
+)
+};
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        // Volume control
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        // Page up/Page down
+        if (clockwise) {
+            tap_code(KC_WH_U);
+        } else {
+            tap_code(KC_WH_D);
+        }
+    }
+    return false;
+}
+#endif

keyboards/boardsource/lulu/keymaps/davidrambo/readme.org

@@ -0,0 +1,12 @@
+#+title: README
+
+This is my configuration for the Lulu received as part of Boardsource's 2022 group buy.
+Since I already have a few keyboards configured with QMK, I decided to swap out KMK.
+Hopefully this helps others get started.
+
+The base layer is colemak.
+
+I use this keymap on both Linux and MacOS.
+To keep muscle memory between the two as similar as possible, it takes advantage of QMK's boot magic keycodes.
+The ~_FKEYS~ layer provides access to a Left Alt and GUI switch.
+(I use LAlt with yabai on MacOS and GUI with Pop OS's tiling.)

keyboards/boardsource/lulu/keymaps/davidrambo/rules.mk

@@ -0,0 +1,2 @@
+CAPS_WORD_ENABLE = yes
+MOUSEKEY_ENABLE = yes

keyboards/contra/config.h

@@ -1,15 +0,0 @@
-#pragma once
-
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F6, B3, B2, B6 }
-#define MATRIX_COL_PINS { F4, F5, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE

keyboards/contra/contra.c

@@ -1 +0,0 @@
-#include "contra.h"

keyboards/contra/contra.h

@@ -1,27 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x12( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B } \
-}
-
-#define LAYOUT_planck_mit( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
-    k30, k31, k32, k33, k34,   k35,    k37, k38, k39, k3A, k3B \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
-    { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3A, k3B } \
-}

keyboards/contra/info.json

@@ -3,6 +3,12 @@
   "manufacturer": "Cartel",
   "url": "",
   "maintainer": "qmk",
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": true,
+    "nkro": true
+  },
   "usb": {
     "vid": "0x4354",
     "pid": "0x0001",
@@ -10,14 +16,122 @@
   },
   "processor": "atmega32u4",
   "bootloader": "caterina",
+  "diode_direction": "COL2ROW",
+  "matrix_pins": {
+    "cols": ["F4", "F5", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"],
+    "rows": ["F6", "B3", "B2", "B6"]
+  },
   "community_layouts": ["planck_mit", "ortho_4x12"],
   "layouts": {
     "LAYOUT_ortho_4x12": {
-      "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"⇑", "x":7, "y":3}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}, {"label":"→", "x":11, "y":3}]
+      "layout": [
+        {"label":"Tab", "matrix": [0, 0], "x":0, "y":0},
+        {"label":"Q", "matrix": [0, 1], "x":1, "y":0},
+        {"label":"W", "matrix": [0, 2], "x":2, "y":0},
+        {"label":"E", "matrix": [0, 3], "x":3, "y":0},
+        {"label":"R", "matrix": [0, 4], "x":4, "y":0},
+        {"label":"T", "matrix": [0, 5], "x":5, "y":0},
+        {"label":"Y", "matrix": [0, 6], "x":6, "y":0},
+        {"label":"U", "matrix": [0, 7], "x":7, "y":0},
+        {"label":"I", "matrix": [0, 8], "x":8, "y":0},
+        {"label":"O", "matrix": [0, 9], "x":9, "y":0},
+        {"label":"P", "matrix": [0, 10], "x":10, "y":0},
+        {"label":"BackSpace", "matrix": [0, 11], "x":11, "y":0},
+
+        {"label":"Esc", "matrix": [1, 0], "x":0, "y":1},
+        {"label":"A", "matrix": [1, 1], "x":1, "y":1},
+        {"label":"S", "matrix": [1, 2], "x":2, "y":1},
+        {"label":"D", "matrix": [1, 3], "x":3, "y":1},
+        {"label":"F", "matrix": [1, 4], "x":4, "y":1},
+        {"label":"G", "matrix": [1, 5], "x":5, "y":1},
+        {"label":"H", "matrix": [1, 6], "x":6, "y":1},
+        {"label":"J", "matrix": [1, 7], "x":7, "y":1},
+        {"label":"K", "matrix": [1, 8], "x":8, "y":1},
+        {"label":"L", "matrix": [1, 9], "x":9, "y":1},
+        {"label":";", "matrix": [1, 10], "x":10, "y":1},
+        {"label":"'", "matrix": [1, 11], "x":11, "y":1},
+
+        {"label":"Shift", "matrix": [2, 0], "x":0, "y":2},
+        {"label":"Z", "matrix": [2, 1], "x":1, "y":2},
+        {"label":"X", "matrix": [2, 2], "x":2, "y":2},
+        {"label":"C", "matrix": [2, 3], "x":3, "y":2},
+        {"label":"V", "matrix": [2, 4], "x":4, "y":2},
+        {"label":"B", "matrix": [2, 5], "x":5, "y":2},
+        {"label":"N", "matrix": [2, 6], "x":6, "y":2},
+        {"label":"M", "matrix": [2, 7], "x":7, "y":2},
+        {"label":",", "matrix": [2, 8], "x":8, "y":2},
+        {"label":".", "matrix": [2, 9], "x":9, "y":2},
+        {"label":"/", "matrix": [2, 10], "x":10, "y":2},
+        {"label":"Return", "matrix": [2, 11], "x":11, "y":2},
+
+        {"matrix": [3, 0], "x":0, "y":3},
+        {"label":"Ctrl", "matrix": [3, 1], "x":1, "y":3},
+        {"label":"Alt", "matrix": [3, 2], "x":2, "y":3},
+        {"label":"Super", "matrix": [3, 3], "x":3, "y":3},
+        {"label":"⇓", "matrix": [3, 4], "x":4, "y":3},
+        {"matrix": [3, 5], "x":5, "y":3},
+        {"matrix": [3, 6], "x":6, "y":3},
+        {"label":"⇑", "matrix": [3, 7], "x":7, "y":3},
+        {"label":"←", "matrix": [3, 8], "x":8, "y":3},
+        {"label":"↓", "matrix": [3, 9], "x":9, "y":3},
+        {"label":"↑", "matrix": [3, 10], "x":10, "y":3},
+        {"label":"→", "matrix": [3, 11], "x":11, "y":3}
+      ]
     },
 
     "LAYOUT_planck_mit": {
-      "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3, "w":2}, {"label":"⇑", "x":7, "y":3}, {"label":"←", "x":8, "y":3}, {"label":"↓", "x":9, "y":3}, {"label":"↑", "x":10, "y":3}, {"label":"→", "x":11, "y":3}]
+      "layout": [
+        {"label":"Tab", "matrix": [0, 0], "x":0, "y":0},
+        {"label":"Q", "matrix": [0, 1], "x":1, "y":0},
+        {"label":"W", "matrix": [0, 2], "x":2, "y":0},
+        {"label":"E", "matrix": [0, 3], "x":3, "y":0},
+        {"label":"R", "matrix": [0, 4], "x":4, "y":0},
+        {"label":"T", "matrix": [0, 5], "x":5, "y":0},
+        {"label":"Y", "matrix": [0, 6], "x":6, "y":0},
+        {"label":"U", "matrix": [0, 7], "x":7, "y":0},
+        {"label":"I", "matrix": [0, 8], "x":8, "y":0},
+        {"label":"O", "matrix": [0, 9], "x":9, "y":0},
+        {"label":"P", "matrix": [0, 10], "x":10, "y":0},
+        {"label":"BackSpace", "matrix": [0, 11], "x":11, "y":0},
+
+        {"label":"Esc", "matrix": [1, 0], "x":0, "y":1},
+        {"label":"A", "matrix": [1, 1], "x":1, "y":1},
+        {"label":"S", "matrix": [1, 2], "x":2, "y":1},
+        {"label":"D", "matrix": [1, 3], "x":3, "y":1},
+        {"label":"F", "matrix": [1, 4], "x":4, "y":1},
+        {"label":"G", "matrix": [1, 5], "x":5, "y":1},
+        {"label":"H", "matrix": [1, 6], "x":6, "y":1},
+        {"label":"J", "matrix": [1, 7], "x":7, "y":1},
+        {"label":"K", "matrix": [1, 8], "x":8, "y":1},
+        {"label":"L", "matrix": [1, 9], "x":9, "y":1},
+        {"label":";", "matrix": [1, 10], "x":10, "y":1},
+        {"label":"'", "matrix": [1, 11], "x":11, "y":1},
+
+        {"label":"Shift", "matrix": [2, 0], "x":0, "y":2},
+        {"label":"Z", "matrix": [2, 1], "x":1, "y":2},
+        {"label":"X", "matrix": [2, 2], "x":2, "y":2},
+        {"label":"C", "matrix": [2, 3], "x":3, "y":2},
+        {"label":"V", "matrix": [2, 4], "x":4, "y":2},
+        {"label":"B", "matrix": [2, 5], "x":5, "y":2},
+        {"label":"N", "matrix": [2, 6], "x":6, "y":2},
+        {"label":"M", "matrix": [2, 7], "x":7, "y":2},
+        {"label":",", "matrix": [2, 8], "x":8, "y":2},
+        {"label":".", "matrix": [2, 9], "x":9, "y":2},
+        {"label":"/", "matrix": [2, 10], "x":10, "y":2},
+        {"label":"Return", "matrix": [2, 11], "x":11, "y":2},
+
+        {"matrix": [3, 0], "x":0, "y":3},
+        {"label":"Ctrl", "matrix": [3, 1], "x":1, "y":3},
+        {"label":"Alt", "matrix": [3, 2], "x":2, "y":3},
+        {"label":"Super", "matrix": [3, 3], "x":3, "y":3},
+        {"label":"⇓", "matrix": [3, 4], "x":4, "y":3},
+        {"matrix": [3, 5], "x":5, "y":3},
+        {"label":"⇑", "matrix": [3, 7], "x":7, "y":3},
+        {"label":"←", "matrix": [3, 8], "x":8, "y":3},
+        {"label":"↓", "matrix": [3, 9], "x":9, "y":3},
+        {"label":"↑", "matrix": [3, 10], "x":10, "y":3},
+        {"label":"→", "matrix": [3, 11], "x":11, "y":3}
+      ]
     }
   }
 }

keyboards/contra/keymaps/default/config.h

@@ -1,3 +1,6 @@
+// Copyright QMK Community
+// SPDX-License-Identifier: GPL-2.0+
+
 #pragma once
 
 

keyboards/contra/readme.md

@@ -1,16 +1,21 @@
-CONTRA
+# Contra
-======
 
-![CONTRA](https://cartel.ltd/wp-content/uploads/2018/01/img_3209.jpg)
+Contra is a low cost 40% keyboard.
 
-A 40% keyboard by [CARTEL](https://cartel.ltd/)
+* Keyboard Maintainer: The QMK Community  
-
+* Hardware Supported: [Contra](https://github.com/ai03-2725/Contra)
-Keyboard Maintainer: The QMK Community  
+* Hardware Availability: PCB sold by various vendors
-Hardware Supported: CONTRA  
-Hardware Availability: [CARTEL](https://cartel.ltd/projects/contra/)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make contra:dana
+    make contra:default
 
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is configured.
+* **Physical reset button**: Briefly press the reset button soldered on the PCB.
+* **Bootmagic reset**: Hold down the top left key and plug in the controller.

keyboards/contra/rules.mk

@@ -1,18 +1 @@
-# Build Options
+# This file intentionally left blank
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic 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
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-
-LAYOUTS_HAS_RGB = no
-
-# Disable unsupported hardware
-RGBLIGHT_SUPPORTED = no
-AUDIO_SUPPORTED = no
-BACKLIGHT_SUPPORTED = no

keyboards/handwired/polly40/config.h

@@ -0,0 +1,24 @@
+/* Copyright 2023 PAUL ENRICO N. VIOLA @PollyV1
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+// generated by KBFirmware JSON to QMK Parser
+// https://noroadsleft.github.io/kbf_qmk_converter/

keyboards/handwired/polly40/info.json

@@ -0,0 +1,77 @@
+{
+    "keyboard_name": "polly40 v2",
+    "manufacturer": "paul",
+    "url": "https://github.com/PollyV1",
+    "maintainer": "Paul Enrico N. Viola",
+    "usb": {
+        "vid": "0x6532",
+        "pid": "0x0069",
+        "device_version": "0.0.1"
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
+    "matrix_pins": {
+        "rows": ["F0", "F1", "F5", "B4"],
+        "cols": ["F4", "D7", "B5", "B6", "C6", "C7", "D4", "D6", "D5", "D0", "D1", "D2"]
+    },
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "mousekey": true,
+        "extrakey": true,
+        "console": false,
+        "command": false,
+        "nkro": true,
+        "backlight": false,
+        "rgblight": false,
+        "audio": false,
+        "key_lock": false
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "K00 (F0,F4)", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "K01 (F0,D7)", "matrix": [0, 1], "x": 1, "y": 0},
+                {"label": "K02 (F0,B5)", "matrix": [0, 2], "x": 2, "y": 0},
+                {"label": "K03 (F0,B6)", "matrix": [0, 3], "x": 3, "y": 0},
+                {"label": "K04 (F0,C6)", "matrix": [0, 4], "x": 4, "y": 0},
+                {"label": "K05 (F0,C7)", "matrix": [0, 5], "x": 5, "y": 0},
+                {"label": "K06 (F0,D4)", "matrix": [0, 6], "x": 6, "y": 0},
+                {"label": "K07 (F0,D6)", "matrix": [0, 7], "x": 7, "y": 0},
+                {"label": "K08 (F0,D5)", "matrix": [0, 8], "x": 8, "y": 0},
+                {"label": "K09 (F0,D0)", "matrix": [0, 9], "x": 9, "y": 0},
+                {"label": "K0A (F0,D1)", "matrix": [0, 10], "x": 10, "y": 0},
+                {"label": "K0B (F0,D2)", "matrix": [0, 11], "x": 11, "y": 0},
+                {"label": "K10 (F1,F4)", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
+                {"label": "K11 (F1,D7)", "matrix": [1, 1], "x": 1.25, "y": 1},
+                {"label": "K12 (F1,B5)", "matrix": [1, 2], "x": 2.25, "y": 1},
+                {"label": "K13 (F1,B6)", "matrix": [1, 3], "x": 3.25, "y": 1},
+                {"label": "K14 (F1,C6)", "matrix": [1, 4], "x": 4.25, "y": 1},
+                {"label": "K15 (F1,C7)", "matrix": [1, 5], "x": 5.25, "y": 1},
+                {"label": "K16 (F1,D4)", "matrix": [1, 6], "x": 6.25, "y": 1},
+                {"label": "K17 (F1,D6)", "matrix": [1, 7], "x": 7.25, "y": 1},
+                {"label": "K18 (F1,D5)", "matrix": [1, 8], "x": 8.25, "y": 1},
+                {"label": "K19 (F1,D0)", "matrix": [1, 9], "x": 9.25, "y": 1},
+                {"label": "K1B (F1,D2)", "matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
+                {"label": "K20 (F5,F4)", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"label": "K22 (F5,B5)", "matrix": [2, 2], "x": 1.75, "y": 2},
+                {"label": "K23 (F5,B6)", "matrix": [2, 3], "x": 2.75, "y": 2},
+                {"label": "K24 (F5,C6)", "matrix": [2, 4], "x": 3.75, "y": 2},
+                {"label": "K25 (F5,C7)", "matrix": [2, 5], "x": 4.75, "y": 2},
+                {"label": "K26 (F5,D4)", "matrix": [2, 6], "x": 5.75, "y": 2},
+                {"label": "K27 (F5,D6)", "matrix": [2, 7], "x": 6.75, "y": 2},
+                {"label": "K28 (F5,D5)", "matrix": [2, 8], "x": 7.75, "y": 2},
+                {"label": "K29 (F5,D0)", "matrix": [2, 9], "x": 8.75, "y": 2},
+                {"label": "K2A (F5,D1)", "matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25},
+                {"label": "K2B (F5,D2)", "matrix": [2, 11], "x": 11, "y": 2},
+                {"label": "K30 (B4,F4)", "matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+                {"label": "K31 (B4,D7)", "matrix": [3, 1], "x": 1.25, "y": 3},
+                {"label": "K32 (B4,B5)", "matrix": [3, 2], "x": 2.25, "y": 3},
+                {"label": "K36 (B4,D4)", "matrix": [3, 6], "x": 3.25, "y": 3, "w": 6.25},
+                {"label": "K3A (B4,D1)", "matrix": [3, 10], "x": 9.5, "y": 3, "w": 1.25},
+                {"label": "K3B (B4,D2)", "matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}
+           ]
+        }
+    },
+    "meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
+}

keyboards/handwired/polly40/keymaps/default/keymap.c

@@ -0,0 +1,49 @@
+/* Copyright 2023 PAUL ENRICO N. VIOLA @PollyV1
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, 
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,  
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_RSFT, MO(3),   
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(2),   MO(1)    
+    ),
+
+    [1] = LAYOUT(
+        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_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_ENT,  
+        KC_PSCR, KC_MPLY, KC_VOLD, KC_VOLU, KC_INS,  KC_DEL,  KC_COMM, KC_DOT,  KC_SLSH, KC_PGUP, _______,   
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_PGDN, _______  
+    ),
+
+    [2] = LAYOUT(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_INS,  
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_UP,   KC_DEL,  
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_LEFT, KC_DOWN, KC_RGHT, _______,   
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  _______, _______  
+    ),
+
+    [3] = LAYOUT(
+        QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  _______, 
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, 
+        _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, KC_SLSH, KC_RSFT, _______, 
+        _______, _______, _______, _______, _______, _______  
+    ),
+
+};

keyboards/handwired/polly40/keymaps/via/keymap.c

@@ -0,0 +1,49 @@
+/* Copyright 2023 PAUL ENRICO N. VIOLA @PollyV1
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, 
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,  
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_DOT,  KC_RSFT, MO(3),   
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(2),   MO(1)    
+    ),
+
+    [1] = LAYOUT(
+        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_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_ENT,  
+        KC_PSCR, KC_MPLY, KC_VOLD, KC_VOLU, KC_INS,  KC_DEL,  KC_COMM, KC_DOT,  KC_SLSH, KC_PGUP, _______,   
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_PGDN, _______  
+    ),
+
+    [2] = LAYOUT(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_INS,  
+        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_UP,   KC_DEL,  
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_LEFT, KC_DOWN, KC_RGHT, _______,   
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  _______, _______  
+    ),
+
+    [3] = LAYOUT(
+        QK_BOOT,   _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL,  _______, 
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_BSLS, 
+        _______, _______, _______, _______, _______, _______, KC_SCLN, KC_QUOT, KC_SLSH, KC_RSFT, _______, 
+        _______, _______, _______, _______, _______, _______  
+    ),
+
+};

keyboards/handwired/polly40/keymaps/via/rules.mk

@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes

keyboards/handwired/polly40/readme.md

@@ -0,0 +1,26 @@
+# Polly40
+
+![Polly40](https://i.imgur.com/QJCQcFAh.jpg)
+
+A handwired 40% keyboard running a Pro micro Atmega32u4 controller
+
+* Keyboard Maintainer: [Paul Enrico N. Viola](https://github.com/PollyV1)
+* Hardware Supported: Atmega32u4 controller
+* Hardware Availability: https://shopee.ph/Pro-Micro-ATmega32U4-5V-16MHz-USB-Arduino-Compatible-i.20469516.225455828
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/polly40:default
+
+Flashing example for this keyboard:
+
+    make handwired/polly40:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Physical reset button**: Short Ground and RST pin
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

keyboards/handwired/polly40/rules.mk

@@ -0,0 +1 @@
+# This file intentionally left blank