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

This commit is contained in:
QMK Bot 2023-07-07 21:20:13 +00:00
commit 38b18032d8
13 changed files with 228 additions and 75 deletions

View File

@ -1,23 +0,0 @@
/* Copyright 2022 Joah Nelson (Jels)
*
* 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
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

View File

@ -8,16 +8,7 @@
"pid": "0x0060",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["E6", "C7", "B4", "D7", "D6", "D4", "D5", "D3", "F5", "F6", "F7", "C6", "B6", "B5"],
"rows": ["B3", "D2", "F0", "F4", "F1"]
},
"diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "B7"
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
"layout": [

View File

@ -1,18 +1,18 @@
/* Copyright 2022 Joah Nelson (Jels)
*
* 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/>.
*/
/* Copyright 2022 Joah Nelson (Jels)
*
* 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

View File

@ -1,18 +1,18 @@
/* Copyright 2022 Joah Nelson (Jels)
*
* 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/>.
*/
/* Copyright 2022 Joah Nelson (Jels)
*
* 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

View File

@ -1,12 +0,0 @@
# Build Options
# change yes to no to disable
#
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 = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output

View File

@ -0,0 +1,23 @@
/* Copyright 2022 Joah Nelson (Jels)
*
* 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
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

View File

@ -0,0 +1,19 @@
{
"matrix_pins": {
"cols": ["E6", "C7", "B4", "D7", "D6", "D4", "D5", "D3", "F5", "F6", "F7", "C6", "B6", "B5"],
"rows": ["B3", "D2", "F0", "F4", "F1"]
},
"indicators": {
"caps_lock": "B7"
},
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"console": false,
"command": false,
"nkro": false
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu"
}

View File

@ -0,0 +1 @@
# left blank intentionally

View File

@ -0,0 +1,25 @@
/* Copyright 2022 Joah Nelson (Jels)
*
* 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
#define WS2812_PIO_USE_PIO1
#define RGBLIGHT_DEFAULT_VAL 0
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE

View File

@ -0,0 +1,39 @@
{
"bootloader": "rp2040",
"processor": "RP2040",
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"console": false,
"command": false,
"nkro": false
},
"matrix_pins": {
"cols": ["GP24", "GP25", "GP23", "GP21", "GP22", "GP2", "GP1", "GP0", "GP6", "GP18", "GP19", "GP20", "GP9", "GP8"],
"rows": ["GP26", "GP27", "GP3", "GP4", "GP5"]
},
"ws2812": {
"pin": "GP29",
"driver": "vendor"
},
"rgblight": {
"led_count": 22,
"sleep": true,
"animations": {
"alternating": true,
"breathing": true,
"christmas": true,
"knight": true,
"rainbow_mood": true,
"rainbow_swirl": true,
"rgb_test": true,
"snake": true,
"static_gradient": true,
"twinkle": true
}
},
"indicators": {
"caps_lock": "GP28"
}
}

View File

@ -0,0 +1 @@
# left blank intentionally

View File

@ -0,0 +1,14 @@
// Copyright 2023 devzhaoyou (@gevzhaoyou)
/* SPDX-License-Identifier: GPL-2.0-or-later */
#pragma once
#define RGB_MATRIX_LED_COUNT 17
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
#define RGB_DISABLE_WHEN_USB_SUSPENDED //

View File

@ -20,7 +20,82 @@
"bootmagic": true,
"extrakey": true,
"mousekey": true,
"nkro": true
"nkro": true,
"rgb_matrix": true
},
"ws2812": {
"pin": "A2"
},
"rgb_matrix": {
"animations": {
"alphas_mods": true,
"gradient_up_down": true,
"gradient_left_right": true,
"breathing": true,
"band_sat": true,
"band_val": true,
"band_pinwheel_sat": true,
"band_pinwheel_val": true,
"band_spiral_sat": true,
"band_spiral_val": true,
"cycle_all": true,
"cycle_left_right": true,
"cycle_up_down": true,
"cycle_out_in": true,
"cycle_out_in_dual": true,
"rainbow_moving_chevron": true,
"cycle_pinwheel": true,
"cycle_spiral": true,
"dual_beacon": true,
"rainbow_beacon": true,
"rainbow_pinwheels": true,
"raindrops": true,
"jellybean_raindrops": true,
"hue_breathing": true,
"hue_pendulum": true,
"hue_wave": true,
"pixel_fractal": true,
"pixel_flow": true,
"pixel_rain": true,
"typing_heatmap": true,
"digital_rain": true,
"solid_reactive_simple": true,
"solid_reactive": true,
"solid_reactive_wide": true,
"solid_reactive_multiwide": true,
"solid_reactive_cross": true,
"solid_reactive_multicross": true,
"solid_reactive_nexus": true,
"solid_reactive_multinexus": true,
"splash": true,
"multisplash": true,
"solid_splash": true,
"solid_multisplash": true
},
"driver": "WS2812",
"layout": [
{"flags": 1, "matrix": [0, 0], "x": 0, "y": 0},
{"flags": 1, "matrix": [0, 1], "x": 75, "y": 0},
{"flags": 1, "matrix": [0, 2], "x": 150, "y": 0},
{"flags": 1, "matrix": [0, 3], "x": 224, "y": 0},
{"flags": 1, "matrix": [1, 0], "x": 0, "y": 16},
{"flags": 1, "matrix": [1, 1], "x": 75, "y": 16},
{"flags": 1, "matrix": [1, 2], "x": 150, "y": 16},
{"flags": 1, "matrix": [2, 0], "x": 0, "y": 32},
{"flags": 1, "matrix": [2, 1], "x": 75, "y": 32},
{"flags": 1, "matrix": [2, 2], "x": 150, "y": 32},
{"flags": 1, "matrix": [2, 3], "x": 224, "y": 24},
{"flags": 1, "matrix": [3, 0], "x": 0, "y": 48},
{"flags": 1, "matrix": [3, 1], "x": 75, "y": 48},
{"flags": 1, "matrix": [3, 2], "x": 150, "y": 48},
{"flags": 1, "matrix": [4, 0], "x": 32, "y": 64},
{"flags": 1, "matrix": [4, 1], "x": 150, "y": 64},
{"flags": 1, "matrix": [4, 2], "x": 224, "y": 64}
]
},
"indicators": {
"caps_lock": "B15",
"on_state": 0
},
"community_layouts": ["numpad_5x4"],
"layouts": {