From 71e0e87d708689cac2dda7ed1227ed85157520f9 Mon Sep 17 00:00:00 2001
From: Gerrit Plehn <52218643+GerritPlehn@users.noreply.github.com>
Date: Thu, 28 Apr 2022 23:26:00 +0200
Subject: [PATCH] Basketweave-S additions (#153)

* VIAL support for basketweave

* fix: bootmagic from lite to yes

* readme corrections

* more sensible encoder defaults

* enable 2 additional layers
---
 .../basketweave_s/keymaps/vial/config.h       |  8 ++++--
 .../basketweave_s/keymaps/vial/keymap.c       | 26 +++++++++++++++++++
 keyboards/42keebs/basketweave_s/readme.md     |  4 +--
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/keyboards/42keebs/basketweave_s/keymaps/vial/config.h b/keyboards/42keebs/basketweave_s/keymaps/vial/config.h
index c9d3df365a..b373a09629 100644
--- a/keyboards/42keebs/basketweave_s/keymaps/vial/config.h
+++ b/keyboards/42keebs/basketweave_s/keymaps/vial/config.h
@@ -7,6 +7,10 @@
 #define VIAL_UNLOCK_COMBO_ROWS { 0, 2 }
 #define VIAL_UNLOCK_COMBO_COLS { 0, 13 }
 
-#define DYNAMIC_KEYMAP_LAYER_COUNT 2
+#define DYNAMIC_KEYMAP_LAYER_COUNT 4
 
-#define VIAL_ENCODER_DEFAULT { KC_VOLU, KC_VOLD, KC_MS_WH_UP, KC_MS_WH_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS }
+#define VIAL_ENCODER_DEFAULT { KC_VOLD, KC_VOLU, KC_VOLD, KC_VOLU, KC_MS_WH_DOWN, KC_MS_WH_UP, KC_MS_WH_DOWN, KC_MS_WH_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS }
+
+#define VIAL_TAP_DANCE_ENTRIES 5
+#define VIAL_COMBO_ENTRIES 5
+#define VIAL_KEY_OVERRIDE_ENTRIES 5
diff --git a/keyboards/42keebs/basketweave_s/keymaps/vial/keymap.c b/keyboards/42keebs/basketweave_s/keymaps/vial/keymap.c
index fa85f2758d..02ac820017 100644
--- a/keyboards/42keebs/basketweave_s/keymaps/vial/keymap.c
+++ b/keyboards/42keebs/basketweave_s/keymaps/vial/keymap.c
@@ -38,5 +38,31 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, KC_PGUP, KC_TRNS,
      /*         ctrl      alt              space              fn               space              alt      ctrl              left     down     right  */
                KC_LCTL, KC_LALT,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_RALT, KC_RCTL,          KC_HOME, KC_PGDN, KC_END
+    ),
+
+  [2] = LAYOUT_default(
+     /* esc       `        1        2        3        4        5        6        7        8        9        0        -        =       bspc            */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     /* ins     tab        Q        W        E        R        T        Y        U        I        O        P        [        ]        \              */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     /* rotary  caps       A        S        D        F        G        H        J        K        L        ;        '       enter                    */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+     /*         shift      Z        X        C        V        B        B        N        M        ,        .        /       shift     up             */
+               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     /*         ctrl      alt              space              fn               space              alt      ctrl              left     down     right  */
+               KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+
+  [3] = LAYOUT_default(
+     /* esc       `        1        2        3        4        5        6        7        8        9        0        -        =       bspc            */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     /* ins     tab        Q        W        E        R        T        Y        U        I        O        P        [        ]        \              */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     /* rotary  caps       A        S        D        F        G        H        J        K        L        ;        '       enter                    */
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+     /*         shift      Z        X        C        V        B        B        N        M        ,        .        /       shift     up             */
+               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+     /*         ctrl      alt              space              fn               space              alt      ctrl              left     down     right  */
+               KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS
     )
 };
diff --git a/keyboards/42keebs/basketweave_s/readme.md b/keyboards/42keebs/basketweave_s/readme.md
index 10418b06d1..e96cd6e385 100644
--- a/keyboards/42keebs/basketweave_s/readme.md
+++ b/keyboards/42keebs/basketweave_s/readme.md
@@ -6,12 +6,12 @@ A through-hole Alice style keyboard with arrow keys, symmetric macro keys, and r
 
 Based on [null-l's Basketweave](https://github.com/null-l/basketweave)
 
-* Keyboard Maintainer: [GerritPlehn](https://github.com/piit79)
+* Keyboard Maintainer: [piit79](https://github.com/piit79)
 * Hardware Supported: atmega32a
 * Hardware Availability: [42. Keebs](https://42keebs.eu), [Github](https://github.com/piit79/basketweave-s)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make 42keebs/basketweave:default
+    make 42keebs/basketweave_s:vial
 
 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).