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

This commit is contained in:
QMK Bot 2023-03-13 05:34:07 +00:00
commit 183e99f638
4 changed files with 20 additions and 49 deletions

View File

@ -1,21 +1,8 @@
/* Copyright 2018-2020 // Copyright 2018-2020
ENDO Katsuhiro <ka2hiro@curlybracket.co.jp> // ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
David Philip Barr <@davidphilipbarr> // David Philip Barr <@davidphilipbarr>
Pierre Chevalier <pierrechevalier83@gmail.com> // Pierre Chevalier <pierrechevalier83@gmail.com>
// SPDX-License-Identifier: GPL-2.0+
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 #pragma once

View File

@ -6,8 +6,13 @@
"pid": "0x3939", "pid": "0x3939",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"processor": "atmega32u4", "development_board": "promicro",
"bootloader": "caterina", "features": {
"bootmagic": true,
"extrakey": true,
"mousekey": true,
"unicode": true
},
"matrix_pins": { "matrix_pins": {
"direct": [ "direct": [
["E6", "F7", "F6", "F5", "F4"], ["E6", "F7", "F6", "F5", "F4"],
@ -17,6 +22,7 @@
] ]
}, },
"split": { "split": {
"enabled": true,
"soft_serial_pin": "D2", "soft_serial_pin": "D2",
"bootmagic": { "bootmagic": {
"matrix": [4, 4] "matrix": [4, 4]

View File

@ -1,14 +1 @@
# Build Options # This file intentionally left blank
# 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 = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
UNICODE_ENABLE = yes # Unicode
AUDIO_ENABLE = no # Audio output
SPLIT_KEYBOARD = yes # Use shared split_common code

View File

@ -1,18 +1,9 @@
/* Copyright 2018-2020 ENDO Katsuhiro <ka2hiro@curlybracket.co.jp> David Philip Barr <@davidphilipbarr> Pierre Chevalier <pierrechevalier83@gmail.com> // Copyright 2018-2020
* // ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
* This program is free software: you can redistribute it and/or modify // David Philip Barr <@davidphilipbarr>
* it under the terms of the GNU General Public License as published by // Pierre Chevalier <pierrechevalier83@gmail.com>
* the Free Software Foundation, either version 2 of the License, or // SPDX-License-Identifier: GPL-2.0+
* (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 "quantum.h" #include "quantum.h"
#ifdef SWAP_HANDS_ENABLE #ifdef SWAP_HANDS_ENABLE