From b5aa5e4338750f6a7d969a30b2fe96f0f5382405 Mon Sep 17 00:00:00 2001 From: Joshua Rubin Date: Thu, 9 Apr 2020 01:25:08 -0600 Subject: [PATCH] Add RGB support in via to launchpad (#8621) Signed-off-by: Joshua Rubin --- keyboards/launchpad/keymaps/via/keymap.c | 24 ++++++++++++------------ keyboards/launchpad/keymaps/via/rules.mk | 2 ++ keyboards/launchpad/rev1/config.h | 7 ++++--- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/keyboards/launchpad/keymaps/via/keymap.c b/keyboards/launchpad/keymaps/via/keymap.c index c9843203542..ac25fa1e1ee 100644 --- a/keyboards/launchpad/keymaps/via/keymap.c +++ b/keyboards/launchpad/keymaps/via/keymap.c @@ -9,7 +9,7 @@ enum layer_names { _QWERTY, _FUNC, - _LAYER2, + _RGB, _LAYER3 }; @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, - MO(_FUNC), KC_8 + MO(_FUNC), TG(_RGB) ), /* Function @@ -55,22 +55,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_C ), -/* Layer 2 +/* RGB * ,-------------. - * | | | + * | MODE-| MODE+| * |------+------| - * | | | + * | HUE- | HUE+ | * |------+------| - * | | | + * | SAT- | SAT+ | * |------+------| - * | | | + * |TOGGLE| | * `-------------' */ -[_LAYER2] = LAYOUT( - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS +[_RGB] = LAYOUT( + RGB_RMOD, RGB_MOD, + RGB_HUD, RGB_HUI, + RGB_SAD, RGB_SAI, + RGB_TOG, KC_TRNS ), /* Layer 3 diff --git a/keyboards/launchpad/keymaps/via/rules.mk b/keyboards/launchpad/keymaps/via/rules.mk index 1e5b99807cb..87843cb0d6e 100644 --- a/keyboards/launchpad/keymaps/via/rules.mk +++ b/keyboards/launchpad/keymaps/via/rules.mk @@ -1 +1,3 @@ VIA_ENABLE = yes +LINK_TIME_OPTIMIZATION_ENABLE = yes +RGBLIGHT_ENABLE = yes diff --git a/keyboards/launchpad/rev1/config.h b/keyboards/launchpad/rev1/config.h index 67a4154226f..debc28fab31 100644 --- a/keyboards/launchpad/rev1/config.h +++ b/keyboards/launchpad/rev1/config.h @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef REV1_CONFIG_H -#define REV1_CONFIG_H +#pragma once #include "../config.h" @@ -29,4 +28,6 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW -#endif +#define RGBLED_NUM 10 +#define RGB_DI_PIN F6 +#define RGBLIGHT_ANIMATIONS