summaryrefslogtreecommitdiff
path: root/layouts/community/ortho_5x12
diff options
context:
space:
mode:
authorDanny <nooges@users.noreply.github.com>2019-02-12 19:57:24 -0500
committerDrashna Jaelre <drashna@live.com>2019-02-12 16:57:24 -0800
commitb2ee290c9f506e42dd9c4577c8147646c405aeb0 (patch)
tree4338c3ee37d2f8380c24624a24d8a4cb81d54693 /layouts/community/ortho_5x12
parent994852712dbd183e2c764d624ae8ba7d3efb385a (diff)
downloadqmk_firmware-b2ee290c9f506e42dd9c4577c8147646c405aeb0.tar.gz
qmk_firmware-b2ee290c9f506e42dd9c4577c8147646c405aeb0.zip
[Keyboard] Move Keebio boards to own folder (#5109)
* Move boards into keebio folder * Rename keymap * Update BDN9 files * Update BFO-9000 files * Update Chocopad files * Update Dilly files * Update Fourier files, collapse rev1 into main * Update Iris files * Update Laplace files * Update Levinson files, fix buswerks keymap * Update Nyquist files * Fix keymap issues * Update Quefrency files * Update Rorschach files * Update TF68 files * Update Viterbi files * Update Viterbi files * Update Wavelet files * Reformat default layout * Fix up default folder for Iris * Remove already defined aliases
Diffstat (limited to 'layouts/community/ortho_5x12')
-rw-r--r--layouts/community/ortho_5x12/rs/keymap.c2
-rw-r--r--layouts/community/ortho_5x12/xyverz/config.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/layouts/community/ortho_5x12/rs/keymap.c b/layouts/community/ortho_5x12/rs/keymap.c
index f33dcc2536..e4e590669f 100644
--- a/layouts/community/ortho_5x12/rs/keymap.c
+++ b/layouts/community/ortho_5x12/rs/keymap.c
@@ -16,6 +16,7 @@ enum layers {
#define KC_BRDN KC_SLCK
// Used to create a keymap using only KC_ prefixed keys
+#ifndef LAYOUT_kc
#define LAYOUT_kc( \
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
@@ -30,6 +31,7 @@ enum layers {
KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b, \
KC_##k40, KC_##k41, KC_##k42, KC_##k43, KC_##k44, KC_##k45, KC_##k46, KC_##k47, KC_##k48, KC_##k49, KC_##k4a, KC_##k4b \
)
+#endif
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/layouts/community/ortho_5x12/xyverz/config.h b/layouts/community/ortho_5x12/xyverz/config.h
index 4489c6e5f5..5f9f6e5c11 100644
--- a/layouts/community/ortho_5x12/xyverz/config.h
+++ b/layouts/community/ortho_5x12/xyverz/config.h
@@ -6,7 +6,9 @@
#define BACKLIGHT_LEVELS 8
/* ws2812 RGB LED */
+#ifndef RGBLIGHT_ENABLE
#undef RGB_DI_PIN
+#endif
#if defined(KEYBOARD_preonic_rev2)
#define RGB_DI_PIN B3
#undef RGBLED_NUM