summaryrefslogtreecommitdiffstats
path: root/layouts
diff options
context:
space:
mode:
authorzvecr <z.zvecr@gmail.com>2018-11-26 17:27:07 +0000
committerDrashna Jaelre <drashna@live.com>2018-11-26 09:27:07 -0800
commit0031e461913d23e37a9aebd1da5daf1c93a149ee (patch)
treeb82a750c397ba3d6159133fe09a9e185a3e78ca9 /layouts
parent97ab3211e2ace7a5cbf7bd2a21723ed751286c99 (diff)
Keyboard: 40percentclub - enable 4x4 and 5x5 community keymaps (#4437)
* Enable 4x4 and 5x5 community keymap support * Pull 4x4 community keymap fixes from @noroadsleft * Build fixes for guidoism keymap - move keymap to layouts/community/planck_mit as it uses the LAYOUT_planck_mit macro
Diffstat (limited to 'layouts')
-rw-r--r--layouts/community/ortho_4x12/bakingpy/rules.mk2
-rw-r--r--layouts/community/ortho_4x12/wanleg/rules.mk4
-rw-r--r--layouts/community/ortho_4x12/xyverz/rules.mk2
-rw-r--r--layouts/community/planck_mit/guidoism/config.h (renamed from layouts/community/ortho_4x12/guidoism/config.h)0
-rw-r--r--layouts/community/planck_mit/guidoism/generate_c.py (renamed from layouts/community/ortho_4x12/guidoism/generate_c.py)0
-rw-r--r--layouts/community/planck_mit/guidoism/guidoism.json (renamed from layouts/community/ortho_4x12/guidoism/guidoism.json)0
-rw-r--r--layouts/community/planck_mit/guidoism/keymap.c (renamed from layouts/community/ortho_4x12/guidoism/keymap.c)0
-rw-r--r--layouts/community/planck_mit/guidoism/keys.json (renamed from layouts/community/ortho_4x12/guidoism/keys.json)0
-rw-r--r--layouts/community/planck_mit/guidoism/readme.md (renamed from layouts/community/ortho_4x12/guidoism/readme.md)0
9 files changed, 6 insertions, 2 deletions
diff --git a/layouts/community/ortho_4x12/bakingpy/rules.mk b/layouts/community/ortho_4x12/bakingpy/rules.mk
index 490ebbf779..9be2f01d4d 100644
--- a/layouts/community/ortho_4x12/bakingpy/rules.mk
+++ b/layouts/community/ortho_4x12/bakingpy/rules.mk
@@ -5,6 +5,8 @@ endif
AUDIO_ENABLE = no
ifeq ($(strip $(KEYBOARD)), zlant)
BACKLIGHT_ENABLE = no
+else ifeq ($(strip $(KEYBOARD)), 40percentclub/4x4)
+ BACKLIGHT_ENABLE = no
else
BACKLIGHT_ENABLE = yes
endif
diff --git a/layouts/community/ortho_4x12/wanleg/rules.mk b/layouts/community/ortho_4x12/wanleg/rules.mk
index fa433a6b0d..835022f4bf 100644
--- a/layouts/community/ortho_4x12/wanleg/rules.mk
+++ b/layouts/community/ortho_4x12/wanleg/rules.mk
@@ -5,10 +5,10 @@ ifeq ($(strip $(KEYBOARD)), jj40)
SWAP_HANDS_ENABLE = no
endif
-ifeq ($(strip $(KEYBOARD)), 4x4)
+ifeq ($(strip $(KEYBOARD)), 40percentclub/4x4)
SWAP_HANDS_ENABLE = no
endif
ifeq ($(strip $(KEYBOARD)), zlant)
SWAP_HANDS_ENABLE = no
-endif \ No newline at end of file
+endif
diff --git a/layouts/community/ortho_4x12/xyverz/rules.mk b/layouts/community/ortho_4x12/xyverz/rules.mk
index 852e38f24e..c181e11072 100644
--- a/layouts/community/ortho_4x12/xyverz/rules.mk
+++ b/layouts/community/ortho_4x12/xyverz/rules.mk
@@ -3,6 +3,8 @@ AUDIO_ENABLE = no # Audio output on port C6
ifeq ("$(KEYBOARD)","vitamins_included")
RGBLIGHT_ENABLE = no
+else ifeq ($(strip $(KEYBOARD)), 40percentclub/4x4)
+ RGBLIGHT_ENABLE = no
else
RGBLIGHT_ENABLE = yes
endif
diff --git a/layouts/community/ortho_4x12/guidoism/config.h b/layouts/community/planck_mit/guidoism/config.h
index e22f298035..e22f298035 100644
--- a/layouts/community/ortho_4x12/guidoism/config.h
+++ b/layouts/community/planck_mit/guidoism/config.h
diff --git a/layouts/community/ortho_4x12/guidoism/generate_c.py b/layouts/community/planck_mit/guidoism/generate_c.py
index 5bee576084..5bee576084 100644
--- a/layouts/community/ortho_4x12/guidoism/generate_c.py
+++ b/layouts/community/planck_mit/guidoism/generate_c.py
diff --git a/layouts/community/ortho_4x12/guidoism/guidoism.json b/layouts/community/planck_mit/guidoism/guidoism.json
index 6a4364c6be..6a4364c6be 100644
--- a/layouts/community/ortho_4x12/guidoism/guidoism.json
+++ b/layouts/community/planck_mit/guidoism/guidoism.json
diff --git a/layouts/community/ortho_4x12/guidoism/keymap.c b/layouts/community/planck_mit/guidoism/keymap.c
index 2027e2bfa4..2027e2bfa4 100644
--- a/layouts/community/ortho_4x12/guidoism/keymap.c
+++ b/layouts/community/planck_mit/guidoism/keymap.c
diff --git a/layouts/community/ortho_4x12/guidoism/keys.json b/layouts/community/planck_mit/guidoism/keys.json
index 791119b4f2..791119b4f2 100644
--- a/layouts/community/ortho_4x12/guidoism/keys.json
+++ b/layouts/community/planck_mit/guidoism/keys.json
diff --git a/layouts/community/ortho_4x12/guidoism/readme.md b/layouts/community/planck_mit/guidoism/readme.md
index 540db64e85..540db64e85 100644
--- a/layouts/community/ortho_4x12/guidoism/readme.md
+++ b/layouts/community/planck_mit/guidoism/readme.md