Merge remote-tracking branch 'upstream/master' into develop
Fixes merge conflicts in: - keyboards/bm40hsrgb/config.h - Conflict from PR 13132: - RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch - updated file with changes from master branch - keyboards/keebio/iris/keymaps/nstickney/keymap.c - Conflict from PR 11456: - layer_state_set_user() updated in develop branch, removed in master branch - updated file with changes from master branch
This commit is contained in:
commit
7bec943043
39 changed files with 812 additions and 381 deletions
|
@ -37,3 +37,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define PERMISSIVE_HOLD
|
||||
#define IGNORE_MOD_TAP_INTERRUPT
|
||||
#define TAPPING_FORCE_HOLD
|
||||
|
||||
// Underglow configuration
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
#define RGBLIGHT_ANIMATIONS
|
||||
#define RGBLIGHT_HUE_STEP 8
|
||||
#define RGBLIGHT_SAT_STEP 8
|
||||
#define RGBLIGHT_VAL_STEP 8
|
||||
#endif
|
||||
|
|
|
@ -50,8 +50,8 @@
|
|||
"KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS",
|
||||
"KC_TRNS" , "KC_MINS" , "KC_BSLS" , "KC_GRV" , "KC_TRNS",
|
||||
|
||||
"KC_TRNS" , "KC_TRNS",
|
||||
"KC_TRNS" , "KC_TRNS"
|
||||
"RGB_RMOD" , "KC_TRNS",
|
||||
"KC_TRNS" , "RGB_MOD"
|
||||
],
|
||||
["KC_TRNS" , "KC_COLN" , "KC_LT" , "KC_GT" , "KC_SCLN",
|
||||
"KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS",
|
||||
|
|
|
@ -37,3 +37,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#define PERMISSIVE_HOLD
|
||||
#define IGNORE_MOD_TAP_INTERRUPT
|
||||
#define TAPPING_FORCE_HOLD
|
||||
|
||||
// Underglow configuration
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
#define RGBLIGHT_ANIMATIONS
|
||||
#define RGBLIGHT_HUE_STEP 8
|
||||
#define RGBLIGHT_SAT_STEP 8
|
||||
#define RGBLIGHT_VAL_STEP 8
|
||||
#endif
|
||||
|
|
|
@ -50,8 +50,8 @@
|
|||
"KC_TRNS" , "KC_HOME" , "KC_PGDN" , "KC_END" , "KC_TRNS",
|
||||
"KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS",
|
||||
|
||||
"LGUI(KC_LEFT)" , "KC_TRNS",
|
||||
"KC_TRNS" , "LGUI(KC_RGHT)"
|
||||
"RGB_RMOD" , "KC_TRNS",
|
||||
"KC_TRNS" , "RGB_MOD"
|
||||
],
|
||||
["KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS",
|
||||
"KC_TRNS" , "KC_UNDS" , "KC_PIPE" , "KC_QUOT" , "KC_TRNS",
|
||||
|
|
|
@ -18,3 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
#pragma once
|
||||
|
||||
#define DEBUG_MATRIX_SCAN_RATE
|
||||
|
||||
// Underglow configuration
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
#define RGBLIGHT_ANIMATIONS
|
||||
#define RGBLIGHT_HUE_STEP 8
|
||||
#define RGBLIGHT_SAT_STEP 8
|
||||
#define RGBLIGHT_VAL_STEP 8
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue