Merge branch 'master' into taamas

8 files changed, 47 insertions, 46 deletions

diff --git a/keyboards/eternal_keypad/config.h b/keyboards/eternal_keypad/config.h
index 5b5ad02f44..29933bcbb0 100644
--- a/keyboards/eternal_keypad/config.h
+++ b/keyboards/eternal_keypad/config.h
@@ -19,13 +19,6 @@ 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 PRODUCT_ID   0xDB00
-#define DEVICE_VER   0x0001
-#define MANUFACTURER duckyb
-#define PRODUCT      eternal_keypad
-
 /* key matrix size */
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 8
@@ -42,7 +35,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define MATRIX_ROW_PINS { B5, B4, E6, D7, C6 }
 #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
-#define UNUSED_PINS
 
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
@@ -62,6 +54,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
diff --git a/keyboards/eternal_keypad/info.json b/keyboards/eternal_keypad/info.json
index 2bdf9624ce..55c4d67bed 100644
--- a/keyboards/eternal_keypad/info.json
+++ b/keyboards/eternal_keypad/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "eternal_keypad",
+    "manufacturer": "duckyb",
     "url": "https://github.com/duckyb/eternal-keypad",
     "maintainer": "duckyb",
+    "usb": {
+        "vid": "0x1209",
+        "pid": "0xDB00",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/eternal_keypad/keymaps/default/keymap.c b/keyboards/eternal_keypad/keymaps/default/keymap.c
index f4d06bc1ff..d94b0781f6 100644
--- a/keyboards/eternal_keypad/keymaps/default/keymap.c
+++ b/keyboards/eternal_keypad/keymaps/default/keymap.c
@@ -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|     |   |   |   |
-	 * |----||-------+----+----+-----+---+---+---|
-   * |    ||       |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, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, 
+		         _______, _______, KC_UP, _______, RGB_TOG, RGB_HUI, RGB_HUD, 
+		_______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, RGB_VAI, RGB_VAD, 
+		_______, _______, _______, _______, _______, _______, RGB_MOD, RGB_RMOD, 
 		QK_BOOT,   _______, _______, _______, _______, _______
     ),
   /* Function Layer
diff --git a/keyboards/eternal_keypad/keymaps/kyek/config.h b/keyboards/eternal_keypad/keymaps/kyek/config.h
index 226b16e546..36ab46334c 100644
--- a/keyboards/eternal_keypad/keymaps/kyek/config.h
+++ b/keyboards/eternal_keypad/keymaps/kyek/config.h
@@ -17,5 +17,3 @@
 
 #define ONESHOT_TIMEOUT 2000
 #define FORCE_NKRO
-#define USB_POLLING_INTERVAL_MS 1
-#define QMK_KEYS_PER_SCAN 12
diff --git a/keyboards/eternal_keypad/keymaps/kyek/keymap.c b/keyboards/eternal_keypad/keymaps/kyek/keymap.c
index 592e73bc74..1dd2f2f0b3 100644
--- a/keyboards/eternal_keypad/keymaps/kyek/keymap.c
+++ b/keyboards/eternal_keypad/keymaps/kyek/keymap.c
@@ -57,11 +57,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * `----'`-----------------------------------'
    */
     [_ARROW] = LAYOUT(
-		         _______, _______, _______, _______, _______, _______, _______,
-		         _______, _______, KC_UP, _______, _______, _______, _______, 
-		_______, KC_DEL , KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, 
-		RESET,   _______, _______, _______, _______, _______
+		         _______, _______, _______, _______, 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, 
+		QK_BOOT, _______, _______, _______, _______, _______
     ),
   /* Function Layer
    * ,-------------------------------------.
diff --git a/keyboards/eternal_keypad/keymaps/lefty/keymap.c b/keyboards/eternal_keypad/keymaps/lefty/keymap.c
index 886ac25ccd..2b14774aeb 100644
--- a/keyboards/eternal_keypad/keymaps/lefty/keymap.c
+++ b/keyboards/eternal_keypad/keymaps/lefty/keymap.c
@@ -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|     |   |   |   |
-	 * |----||-------+----+----+-----+---+---+---|
-   * |    ||       |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, _______, _______, _______, 
-		_______, _______, _______, _______, _______, _______, _______, _______, 
-		RESET,   _______, _______, _______, _______, _______
+		         _______, _______, KC_UP, _______, RGB_TOG, RGB_HUI, RGB_HUD, 
+		_______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, RGB_VAI, RGB_VAD, 
+		_______, _______, _______, _______, _______, _______, RGB_MOD, RGB_RMOD, 
+		QK_BOOT, _______, _______, _______, _______, _______
     ),
   /* Function Layer
    * ,-------------------------------------.
diff --git a/keyboards/eternal_keypad/readme.md b/keyboards/eternal_keypad/readme.md
index 196f51b31d..05c13bc516 100644
--- a/keyboards/eternal_keypad/readme.md
+++ b/keyboards/eternal_keypad/readme.md
@@ -23,5 +23,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,1) in the matrix (the top left key or Escape) and plug in the keyboard
-* **Keycode in layout**: Press the key mapped to `RESET` if it is available (activated by holding the lower right key and tapping the lower left key)
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available (activated by holding the lower right key and tapping the lower left key)
 * **Physical reset button**: Briefly sort the pads labeled "RST" and "GND" on the micro-controller
diff --git a/keyboards/eternal_keypad/rules.mk b/keyboards/eternal_keypad/rules.mk
index e0403a960b..4d1d6e2d05 100644
--- a/keyboards/eternal_keypad/rules.mk
+++ b/keyboards/eternal_keypad/rules.mk
@@ -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