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

This commit is contained in:
QMK Bot 2022-09-14 15:41:05 +00:00
commit ff2585dc49
9 changed files with 288 additions and 0 deletions

View File

@ -0,0 +1,79 @@
// Copyright 2022 Jimmy Lye (@satorusaka)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
/*
* Feature disable options
* These options are also useful to firmware size reduction.
*/
/* disable debug print */
//#define NO_DEBUG
/* disable print */
//#define NO_PRINT
/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
#define FORCE_NKRO
#define RGB_DI_PIN GP1 // RGB LED pin
#define RGBLED_NUM 15 // Number of LEDs
#define DRIVER_LED_TOTAL 15 // Number of LEDs
#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
#define RGB_MATRIX_LED_FLUSH_LIMIT 16
#define RGB_MATRIX_KEYPRESSES
// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
# define ENABLE_RGB_MATRIX_ALPHAS_MODS
# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
# define ENABLE_RGB_MATRIX_BREATHING
# 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_CYCLE_LEFT_RIGHT
# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
# 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_RAINBOW_PINWHEELS
# define ENABLE_RGB_MATRIX_RAINDROPS
# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
# define ENABLE_RGB_MATRIX_HUE_BREATHING
# define ENABLE_RGB_MATRIX_HUE_PENDULUM
# define ENABLE_RGB_MATRIX_HUE_WAVE
# define ENABLE_RGB_MATRIX_PIXEL_RAIN
# define ENABLE_RGB_MATRIX_PIXEL_FLOW
# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
# define ENABLE_RGB_MATRIX_SPLASH
# define ENABLE_RGB_MATRIX_MULTISPLASH
# define ENABLE_RGB_MATRIX_SOLID_SPLASH
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH

View File

@ -0,0 +1,68 @@
{
"manufacturer": "SKMT",
"keyboard_name": "SKMT 15k",
"maintainer": "satorusaka",
"bootloader": "rp2040",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true,
"rgb_matrix": true
},
"matrix_pins": {
"cols": ["GP2", "GP3", "GP4", "GP5", "GP6"],
"rows": ["GP7", "GP8", "GP9"]
},
"processor": "RP2040",
"url": "https://github.com/satorusaka/15k-macropad",
"usb": {
"device_version": "1.1.0",
"pid": "0x3488",
"vid": "0xFEFE"
},
"layouts": {
"LAYOUT_default": {
"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": [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": [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 }
]
}
},
"rgb_matrix": {
"driver": "WS2812",
"layout": [
{ "flags": 4, "matrix": [2, 4], "x": 224, "y": 64 },
{ "flags": 4, "matrix": [2, 3], "x": 168, "y": 64 },
{ "flags": 4, "matrix": [2, 2], "x": 112, "y": 64 },
{ "flags": 4, "matrix": [2, 1], "x": 56, "y": 64 },
{ "flags": 4, "matrix": [2, 0], "x": 0, "y": 64 },
{ "flags": 4, "matrix": [1, 4], "x": 224, "y": 32 },
{ "flags": 4, "matrix": [1, 3], "x": 168, "y": 32 },
{ "flags": 4, "matrix": [1, 2], "x": 112, "y": 32 },
{ "flags": 4, "matrix": [1, 1], "x": 56, "y": 32 },
{ "flags": 4, "matrix": [1, 0], "x": 0, "y": 32 },
{ "flags": 4, "matrix": [0, 4], "x": 224, "y": 0 },
{ "flags": 4, "matrix": [0, 3], "x": 168, "y": 0 },
{ "flags": 4, "matrix": [0, 2], "x": 112, "y": 0 },
{ "flags": 4, "matrix": [0, 1], "x": 56, "y": 0 },
{ "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }
]
}
}

View File

@ -0,0 +1,26 @@
// Copyright 2022 Jimmy Lye (@satorusaka)
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
*
* F3 9 6 3 fn
*
* F2 8 5 2 .
*
* F1 7 4 1 O
*
*/
[0] = LAYOUT_default(
KC_F3, KC_KP_9, KC_KP_6, KC_KP_3, LT(1, KC_KP_ENTER),
KC_F2, KC_KP_8, KC_KP_5, KC_KP_2, KC_KP_DOT,
KC_F1, KC_KP_7, KC_KP_4, KC_KP_1, KC_KP_0
),
[1] = LAYOUT_default(
RGB_TOG,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
RGB_MODE_FORWARD,RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI,
RGB_MODE_REVERSE,RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD
)
};

View File

@ -0,0 +1,25 @@
// Copyright 2022 Jimmy Lye (@satorusaka)
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
*
* F3 9 6 3 fn
*
* F2 8 5 2 .
*
* F1 7 4 1 O
*
*/
[0] = LAYOUT_default(
KC_F1, KC_F2, KC_F3, KC_F4, LT(1, KC_KB_MUTE),
KC_F5, KC_F6, KC_F7, KC_F8, KC_KB_VOLUME_UP,
KC_F9, KC_F10, KC_F11, KC_F12, KC_KB_VOLUME_DOWN
),
[1] = LAYOUT_default(
RGB_TOG,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
RGB_MODE_FORWARD,RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI,
RGB_MODE_REVERSE,RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD
)
};

View File

@ -0,0 +1,25 @@
// Copyright 2022 Jimmy Lye (@satorusaka)
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
*
* Q W E R BACKSPACE (LAYER 1)
*
* A S D F ENTER
*
* Z X C V SPACE
*
*/
[0] = LAYOUT_default(
KC_Q, KC_W, KC_E, KC_R, LT(1, KC_BSPC),
KC_A, KC_S, KC_D, KC_F, KC_ENT,
KC_Z, KC_X, KC_C, KC_V, KC_SPC
),
[1] = LAYOUT_default(
RGB_TOG,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
RGB_MODE_FORWARD,RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI,
RGB_MODE_REVERSE,RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD
)
};

View File

@ -0,0 +1,35 @@
// Copyright 2022 Jimmy Lye (@satorusaka)
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
*
* Q W E R BACKSPACE (LAYER 1)
*
* A S D F ENTER
*
* Z X C V SPACE
*
*/
[0] = LAYOUT_default(
KC_Q, KC_W, KC_E, KC_R, LT(1, KC_BSPC),
KC_A, KC_S, KC_D, KC_F, LT(2, KC_ENT),
KC_Z, KC_X, KC_C, KC_V, LT(3, KC_SPC)
),
[1] = LAYOUT_default(
RGB_TOG,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
RGB_MODE_FORWARD,RGB_HUI,RGB_SAI,RGB_VAI,RGB_SPI,
RGB_MODE_REVERSE,RGB_HUD,RGB_SAD,RGB_VAD,RGB_SPD
),
[2] = LAYOUT_default(
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
),
[3] = LAYOUT_default(
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS
)
};

View File

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

View File

@ -0,0 +1,26 @@
# skmt_15k_macropad
![skmt_15k_macropad](https://i.imgur.com/Sl6t4Lmh.jpg)
![skmt_15k_macropad](https://i.imgur.com/SihSIVth.jpg)
A diy, 3d-printed, 15 key (3x5), hotswap, RGB macropad.
* Keyboard Maintainer: [Jimmy Lye](https://github.com/satorusaka)
* Hardware Supported: skmt_15k_macropad on rpi pico
* Hardware Availability: [satorusaka/15k-macropad](https://github.com/satorusaka/15k-macropad)
Make example for this keyboard (after setting up your build environment):
make skmt/15k:default
Flashing example for this keyboard:
make skmt/15k:default:flash
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 top left key and plug in the keyboard

View File

@ -0,0 +1,3 @@
WS2812_DRIVER = vendor
LTO_ENABLE = yes