mirror of
https://github.com/firewalkwithm3/qmk_firmware.git
synced 2024-11-23 03:50:28 +08:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
QMK Bot
commit
c6a6f987c9
|
|
@ -1,23 +0,0 @@
|
|||
/* Copyright 2020 QMK
|
||||
*
|
||||
* 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 CH_CFG_ST_TIMEDELTA 0
|
||||
|
||||
#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
|
||||
|
||||
#include_next <chconf.h>
|
||||
|
|
@ -13,4 +13,4 @@
|
|||
|
||||
#if !(defined(USE_SDI1_ON_STANDARD_ROLE_PINS) || defined(USE_SDI1_ON_ALTERNATE_ROLE_PINS) || defined(USE_SDI2))
|
||||
#define USE_SDI1_ON_STANDARD_ROLE_PINS
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
// Copyright 2022 dvermd (@dvermd)
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
/* Needed for serial bitbang, half-duplex and full-duplex */
|
||||
#define HAL_USE_PAL TRUE
|
||||
#define PAL_USE_WAIT TRUE
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
// Copyright 2022 dvermd (@dvermd)
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
#include_next <mcuconf.h>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
// Copyright 2022 dvermd (@dvermd)
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#if defined(SPLIT_BITBANG)
|
||||
#pragma once
|
||||
|
||||
#define SOFT_SERIAL_PIN B8
|
||||
|
||||
#elif defined(SPLIT_SERIAL_HALFDUPLEX)
|
||||
#if defined(SPLIT_SERIAL_HALFDUPLEX)
|
||||
|
||||
#if defined(USE_SDI1_ON_STANDARD_ROLE_PINS)
|
||||
#define SOFT_SERIAL_PIN A9
|
||||
|
|
@ -35,4 +35,9 @@
|
|||
#else
|
||||
#error "splittest serial_fullduplex keymap is missing a configuration (USE_SDI1_ON_STANDARD_ROLE_PINS, USE_SDI1_ON_ALTERNATE_ROLE_PINS, USE_SDI2)"
|
||||
#endif
|
||||
|
||||
#else // defined(SPLIT_BITBANG)
|
||||
|
||||
#define SOFT_SERIAL_PIN B8
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -4,7 +4,5 @@ MCU = STM32F103
|
|||
# Bootloader selection
|
||||
BOOTLOADER = stm32duino
|
||||
|
||||
CONSOLE_ENABLE = yes
|
||||
|
||||
# Enter lower-power sleep mode when on the ChibiOS idle thread
|
||||
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
#define SPLIT_BITBANG
|
||||
|
||||
#define FORCED_SYNC_THROTTLE_MS 100
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
// Copyright 2022 dvermd (@dvermd)
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(KC_L, KC_R)};
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
// Copyright 2022 QMK
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[0] = LAYOUT(RGB_MOD, QK_BOOT)
|
||||
[0] = LAYOUT(KC_L, KC_R)
|
||||
};
|
||||
|
|
|
|||
8
keyboards/handwired/splittest/keymaps/rgb/keymap.c
Normal file
8
keyboards/handwired/splittest/keymaps/rgb/keymap.c
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
// Copyright 2022 QMK
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[0] = LAYOUT(RGB_MOD, QK_BOOT)
|
||||
};
|
||||
1
keyboards/handwired/splittest/keymaps/rgb/rules.mk
Normal file
1
keyboards/handwired/splittest/keymaps/rgb/rules.mk
Normal file
|
|
@ -0,0 +1 @@
|
|||
RGBLIGHT_ENABLE = yes
|
||||
|
|
@ -3,6 +3,4 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
#define SPLIT_SERIAL_FULLDUPLEX
|
||||
|
|
|
|||
|
|
@ -1,2 +1,8 @@
|
|||
// Copyright 2022 dvermd (@dvermd)
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
#define HAL_USE_SERIAL TRUE
|
||||
|
||||
#include_next <halconf.h>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
// Copyright 2022 dvermd (@dvermd)
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(KC_L, KC_R)};
|
||||
|
|
|
|||
|
|
@ -3,6 +3,4 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "config_common.h"
|
||||
|
||||
#define SPLIT_SERIAL_HALFDUPLEX
|
||||
|
|
|
|||
|
|
@ -1,2 +1,8 @@
|
|||
// Copyright 2022 dvermd (@dvermd)
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
#define HAL_USE_SERIAL TRUE
|
||||
|
||||
#include_next <halconf.h>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
// Copyright 2022 dvermd (@dvermd)
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#pragma once
|
||||
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(KC_L, KC_R)};
|
||||
|
|
|
|||
|
|
@ -3,5 +3,3 @@ MCU = atmega32u4
|
|||
|
||||
# Bootloader selection
|
||||
BOOTLOADER = caterina
|
||||
|
||||
RGBLIGHT_ENABLE = yes
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@
|
|||
#
|
||||
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
|
||||
MOUSEKEY_ENABLE = no # Mouse keys
|
||||
EXTRAKEY_ENABLE = yes # Audio control and System control
|
||||
CONSOLE_ENABLE = no # Console for debug
|
||||
COMMAND_ENABLE = yes # Commands for debug and configuration
|
||||
EXTRAKEY_ENABLE = no # Audio control and System control
|
||||
CONSOLE_ENABLE = yes # 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
|
||||
AUDIO_ENABLE = no # Audio output
|
||||
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
|
||||
|
||||
SPLIT_KEYBOARD = yes
|
||||
|
||||
|
|
|
|||
|
|
@ -3,5 +3,3 @@ MCU = atmega32u4
|
|||
|
||||
# Bootloader selection
|
||||
BOOTLOADER = halfkay
|
||||
|
||||
RGBLIGHT_ENABLE = yes
|
||||
|
|
|
|||
Loading…
Reference in a new issue