summaryrefslogtreecommitdiffstats
path: root/keyboards/bfo9000
diff options
context:
space:
mode:
authorAlex Ong <the.onga@gmail.com>2019-01-04 19:39:14 +1100
committerAlex Ong <the.onga@gmail.com>2019-01-04 19:39:14 +1100
commit47c91fc7f75ae0a477e55b687aa0fc30da0a283c (patch)
tree65ad39452748ff2e6d4a83ce54ede6ca22c9ada9 /keyboards/bfo9000
parentac9b88e8ccbbf38762871504cd827ff0d941c426 (diff)
parent563ce3f225d981ce460c12ca5130dfe47af41df0 (diff)
Merge branch 'master' of https://github.com/qmk/qmk_firmware
Diffstat (limited to 'keyboards/bfo9000')
-rw-r--r--keyboards/bfo9000/config.h2
-rw-r--r--keyboards/bfo9000/keymaps/andylikescandy6x18/config.h3
-rw-r--r--keyboards/bfo9000/rules.mk2
3 files changed, 2 insertions, 5 deletions
diff --git a/keyboards/bfo9000/config.h b/keyboards/bfo9000/config.h
index 561d2d1146..893fa5ab6a 100644
--- a/keyboards/bfo9000/config.h
+++ b/keyboards/bfo9000/config.h
@@ -53,7 +53,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* ws2812 RGB LED */
#define RGB_DI_PIN B4
-#define RGBLIGHT_TIMER
+
#define RGBLED_NUM 20 // Number of LEDs
/*
diff --git a/keyboards/bfo9000/keymaps/andylikescandy6x18/config.h b/keyboards/bfo9000/keymaps/andylikescandy6x18/config.h
index 9d124a98e5..be57e385ef 100644
--- a/keyboards/bfo9000/keymaps/andylikescandy6x18/config.h
+++ b/keyboards/bfo9000/keymaps/andylikescandy6x18/config.h
@@ -37,7 +37,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PERMISSIVE_HOLD
- #define PREVENT_STUCK_MODIFIERS
-
-
#endif
diff --git a/keyboards/bfo9000/rules.mk b/keyboards/bfo9000/rules.mk
index 8a7e56f462..d11f9a54e7 100644
--- a/keyboards/bfo9000/rules.mk
+++ b/keyboards/bfo9000/rules.mk
@@ -63,7 +63,7 @@ MIDI_ENABLE = no # MIDI controls
AUDIO_ENABLE = no # Audio output on port C6
UNICODE_ENABLE = no # Unicode
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend