summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2020-12-04 02:17:51 +0000
committerQMK Bot <hello@qmk.fm>2020-12-04 02:17:51 +0000
commit024b3bd0dda733a7896927a51b7074ec5b25d643 (patch)
treed89c7ad63c43a28ec1095283be15cb4a4fad5edb
parent7a6e7d87cc8f720cc5c2d898bd36ddb45dc01a98 (diff)
parent6ab0a6e7967344a13bda480ccc477939695e9cf2 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/sneakbox/aliceclone/aliceclone.h19
-rw-r--r--keyboards/sneakbox/aliceclone/info.json9
-rw-r--r--keyboards/sneakbox/aliceclone/rules.mk2
3 files changed, 29 insertions, 1 deletions
diff --git a/keyboards/sneakbox/aliceclone/aliceclone.h b/keyboards/sneakbox/aliceclone/aliceclone.h
index 26ab4472ca..49d227fdcf 100644
--- a/keyboards/sneakbox/aliceclone/aliceclone.h
+++ b/keyboards/sneakbox/aliceclone/aliceclone.h
@@ -39,3 +39,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
{ KC_NO, K081, KC_NO, K083, KC_NO, K085, K086, KC_NO }, \
{ KC_NO, K091, KC_NO, K093, KC_NO, KC_NO, KC_NO, K097 } \
}
+
+#define LAYOUT_alice( \
+ K020, K000, K001, K002, K003, K004, K005, K006, K010, K011, K012, K013, K014, K015, K016, \
+ K040, K021, K022, K023, K024, K025, K026, K030, K031, K032, K033, K034, K035, K036, K037, \
+ K060, K041, K042, K043, K044, K045, K046, K050, K051, K052, K053, K054, K055, K056, \
+ K061, K062, K063, K064, K065, K066, K070, K071, K072, K073, K074, K075, K076, K077, \
+ K081, K083, K085, K086, K091, K093, K097 \
+) { \
+ { K000, K001, K002, K003, K004, K005, K006, KC_NO }, \
+ { K010, K011, K012, K013, K014, K015, K016, KC_NO }, \
+ { K020, K021, K022, K023, K024, K025, K026, KC_NO }, \
+ { K030, K031, K032, K033, K034, K035, K036, K037 }, \
+ { K040, K041, K042, K043, K044, K045, K046, KC_NO }, \
+ { K050, K051, K052, K053, K054, K055, K056, KC_NO }, \
+ { K060, K061, K062, K063, K064, K065, K066, KC_NO }, \
+ { K070, K071, K072, K073, K074, K075, K076, K077 }, \
+ { KC_NO, K081, KC_NO, K083, KC_NO, K085, K086, KC_NO }, \
+ { KC_NO, K091, KC_NO, K093, KC_NO, KC_NO, KC_NO, K097 } \
+}
diff --git a/keyboards/sneakbox/aliceclone/info.json b/keyboards/sneakbox/aliceclone/info.json
index d5601c9306..cacef99b86 100644
--- a/keyboards/sneakbox/aliceclone/info.json
+++ b/keyboards/sneakbox/aliceclone/info.json
@@ -13,6 +13,15 @@
{"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3},
{"x":1.25, "y":4, "w":1.5}, {"x":4, "y":4, "w":1.5}, {"x":5.5, "y":4, "w":2.25}, {"x":7.75, "y":4}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1.5}, {"x":16.75, "y":4, "w":1.5}
]
+ },
+ "LAYOUT_alice": {
+ "layout": [
+ {"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0, "w":2},
+ {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1, "w":1.5},
+ {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2, "w":2.25},
+ {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3},
+ {"x":1.25, "y":4, "w":1.5}, {"x":4, "y":4, "w":1.5}, {"x":5.5, "y":4, "w":2.25}, {"x":7.75, "y":4}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1.5}, {"x":16.75, "y":4, "w":1.5}
+ ]
}
}
}
diff --git a/keyboards/sneakbox/aliceclone/rules.mk b/keyboards/sneakbox/aliceclone/rules.mk
index c69b4e5630..24bce999b7 100644
--- a/keyboards/sneakbox/aliceclone/rules.mk
+++ b/keyboards/sneakbox/aliceclone/rules.mk
@@ -22,4 +22,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes
-LAYOUTS = alice_split_bs
+LAYOUTS = alice alice_split_bs