summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-12-20 19:32:28 +0000
committerQMK Bot <hello@qmk.fm>2021-12-20 19:32:28 +0000
commit9a356ab9439d88be951eabb720b79a46ffa8f3db (patch)
tree2d0234b5156b97ffdef0b62f67da2c2741c13f63 /keyboards
parentacf7824f9ab8bcd6f23b7fa26dbaa3023aa77e9f (diff)
parentd4ae858e0aea3ee3e99badaaf489425b6b00d39e (diff)
downloadqmk_firmware-9a356ab9439d88be951eabb720b79a46ffa8f3db.tar.gz
qmk_firmware-9a356ab9439d88be951eabb720b79a46ffa8f3db.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/nasu/nasu.h14
-rw-r--r--keyboards/nasu/rules.mk2
2 files changed, 15 insertions, 1 deletions
diff --git a/keyboards/nasu/nasu.h b/keyboards/nasu/nasu.h
index a2917fdb45..41bd1212f6 100644
--- a/keyboards/nasu/nasu.h
+++ b/keyboards/nasu/nasu.h
@@ -32,3 +32,17 @@
{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
{ XXX, K41, XXX, K43, XXX, K45, K46, XXX, K48, XXX, K4A, XXX, XXX, XXX, K4E } \
}
+
+#define LAYOUT_alice( \
+ K10, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+ K20, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+ K30, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \
+ K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+ K41, K43, K45, K46, K48, K4A, K4E \
+) { \
+ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \
+ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+ { XXX, K41, XXX, K43, XXX, K45, K46, XXX, K48, XXX, K4A, XXX, XXX, XXX, K4E } \
+}
diff --git a/keyboards/nasu/rules.mk b/keyboards/nasu/rules.mk
index e8b7f22e0b..dac69f915b 100644
--- a/keyboards/nasu/rules.mk
+++ b/keyboards/nasu/rules.mk
@@ -25,4 +25,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-LAYOUTS = alice_split_bs
+LAYOUTS = alice alice_split_bs