Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2022-07-19 23:24:53 +00:00
commit 6992efb229
5 changed files with 40 additions and 35 deletions

View file

@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
/* USB Device descriptor parameter */
#define VENDOR_ID 0xFEED
#define VENDOR_ID 0x1209 // pid.codes
#define PRODUCT_ID 0xDB00
#define DEVICE_VER 0x0001
#define MANUFACTURER duckyb
@ -62,6 +62,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define BACKLIGHT_LEVELS 3
//#define BACKLIGHT_BREATHING
#define RGB_DI_PIN D3
#define RGBLED_NUM 8
#define RGBLIGHT_SLEEP
#define RGBLIGHT_ANIMATIONS
//#define RGB_DI_PIN E2
//#ifdef RGB_DI_PIN
//# define RGBLED_NUM 16

View file

@ -44,24 +44,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_F15, KC_LCTL, OSL(_FN), KC_LALT, KC_SPC, LT(_ARROW, KC_0)
),
/* Arrows Layer
* ,-----------------------------------------.
* | | | | | | | | |
* | |-------+----+----+-----+---+---+---|
* | | | | UP| | | | |
* |----||-------+----+----+-----+---+---+---|
* | || |LEFT|DOWN|RIGHT| | | |
* |----||-------+----+----+-----+---+---+---|
* | || | | | | | | |
* |----||-----------------------------------|
* | RST|| | | | | |
* `----'`-----------------------------------'
* ,--------------------------------------------------.
* | | | | | | | | |
* | |-------+----+----+-----+----+-------+-------|
* | | | | UP| |RGB?| HUE+ | HUE- |
* |----||-------+----+----+-----+----+-------+-------|
* | || |LEFT|DOWN|RIGHT| |BRIGHT+|BRIGHT-|
* |----||-------+----+----+-----+----+-------+-------|
* | || | | | | | MODE+ | MODE- |
* |----||--------------------------------------------|
* | RST|| | | | | |
* `----'`--------------------------------------------'
*/
[_ARROW] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______,
_______, _______, KC_UP, _______, _______, _______, _______,
_______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______,
QK_BOOT, _______, _______, _______, _______, _______
_______, _______, KC_UP, _______, RGB_TOG, RGB_HUI, RGB_HUD,
_______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, RGB_VAI, RGB_VAD,
_______, _______, _______, _______, _______, _______, RGB_MOD, RGB_RMOD,
RESET, _______, _______, _______, _______, _______
),
/* Function Layer
* ,-------------------------------------.

View file

@ -57,10 +57,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `----'`-----------------------------------'
*/
[_ARROW] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______,
_______, _______, KC_UP, _______, _______, _______, _______,
_______, KC_DEL , KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, RGB_MODE_RGBTEST, RGB_TOG, RGB_HUI,
_______, _______, KC_UP, _______, _______, RGB_MODE_PLAIN, RGB_HUD,
_______, KC_DEL , KC_LEFT, KC_DOWN, KC_RIGHT, _______, RGB_MODE_BREATHE, RGB_VAI,
_______, _______, _______, _______, _______, _______, RGB_MODE_SWIRL, RGB_VAD,
RESET, _______, _______, _______, _______, _______
),
/* Function Layer

View file

@ -44,23 +44,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_F15, KC_LCTL, OSL(_FN), KC_LALT, KC_SPC, LT(_ARROW, KC_0)
),
/* Arrows Layer
* ,-----------------------------------------.
* | | | | | | | | |
* | |-------+----+----+-----+---+---+---|
* | | | | UP| | | | |
* |----||-------+----+----+-----+---+---+---|
* | || |RIGHT|DOWN|LEFT| | | |
* |----||-------+----+----+-----+---+---+---|
* | || | | | | | | |
* |----||-----------------------------------|
* | RST|| | | | | |
* `----'`-----------------------------------'
* ,--------------------------------------------------.
* | | | | | | | | |
* | |-------+----+----+-----+----+-------+-------|
* | | | | UP| |RGB?| HUE+ | HUE- |
* |----||-------+----+----+-----+----+-------+-------|
* | || |LEFT|DOWN|RIGHT| |BRIGHT+|BRIGHT-|
* |----||-------+----+----+-----+----+-------+-------|
* | || | | | | | MODE+ | MODE- |
* |----||--------------------------------------------|
* | RST|| | | | | |
* `----'`--------------------------------------------'
*/
[_ARROW] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______,
_______, _______, KC_UP, _______, _______, _______, _______,
_______, _______, KC_RIGHT,KC_DOWN, KC_LEFT, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, KC_UP, _______, RGB_TOG, RGB_HUI, RGB_HUD,
_______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, RGB_VAI, RGB_VAD,
_______, _______, _______, _______, _______, _______, RGB_MOD, RGB_RMOD,
RESET, _______, _______, _______, _______, _______
),
/* Function Layer

View file

@ -14,5 +14,5 @@ CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output