hailey
/
qmk_firmware
mirror of https://github.com/hailey/qmk_firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
master
QMK Bot 2 years ago
parent 222f685b90 70b9cec3f2
commit 3cb0888afa
9 changed files with 393 additions and 0 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 99
      keyboards/deng/thirty/config.h
  2. 47
      keyboards/deng/thirty/info.json
  3. 52
      keyboards/deng/thirty/keymaps/default/keymap.c
  4. 67
      keyboards/deng/thirty/keymaps/via/keymap.c
  5. 1
      keyboards/deng/thirty/keymaps/via/rules.mk
  6. 26
      keyboards/deng/thirty/readme.md
  7. 22
      keyboards/deng/thirty/rules.mk
  8. 48
      keyboards/deng/thirty/thirty.c
  9. 31
      keyboards/deng/thirty/thirty.h

99
keyboards/deng/thirty/config.h
Unescape View File

@ -0,0 +1,99 @@
/* Copyright 2022 Leo Deng (@myst729)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "config_common.h"
/* Matrix */
#define MATRIX_ROWS 6
#define MATRIX_COLS 5
#define MATRIX_ROW_PINS { B15, A5, A3, A15, B7, B8 }
#define MATRIX_COL_PINS { B13, B14, B3, A4, A6 }
#define DIODE_DIRECTION COL2ROW
/* Backlight */
#ifdef BACKLIGHT_ENABLE
#define BACKLIGHT_PIN B11
#define BACKLIGHT_LEVELS 5
#define BACKLIGHT_ON_STATE 0
#endif
/* RGB Matrix */
#ifdef RGB_MATRIX_ENABLE
#define RGB_DI_PIN B12
#define RGB_MATRIX_LED_COUNT 30
#define RGB_MATRIX_KEYPRESSES
// #define RGB_MATRIX_KEYRELEASES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_ALL
#define RGB_MATRIX_DEFAULT_HUE 0
#define RGB_MATRIX_DEFAULT_SAT 255
#define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
#define RGB_MATRIX_DEFAULT_SPD 127
// Enable Effects
// == Regular 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_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_MOVING_CHEVRON
#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_FRACTAL
#define ENABLE_RGB_MATRIX_PIXEL_FLOW
#define ENABLE_RGB_MATRIX_PIXEL_RAIN
// == Framebuffer Effects ==
#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
// == Reactive Effects ==
#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
#endif
/* VIA */
#ifdef VIA_ENABLE
#define DYNAMIC_KEYMAP_LAYER_COUNT 8
#endif

47
keyboards/deng/thirty/info.json
Unescape View File

@ -0,0 +1,47 @@
{
"keyboard_name": "Thirty",
"manufacturer": "Leo Deng",
"url": "",
"maintainer": "myst729",
"usb": {
"vid": "0xDE29",
"pid": "0x7342",
"device_version": "0.0.1"
},
"layouts": {
"LAYOUT_ortho_3x10": {
"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": [3, 4], "x": 5, "y": 0 },
{ "matrix": [3, 3], "x": 6, "y": 0 },
{ "matrix": [3, 2], "x": 7, "y": 0 },
{ "matrix": [3, 1], "x": 8, "y": 0 },
{ "matrix": [3, 0], "x": 9, "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": [4, 4], "x": 5, "y": 1 },
{ "matrix": [4, 3], "x": 6, "y": 1 },
{ "matrix": [4, 2], "x": 7, "y": 1 },
{ "matrix": [4, 1], "x": 8, "y": 1 },
{ "matrix": [4, 0], "x": 9, "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": [5, 4], "x": 5, "y": 2 },
{ "matrix": [5, 3], "x": 6, "y": 2 },
{ "matrix": [5, 2], "x": 7, "y": 2 },
{ "matrix": [5, 1], "x": 8, "y": 2 },
{ "matrix": [5, 0], "x": 9, "y": 2 }
]
}
}
}

52
keyboards/deng/thirty/keymaps/default/keymap.c
Unescape View File

@ -0,0 +1,52 @@
/* Copyright 2022 Leo Deng (@myst729)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
#define LCTL_Z LCTL_T(KC_Z)
#define LGUI_X LGUI_T(KC_X)
#define LALT_C LALT_T(KC_C)
#define FN1_V LT(1, KC_V)
#define FN2_B LT(2, KC_B)
#define FN3_N LT(3, KC_N)
#define FN4_M LT(4, KC_M)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_ortho_3x10(
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_RSFT,
LCTL_Z, LGUI_X, LALT_C, FN1_V, FN2_B, FN3_N, FN4_M, KC_SPC, KC_BSPC, KC_ENT),
[1] = LAYOUT_ortho_3x10(
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
KC_TAB, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_SCLN, KC_QUOT, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[2] = LAYOUT_ortho_3x10(
KC_ESC, KC_GRV, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_UP, _______,
KC_CAPS, _______, KC_COMM, KC_DOT, KC_SLSH, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[3] = LAYOUT_ortho_3x10(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, KC_INS, KC_HOME, KC_PGUP,
KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, KC_END, KC_PGDN,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[4] = LAYOUT_ortho_3x10(
QK_BOOT, KC_BRID, KC_BRIU, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MOD,
KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_M_B, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_RMOD,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
};

67
keyboards/deng/thirty/keymaps/via/keymap.c
Unescape View File

@ -0,0 +1,67 @@
/* Copyright 2022 Leo Deng (@myst729)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
#define LCTL_Z LCTL_T(KC_Z)
#define LGUI_X LGUI_T(KC_X)
#define LALT_C LALT_T(KC_C)
#define FN1_V LT(1, KC_V)
#define FN2_B LT(2, KC_B)
#define FN3_N LT(3, KC_N)
#define FN4_M LT(4, KC_M)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_ortho_3x10(
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_RSFT,
LCTL_Z, LGUI_X, LALT_C, FN1_V, FN2_B, FN3_N, FN4_M, KC_SPC, KC_BSPC, KC_ENT),
[1] = LAYOUT_ortho_3x10(
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
KC_TAB, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_SCLN, KC_QUOT, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[2] = LAYOUT_ortho_3x10(
KC_ESC, KC_GRV, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, _______, KC_UP, _______,
KC_CAPS, _______, KC_COMM, KC_DOT, KC_SLSH, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[3] = LAYOUT_ortho_3x10(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, _______, KC_INS, KC_HOME, KC_PGUP,
KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_DEL, KC_END, KC_PGDN,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[4] = LAYOUT_ortho_3x10(
QK_BOOT, KC_BRID, KC_BRIU, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_MOD,
KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_M_B, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_RMOD,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[5] = LAYOUT_ortho_3x10(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[6] = LAYOUT_ortho_3x10(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
[7] = LAYOUT_ortho_3x10(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
};

1
keyboards/deng/thirty/keymaps/via/rules.mk
Unescape View File

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

26
keyboards/deng/thirty/readme.md
Unescape View File

@ -0,0 +1,26 @@
# Thirty
![Thirty](https://i.imgur.com/4g2fcYOh.jpeg)
A 3x10 toy with plenty of RGB effects.
* Keyboard Maintainer: [Leo Deng](https://github.com/myst729)
* Hardware Supported: APM32F103C8T6 (also hardware compatible with APM32F072CxT6).
* Hardware Availability: Private Groupbuy
Make example for this keyboard (after setting up your build environment):
make deng/thirty:default
Flashing example for this keyboard:
make deng/thirty: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 2 ways:
* **Bootmagic reset**: Hold down the top left key and plug in the keyboard
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

22
keyboards/deng/thirty/rules.mk
Unescape View File

@ -0,0 +1,22 @@
MCU = STM32F103
BOOTLOADER = stm32duino
# Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -p FFFF -v FFFF
# Build Options
BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
BACKLIGHT_DRIVER = software
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = WS2812

48
keyboards/deng/thirty/thirty.c
Unescape View File

@ -0,0 +1,48 @@
/* Copyright 2022 Leo Deng (@myst729)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "thirty.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = {
{
/* Key Matrix to LED Index */
{ 0, 1, 2, 3, 4 },
{ 9, 8, 7, 6, 5 },
{ 10, 11, 12, 13, 14 },
{ 29, 28, 27, 26, 25 },
{ 20, 21, 22, 23, 24 },
{ 19, 18, 17, 16, 15 },
},
{
/* LED Index to Physical Position */
// Switch LEDs
{4,4}, {28,4}, {52,4}, {76,4}, {100,4},
{100,32}, {76,32}, {52,32}, {28,32}, {4,32},
{4,60}, {28,60}, {52,60}, {76,60}, {100,60},
{124,60}, {148,60}, {172,60}, {196,60}, {220,60},
{220,32}, {196,32}, {172,32}, {148,32}, {124,32},
{124,4}, {148,4}, {172,4}, {196,4}, {220,4},
// Underglow LEDs
},
{
/* LED Index to Flag */
4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4
}
};
#endif

31
keyboards/deng/thirty/thirty.h
Unescape View File

@ -0,0 +1,31 @@
/* Copyright 2022 Leo Deng (@myst729)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#include "quantum.h"
#define LAYOUT_ortho_3x10( \
K00, K01, K02, K03, K04, K34, K33, K32, K31, K30, \
K10, K11, K12, K13, K14, K44, K43, K42, K41, K40, \
K20, K21, K22, K23, K24, K54, K53, K52, K51, K50 \
) { \
{ K00, K01, K02, K03, K04 }, \
{ K10, K11, K12, K13, K14 }, \
{ K20, K21, K22, K23, K24 }, \
{ K30, K31, K32, K33, K34 }, \
{ K40, K41, K42, K43, K44 }, \
{ K50, K51, K52, K53, K54 } \
}
Write Preview
Loading…
Cancel
Save