From 138c3e7042a3fb9e94a784c3b8f6b0815e71cf3b Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 3 Dec 2020 14:07:41 -0800
Subject: Rework LAYOUT_alice support; add LAYOUT_alice_split_bs (#11106)

* Add LAYOUT_alice support: fallacy

* Add LAYOUT_alice support: kb_elmo/sesame

* Add LAYOUT_alice support: cheshire/curiosity

* Add LAYOUT_alice support: evyd13/wonderland

* Add LAYOUT_alice support: mechlovin/adelais

* Update LAYOUT_alice support: projectkb/alice

The PR that added Alice community layout support for the projectkb/alice/rev2 simultaneously broke support for every other keyboard that supported LAYOUT_alice.

This commit partially reverts the offending PR. `LAYOUT_alice` for the projectkb/alice has been renamed to `LAYOUT_alice_split_bs`, and a correct 65-key `LAYOUT_alice` has been added.

Additionally, the `LAYOUTS` rule has been moved to keyboard level as the layout macros are shared between rev1 and rev2 boards, which means the layout options are the same for both revisions.

* Update ramonimbao/aelith info.json

Keyboard source was already correct to support LAYOUT_alice, but the layout tree was missing from info.json.

* Fork `alice` Community Layout...

... into Standard and Split Backspace versions

Also updates stanrc85's layout keymap to use 65 keys instead of the Split Backspace 66-key version.

* Update LAYOUT_alice support: sneakbox/aliceclone

Rework the sneakbox/aliceclone to use the Split Backspace Alice layout.

* Update LAYOUT_alice support: zoo/wampus

The layout macro that was `LAYOUT_alice` was 66 keys. This layout macro has been renamed to `LAYOUT_alice_split_bs`, and a 65-key `LAYOUT_alice` has been added.

Additionally, the 66-key macro has been rearranged to accept its keycodes in the intended order for Community Layout support.

* Update keyboards for `LAYOUT_alice_split_bs` support

* LAYOUT_alice_split_bs support: ergosaurus

* LAYOUT_alice_split_bs support: handwired/colorlice

* LAYOUT_alice(_split_bs) support: handwired/owlet60

* LAYOUT_alice_split_bs support: nightly_boards/alter/rev1

* LAYOUT_alice(_split_bs) support: sck/osa

* LAYOUT_alice_split_bs support: tgr/alice

* LAYOUT_alice(_split_bs) support: tkc/osav2

* LAYOUT_alice_split_bs support: xelus/valor/rev1
---
 keyboards/kb_elmo/sesame/sesame.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'keyboards/kb_elmo/sesame/sesame.h')

diff --git a/keyboards/kb_elmo/sesame/sesame.h b/keyboards/kb_elmo/sesame/sesame.h
index a51023be41..d596619c3a 100644
--- a/keyboards/kb_elmo/sesame/sesame.h
+++ b/keyboards/kb_elmo/sesame/sesame.h
@@ -26,7 +26,7 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT( \
+#define LAYOUT_alice( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \
     k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42,      k44, \
@@ -40,7 +40,7 @@
     { KC_NO, k59,   KC_NO, k60,   KC_NO, k61,   k62,  KC_NO,  k63,   KC_NO, k64,   KC_NO, KC_NO, k65,   KC_NO }  \
 }
 
-#define LAYOUT_all( \
+#define LAYOUT_alice_split_bs( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k43, k14, \
     k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42,      k44, \
@@ -81,3 +81,6 @@
     { KC_NO, k45,   k46,   k47,   k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   KC_NO }, \
     { KC_NO, k59,   KC_NO, k60,   KC_NO, k61,   k62,  KC_NO,  k63,   KC_NO, k64,   KC_NO, KC_NO, k65,   KC_NO }  \
 }
+
+#define LAYOUT LAYOUT_alice
+#define LAYOUT_all LAYOUT_alice_split_bs
-- 
cgit v1.2.3