mirror of
https://github.com/qmk/qmk_userspace.git
synced 2026-07-23 18:23:37 -04:00
planck/rev7/bugFixes default and deferred
This commit is contained in:
Jenn Sears
parent
3f65cf6589
commit
8f96232647
5 changed files with 53 additions and 60 deletions
|
|
@ -41,15 +41,9 @@
|
|||
// They would have be held together intentionally to trigger this.
|
||||
#define COMBO_TERM 40
|
||||
|
||||
// These mostly affect my one-shot Shift key, providing a CapsLock alternative.
|
||||
// I want a relatively low timeout, so if I accidentally type "Shift", I can pause just briefly and move on.
|
||||
#define ONESHOT_TAP_TOGGLE 3 /* Tapping this number of times holds the key until tapped once again. */
|
||||
#define ONESHOT_TIMEOUT 2000 /* Time (in ms) before the one shot key is released */
|
||||
|
||||
|
||||
#ifdef AUDIO_ENABLE
|
||||
# define STARTUP_SONG SONG(PLANCK_SOUND)
|
||||
// #define STARTUP_SONG SONG(NO_SOUND)
|
||||
// # define STARTUP_SONG SONG(PLANCK_SOUND)
|
||||
#define STARTUP_SONG SONG(NO_SOUND)
|
||||
|
||||
# define DEFAULT_LAYER_SONGS \
|
||||
{ SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND) }
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
* `-----------------------------------------------------------------------------------'
|
||||
*/
|
||||
[_ADJUST] = LAYOUT_planck_grid(
|
||||
_______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
|
||||
_______, QK_BOOT, DB_TOGG, RM_TOGG, RM_NEXT, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, RM_VALU, RM_VALD, KC_DEL ,
|
||||
_______, EE_CLR, MU_NEXT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, COLEMAKDH, PLOVER, _______,
|
||||
_______, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
|
||||
_______, _______, OSM_ALT, OSM_GUI, LOW_TAB, KC_SPC, KC_ENT, RSE_BSP, OSM_SFT, _______, _______, _______
|
||||
|
|
|
|||
|
|
@ -1,39 +1,21 @@
|
|||
/* Copyright 2015-2023 Jack Humbert
|
||||
*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
/* SPI Config for spi flash*/
|
||||
#define SPI_DRIVER SPIDQ
|
||||
#define SPI_SCK_PIN B3
|
||||
#define SPI_MOSI_PIN B5
|
||||
#define SPI_MISO_PIN B4
|
||||
|
||||
#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
|
||||
|
||||
/* I2C Config for LED Driver */
|
||||
#define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND
|
||||
|
||||
/* WB32 MCU has no default definition */
|
||||
#define I2C1_OPMODE OPMODE_I2C
|
||||
#define I2C1_CLOCK_SPEED 400000
|
||||
|
||||
#define RGB_MATRIX_LED_COUNT 47
|
||||
|
||||
#define RGB_MATRIX_DEFAULT_SPD 127
|
||||
#define RGB_MATRIX_TIMEOUT 180000 // 3 minutes // 300000 = 5 minutes
|
||||
#define RGB_MATRIX_LED_FLUSH_LIMIT 16
|
||||
|
||||
#define RGB_MATRIX_DEFAULT_SAT 77
|
||||
#define RGB_MATRIX_DEFAULT_VAL 86
|
||||
#define RGB_DISABLE_WHEN_USB_SUSPENDED
|
||||
|
||||
#define ENABLE_RGB_MATRIX_ALPHAS_MODS
|
||||
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_ALPHAS_MODS
|
||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
|
||||
#define RGB_TRIGGER_ON_KEYDOWN
|
||||
|
||||
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
|
||||
#define RGB_MATRIX_KEYPRESSES
|
||||
|
||||
|
||||
// Customized by markstos
|
||||
#define TAPPING_TERM 200
|
||||
#define TAPPING_TERM_PER_KEY
|
||||
|
|
@ -59,7 +41,28 @@
|
|||
// They would have be held together intentionally to trigger this.
|
||||
#define COMBO_TERM 40
|
||||
|
||||
// These mostly affect my one-shot Shift key, providing a CapsLock alternative.
|
||||
// I want a relatively low timeout, so if I accidentally type "Shift", I can pause just briefly and move on.
|
||||
#define ONESHOT_TAP_TOGGLE 3 /* Tapping this number of times holds the key until tapped once again. */
|
||||
#define ONESHOT_TIMEOUT 2000 /* Time (in ms) before the one shot key is released */
|
||||
#ifdef AUDIO_ENABLE
|
||||
// # define STARTUP_SONG SONG(PLANCK_SOUND)
|
||||
#define STARTUP_SONG SONG(NO_SOUND)
|
||||
|
||||
# define DEFAULT_LAYER_SONGS \
|
||||
{ SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND) }
|
||||
#endif
|
||||
|
||||
/*
|
||||
* MIDI options
|
||||
*/
|
||||
|
||||
/* enable basic MIDI features:
|
||||
- MIDI notes can be sent when in Music mode is on
|
||||
*/
|
||||
|
||||
#define MIDI_BASIC
|
||||
|
||||
/* enable advanced MIDI features:
|
||||
- MIDI notes can be added to the keymap
|
||||
- Octave shift and transpose
|
||||
- Virtual sustain, portamento, and modulation wheel
|
||||
- etc.
|
||||
*/
|
||||
// #define MIDI_ADVANCED
|
||||
|
|
|
|||
|
|
@ -235,7 +235,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
* `-----------------------------------------------------------------------------------'
|
||||
*/
|
||||
[_ADJUST] = LAYOUT_planck_grid(
|
||||
_______, QK_BOOT, DB_TOGG, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_DEL ,
|
||||
_______, QK_BOOT, DB_TOGG, RM_TOGG, RM_NEXT, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, RM_VALU, RM_VALD, KC_DEL ,
|
||||
_______, EE_CLR, MU_NEXT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, COLEMAKDH, PLOVER, _______,
|
||||
_______, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______,
|
||||
_______, _______, OSM_ALT, OSM_GUI, LOW_TAB, KC_SPC, KC_ENT, RSE_BSP, OSM_SFT, _______, _______, _______
|
||||
|
|
|
|||
|
|
@ -1,19 +1,15 @@
|
|||
BOOTMAGIC_ENABLE = yes
|
||||
CONSOLE_ENABLE = yes
|
||||
COMMAND_ENABLE = no
|
||||
ENCODER_ENABLE = no
|
||||
RGB_MATRIX_ENABLE = yes
|
||||
VIA_ENABLE = no
|
||||
|
||||
# markstos: enable media keys
|
||||
EXTRAKEY_ENABLE = yes
|
||||
|
||||
DEFERRED_EXEC_ENABLE = yes
|
||||
|
||||
# markstos: smaller file size, little down-side
|
||||
LINK_TIME_OPTIMIZATION_ENABLE = yes
|
||||
|
||||
# markstos: for combos!
|
||||
COMBO_ENABLE = yes
|
||||
|
||||
TAP_DANCE_ENABLE = yes
|
||||
TAP_DANCE_ENABLE = yes
|
||||
EXTRAKEY_ENABLE = yes
|
||||
#BOOTMAGIC_ENABLE = yes
|
||||
CONSOLE_ENABLE = yes
|
||||
COMMAND_ENABLE = no
|
||||
#ENCODER_ENABLE = no
|
||||
#RGB_MATRIX_ENABLE = yes
|
||||
#VIA_ENABLE = no
|
||||
Loading…
Reference in a new issue