Skip to content

Commit 6992efb

Browse files
committed
Merge remote-tracking branch 'origin/master' into develop
2 parents d0c095e + a7893f2 commit 6992efb

File tree

5 files changed

+40
-35
lines changed

5 files changed

+40
-35
lines changed

keyboards/eternal_keypad/config.h

+6-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2020
#include "config_common.h"
2121

2222
/* USB Device descriptor parameter */
23-
#define VENDOR_ID 0xFEED
23+
#define VENDOR_ID 0x1209 // pid.codes
2424
#define PRODUCT_ID 0xDB00
2525
#define DEVICE_VER 0x0001
2626
#define MANUFACTURER duckyb
@@ -62,6 +62,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
6262
//#define BACKLIGHT_LEVELS 3
6363
//#define BACKLIGHT_BREATHING
6464

65+
#define RGB_DI_PIN D3
66+
#define RGBLED_NUM 8
67+
#define RGBLIGHT_SLEEP
68+
#define RGBLIGHT_ANIMATIONS
69+
6570
//#define RGB_DI_PIN E2
6671
//#ifdef RGB_DI_PIN
6772
//# define RGBLED_NUM 16

keyboards/eternal_keypad/keymaps/default/keymap.c

+15-15
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4444
KC_F15, KC_LCTL, OSL(_FN), KC_LALT, KC_SPC, LT(_ARROW, KC_0)
4545
),
4646
/* Arrows Layer
47-
* ,-----------------------------------------.
48-
* | | | | | | | | |
49-
* | |-------+----+----+-----+---+---+---|
50-
* | | | | UP| | | | |
51-
* |----||-------+----+----+-----+---+---+---|
52-
* | || |LEFT|DOWN|RIGHT| | | |
53-
* |----||-------+----+----+-----+---+---+---|
54-
* | || | | | | | | |
55-
* |----||-----------------------------------|
56-
* | RST|| | | | | |
57-
* `----'`-----------------------------------'
47+
* ,--------------------------------------------------.
48+
* | | | | | | | | |
49+
* | |-------+----+----+-----+----+-------+-------|
50+
* | | | | UP| |RGB?| HUE+ | HUE- |
51+
* |----||-------+----+----+-----+----+-------+-------|
52+
* | || |LEFT|DOWN|RIGHT| |BRIGHT+|BRIGHT-|
53+
* |----||-------+----+----+-----+----+-------+-------|
54+
* | || | | | | | MODE+ | MODE- |
55+
* |----||--------------------------------------------|
56+
* | RST|| | | | | |
57+
* `----'`--------------------------------------------'
5858
*/
5959
[_ARROW] = LAYOUT(
6060
_______, _______, _______, _______, _______, _______, _______,
61-
_______, _______, KC_UP, _______, _______, _______, _______,
62-
_______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______,
63-
_______, _______, _______, _______, _______, _______, _______, _______,
64-
QK_BOOT, _______, _______, _______, _______, _______
61+
_______, _______, KC_UP, _______, RGB_TOG, RGB_HUI, RGB_HUD,
62+
_______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, RGB_VAI, RGB_VAD,
63+
_______, _______, _______, _______, _______, _______, RGB_MOD, RGB_RMOD,
64+
RESET, _______, _______, _______, _______, _______
6565
),
6666
/* Function Layer
6767
* ,-------------------------------------.

keyboards/eternal_keypad/keymaps/kyek/keymap.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
5757
* `----'`-----------------------------------'
5858
*/
5959
[_ARROW] = LAYOUT(
60-
_______, _______, _______, _______, _______, _______, _______,
61-
_______, _______, KC_UP, _______, _______, _______, _______,
62-
_______, KC_DEL , KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______,
63-
_______, _______, _______, _______, _______, _______, _______, _______,
60+
_______, _______, _______, _______, RGB_MODE_RGBTEST, RGB_TOG, RGB_HUI,
61+
_______, _______, KC_UP, _______, _______, RGB_MODE_PLAIN, RGB_HUD,
62+
_______, KC_DEL , KC_LEFT, KC_DOWN, KC_RIGHT, _______, RGB_MODE_BREATHE, RGB_VAI,
63+
_______, _______, _______, _______, _______, _______, RGB_MODE_SWIRL, RGB_VAD,
6464
RESET, _______, _______, _______, _______, _______
6565
),
6666
/* Function Layer

keyboards/eternal_keypad/keymaps/lefty/keymap.c

+14-14
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4444
KC_F15, KC_LCTL, OSL(_FN), KC_LALT, KC_SPC, LT(_ARROW, KC_0)
4545
),
4646
/* Arrows Layer
47-
* ,-----------------------------------------.
48-
* | | | | | | | | |
49-
* | |-------+----+----+-----+---+---+---|
50-
* | | | | UP| | | | |
51-
* |----||-------+----+----+-----+---+---+---|
52-
* | || |RIGHT|DOWN|LEFT| | | |
53-
* |----||-------+----+----+-----+---+---+---|
54-
* | || | | | | | | |
55-
* |----||-----------------------------------|
56-
* | RST|| | | | | |
57-
* `----'`-----------------------------------'
47+
* ,--------------------------------------------------.
48+
* | | | | | | | | |
49+
* | |-------+----+----+-----+----+-------+-------|
50+
* | | | | UP| |RGB?| HUE+ | HUE- |
51+
* |----||-------+----+----+-----+----+-------+-------|
52+
* | || |LEFT|DOWN|RIGHT| |BRIGHT+|BRIGHT-|
53+
* |----||-------+----+----+-----+----+-------+-------|
54+
* | || | | | | | MODE+ | MODE- |
55+
* |----||--------------------------------------------|
56+
* | RST|| | | | | |
57+
* `----'`--------------------------------------------'
5858
*/
5959
[_ARROW] = LAYOUT(
6060
_______, _______, _______, _______, _______, _______, _______,
61-
_______, _______, KC_UP, _______, _______, _______, _______,
62-
_______, _______, KC_RIGHT,KC_DOWN, KC_LEFT, _______, _______, _______,
63-
_______, _______, _______, _______, _______, _______, _______, _______,
61+
_______, _______, KC_UP, _______, RGB_TOG, RGB_HUI, RGB_HUD,
62+
_______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, RGB_VAI, RGB_VAD,
63+
_______, _______, _______, _______, _______, _______, RGB_MOD, RGB_RMOD,
6464
RESET, _______, _______, _______, _______, _______
6565
),
6666
/* Function Layer

keyboards/eternal_keypad/rules.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ CONSOLE_ENABLE = no # Console for debug
1414
COMMAND_ENABLE = no # Commands for debug and configuration
1515
NKRO_ENABLE = yes # Enable N-Key Rollover
1616
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
17-
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
17+
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
1818
AUDIO_ENABLE = no # Audio output

0 commit comments

Comments
 (0)