summaryrefslogtreecommitdiff
path: root/layouts
diff options
context:
space:
mode:
authorBrian Choromanski <BrianChoromanski@gmail.com>2018-03-16 16:20:09 -0400
committerJack Humbert <jack.humb@gmail.com>2018-03-16 16:20:09 -0400
commit6c74d734c274f70ce72150ecbd844f8eff5040c4 (patch)
tree2e675ef4f061ae47f27f854f7659692f54646453 /layouts
parentad1a868701102fdf031c2d187b7fb9b656040fc6 (diff)
Fixed various keymaps and the allocation of "key_combos" (#2526)
* Fixed plank keymaps so that they will compile for planck light * tv44:budi now compiles * s60_x:amnesia0287 now compiles * Fixed allocation of key_combos so that narze keymap for planck can compile correctly * Disabled rgb on ergodone and infinity * Enabled tap dance so it compiles * Added return statement so it compiles * If compiling on light disable extra functionality * Properly redefined variable so it compiles
Diffstat (limited to 'layouts')
-rw-r--r--layouts/community/ergodox/berfarah/keymap.c6
-rw-r--r--layouts/community/ergodox/berfarah/rules.mk3
2 files changed, 8 insertions, 1 deletions
diff --git a/layouts/community/ergodox/berfarah/keymap.c b/layouts/community/ergodox/berfarah/keymap.c
index bc639b189d..a0a1077852 100644
--- a/layouts/community/ergodox/berfarah/keymap.c
+++ b/layouts/community/ergodox/berfarah/keymap.c
@@ -183,6 +183,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
};
+#ifdef RGBLIGHT_ENABLE
/*
* Led Configuration
*/
@@ -222,6 +223,7 @@ static inline void mod_layer_with_rgb(keyrecord_t *record, uint8_t layer) {
bf_set_led(currentLayer);
};
};
+#endif
/*
* Custom keycodes
@@ -240,12 +242,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
SEND_STRING(" ");
}
return false; break;
+ #ifdef RGBLIGHT_ENABLE
case BF_NUMS:
mod_layer_with_rgb(record, NUMS);
return false; break;
case BF_MOVE:
mod_layer_with_rgb(record, MOVE);
return false; break;
+ #endif
}
return true;
@@ -255,7 +259,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
* Active Routines
*/
void matrix_init_user(void) {
+#ifdef RGBLIGHT_ENABLE
bf_set_led(QWERTY);
+#endif
};
// Runs constantly in the background, in a loop.
diff --git a/layouts/community/ergodox/berfarah/rules.mk b/layouts/community/ergodox/berfarah/rules.mk
index 7153c6ad0f..a873250372 100644
--- a/layouts/community/ergodox/berfarah/rules.mk
+++ b/layouts/community/ergodox/berfarah/rules.mk
@@ -6,8 +6,9 @@ DEBUG_ENABLE = no
CONSOLE_ENABLE = no
TAP_DANCE_ENABLE = no
MOUSEKEY_ENABLE = no
-RGBLIGHT_ENABLE = yes
+ifdef RGBLIGHT_ENABLE
RGBLIGHT_ANIMATION = yes
+endif
ifeq (${FORCE_NKRO},yes)
OPT_DEFS += -DFORCE_NKRO