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

5 files changed, 276 insertions, 0 deletions

diff --git a/keyboards/handwired/3dfoxc/keymaps/default/keymap.c b/keyboards/handwired/3dfoxc/keymaps/default/keymap.c
new file mode 100644
index 0000000000..aaed418709
--- /dev/null
+++ b/keyboards/handwired/3dfoxc/keymaps/default/keymap.c
@@ -0,0 +1,69 @@
+/* Copyright 2022 david l goodrich <dlg@dsrw.org>
+ *
+ * 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 {
+    _BL,
+    _FL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* Keymap _BL: (Base Layer) Default Layer
+   * ,---------------------------------------------------------------.
+   * |Esc| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ |~` |???|
+   * |---------------------------------------------------------------|
+   * |Tab  | Q | W | E | R | T | Y | U | I | O | P | [ | ] |Bkspc|Del|
+   * |---------------------------------------------------------------|
+   * |Ctrl  | A | S | D | F | G | H | J | K | L | ; | ' | Enter  |PUp|
+   * |---------------------------------------------------------------|
+   * |Shift   | Z | X | C | V | B | N | M | , | . | / |Shift |Up |PDn|
+   * |---------------------------------------------------------------|
+   * |Ctrl|Win |Alt |        Space            |Alt |Fn  ||Lt |Dn |Rt |
+   * `--------------------------------------------------''-----------'
+   */
+
+    [_BL] = LAYOUT(
+       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_BSLS, KC_GRV,  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_BSPC,     KC_DEL,
+       KC_LCTL,          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_PGUP,
+       KC_LSFT,               KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,     KC_UP,   KC_PGDN,
+       KC_LCTL,    KC_LGUI,    KC_LALT,                         KC_SPC,                          KC_LALT,    MO(_FL),       KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+  /* Keymap _FL: Function Layer
+   * ,---------------------------------------------------------------.
+   * |   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|   |RST|   |
+   * |---------------------------------------------------------------|
+   * |     |   |   |   |   |   |   |   |   |   |PSc|   |   |Del  |Ins|
+   * |---------------------------------------------------------------|
+   * |      |   |   |   |   |   |   |   |   |   |   |   |        |Hme|
+   * |---------------------------------------------------------------|
+   * |        |   |   |   |   |   |   |MUT|V- |V+ |   |      |PUp|End|
+   * |---------------------------------------------------------------|
+   * |    |    |    |                         |    |    ||Hme|PDn|End|
+   * `--------------------------------------------------''-----------'
+   */
+    [_FL] = 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,  _______, RESET,   _______,
+        _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, KC_DEL,      KC_INS,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_HOME,
+        _______,               _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,     KC_PGUP, KC_END,
+        _______,    _______,    _______,                         _______,                         _______,    _______,       KC_HOME, KC_PGDN, KC_END
+    )
+};
+ 
\ No newline at end of file
diff --git a/keyboards/handwired/3dfoxc/keymaps/default/readme.md b/keyboards/handwired/3dfoxc/keymaps/default/readme.md
new file mode 100644
index 0000000000..26ced1cb91
--- /dev/null
+++ b/keyboards/handwired/3dfoxc/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# 3dfoxc "Default" keymap
+
+Set up just like the [original whitefox](https://input.club/whitefox/), except the function layer is totally made up.
\ No newline at end of file
diff --git a/keyboards/handwired/3dfoxc/keymaps/dlg/config.h b/keyboards/handwired/3dfoxc/keymaps/dlg/config.h
new file mode 100644
index 0000000000..d824330b04
--- /dev/null
+++ b/keyboards/handwired/3dfoxc/keymaps/dlg/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2022 david l goodrich <dlg@dsrw.org>
+ *
+ * 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 GRAVE_ESC_ALT_OVERRIDE
diff --git a/keyboards/handwired/3dfoxc/keymaps/dlg/keymap.c b/keyboards/handwired/3dfoxc/keymaps/dlg/keymap.c
new file mode 100644
index 0000000000..c4431acecc
--- /dev/null
+++ b/keyboards/handwired/3dfoxc/keymaps/dlg/keymap.c
@@ -0,0 +1,112 @@
+/* Copyright 2022 david l goodrich <dlg@dsrw.org>
+ *
+ * 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 {
+    _BL,
+    _FL,
+    _MAC,
+    _LA,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* Keymap _BL: (Base Layer) Default Layer
+   * ,---------------------------------------------------------------.
+   * |~` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Bks|???|Esc|
+   * |---------------------------------------------------------------|
+   * |Tab  | Q | W | E | R | T | Y | U | I | O | P | [ | ] |  \  |Del|
+   * |---------------------------------------------------------------|
+   * |Ctrl  | A | S | D | F | G | H | J | K | L | ; | ' | Enter  |PUp|
+   * |---------------------------------------------------------------|
+   * |Shift   | Z | X | C | V | B | N | M | , | . | / |Shift |Up |PDn|
+   * |---------------------------------------------------------------|
+   * |Ctrl|Win |Alt |        Space            |Alt |Fn  ||Lt |Dn |Rt |
+   * `--------------------------------------------------''-----------'
+   */
+    [_BL] = 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_EQL,  KC_BSPC, XXXXXXX, KC_ESC,
+       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_DEL,
+       KC_LCTL,          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_PGUP,
+       KC_LSFT,               KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT,     KC_UP,   KC_PGDN,
+       KC_LCTL,    KC_LGUI,    LM(_LA, MOD_LALT),               KC_SPC,                          KC_LALT,    MO(_FL),       KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+  /* Keymap _FL: Function Layer
+   * ,---------------------------------------------------------------.
+   * |   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del|RST|   |
+   * |---------------------------------------------------------------|
+   * |     |   |   |   |   |   |   |   |mac|   |PSc|Br-|Br+|     |Ins|
+   * |---------------------------------------------------------------|
+   * |      |   |   |   |   |   |Lt |Dn |Up |Rt |   |   |        |Hme|
+   * |---------------------------------------------------------------|
+   * |        |   |   |   |   |   |   |MUT|V- |V+ |   |      |PUp|End|
+   * |---------------------------------------------------------------|
+   * |    |    |    |                         |    |    ||Hme|PDn|End|
+   * `--------------------------------------------------''-----------'
+   */
+    [_FL] = 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_DEL,  RESET,   _______,
+        _______,      _______, _______, _______, _______, _______, _______, _______, TG(_MAC),_______, KC_PSCR, KC_BRID, KC_BRIU, _______,     KC_INS,
+        _______,          _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______,          KC_HOME,
+        _______,               _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,     KC_PGUP, KC_END,
+        _______,    _______,    _______,                         _______,                         _______,    _______,       KC_HOME, KC_PGDN, KC_END
+    ),
+
+   /* Keymap _MAC: Mac Layer
+   * ,---------------------------------------------------------------.
+   * |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+   * |---------------------------------------------------------------|
+   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |   |
+   * |---------------------------------------------------------------|
+   * |      |   |   |   |   |   |   |   |   |   |   |   |        |   |
+   * |---------------------------------------------------------------|
+   * |        |   |   |   |   |   |   |   |   |   |   |      |   |   |
+   * |---------------------------------------------------------------|
+   * |Ctrl|Alt |Win |                         |Win |    ||   |   |   |
+   * `--------------------------------------------------''-----------'
+   */
+   [_MAC] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______,
+        KC_LCTL,    KC_LALT,    KC_LGUI,                         _______,                         KC_RGUI,    _______,       _______, _______, _______
+    ),
+
+  /* Keymap _LA: Left Alt Layer - LALT-4 maps to LALT-F4 so I can quit apps
+   * ,---------------------------------------------------------------.
+   * |   |   |   |   |F4 |   |   |   |   |   |   |   |   |   |   |   |
+   * |---------------------------------------------------------------|
+   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |   |
+   * |---------------------------------------------------------------|
+   * |      |   |   |   |   |   |   |   |   |   |   |   |        |   |
+   * |---------------------------------------------------------------|
+   * |        |   |   |   |   |   |   |   |   |   |   |      |   |   |
+   * |---------------------------------------------------------------|
+   * |    |    |    |                         |    |    ||   |   |   |
+   * `--------------------------------------------------''-----------'
+   */
+    [_LA] = LAYOUT(
+        _______, _______, _______, _______, KC_F4,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______,
+        _______,    _______,    _______,                         _______,                         _______,    _______,       _______, _______, _______
+    )
+
+};
diff --git a/keyboards/handwired/3dfoxc/keymaps/dlg/readme.md b/keyboards/handwired/3dfoxc/keymaps/dlg/readme.md
new file mode 100755
index 0000000000..487086e572
--- /dev/null
+++ b/keyboards/handwired/3dfoxc/keymaps/dlg/readme.md
@@ -0,0 +1,73 @@
+# dlg's layout
+
+Inspired heavily by [my tada68 layout](https://github.com/qmk/qmk_firmware/tree/master/keyboards/tada68/keymaps/dlg).
+
+Notable deviation from the default keymap includes correctly placing `KC_BSLS` and moving `KC_BSPC` up to the top row where it belongs. The additional key on the top-row is a NOOP while I think of something fun.  I also swapped `Esc` and `~` as in my tada68 layout.
+
+
+### Base Layer
+
+```
+,---------------------------------------------------------------.
+|~` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |Bks|???|Esc|
+|---------------------------------------------------------------|
+|Tab  | Q | W | E | R | T | Y | U | I | O | P | [ | ] |  \  |Del|
+|---------------------------------------------------------------|
+|Ctrl  | A | S | D | F | G | H | J | K | L | ; | ' | Enter  |PUp|
+|---------------------------------------------------------------|
+|Shift   | Z | X | C | V | B | N | M | , | . | / |Shift |Up |PDn|
+|---------------------------------------------------------------|
+|Ctrl|Win |Alt |        Space            |Alt |Fn  ||Lt |Dn |Rt |
+`--------------------------------------------------''-----------'
+```
+
+
+### Fn Layer
+
+```
+,---------------------------------------------------------------.
+|   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del|RST|   |
+|---------------------------------------------------------------|
+|     |   |   |   |   |   |   |   |mac|   |PSc|Br-|Br+|     |Ins|
+|---------------------------------------------------------------|
+|      |   |   |   |   |   |Lt |Dn |Up |Rt |   |   |        |Hme|
+|---------------------------------------------------------------|
+|        |   |   |   |   |   |   |MUT|V- |V+ |   |      |PUp|End|
+|---------------------------------------------------------------|
+|    |    |    |                         |    |    ||Hme|PDn|End|
+`--------------------------------------------------''-----------'
+```
+
+### Mac Layer
+
+```
+,---------------------------------------------------------------.
+|   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
+|---------------------------------------------------------------|
+|     |   |   |   |   |   |   |   |   |   |   |   |   |     |   |
+|---------------------------------------------------------------|
+|      |   |   |   |   |   |   |   |   |   |   |   |        |   |
+|---------------------------------------------------------------|
+|        |   |   |   |   |   |   |   |   |   |   |      |   |   |
+|---------------------------------------------------------------|
+|Ctrl|Alt |Win |                         |Win |    ||   |   |   |
+`--------------------------------------------------''-----------'
+```
+
+### `LALT` Layer
+
+Left Alt Layer - LALT-4 maps to LALT-F4 so I can quit apps
+
+```
+,---------------------------------------------------------------.
+|   |   |   |   |F4 |   |   |   |   |   |   |   |   |   |   |   |
+|---------------------------------------------------------------|
+|     |   |   |   |   |   |   |   |   |   |   |   |   |     |   |
+|---------------------------------------------------------------|
+|      |   |   |   |   |   |   |   |   |   |   |   |        |   |
+|---------------------------------------------------------------|
+|        |   |   |   |   |   |   |   |   |   |   |      |   |   |
+|---------------------------------------------------------------|
+|    |    |    |                         |    |    ||   |   |   |
+`--------------------------------------------------''-----------'
+```