removed redundant code from default_rgb config.h file, included QMK KEYBOARD H in place of initial defines in keymap.c

pull/5340/head
Eric Peterson 6 years ago
parent accb2e72eb
commit 91a249f6cf

@ -1,49 +1,4 @@
/* #pragma once
Copyright 2012 Jun Wako <wakojun@gmail.com>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CONFIG_H
#define CONFIG_H
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0x1337
#define PRODUCT_ID 0x6007
#define MANUFACTURER Maple Computing
#define PRODUCT Launch Pad
#define DESCRIPTION An all - in - on macropad
/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 2
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
/* define if matrix has ghost */
//#define MATRIX_HAS_GHOST
/* Set 0 if debouncing isn't needed */
#define DEBOUNCING_DELAY 5
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
/* Underlight Configuration */ /* Underlight Configuration */
#define RGB_DI_PIN F4 #define RGB_DI_PIN F4
@ -51,28 +6,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLED_NUM 2 // Number of LEDs #define RGBLED_NUM 2 // Number of LEDs
#define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17 #define RGBLIGHT_VAL_STEP 17
/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/
/* disable debug print */
//#define NO_DEBUG
/* disable print */
//#define NO_PRINT
/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION
#ifdef SUBPROJECT_rev1
# include "rev1/config.h"
#endif
#endif

@ -1,7 +1,5 @@
// Below layout is based upon /u/That-Canadian's planck layout // Below layout is based upon /u/That-Canadian's planck layout
#include "launchpad.h" #include QMK_KEYBOARD_H
#include "action_layer.h"
#include "eeconfig.h"
extern keymap_config_t keymap_config; extern keymap_config_t keymap_config;
@ -19,62 +17,45 @@ extern keymap_config_t keymap_config;
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Qwerty /* Qwerty
* ,-------------. * ,-------------.
* | 1 | 2 | * | 1 | 2 |
* |------+------| * |------+------|
* | 3 | 4 | * | 3 | 4 |
* |------+------| * |------+------|
* | 5 | 6 | * | 5 | 6 |
* |------+------| * |------+------|
* | FUNC | RGB | * | FUNC | RGB |
* `-------------' * `-------------'
*/ */
[_QWERTY] = LAYOUT( \ [_QWERTY] = LAYOUT(KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, MO(_FUNC), TG(_RGB)),
KC_1, KC_2, \
KC_3, KC_4, \ /* RGB
KC_5, KC_6, \ * ,-------------.
MO(_FUNC), TG(_RGB) \ * | Mode-| Mode+|
), * |------+------|
* | HUE- | HUE+ |
/* RGB * |------+------|
* ,-------------. * | SAT- | SAT+ |
* | Mode-| Mode+| * |------+------|
* |------+------| * |RGBTOG| |
* | HUE- | HUE+ | * `-------------'
* |------+------| */
* | SAT- | SAT+ | [_RGB] = LAYOUT(RGB_RMOD, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_TOG, KC_TRNS),
* |------+------|
* |RGBTOG| | /* Function
* `-------------' * ,-------------.
*/ * | Q |CALDEL|
[_RGB] = LAYOUT( \ * |------+------|
RGB_RMOD, RGB_MOD, \ * | A |TSKMGR|
RGB_HUD, RGB_HUI, \ * |------+------|
RGB_SAD, RGB_SAI, \ * | Z | X |
RGB_TOG, KC_TRNS \ * |------+------|
), * | | C |
* `-------------'
/* Function */
* ,-------------. [_FUNC] = LAYOUT(KC_Q, CALTDEL, KC_A, TSKMGR, KC_Z, KC_X, _______, KC_C)
* | Q |CALDEL|
* |------+------|
* | A |TSKMGR|
* |------+------|
* | Z | X |
* |------+------|
* | | C |
* `-------------'
*/
[_FUNC] = LAYOUT( \
KC_Q, CALTDEL, \
KC_A, TSKMGR, \
KC_Z, KC_X, \
_______, KC_C \
)
}; };
void matrix_init_user(void) { void matrix_init_user(void) {}
}

Loading…
Cancel
Save