diff options
| author | Joshua Rubin <joshuarubin@users.noreply.github.com> | 2020-04-09 01:25:08 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-09 09:25:08 +0200 |
| commit | b5aa5e4338750f6a7d969a30b2fe96f0f5382405 (patch) | |
| tree | 5b2f5366a694930b43a3dd186bb359c23ee2bf40 | |
| parent | be8443b35b3ec1b6abbe31c6533d22e14df27c4e (diff) | |
| download | qmk_firmware-b5aa5e4338750f6a7d969a30b2fe96f0f5382405.tar.gz qmk_firmware-b5aa5e4338750f6a7d969a30b2fe96f0f5382405.zip | |
Add RGB support in via to launchpad (#8621)
Signed-off-by: Joshua Rubin <me@jawa.dev>
| -rw-r--r-- | keyboards/launchpad/keymaps/via/keymap.c | 24 | ||||
| -rw-r--r-- | keyboards/launchpad/keymaps/via/rules.mk | 2 | ||||
| -rw-r--r-- | 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 c98432035..ac25fa1e1 100644 --- a/keyboards/launchpad/keymaps/via/keymap.c +++ b/keyboards/launchpad/keymaps/via/keymap.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | enum layer_names { | 9 | enum layer_names { |
| 10 | _QWERTY, | 10 | _QWERTY, |
| 11 | _FUNC, | 11 | _FUNC, |
| 12 | _LAYER2, | 12 | _RGB, |
| 13 | _LAYER3 | 13 | _LAYER3 |
| 14 | }; | 14 | }; |
| 15 | 15 | ||
| @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 34 | KC_1, KC_2, | 34 | KC_1, KC_2, |
| 35 | KC_3, KC_4, | 35 | KC_3, KC_4, |
| 36 | KC_5, KC_6, | 36 | KC_5, KC_6, |
| 37 | MO(_FUNC), KC_8 | 37 | MO(_FUNC), TG(_RGB) |
| 38 | ), | 38 | ), |
| 39 | 39 | ||
| 40 | /* Function | 40 | /* Function |
| @@ -55,22 +55,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 55 | KC_TRNS, KC_C | 55 | KC_TRNS, KC_C |
| 56 | ), | 56 | ), |
| 57 | 57 | ||
| 58 | /* Layer 2 | 58 | /* RGB |
| 59 | * ,-------------. | 59 | * ,-------------. |
| 60 | * | | | | 60 | * | MODE-| MODE+| |
| 61 | * |------+------| | 61 | * |------+------| |
| 62 | * | | | | 62 | * | HUE- | HUE+ | |
| 63 | * |------+------| | 63 | * |------+------| |
| 64 | * | | | | 64 | * | SAT- | SAT+ | |
| 65 | * |------+------| | 65 | * |------+------| |
| 66 | * | | | | 66 | * |TOGGLE| | |
| 67 | * `-------------' | 67 | * `-------------' |
| 68 | */ | 68 | */ |
| 69 | [_LAYER2] = LAYOUT( | 69 | [_RGB] = LAYOUT( |
| 70 | KC_TRNS, KC_TRNS, | 70 | RGB_RMOD, RGB_MOD, |
| 71 | KC_TRNS, KC_TRNS, | 71 | RGB_HUD, RGB_HUI, |
| 72 | KC_TRNS, KC_TRNS, | 72 | RGB_SAD, RGB_SAI, |
| 73 | KC_TRNS, KC_TRNS | 73 | RGB_TOG, KC_TRNS |
| 74 | ), | 74 | ), |
| 75 | 75 | ||
| 76 | /* Layer 3 | 76 | /* Layer 3 |
diff --git a/keyboards/launchpad/keymaps/via/rules.mk b/keyboards/launchpad/keymaps/via/rules.mk index 1e5b99807..87843cb0d 100644 --- a/keyboards/launchpad/keymaps/via/rules.mk +++ b/keyboards/launchpad/keymaps/via/rules.mk | |||
| @@ -1 +1,3 @@ | |||
| 1 | VIA_ENABLE = yes | 1 | VIA_ENABLE = yes |
| 2 | LINK_TIME_OPTIMIZATION_ENABLE = yes | ||
| 3 | RGBLIGHT_ENABLE = yes | ||
diff --git a/keyboards/launchpad/rev1/config.h b/keyboards/launchpad/rev1/config.h index 67a415422..debc28fab 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 | |||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #ifndef REV1_CONFIG_H | 18 | #pragma once |
| 19 | #define REV1_CONFIG_H | ||
| 20 | 19 | ||
| 21 | #include "../config.h" | 20 | #include "../config.h" |
| 22 | 21 | ||
| @@ -29,4 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 29 | 28 | ||
| 30 | #define DIODE_DIRECTION COL2ROW | 29 | #define DIODE_DIRECTION COL2ROW |
| 31 | 30 | ||
| 32 | #endif | 31 | #define RGBLED_NUM 10 |
| 32 | #define RGB_DI_PIN F6 | ||
| 33 | #define RGBLIGHT_ANIMATIONS | ||