Rework default keymap

keyboards/treasure/type30/hotswap/config.h

@@ -1,56 +0,0 @@
-// TREASURE TYPE 30
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* disable action features */
-
-#define NO_ACTION_TAPPING
-#define NO_ACTION_ONESHOT
-
-#define RGB_MATRIX_LED_COUNT 36
-#define DRIVER_LED_TOTAL 36
-
-#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_GRADIENT_LEFT_RIGHT // Sets the default mode, if none has been set
-
-//#define RGB_MATRIX_LED_FLUSH_LIMIT 32 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) _ Default is 16
-//#define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 6 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) - Default is 5
-
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-
-#define RGB_MATRIX_SLEEP
-
-#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_BREATHING
-#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-
-//#define ENABLE_RGB_MATRIX_ALPHAS_MODS
-//#define ENABLE_RGB_MATRIX_BAND_SAT
-//#define ENABLE_RGB_MATRIX_BAND_VAL
-//#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-//#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-//#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-//#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-//#define ENABLE_RGB_MATRIX_CYCLE_ALL
-//#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-//#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-//#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-//#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-//#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-//#define ENABLE_RGB_MATRIX_DUAL_BEACON
-//#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-//#define ENABLE_RGB_MATRIX_RAINDROPS
-//#define ENABLE_RGB_MATRIX_HUE_BREATHING
-//#define ENABLE_RGB_MATRIX_HUE_PENDULUMZ
-//#define ENABLE_RGB_MATRIX_HUE_WAVE
-//#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-//#define ENABLE_RGB_MATRIX_PIXEL_RAIN
-
-#ifdef RGB_MATRIX_FRAMEBUFFER_EFFECTS
-    #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#endif
-

keyboards/treasure/type30/hotswap/keymaps/default/rules.mk

@@ -1 +0,0 @@
-COMBO_ENABLE = yes

keyboards/treasure/type30/keyboard.json

@@ -2,6 +2,7 @@
     "manufacturer": "TREASURE",
     "keyboard_name": "TYPE30",
     "maintainer": "TREASURE",
+    "processor": "atmega32u2",
     "bootloader": "atmel-dfu",
     "diode_direction": "COL2ROW",
     "features": {
@@ -20,17 +21,38 @@
         "cols": ["B5", "B6", "B7", "C7", "C6", "C4", "D4", "D5", "D6", "B0", "B1", "B2"],
         "rows": ["D2", "C5", "B3"]
     },
-    "processor": "atmega32u2",
+    "build": {
-    "url": "http://treasuretypes.com",
+        "lto": true
+    },
     "usb": {
         "device_version": "1.0.0",
-        "pid": "0x3330",
+        "pid": "0x0001",
-        "vid": "0x5452"
+        "vid": "0xFEED"
+    },
+    "ws2812": {
+        "pin": "B4"
+    },
+    "rgblight": {
+        "led_count": 36
     },
     "rgb_matrix": {
         "driver": "ws2812",
+        "speed": 40,
+        "max_brightness": 180,
+        "sleep": true,
+        "animations": {
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_pinwheels": true,
+            "jellybean_raindrops": true,
+            "typing_heatmap": true
+        },
         "default": {
-            "speed": 40
+            "animation": "gradient_left_right"
+        },
         "layout": [
             { "matrix": [2, 0],"flags": 4, "x": 0, "y": 20 },
             { "matrix": [2, 1],"flags": 4, "x": 10, "y": 20 },
@@ -68,15 +90,10 @@
             { "matrix": [0, 9],"flags": 4, "x": 90, "y": 0 },
             { "matrix": [0, 10],"flags": 4, "x": 100, "y": 0 },
             { "matrix": [0, 11],"flags": 4, "x": 110, "y": 0 }
-        ],
+        ]
-        "max_brightness": 180,
-        "sleep": true
-    },
-    "ws2812": {
-        "pin": "B4"
     },
     "layouts": {
-        "LAYOUT_ortho_3x12": {
+        "LAYOUT": {
             "layout": [
                 { "matrix": [0, 0], "x": 0, "y": 0 },
                 { "matrix": [0, 1], "x": 1, "y": 0 },
@@ -118,3 +135,4 @@
         }
     }
 }
+

keyboards/treasure/type30/keymaps/default/config.h

@@ -0,0 +1,10 @@
+// TREASURE TYPE 30
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* disable action features */
+
+#define NO_ACTION_TAPPING
+#define NO_ACTION_ONESHOT
+

keyboards/treasure/type30/keymaps/default/keymap.c

@@ -11,11 +11,8 @@ enum combos {
     COMBO_TRHME,
     COMBO_TREND,
     COMBO_TRENT,
-
     COMBO_RVAL,
     COMBO_RVALD,
-
-
     COMBO_LENGTH
 };
 
@@ -48,12 +45,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT_ortho_3x12(
+    [0] = LAYOUT(
         KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
         TAP_KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, MO(1), KC_SPC,
         KC_LCTL, KC_LALT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_RGUI, KC_UP, KC_DOWN
     ),
-    [1] = LAYOUT_ortho_3x12(
+    [1] = LAYOUT(
         KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
         KC_TRNS, KC_PLUS, KC_MINUS, KC_SLASH, KC_KP_ASTERISK, KC_LBRC, KC_RBRC,KC_BACKSLASH, KC_SCLN, KC_QUOT, KC_TRNS, KC_ENT,
         KC_TRNS, KC_TRNS, KC_EQL, RGB_TOG,RGB_HUI, RGB_MOD,  KC_GRAVE, KC_COMMA,  KC_DOT, KC_TRNS, KC_LEFT, KC_RIGHT

keyboards/treasure/type30/keymaps/default/rules.mk

@@ -0,0 +1,2 @@
+COMBO_ENABLE = yes
+RGBLIGHT_ENABLE = yes