From 3e8f2728732b20b5b6af63db73ad8b6f2be18823 Mon Sep 17 00:00:00 2001 From: Xyverz Date: Sat, 4 Aug 2018 09:01:26 -0700 Subject: Keyboard: LED fixes for Kinesis Stapelberg controller, and keymap changes (#3564) * Rules for vitamins_included Added a section to disable RGB underglow for the Let's Split Vitamins Included board. * fixing ortho_4x12 configs * Using upstream/master version instead * Additions and Corrections Corrected the Kinesis/Stapelberg's .c file to allow LEDs to work Removed excess cruft from my Kinesis keymap to reflect this change Other minor tweaks and adjustments to my ortho_4x12 and 5x12 layouts * Updated readme --- layouts/community/ortho_4x12/xyverz/config.h | 5 ++--- layouts/community/ortho_5x12/xyverz/keymap.c | 10 ++++++++++ layouts/community/ortho_5x12/xyverz/rules.mk | 12 +++++++++--- 3 files changed, 21 insertions(+), 6 deletions(-) (limited to 'layouts') diff --git a/layouts/community/ortho_4x12/xyverz/config.h b/layouts/community/ortho_4x12/xyverz/config.h index d2c329767..0fa89d6c7 100644 --- a/layouts/community/ortho_4x12/xyverz/config.h +++ b/layouts/community/ortho_4x12/xyverz/config.h @@ -15,12 +15,11 @@ #define RGBLED_NUM 12 #elif defined(KEYBOARD_lets_split_rev2) #define RGBLED_NUM 8 +#elif defined(KEYBOARD_jj40) + #define RGBLED_NUM 5 #else #define RGBLED_NUM 1 #endif -#ifdef KEYBOARD_jj40 - #define RGBLED_NUM 5 -#endif #define RGBLIGHT_ANIMATIONS #define RGBLIGHT_HUE_STEP 8 diff --git a/layouts/community/ortho_5x12/xyverz/keymap.c b/layouts/community/ortho_5x12/xyverz/keymap.c index a0f1274d0..23a456e6d 100644 --- a/layouts/community/ortho_5x12/xyverz/keymap.c +++ b/layouts/community/ortho_5x12/xyverz/keymap.c @@ -175,6 +175,16 @@ void persistent_default_layer_set(uint16_t default_layer) { default_layer_set(default_layer); } +void matrix_init_user(void) { +#ifdef BOOTLOADER_CATERINA + // This will disable the red LEDs on the ProMicros + DDRD &= ~(1<<5); + PORTD &= ~(1<<5); + DDRB &= ~(1<<0); + PORTB &= ~(1<<0); +#endif +}; + bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: diff --git a/layouts/community/ortho_5x12/xyverz/rules.mk b/layouts/community/ortho_5x12/xyverz/rules.mk index 44bbc61e5..63c544ad5 100644 --- a/layouts/community/ortho_5x12/xyverz/rules.mk +++ b/layouts/community/ortho_5x12/xyverz/rules.mk @@ -1,5 +1,5 @@ # Build Options -# change to "no" to disable the options, or define them in the Makefile in +# change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically # BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) @@ -7,12 +7,18 @@ MOUSEKEY_ENABLE = no # Mouse keys(+4700) EXTRAKEY_ENABLE = yes # Audio control and System control(+450) CONSOLE_ENABLE = no # Console for debug(+400) COMMAND_ENABLE = no # Commands for debug and configuration -BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality 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 = yes # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. + +ifneq ("$(KEYBOARD)","nyquist") + RGBLIGHT_ENABLE = yes + BACKLIGHT_ENABLE = yes +else + RGBLIGHT_ENABLE = no + BACKLIGHT_ENABLE = no +endif # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -- cgit v1.2.3-24-g4f1b