From e29bfd82ee24ebcc67dc050f13d42180748f7fe5 Mon Sep 17 00:00:00 2001 From: TreasureTypes <73436366+TreasureTypes@users.noreply.github.com> Date: Thu, 27 Feb 2025 21:41:42 +0100 Subject: [PATCH 01/17] Create type30 --- keyboards/treasure/type30 | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/treasure/type30 diff --git a/keyboards/treasure/type30 b/keyboards/treasure/type30 new file mode 100644 index 00000000000..b498fd495d6 --- /dev/null +++ b/keyboards/treasure/type30 @@ -0,0 +1 @@ +/ From ccaaa8beef6afc272a99fa812106b4671b8200ca Mon Sep 17 00:00:00 2001 From: TreasureTypes <73436366+TreasureTypes@users.noreply.github.com> Date: Thu, 27 Feb 2025 21:47:25 +0100 Subject: [PATCH 02/17] Delete keyboards/treasure/type30 --- keyboards/treasure/type30 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/treasure/type30 diff --git a/keyboards/treasure/type30 b/keyboards/treasure/type30 deleted file mode 100644 index b498fd495d6..00000000000 --- a/keyboards/treasure/type30 +++ /dev/null @@ -1 +0,0 @@ -/ From b23ea9e0a6b8ea34dfa62c0d806ed98324ebc608 Mon Sep 17 00:00:00 2001 From: TreasureTypes <73436366+TreasureTypes@users.noreply.github.com> Date: Thu, 27 Feb 2025 21:49:17 +0100 Subject: [PATCH 03/17] Create dummy --- keyboards/treasure/type30/dummy | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/treasure/type30/dummy diff --git a/keyboards/treasure/type30/dummy b/keyboards/treasure/type30/dummy new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/keyboards/treasure/type30/dummy @@ -0,0 +1 @@ + From af69c7896cb5957766b2e39cb3272f710889fedb Mon Sep 17 00:00:00 2001 From: TreasureTypes <73436366+TreasureTypes@users.noreply.github.com> Date: Thu, 27 Feb 2025 21:50:23 +0100 Subject: [PATCH 04/17] Create dummy --- keyboards/treasure/type30/hotswap/dummy | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/treasure/type30/hotswap/dummy diff --git a/keyboards/treasure/type30/hotswap/dummy b/keyboards/treasure/type30/hotswap/dummy new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/keyboards/treasure/type30/hotswap/dummy @@ -0,0 +1 @@ + From 90b41d6feb19a9021852c222b657a3f79f6a21ea Mon Sep 17 00:00:00 2001 From: TreasureTypes <73436366+TreasureTypes@users.noreply.github.com> Date: Thu, 27 Feb 2025 21:53:29 +0100 Subject: [PATCH 05/17] Add files via upload --- keyboards/treasure/type30/hotswap/config.h | 65 ++++++++++++ keyboards/treasure/type30/hotswap/info.json | 110 ++++++++++++++++++++ keyboards/treasure/type30/hotswap/rules.mk | 1 + 3 files changed, 176 insertions(+) create mode 100644 keyboards/treasure/type30/hotswap/config.h create mode 100644 keyboards/treasure/type30/hotswap/info.json create mode 100644 keyboards/treasure/type30/hotswap/rules.mk diff --git a/keyboards/treasure/type30/hotswap/config.h b/keyboards/treasure/type30/hotswap/config.h new file mode 100644 index 00000000000..feaba578124 --- /dev/null +++ b/keyboards/treasure/type30/hotswap/config.h @@ -0,0 +1,65 @@ +// TREASURE TYPE 30 +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* COMBO FUNCTION */ +#define COMBO_TERM 150 // how quickly all combo keys must be pressed in succession to trigger +//#define COMBO_MUST_HOLD_MODS // if a combo triggers a modifier, only trigger when the combo is held +//#define COMBO_HOLD_TERM 175 // how long at least one of the combo keys must be held to trigger + +/* disable action features */ + + +#define NO_ACTION_TAPPING +#define NO_ACTION_ONESHOT + +#define RGB_MATRIX_LED_COUNT 36 +#define WS2812_DI_PIN B4 +#define DRIVER_LED_TOTAL 36 +#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 + +#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_GRADIENT_LEFT_RIGHT // Sets the default mode, if none has been set +#define RGB_MATRIX_DEFAULT_SPD 40 // Sets the default animation speed, 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 + diff --git a/keyboards/treasure/type30/hotswap/info.json b/keyboards/treasure/type30/hotswap/info.json new file mode 100644 index 00000000000..26697089533 --- /dev/null +++ b/keyboards/treasure/type30/hotswap/info.json @@ -0,0 +1,110 @@ +{ + "manufacturer": "TREASURE", + "keyboard_name": "TYPE30", + "maintainer": "TREASURE", + "bootloader": "atmel-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["B5", "B6", "B7", "C7", "C6", "C4", "D4", "D5", "D6", "B0", "B1", "B2"], + "rows": ["D2", "C5", "B3"] + }, + "processor": "atmega32u2", + "url": "http://treasuretypes.com", + "usb": { + "device_version": "1.0.0", + "pid": "0x3330", + "vid": "0x5452" + }, + "rgb_matrix": { + "driver": "ws2812", + "layout": [ + { "matrix": [2, 0],"flags": 4, "x": 0, "y": 20 }, + { "matrix": [2, 1],"flags": 4, "x": 10, "y": 20 }, + { "matrix": [2, 2],"flags": 4, "x": 20, "y": 20 }, + { "matrix": [2, 3],"flags": 4, "x": 30, "y": 20 }, + { "matrix": [2, 4],"flags": 4, "x": 40, "y": 20 }, + { "matrix": [2, 5],"flags": 4, "x": 50, "y": 20 }, + { "matrix": [2, 6],"flags": 4, "x": 60, "y": 20 }, + { "matrix": [2, 7],"flags": 4, "x": 70, "y": 20 }, + { "matrix": [2, 8],"flags": 4, "x": 80, "y": 20 }, + { "matrix": [2, 9],"flags": 4, "x": 90, "y": 20 }, + { "matrix": [2, 10],"flags": 4, "x": 100, "y": 20 }, + { "matrix": [2, 11],"flags": 4, "x": 110, "y": 20 }, + { "matrix": [1, 11],"flags": 4, "x": 110, "y": 10 }, + { "matrix": [1, 10],"flags": 4, "x": 100, "y": 10 }, + { "matrix": [1, 9],"flags": 4, "x": 90, "y": 10 }, + { "matrix": [1, 8],"flags": 4, "x": 80, "y": 10 }, + { "matrix": [1, 7],"flags": 4, "x": 70, "y": 10 }, + { "matrix": [1, 6],"flags": 4, "x": 60, "y": 10 }, + { "matrix": [1, 5],"flags": 4, "x": 50, "y": 10 }, + { "matrix": [1, 4],"flags": 4, "x": 40, "y": 10 }, + { "matrix": [1, 3],"flags": 4, "x": 30, "y": 10 }, + { "matrix": [1, 2],"flags": 4, "x": 20, "y": 10 }, + { "matrix": [1, 1],"flags": 4, "x": 10, "y": 10 }, + { "matrix": [1, 0],"flags": 4, "x": 0, "y": 10 }, + { "matrix": [0, 0],"flags": 4, "x": 0, "y": 0 }, + { "matrix": [0, 1],"flags": 4, "x": 10, "y": 0 }, + { "matrix": [0, 2],"flags": 4, "x": 20, "y": 0 }, + { "matrix": [0, 3],"flags": 4, "x": 30, "y": 0 }, + { "matrix": [0, 4],"flags": 4, "x": 40, "y": 0 }, + { "matrix": [0, 5],"flags": 4, "x": 50, "y": 0 }, + { "matrix": [0, 6],"flags": 4, "x": 60, "y": 0 }, + { "matrix": [0, 7],"flags": 4, "x": 70, "y": 0 }, + { "matrix": [0, 8],"flags": 4, "x": 80, "y": 0 }, + { "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 } + ] + }, + "layouts": { + "LAYOUT_ortho_3x12": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0 }, + { "matrix": [0, 5], "x": 5, "y": 0 }, + { "matrix": [0, 6], "x": 6, "y": 0 }, + { "matrix": [0, 7], "x": 7, "y": 0 }, + { "matrix": [0, 8], "x": 8, "y": 0 }, + { "matrix": [0, 9], "x": 9, "y": 0 }, + { "matrix": [0, 10], "x": 10, "y": 0}, + { "matrix": [0, 11], "x": 11, "y": 0}, + { "matrix": [1, 0], "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1, "y": 1 }, + { "matrix": [1, 2], "x": 2, "y": 1 }, + { "matrix": [1, 3], "x": 3, "y": 1 }, + { "matrix": [1, 4], "x": 4, "y": 1 }, + { "matrix": [1, 5], "x": 5, "y": 1 }, + { "matrix": [1, 6], "x": 6, "y": 1 }, + { "matrix": [1, 7], "x": 7, "y": 1 }, + { "matrix": [1, 8], "x": 8, "y": 1 }, + { "matrix": [1, 9], "x": 9, "y": 1 }, + { "matrix": [1, 10], "x": 10, "y": 1 }, + { "matrix": [1, 11], "x": 11, "y": 1 }, + { "matrix": [2, 0], "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1, "y": 2 }, + { "matrix": [2, 2], "x": 2, "y": 2 }, + { "matrix": [2, 3], "x": 3, "y": 2 }, + { "matrix": [2, 4], "x": 4, "y": 2 }, + { "matrix": [2, 5], "x": 5, "y": 2 }, + { "matrix": [2, 6], "x": 6, "y": 2 }, + { "matrix": [2, 7], "x": 7, "y": 2 }, + { "matrix": [2, 8], "x": 8, "y": 2 }, + { "matrix": [2, 9], "x": 9, "y": 2 }, + { "matrix": [2, 10], "x": 10, "y": 2 }, + { "matrix": [2, 11], "x": 11, "y": 2 } + ] + } + } +} diff --git a/keyboards/treasure/type30/hotswap/rules.mk b/keyboards/treasure/type30/hotswap/rules.mk new file mode 100644 index 00000000000..7ff128fa692 --- /dev/null +++ b/keyboards/treasure/type30/hotswap/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank \ No newline at end of file From 308828c5e57138fd8cd40b77a8e1608efc9849a6 Mon Sep 17 00:00:00 2001 From: TreasureTypes <73436366+TreasureTypes@users.noreply.github.com> Date: Thu, 27 Feb 2025 22:00:33 +0100 Subject: [PATCH 06/17] Add files via upload --- .../type30/hotswap/keymaps/default/keymap.c | 96 +++++++++++++++++++ .../type30/hotswap/keymaps/via/keymap.c | 96 +++++++++++++++++++ .../type30/hotswap/keymaps/via/rules.mk | 2 + keyboards/treasure/type30/hotswap/readme.md | 19 ++++ 4 files changed, 213 insertions(+) create mode 100644 keyboards/treasure/type30/hotswap/keymaps/default/keymap.c create mode 100644 keyboards/treasure/type30/hotswap/keymaps/via/keymap.c create mode 100644 keyboards/treasure/type30/hotswap/keymaps/via/rules.mk create mode 100644 keyboards/treasure/type30/hotswap/readme.md diff --git a/keyboards/treasure/type30/hotswap/keymaps/default/keymap.c b/keyboards/treasure/type30/hotswap/keymaps/default/keymap.c new file mode 100644 index 00000000000..2d3d3f79a66 --- /dev/null +++ b/keyboards/treasure/type30/hotswap/keymaps/default/keymap.c @@ -0,0 +1,96 @@ +#include QMK_KEYBOARD_H + +// define combo names +enum combos { + COMBO_TRSPC, + COMBO_TRHME, + COMBO_TREND, + COMBO_TRENT, + + COMBO_RVAL, + COMBO_RVALD, + + + COMBO_LENGTH +}; + +// Define a custom keycode +enum custom_keycodes { + TAP_KC_LSFT = SAFE_RANGE +}; + +uint16_t COMBO_LEN = COMBO_LENGTH; + + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + static uint16_t shift_timer; // Timer to differentiate tap vs. hold + + switch (keycode) { + case TAP_KC_LSFT: + if (record->event.pressed) { + shift_timer = timer_read(); // Start timer on key press + register_code(KC_LSFT); // Register Shift immediately for hold behavior + } else { + unregister_code(KC_LSFT); // Unregister Shift on key release + if (timer_elapsed(shift_timer) < TAPPING_TERM) { + // If released quickly, treat as tap and send Space + tap_code(KC_SPC); + } + } + return false; // Skip further processing for this key + } + return true; // Process other keys normally +} +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_ortho_3x12( + 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( + 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 + ) +}; + +// define keys that make up combos +const uint16_t PROGMEM fd_combo1[] = {KC_V, KC_B, COMBO_END}; +const uint16_t PROGMEM fd_combo2[] = {KC_UP, KC_DOWN, COMBO_END}; +const uint16_t PROGMEM fd_combo3[] = {KC_LEFT, KC_RIGHT, COMBO_END}; +const uint16_t PROGMEM fd_combo7[] = {MO(1), KC_SPC, COMBO_END}; + +const uint16_t PROGMEM fd_combo8[] = {RGB_TOG, RGB_HUI, COMBO_END}; +const uint16_t PROGMEM fd_combo9[] = {RGB_HUI, RGB_MOD, COMBO_END}; + + + +// map combo names to their keys and the key they trigger +combo_t key_combos[] = { + [COMBO_TRSPC] = COMBO(fd_combo1, KC_SPC), + [COMBO_TRHME] = COMBO(fd_combo2, KC_ENT), + [COMBO_TREND] = COMBO(fd_combo3, KC_END), + [COMBO_TRENT] = COMBO(fd_combo7, KC_ENT), + [COMBO_RVAL] = COMBO(fd_combo8, KC_NO), + [COMBO_RVALD] = COMBO(fd_combo9, KC_NO), + + // more here... +}; + +// Custom combo event handler +void process_combo_event(uint16_t combo_index, bool pressed) { + switch (combo_index) { + case COMBO_RVAL: + if (pressed) { + rgblight_decrease_val(); // Decrease brightness + } + break; + + case COMBO_RVALD: + if (pressed) { + rgblight_increase_val(); // Decrease brightness + } + break; + } +} \ No newline at end of file diff --git a/keyboards/treasure/type30/hotswap/keymaps/via/keymap.c b/keyboards/treasure/type30/hotswap/keymaps/via/keymap.c new file mode 100644 index 00000000000..2d3d3f79a66 --- /dev/null +++ b/keyboards/treasure/type30/hotswap/keymaps/via/keymap.c @@ -0,0 +1,96 @@ +#include QMK_KEYBOARD_H + +// define combo names +enum combos { + COMBO_TRSPC, + COMBO_TRHME, + COMBO_TREND, + COMBO_TRENT, + + COMBO_RVAL, + COMBO_RVALD, + + + COMBO_LENGTH +}; + +// Define a custom keycode +enum custom_keycodes { + TAP_KC_LSFT = SAFE_RANGE +}; + +uint16_t COMBO_LEN = COMBO_LENGTH; + + +bool process_record_user(uint16_t keycode, keyrecord_t *record) { + static uint16_t shift_timer; // Timer to differentiate tap vs. hold + + switch (keycode) { + case TAP_KC_LSFT: + if (record->event.pressed) { + shift_timer = timer_read(); // Start timer on key press + register_code(KC_LSFT); // Register Shift immediately for hold behavior + } else { + unregister_code(KC_LSFT); // Unregister Shift on key release + if (timer_elapsed(shift_timer) < TAPPING_TERM) { + // If released quickly, treat as tap and send Space + tap_code(KC_SPC); + } + } + return false; // Skip further processing for this key + } + return true; // Process other keys normally +} +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_ortho_3x12( + 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( + 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 + ) +}; + +// define keys that make up combos +const uint16_t PROGMEM fd_combo1[] = {KC_V, KC_B, COMBO_END}; +const uint16_t PROGMEM fd_combo2[] = {KC_UP, KC_DOWN, COMBO_END}; +const uint16_t PROGMEM fd_combo3[] = {KC_LEFT, KC_RIGHT, COMBO_END}; +const uint16_t PROGMEM fd_combo7[] = {MO(1), KC_SPC, COMBO_END}; + +const uint16_t PROGMEM fd_combo8[] = {RGB_TOG, RGB_HUI, COMBO_END}; +const uint16_t PROGMEM fd_combo9[] = {RGB_HUI, RGB_MOD, COMBO_END}; + + + +// map combo names to their keys and the key they trigger +combo_t key_combos[] = { + [COMBO_TRSPC] = COMBO(fd_combo1, KC_SPC), + [COMBO_TRHME] = COMBO(fd_combo2, KC_ENT), + [COMBO_TREND] = COMBO(fd_combo3, KC_END), + [COMBO_TRENT] = COMBO(fd_combo7, KC_ENT), + [COMBO_RVAL] = COMBO(fd_combo8, KC_NO), + [COMBO_RVALD] = COMBO(fd_combo9, KC_NO), + + // more here... +}; + +// Custom combo event handler +void process_combo_event(uint16_t combo_index, bool pressed) { + switch (combo_index) { + case COMBO_RVAL: + if (pressed) { + rgblight_decrease_val(); // Decrease brightness + } + break; + + case COMBO_RVALD: + if (pressed) { + rgblight_increase_val(); // Decrease brightness + } + break; + } +} \ No newline at end of file diff --git a/keyboards/treasure/type30/hotswap/keymaps/via/rules.mk b/keyboards/treasure/type30/hotswap/keymaps/via/rules.mk new file mode 100644 index 00000000000..90b6a97fa31 --- /dev/null +++ b/keyboards/treasure/type30/hotswap/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +COMBO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/treasure/type30/hotswap/readme.md b/keyboards/treasure/type30/hotswap/readme.md new file mode 100644 index 00000000000..c911434f614 --- /dev/null +++ b/keyboards/treasure/type30/hotswap/readme.md @@ -0,0 +1,19 @@ +# Treasure TYPE-30 + +* Keyboard Maintainer: [arnstadm](https://www,treasuretypes.com) +* Hardware Supported: Treasure TYPE-30 Hotswap PCB +* Hardware Availability: [Treasure Store](http://treasuretypes.com) + +Make example for this keyboard (after setting up your build environment): + + make treasure/type30/hotswap:default + +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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From b5a93d85a608c37a23925f85b0071f6abbdcf056 Mon Sep 17 00:00:00 2001 From: TreasureTypes <73436366+TreasureTypes@users.noreply.github.com> Date: Wed, 5 Mar 2025 10:06:12 +0100 Subject: [PATCH 07/17] Delete keyboards/treasure/type30/dummy --- keyboards/treasure/type30/dummy | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/treasure/type30/dummy diff --git a/keyboards/treasure/type30/dummy b/keyboards/treasure/type30/dummy deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/treasure/type30/dummy +++ /dev/null @@ -1 +0,0 @@ - From ac5efbb7a7e7d2376884b8b21f622ae5fc78bd5e Mon Sep 17 00:00:00 2001 From: TreasureTypes <73436366+TreasureTypes@users.noreply.github.com> Date: Wed, 5 Mar 2025 10:06:53 +0100 Subject: [PATCH 08/17] Update readme.md --- keyboards/treasure/type30/hotswap/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/treasure/type30/hotswap/readme.md b/keyboards/treasure/type30/hotswap/readme.md index c911434f614..df28420cf4e 100644 --- a/keyboards/treasure/type30/hotswap/readme.md +++ b/keyboards/treasure/type30/hotswap/readme.md @@ -1,6 +1,6 @@ # Treasure TYPE-30 -* Keyboard Maintainer: [arnstadm](https://www,treasuretypes.com) +* Keyboard Maintainer: [Treasure](https://www,treasuretypes.com) * Hardware Supported: Treasure TYPE-30 Hotswap PCB * Hardware Availability: [Treasure Store](http://treasuretypes.com) From a9d5cb308f654285a5e1bdbc4fdc06b4952a9634 Mon Sep 17 00:00:00 2001 From: TreasureTypes <73436366+TreasureTypes@users.noreply.github.com> Date: Wed, 5 Mar 2025 10:09:19 +0100 Subject: [PATCH 09/17] Delete keyboards/treasure/type30/hotswap/keymaps/via directory --- .../type30/hotswap/keymaps/via/keymap.c | 96 ------------------- .../type30/hotswap/keymaps/via/rules.mk | 2 - 2 files changed, 98 deletions(-) delete mode 100644 keyboards/treasure/type30/hotswap/keymaps/via/keymap.c delete mode 100644 keyboards/treasure/type30/hotswap/keymaps/via/rules.mk diff --git a/keyboards/treasure/type30/hotswap/keymaps/via/keymap.c b/keyboards/treasure/type30/hotswap/keymaps/via/keymap.c deleted file mode 100644 index 2d3d3f79a66..00000000000 --- a/keyboards/treasure/type30/hotswap/keymaps/via/keymap.c +++ /dev/null @@ -1,96 +0,0 @@ -#include QMK_KEYBOARD_H - -// define combo names -enum combos { - COMBO_TRSPC, - COMBO_TRHME, - COMBO_TREND, - COMBO_TRENT, - - COMBO_RVAL, - COMBO_RVALD, - - - COMBO_LENGTH -}; - -// Define a custom keycode -enum custom_keycodes { - TAP_KC_LSFT = SAFE_RANGE -}; - -uint16_t COMBO_LEN = COMBO_LENGTH; - - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - static uint16_t shift_timer; // Timer to differentiate tap vs. hold - - switch (keycode) { - case TAP_KC_LSFT: - if (record->event.pressed) { - shift_timer = timer_read(); // Start timer on key press - register_code(KC_LSFT); // Register Shift immediately for hold behavior - } else { - unregister_code(KC_LSFT); // Unregister Shift on key release - if (timer_elapsed(shift_timer) < TAPPING_TERM) { - // If released quickly, treat as tap and send Space - tap_code(KC_SPC); - } - } - return false; // Skip further processing for this key - } - return true; // Process other keys normally -} -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT_ortho_3x12( - 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( - 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 - ) -}; - -// define keys that make up combos -const uint16_t PROGMEM fd_combo1[] = {KC_V, KC_B, COMBO_END}; -const uint16_t PROGMEM fd_combo2[] = {KC_UP, KC_DOWN, COMBO_END}; -const uint16_t PROGMEM fd_combo3[] = {KC_LEFT, KC_RIGHT, COMBO_END}; -const uint16_t PROGMEM fd_combo7[] = {MO(1), KC_SPC, COMBO_END}; - -const uint16_t PROGMEM fd_combo8[] = {RGB_TOG, RGB_HUI, COMBO_END}; -const uint16_t PROGMEM fd_combo9[] = {RGB_HUI, RGB_MOD, COMBO_END}; - - - -// map combo names to their keys and the key they trigger -combo_t key_combos[] = { - [COMBO_TRSPC] = COMBO(fd_combo1, KC_SPC), - [COMBO_TRHME] = COMBO(fd_combo2, KC_ENT), - [COMBO_TREND] = COMBO(fd_combo3, KC_END), - [COMBO_TRENT] = COMBO(fd_combo7, KC_ENT), - [COMBO_RVAL] = COMBO(fd_combo8, KC_NO), - [COMBO_RVALD] = COMBO(fd_combo9, KC_NO), - - // more here... -}; - -// Custom combo event handler -void process_combo_event(uint16_t combo_index, bool pressed) { - switch (combo_index) { - case COMBO_RVAL: - if (pressed) { - rgblight_decrease_val(); // Decrease brightness - } - break; - - case COMBO_RVALD: - if (pressed) { - rgblight_increase_val(); // Decrease brightness - } - break; - } -} \ No newline at end of file diff --git a/keyboards/treasure/type30/hotswap/keymaps/via/rules.mk b/keyboards/treasure/type30/hotswap/keymaps/via/rules.mk deleted file mode 100644 index 90b6a97fa31..00000000000 --- a/keyboards/treasure/type30/hotswap/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -COMBO_ENABLE = yes \ No newline at end of file From 7b82708c6a2d10dd3212a58730dd66eb4f766982 Mon Sep 17 00:00:00 2001 From: TreasureTypes <73436366+TreasureTypes@users.noreply.github.com> Date: Wed, 5 Mar 2025 10:11:18 +0100 Subject: [PATCH 10/17] Rename info.json to keyboard.json --- keyboards/treasure/type30/hotswap/{info.json => keyboard.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename keyboards/treasure/type30/hotswap/{info.json => keyboard.json} (100%) diff --git a/keyboards/treasure/type30/hotswap/info.json b/keyboards/treasure/type30/hotswap/keyboard.json similarity index 100% rename from keyboards/treasure/type30/hotswap/info.json rename to keyboards/treasure/type30/hotswap/keyboard.json From 77c4886b525450832ca970f1591dd20e9bc1288e Mon Sep 17 00:00:00 2001 From: TreasureTypes <73436366+TreasureTypes@users.noreply.github.com> Date: Wed, 5 Mar 2025 10:27:20 +0100 Subject: [PATCH 11/17] Add files via upload --- keyboards/treasure/type30/hotswap/keymaps/default/rules.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 keyboards/treasure/type30/hotswap/keymaps/default/rules.mk diff --git a/keyboards/treasure/type30/hotswap/keymaps/default/rules.mk b/keyboards/treasure/type30/hotswap/keymaps/default/rules.mk new file mode 100644 index 00000000000..ff681299e4e --- /dev/null +++ b/keyboards/treasure/type30/hotswap/keymaps/default/rules.mk @@ -0,0 +1 @@ +COMBO_ENABLE = yes \ No newline at end of file From ecd1e14b15ad3a9862ab8474bc04eada791a97a3 Mon Sep 17 00:00:00 2001 From: TreasureTypes <73436366+TreasureTypes@users.noreply.github.com> Date: Wed, 5 Mar 2025 10:28:00 +0100 Subject: [PATCH 12/17] Delete keyboards/treasure/type30/hotswap/dummy --- keyboards/treasure/type30/hotswap/dummy | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/treasure/type30/hotswap/dummy diff --git a/keyboards/treasure/type30/hotswap/dummy b/keyboards/treasure/type30/hotswap/dummy deleted file mode 100644 index 8b137891791..00000000000 --- a/keyboards/treasure/type30/hotswap/dummy +++ /dev/null @@ -1 +0,0 @@ - From a584c57e6fbd62929c30b1ac8f37795f400b11be Mon Sep 17 00:00:00 2001 From: TreasureTypes <73436366+TreasureTypes@users.noreply.github.com> Date: Wed, 5 Mar 2025 10:29:58 +0100 Subject: [PATCH 13/17] Update config.h --- keyboards/treasure/type30/hotswap/config.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/keyboards/treasure/type30/hotswap/config.h b/keyboards/treasure/type30/hotswap/config.h index feaba578124..4631e625427 100644 --- a/keyboards/treasure/type30/hotswap/config.h +++ b/keyboards/treasure/type30/hotswap/config.h @@ -3,24 +3,15 @@ #pragma once -/* COMBO FUNCTION */ -#define COMBO_TERM 150 // how quickly all combo keys must be pressed in succession to trigger -//#define COMBO_MUST_HOLD_MODS // if a combo triggers a modifier, only trigger when the combo is held -//#define COMBO_HOLD_TERM 175 // how long at least one of the combo keys must be held to trigger - /* disable action features */ - #define NO_ACTION_TAPPING #define NO_ACTION_ONESHOT #define RGB_MATRIX_LED_COUNT 36 -#define WS2812_DI_PIN B4 #define DRIVER_LED_TOTAL 36 -#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_GRADIENT_LEFT_RIGHT // Sets the default mode, if none has been set -#define RGB_MATRIX_DEFAULT_SPD 40 // Sets the default animation speed, 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 From 911232276b143826f671c6b64a643626a0ef6510 Mon Sep 17 00:00:00 2001 From: TreasureTypes <73436366+TreasureTypes@users.noreply.github.com> Date: Wed, 5 Mar 2025 10:31:52 +0100 Subject: [PATCH 14/17] Delete keyboards/treasure/type30/hotswap/rules.mk --- keyboards/treasure/type30/hotswap/rules.mk | 1 - 1 file changed, 1 deletion(-) delete mode 100644 keyboards/treasure/type30/hotswap/rules.mk diff --git a/keyboards/treasure/type30/hotswap/rules.mk b/keyboards/treasure/type30/hotswap/rules.mk deleted file mode 100644 index 7ff128fa692..00000000000 --- a/keyboards/treasure/type30/hotswap/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank \ No newline at end of file From 6c82ca81a0b21c70e502a83cd155456762f09264 Mon Sep 17 00:00:00 2001 From: TreasureTypes <73436366+TreasureTypes@users.noreply.github.com> Date: Wed, 5 Mar 2025 10:33:48 +0100 Subject: [PATCH 15/17] Update keymap.c --- keyboards/treasure/type30/hotswap/keymaps/default/keymap.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/keyboards/treasure/type30/hotswap/keymaps/default/keymap.c b/keyboards/treasure/type30/hotswap/keymaps/default/keymap.c index 2d3d3f79a66..f31ef7190f2 100644 --- a/keyboards/treasure/type30/hotswap/keymaps/default/keymap.c +++ b/keyboards/treasure/type30/hotswap/keymaps/default/keymap.c @@ -1,3 +1,8 @@ +/* Copyright 2025 Treasure + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + #include QMK_KEYBOARD_H // define combo names @@ -93,4 +98,4 @@ void process_combo_event(uint16_t combo_index, bool pressed) { } break; } -} \ No newline at end of file +} From 12a2fc883aa7a5171f3531fd7e1c41e8b23c7133 Mon Sep 17 00:00:00 2001 From: TreasureTypes <73436366+TreasureTypes@users.noreply.github.com> Date: Wed, 5 Mar 2025 10:40:19 +0100 Subject: [PATCH 16/17] Update keyboard.json --- keyboards/treasure/type30/hotswap/keyboard.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/keyboards/treasure/type30/hotswap/keyboard.json b/keyboards/treasure/type30/hotswap/keyboard.json index 26697089533..88cd6e80d4d 100644 --- a/keyboards/treasure/type30/hotswap/keyboard.json +++ b/keyboards/treasure/type30/hotswap/keyboard.json @@ -13,6 +13,9 @@ "nkro": true, "rgb_matrix": true }, + "combo": { + "term": 150 + }, "matrix_pins": { "cols": ["B5", "B6", "B7", "C7", "C6", "C4", "D4", "D5", "D6", "B0", "B1", "B2"], "rows": ["D2", "C5", "B3"] @@ -26,6 +29,8 @@ }, "rgb_matrix": { "driver": "ws2812", + "default": { + "speed": 40 "layout": [ { "matrix": [2, 0],"flags": 4, "x": 0, "y": 20 }, { "matrix": [2, 1],"flags": 4, "x": 10, "y": 20 }, @@ -63,7 +68,12 @@ { "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": { From 64a94bb75f5495969044e723c3d40951d85476e1 Mon Sep 17 00:00:00 2001 From: rouche-q <17704187+rouche-q@users.noreply.github.com> Date: Mon, 10 Mar 2025 22:53:59 +0100 Subject: [PATCH 17/17] Rework default keymap --- keyboards/treasure/type30/hotswap/config.h | 56 ------------------- .../type30/hotswap/keymaps/default/rules.mk | 1 - .../type30/{hotswap => }/keyboard.json | 42 ++++++++++---- .../treasure/type30/keymaps/default/config.h | 10 ++++ .../{hotswap => }/keymaps/default/keymap.c | 7 +-- .../treasure/type30/keymaps/default/rules.mk | 2 + .../treasure/type30/{hotswap => }/readme.md | 0 keyboards/treasure/type30/rules.mk | 0 8 files changed, 44 insertions(+), 74 deletions(-) delete mode 100644 keyboards/treasure/type30/hotswap/config.h delete mode 100644 keyboards/treasure/type30/hotswap/keymaps/default/rules.mk rename keyboards/treasure/type30/{hotswap => }/keyboard.json (89%) create mode 100644 keyboards/treasure/type30/keymaps/default/config.h rename keyboards/treasure/type30/{hotswap => }/keymaps/default/keymap.c (98%) create mode 100644 keyboards/treasure/type30/keymaps/default/rules.mk rename keyboards/treasure/type30/{hotswap => }/readme.md (100%) create mode 100644 keyboards/treasure/type30/rules.mk diff --git a/keyboards/treasure/type30/hotswap/config.h b/keyboards/treasure/type30/hotswap/config.h deleted file mode 100644 index 4631e625427..00000000000 --- a/keyboards/treasure/type30/hotswap/config.h +++ /dev/null @@ -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 - diff --git a/keyboards/treasure/type30/hotswap/keymaps/default/rules.mk b/keyboards/treasure/type30/hotswap/keymaps/default/rules.mk deleted file mode 100644 index ff681299e4e..00000000000 --- a/keyboards/treasure/type30/hotswap/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -COMBO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/treasure/type30/hotswap/keyboard.json b/keyboards/treasure/type30/keyboard.json similarity index 89% rename from keyboards/treasure/type30/hotswap/keyboard.json rename to keyboards/treasure/type30/keyboard.json index 88cd6e80d4d..a2b09f5d3ea 100644 --- a/keyboards/treasure/type30/hotswap/keyboard.json +++ b/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", - "url": "http://treasuretypes.com", + "build": { + "lto": true + }, "usb": { "device_version": "1.0.0", - "pid": "0x3330", - "vid": "0x5452" + "pid": "0x0001", + "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 @@ } } } + diff --git a/keyboards/treasure/type30/keymaps/default/config.h b/keyboards/treasure/type30/keymaps/default/config.h new file mode 100644 index 00000000000..d5c3fde071c --- /dev/null +++ b/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 + diff --git a/keyboards/treasure/type30/hotswap/keymaps/default/keymap.c b/keyboards/treasure/type30/keymaps/default/keymap.c similarity index 98% rename from keyboards/treasure/type30/hotswap/keymaps/default/keymap.c rename to keyboards/treasure/type30/keymaps/default/keymap.c index f31ef7190f2..5bbf31b4797 100644 --- a/keyboards/treasure/type30/hotswap/keymaps/default/keymap.c +++ b/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 diff --git a/keyboards/treasure/type30/keymaps/default/rules.mk b/keyboards/treasure/type30/keymaps/default/rules.mk new file mode 100644 index 00000000000..2e11b6a3f60 --- /dev/null +++ b/keyboards/treasure/type30/keymaps/default/rules.mk @@ -0,0 +1,2 @@ +COMBO_ENABLE = yes +RGBLIGHT_ENABLE = yes diff --git a/keyboards/treasure/type30/hotswap/readme.md b/keyboards/treasure/type30/readme.md similarity index 100% rename from keyboards/treasure/type30/hotswap/readme.md rename to keyboards/treasure/type30/readme.md diff --git a/keyboards/treasure/type30/rules.mk b/keyboards/treasure/type30/rules.mk new file mode 100644 index 00000000000..e69de29bb2d