mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-13 21:30:47 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
cf6b3848d9
@ -40,14 +40,14 @@
|
|||||||
// For full list of effects, see:
|
// For full list of effects, see:
|
||||||
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
|
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_COLOR
|
#define ENABLE_RGB_MATRIX_SOLID_COLOR
|
||||||
#define ENABLE_RGB_MATRIX_ALPHAS_MODS
|
// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
|
||||||
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
|
// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
|
||||||
#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
|
#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
|
||||||
#define ENABLE_RGB_MATRIX_BREATHING
|
#define ENABLE_RGB_MATRIX_BREATHING
|
||||||
#define ENABLE_RGB_MATRIX_BAND_SAT
|
#define ENABLE_RGB_MATRIX_BAND_SAT
|
||||||
#define ENABLE_RGB_MATRIX_BAND_VAL
|
#define ENABLE_RGB_MATRIX_BAND_VAL
|
||||||
#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
|
// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
|
||||||
#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
|
// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
|
||||||
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
|
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
|
||||||
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
|
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_ALL
|
#define ENABLE_RGB_MATRIX_CYCLE_ALL
|
||||||
@ -55,36 +55,36 @@
|
|||||||
#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
|
#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
|
||||||
#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
|
#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
|
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
|
// #define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
|
#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
|
#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
|
||||||
#define ENABLE_RGB_MATRIX_DUAL_BEACON
|
// #define ENABLE_RGB_MATRIX_DUAL_BEACON
|
||||||
#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
|
#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
|
||||||
#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
|
// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
|
||||||
#define ENABLE_RGB_MATRIX_RAINDROPS
|
#define ENABLE_RGB_MATRIX_RAINDROPS
|
||||||
#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
|
// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
|
||||||
#define ENABLE_RGB_MATRIX_HUE_BREATHING
|
// #define ENABLE_RGB_MATRIX_HUE_BREATHING
|
||||||
#define ENABLE_RGB_MATRIX_HUE_PENDULUM
|
// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
|
||||||
#define ENABLE_RGB_MATRIX_HUE_WAVE
|
// #define ENABLE_RGB_MATRIX_HUE_WAVE
|
||||||
#define ENABLE_RGB_MATRIX_PIXEL_RAIN
|
// #define ENABLE_RGB_MATRIX_PIXEL_RAIN
|
||||||
#define ENABLE_RGB_MATRIX_PIXEL_FLOW
|
// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
|
||||||
#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
|
#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
|
||||||
|
|
||||||
// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
|
// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
|
||||||
#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
|
#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
|
||||||
#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
|
// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
|
||||||
|
|
||||||
// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
|
// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
|
||||||
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
|
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
|
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
|
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
|
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
|
||||||
#define ENABLE_RGB_MATRIX_SPLASH
|
#define ENABLE_RGB_MATRIX_SPLASH
|
||||||
#define ENABLE_RGB_MATRIX_MULTISPLASH
|
// #define ENABLE_RGB_MATRIX_MULTISPLASH
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_SPLASH
|
#define ENABLE_RGB_MATRIX_SOLID_SPLASH
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
|
// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
|
||||||
#endif
|
#endif
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
"keyboard_name": "Tap Duo",
|
"keyboard_name": "Tap Duo",
|
||||||
"manufacturer": "Momokai",
|
"manufacturer": "Momokai",
|
||||||
"url": "",
|
"url": "",
|
||||||
"maintainer": "qmk",
|
"maintainer": "peepeetee",
|
||||||
"usb": {
|
"usb": {
|
||||||
"vid": "0x69F9",
|
"vid": "0x69F9",
|
||||||
"pid": "0x0005",
|
"pid": "0x0005",
|
||||||
@ -21,6 +21,9 @@
|
|||||||
"diode_direction": "COL2ROW",
|
"diode_direction": "COL2ROW",
|
||||||
"processor": "atmega32u4",
|
"processor": "atmega32u4",
|
||||||
"bootloader": "atmel-dfu",
|
"bootloader": "atmel-dfu",
|
||||||
|
"bootmagic": {
|
||||||
|
"matrix": [0, 3]
|
||||||
|
},
|
||||||
"layouts": {
|
"layouts": {
|
||||||
"LAYOUT": {
|
"LAYOUT": {
|
||||||
"layout": [
|
"layout": [
|
||||||
|
@ -7,7 +7,9 @@
|
|||||||
|
|
||||||
Make example for this keyboard (after setting up your build environment):
|
Make example for this keyboard (after setting up your build environment):
|
||||||
|
|
||||||
make momokai/tap_trio:default
|
make momokai/tap_duo:default
|
||||||
|
|
||||||
|
|
||||||
|
To use bootmagic to reset this board, hold down the middle key of the lower row on the keyboard while plugging it in.
|
||||||
|
|
||||||
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
|
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
|
||||||
|
@ -30,48 +30,48 @@
|
|||||||
// For full list of effects, see:
|
// For full list of effects, see:
|
||||||
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
|
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_COLOR
|
#define ENABLE_RGB_MATRIX_SOLID_COLOR
|
||||||
#define ENABLE_RGB_MATRIX_ALPHAS_MODS
|
// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
|
||||||
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
|
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
|
||||||
#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
|
#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
|
||||||
#define ENABLE_RGB_MATRIX_BREATHING
|
#define ENABLE_RGB_MATRIX_BREATHING
|
||||||
#define ENABLE_RGB_MATRIX_BAND_SAT
|
#define ENABLE_RGB_MATRIX_BAND_SAT
|
||||||
#define ENABLE_RGB_MATRIX_BAND_VAL
|
#define ENABLE_RGB_MATRIX_BAND_VAL
|
||||||
#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
|
// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
|
||||||
#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
|
// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
|
||||||
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
|
// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
|
||||||
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
|
// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_ALL
|
#define ENABLE_RGB_MATRIX_CYCLE_ALL
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
|
#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
|
#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
|
||||||
#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
|
#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
|
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
|
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
|
// #define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
|
||||||
#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
|
// #define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
|
||||||
#define ENABLE_RGB_MATRIX_DUAL_BEACON
|
#define ENABLE_RGB_MATRIX_DUAL_BEACON
|
||||||
#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
|
#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
|
||||||
#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
|
// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
|
||||||
#define ENABLE_RGB_MATRIX_RAINDROPS
|
#define ENABLE_RGB_MATRIX_RAINDROPS
|
||||||
#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
|
// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
|
||||||
#define ENABLE_RGB_MATRIX_HUE_BREATHING
|
// #define ENABLE_RGB_MATRIX_HUE_BREATHING
|
||||||
#define ENABLE_RGB_MATRIX_HUE_PENDULUM
|
// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
|
||||||
#define ENABLE_RGB_MATRIX_HUE_WAVE
|
// #define ENABLE_RGB_MATRIX_HUE_WAVE
|
||||||
#define ENABLE_RGB_MATRIX_PIXEL_RAIN
|
// #define ENABLE_RGB_MATRIX_PIXEL_RAIN
|
||||||
#define ENABLE_RGB_MATRIX_PIXEL_FLOW
|
// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
|
||||||
#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
|
#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
|
||||||
|
|
||||||
// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
|
// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
|
||||||
#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
|
#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
|
||||||
#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
|
// #define ENABLE_RGB_MATRIX_DIGITAL_RAIN
|
||||||
|
|
||||||
// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
|
// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
|
||||||
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
|
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
|
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
|
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
|
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
|
// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
|
||||||
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
|
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
|
||||||
#define ENABLE_RGB_MATRIX_SPLASH
|
#define ENABLE_RGB_MATRIX_SPLASH
|
||||||
#define ENABLE_RGB_MATRIX_MULTISPLASH
|
#define ENABLE_RGB_MATRIX_MULTISPLASH
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
"keyboard_name": "Tap Trio",
|
"keyboard_name": "Tap Trio",
|
||||||
"manufacturer": "Momokai",
|
"manufacturer": "Momokai",
|
||||||
"url": "",
|
"url": "",
|
||||||
"maintainer": "qmk",
|
"maintainer": "peepeetee",
|
||||||
"usb": {
|
"usb": {
|
||||||
"vid": "0x69F9",
|
"vid": "0x69F9",
|
||||||
"pid": "0x0006",
|
"pid": "0x0006",
|
||||||
|
Loading…
Reference in New Issue
Block a user