summaryrefslogtreecommitdiffstats
path: root/layouts
diff options
context:
space:
mode:
authorDanny <nooges@users.noreply.github.com>2019-02-13 01:57:24 +0100
committerDrashna Jaelre <drashna@live.com>2019-02-13 01:57:24 +0100
commitb2ee290c9f506e42dd9c4577c8147646c405aeb0 (patch)
tree4338c3ee37d2f8380c24624a24d8a4cb81d54693 /layouts
parent994852712dbd183e2c764d624ae8ba7d3efb385a (diff)
downloadqmk_firmware-b2ee290c9f506e42dd9c4577c8147646c405aeb0.tar.gz
qmk_firmware-b2ee290c9f506e42dd9c4577c8147646c405aeb0.tar.xz
[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')
-rw-r--r--layouts/community/ortho_4x12/buswerks/keymap.c4
-rw-r--r--layouts/community/ortho_4x12/xyverz/config.h2
-rw-r--r--layouts/community/ortho_5x12/rs/keymap.c2
-rw-r--r--layouts/community/ortho_5x12/xyverz/config.h2
4 files changed, 7 insertions, 3 deletions
diff --git a/layouts/community/ortho_4x12/buswerks/keymap.c b/layouts/community/ortho_4x12/buswerks/keymap.c
index bea18f8f4..95d9e7019 100644
--- a/layouts/community/ortho_4x12/buswerks/keymap.c
+++ b/layouts/community/ortho_4x12/buswerks/keymap.c
@@ -78,10 +78,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB , KC_Q , KC_W , KC_F , KC_P , KC_G , KC_J , KC_L , KC_U , KC_Y , KC_SCLN, KC_BSPC, \
ESC_CMD, KC_A , KC_R , KC_S , KC_T , KC_D , KC_H , KC_N , KC_E , KC_I , KC_O , KC_QUOT, \
KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_K , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_ENT, \
- xxxxxxx, KC_LCTL, KC_LGUI, KC_LALT, LOWER , KC_SPC , KC_SPC , RSE_ENT, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT \
+ XXXXXXX, KC_LCTL, KC_LGUI, KC_LALT, LOWER , KC_SPC , KC_SPC , RSE_ENT, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT \
),
- [_ADJUST] = LAYOUT_planck_grid(
+ [_ADJUST] = LAYOUT_ortho_4x12(
_______, RESET, DEBUG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL ,
_______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, GAME, _______,
_______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
diff --git a/layouts/community/ortho_4x12/xyverz/config.h b/layouts/community/ortho_4x12/xyverz/config.h
index 0fa89d6c7..287f4cc2b 100644
--- a/layouts/community/ortho_4x12/xyverz/config.h
+++ b/layouts/community/ortho_4x12/xyverz/config.h
@@ -11,7 +11,7 @@
#if defined(KEYBOARD_planck_rev5)
#define RGBLED_NUM 10
#define RGB_DI_PIN D1
-#elif defined(KEYBOARD_levinson_rev2)
+#elif defined(KEYBOARD_keebio_levinson_rev2)
#define RGBLED_NUM 12
#elif defined(KEYBOARD_lets_split_rev2)
#define RGBLED_NUM 8
diff --git a/layouts/community/ortho_5x12/rs/keymap.c b/layouts/community/ortho_5x12/rs/keymap.c
index f33dcc253..e4e590669 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 4489c6e5f..5f9f6e5c1 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