Merge remote-tracking branch 'qmk/master' into merge-2023-03-12
This commit is contained in:
@ -17,21 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
/* 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 DEBOUNCE 5
|
||||
|
||||
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
|
||||
#define LOCKING_SUPPORT_ENABLE
|
||||
/* Locking resynchronize hack */
|
||||
|
@ -41,7 +41,7 @@ enum launchpad_dances {
|
||||
TD_REDR_H
|
||||
};
|
||||
//Tap Dance Definitions
|
||||
qk_tap_dance_action_t tap_dance_actions[] = {
|
||||
tap_dance_action_t tap_dance_actions[] = {
|
||||
[TD_SHLD_LGHT] = ACTION_TAP_DANCE_TRIGGER_LAYER(SINGLE_HOLD, _LIGHT),
|
||||
[TD_SHLD_ADJT] = ACTION_TAP_DANCE_TRIGGER_LAYER(SINGLE_HOLD, _ADJUST),
|
||||
[TD_REDR_H] = ACTION_TAP_DANCE_DOUBLE(KC_H, KC_R)
|
||||
@ -60,11 +60,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* │ Clr │ Sync │
|
||||
* └──────┴──────┘
|
||||
*/
|
||||
[_REEDER] = LAYOUT( \
|
||||
CMD_TAB, TD(TD_REDR_H), \
|
||||
KC_P, KC_K, \
|
||||
KC_N, KC_J, \
|
||||
TD(TD_SHLD_LGHT), TD(TD_SHLD_ADJT) \
|
||||
[_REEDER] = LAYOUT(
|
||||
CMD_TAB, TD(TD_REDR_H),
|
||||
KC_P, KC_K,
|
||||
KC_N, KC_J,
|
||||
TD(TD_SHLD_LGHT), TD(TD_SHLD_ADJT)
|
||||
),
|
||||
|
||||
/* Media
|
||||
@ -78,11 +78,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* │ Spce │ Plyr │
|
||||
* └──────┴──────┘
|
||||
*/
|
||||
[_MEDIA] = LAYOUT( \
|
||||
KC_MUTE, KC_MPLY, \
|
||||
KC_VOLU, KC_MNXT, \
|
||||
KC_VOLD, KC_MPRV, \
|
||||
TD(TD_SHLD_LGHT), TD(TD_SHLD_ADJT) \
|
||||
[_MEDIA] = LAYOUT(
|
||||
KC_MUTE, KC_MPLY,
|
||||
KC_VOLU, KC_MNXT,
|
||||
KC_VOLD, KC_MPRV,
|
||||
TD(TD_SHLD_LGHT), TD(TD_SHLD_ADJT)
|
||||
),
|
||||
|
||||
/* Navigation
|
||||
@ -96,11 +96,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* │LstTab│ClsTab│
|
||||
* └──────┴──────┘
|
||||
*/
|
||||
[_NAVI] = LAYOUT( \
|
||||
PRV_TAB, NXT_TAB, \
|
||||
MC_WH_L, MC_WH_U, \
|
||||
MC_WH_R, MC_WH_D, \
|
||||
TD(TD_SHLD_LGHT), TD(TD_SHLD_ADJT) \
|
||||
[_NAVI] = LAYOUT(
|
||||
PRV_TAB, NXT_TAB,
|
||||
MC_WH_L, MC_WH_U,
|
||||
MC_WH_R, MC_WH_D,
|
||||
TD(TD_SHLD_LGHT), TD(TD_SHLD_ADJT)
|
||||
),
|
||||
|
||||
/* Macro
|
||||
@ -114,11 +114,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* │ 7 │ 8 │
|
||||
* └──────┴──────┘
|
||||
*/
|
||||
[_KARABINER] = LAYOUT( \
|
||||
KC_P1, KC_P2, \
|
||||
KC_P3, KC_P4, \
|
||||
KC_P5, KC_P6, \
|
||||
TD(TD_SHLD_LGHT), TD(TD_SHLD_ADJT) \
|
||||
[_KARABINER] = LAYOUT(
|
||||
KC_P1, KC_P2,
|
||||
KC_P3, KC_P4,
|
||||
KC_P5, KC_P6,
|
||||
TD(TD_SHLD_LGHT), TD(TD_SHLD_ADJT)
|
||||
),
|
||||
|
||||
/* Lights
|
||||
@ -132,11 +132,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* │ XXXX │ Mde+ │
|
||||
* └──────┴──────┘
|
||||
*/
|
||||
[_LIGHT] = LAYOUT( \
|
||||
RGB_THM, RGB_HUI, \
|
||||
RGB_SAD, RGB_SAI, \
|
||||
RGB_VAD, RGB_VAI, \
|
||||
XXXXXXX, RGB_MOD \
|
||||
[_LIGHT] = LAYOUT(
|
||||
RGB_THM, RGB_HUI,
|
||||
RGB_SAD, RGB_SAI,
|
||||
RGB_VAD, RGB_VAI,
|
||||
XXXXXXX, RGB_MOD
|
||||
),
|
||||
|
||||
/* Adjust
|
||||
@ -150,11 +150,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* │ Lght │ XXXX │
|
||||
* └──────┴──────┘
|
||||
*/
|
||||
[_ADJUST] = LAYOUT( \
|
||||
QM_MAKE, QK_BOOT, \
|
||||
DF_REDR, DF_MEDA, \
|
||||
DF_NAVI, DF_KBNR, \
|
||||
TG_LGHT, XXXXXXX \
|
||||
[_ADJUST] = LAYOUT(
|
||||
QM_MAKE, QK_BOOT,
|
||||
DF_REDR, DF_MEDA,
|
||||
DF_NAVI, DF_KBNR,
|
||||
TG_LGHT, XXXXXXX
|
||||
)
|
||||
|
||||
};
|
||||
|
@ -2,8 +2,17 @@
|
||||
|
||||
/* Underlight Configuration */
|
||||
#define RGB_DI_PIN F4
|
||||
#define RGBLIGHT_ANIMATIONS
|
||||
#define RGBLIGHT_EFFECT_BREATHING
|
||||
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
||||
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
||||
#define RGBLIGHT_EFFECT_SNAKE
|
||||
#define RGBLIGHT_EFFECT_KNIGHT
|
||||
#define RGBLIGHT_EFFECT_CHRISTMAS
|
||||
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
|
||||
#define RGBLIGHT_EFFECT_RGB_TEST
|
||||
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||
#define RGBLIGHT_EFFECT_TWINKLE
|
||||
#define RGBLED_NUM 2 // Number of LEDs
|
||||
#define RGBLIGHT_HUE_STEP 10
|
||||
#define RGBLIGHT_SAT_STEP 17
|
||||
#define RGBLIGHT_VAL_STEP 17
|
||||
#define RGBLIGHT_VAL_STEP 17
|
||||
|
@ -19,13 +19,22 @@
|
||||
/* Underlight Configuration */
|
||||
#undef RGB_DI_PIN
|
||||
#define RGB_DI_PIN F5
|
||||
#define RGBLIGHT_ANIMATIONS
|
||||
#define RGBLIGHT_EFFECT_BREATHING
|
||||
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
||||
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
||||
#define RGBLIGHT_EFFECT_SNAKE
|
||||
#define RGBLIGHT_EFFECT_KNIGHT
|
||||
#define RGBLIGHT_EFFECT_CHRISTMAS
|
||||
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
|
||||
#define RGBLIGHT_EFFECT_RGB_TEST
|
||||
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||
#define RGBLIGHT_EFFECT_TWINKLE
|
||||
#undef RGBLED_NUM
|
||||
#define RGBLED_NUM 8 // Number of LEDs
|
||||
#define RGBLIGHT_HUE_STEP 10
|
||||
#define RGBLIGHT_SAT_STEP 17
|
||||
#define RGBLIGHT_VAL_STEP 17
|
||||
|
||||
#define DRIVER_LED_TOTAL RGBLED_NUM
|
||||
#define RGB_MATRIX_LED_COUNT RGBLED_NUM
|
||||
#define AUDIO_PIN B7
|
||||
#define AUDIO_CLICKY
|
||||
|
@ -39,11 +39,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* | FUNC | RGB |
|
||||
* `-------------'
|
||||
*/
|
||||
[_QWERTY] = LAYOUT( \
|
||||
KC_1, KC_2, \
|
||||
KC_3, KC_4, \
|
||||
KC_5, KC_6, \
|
||||
MO(_FUNC), TG(_RGB) \
|
||||
[_QWERTY] = LAYOUT(
|
||||
KC_1, KC_2,
|
||||
KC_3, KC_4,
|
||||
KC_5, KC_6,
|
||||
MO(_FUNC), TG(_RGB)
|
||||
),
|
||||
|
||||
/* RGB
|
||||
@ -57,11 +57,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* |RGBTOG| |
|
||||
* `-------------'
|
||||
*/
|
||||
[_RGB] = LAYOUT( \
|
||||
RGB_RMOD, RGB_MOD, \
|
||||
RGB_HUD, RGB_HUI, \
|
||||
RGB_SAD, RGB_SAI, \
|
||||
RGB_TOG, KC_TRNS \
|
||||
[_RGB] = LAYOUT(
|
||||
RGB_RMOD, RGB_MOD,
|
||||
RGB_HUD, RGB_HUI,
|
||||
RGB_SAD, RGB_SAI,
|
||||
RGB_TOG, KC_TRNS
|
||||
),
|
||||
|
||||
/* Function
|
||||
@ -75,11 +75,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* | | C |
|
||||
* `-------------'
|
||||
*/
|
||||
[_FUNC] = LAYOUT( \
|
||||
KC_Q, CALTDEL, \
|
||||
KC_A, TSKMGR, \
|
||||
KC_Z, KC_X, \
|
||||
_______, QK_BOOT \
|
||||
[_FUNC] = LAYOUT(
|
||||
KC_Q, CALTDEL,
|
||||
KC_A, TSKMGR,
|
||||
KC_Z, KC_X,
|
||||
_______, QK_BOOT
|
||||
)
|
||||
|
||||
};
|
||||
|
@ -27,4 +27,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#define RGBLED_NUM 10
|
||||
#define RGB_DI_PIN F6
|
||||
#define RGBLIGHT_ANIMATIONS
|
||||
#define RGBLIGHT_EFFECT_BREATHING
|
||||
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
|
||||
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
|
||||
#define RGBLIGHT_EFFECT_SNAKE
|
||||
#define RGBLIGHT_EFFECT_KNIGHT
|
||||
#define RGBLIGHT_EFFECT_CHRISTMAS
|
||||
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
|
||||
#define RGBLIGHT_EFFECT_RGB_TEST
|
||||
#define RGBLIGHT_EFFECT_ALTERNATING
|
||||
#define RGBLIGHT_EFFECT_TWINKLE
|
||||
|
@ -8,6 +8,8 @@
|
||||
"pid": "0x6007",
|
||||
"device_version": "0.0.1"
|
||||
},
|
||||
"processor": "atmega32u4",
|
||||
"bootloader": "caterina",
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
|
@ -1,9 +1,3 @@
|
||||
# MCU name
|
||||
MCU = atmega32u4
|
||||
|
||||
# Bootloader selection
|
||||
BOOTLOADER = caterina
|
||||
|
||||
# Build Options
|
||||
# change yes to no to disable
|
||||
#
|
||||
|
Reference in New Issue
Block a user