Fix up splittest/bluepill (#17897)

master
Joel Challis 2022-08-03 21:06:54 +01:00 committed by GitHub
parent df8a538489
commit 92bcbee226
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 57 additions and 45 deletions

View File

@ -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>

View File

@ -13,4 +13,4 @@
#if !(defined(USE_SDI1_ON_STANDARD_ROLE_PINS) || defined(USE_SDI1_ON_ALTERNATE_ROLE_PINS) || defined(USE_SDI2)) #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 #define USE_SDI1_ON_STANDARD_ROLE_PINS
#endif #endif

View File

@ -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 */ /* Needed for serial bitbang, half-duplex and full-duplex */
#define HAL_USE_PAL TRUE #define HAL_USE_PAL TRUE
#define PAL_USE_WAIT TRUE #define PAL_USE_WAIT TRUE

View File

@ -1,3 +1,6 @@
// Copyright 2022 dvermd (@dvermd)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once #pragma once
#include_next <mcuconf.h> #include_next <mcuconf.h>

View File

@ -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 #if defined(SPLIT_SERIAL_HALFDUPLEX)
#elif defined(SPLIT_SERIAL_HALFDUPLEX)
#if defined(USE_SDI1_ON_STANDARD_ROLE_PINS) #if defined(USE_SDI1_ON_STANDARD_ROLE_PINS)
#define SOFT_SERIAL_PIN A9 #define SOFT_SERIAL_PIN A9
@ -35,4 +35,9 @@
#else #else
#error "splittest serial_fullduplex keymap is missing a configuration (USE_SDI1_ON_STANDARD_ROLE_PINS, USE_SDI1_ON_ALTERNATE_ROLE_PINS, USE_SDI2)" #error "splittest serial_fullduplex keymap is missing a configuration (USE_SDI1_ON_STANDARD_ROLE_PINS, USE_SDI1_ON_ALTERNATE_ROLE_PINS, USE_SDI2)"
#endif #endif
#else // defined(SPLIT_BITBANG)
#define SOFT_SERIAL_PIN B8
#endif #endif

View File

@ -4,7 +4,5 @@ MCU = STM32F103
# Bootloader selection # Bootloader selection
BOOTLOADER = stm32duino BOOTLOADER = stm32duino
CONSOLE_ENABLE = yes
# Enter lower-power sleep mode when on the ChibiOS idle thread # Enter lower-power sleep mode when on the ChibiOS idle thread
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

View File

@ -3,8 +3,6 @@
#pragma once #pragma once
#include "config_common.h"
#define SPLIT_BITBANG #define SPLIT_BITBANG
#define FORCED_SYNC_THROTTLE_MS 100 #define FORCED_SYNC_THROTTLE_MS 100

View File

@ -1,3 +1,6 @@
// Copyright 2022 dvermd (@dvermd)
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(KC_L, KC_R)}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(KC_L, KC_R)};

View File

@ -1,5 +1,8 @@
// Copyright 2022 QMK
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(RGB_MOD, QK_BOOT) [0] = LAYOUT(KC_L, KC_R)
}; };

View 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)
};

View File

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

View File

@ -3,6 +3,4 @@
#pragma once #pragma once
#include "config_common.h"
#define SPLIT_SERIAL_FULLDUPLEX #define SPLIT_SERIAL_FULLDUPLEX

View File

@ -1,2 +1,8 @@
// Copyright 2022 dvermd (@dvermd)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define HAL_USE_SERIAL TRUE #define HAL_USE_SERIAL TRUE
#include_next <halconf.h> #include_next <halconf.h>

View File

@ -1,3 +1,6 @@
// Copyright 2022 dvermd (@dvermd)
// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(KC_L, KC_R)}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(KC_L, KC_R)};

View File

@ -3,6 +3,4 @@
#pragma once #pragma once
#include "config_common.h"
#define SPLIT_SERIAL_HALFDUPLEX #define SPLIT_SERIAL_HALFDUPLEX

View File

@ -1,2 +1,8 @@
// Copyright 2022 dvermd (@dvermd)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define HAL_USE_SERIAL TRUE #define HAL_USE_SERIAL TRUE
#include_next <halconf.h> #include_next <halconf.h>

View File

@ -1,3 +1,8 @@
// Copyright 2022 dvermd (@dvermd)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(KC_L, KC_R)}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(KC_L, KC_R)};

View File

@ -3,5 +3,3 @@ MCU = atmega32u4
# Bootloader selection # Bootloader selection
BOOTLOADER = caterina BOOTLOADER = caterina
RGBLIGHT_ENABLE = yes

View File

@ -3,13 +3,12 @@
# #
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no # Mouse keys MOUSEKEY_ENABLE = no # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control EXTRAKEY_ENABLE = no # Audio control and System control
CONSOLE_ENABLE = no # Console for debug CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = no # Enable N-Key Rollover NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output AUDIO_ENABLE = no # Audio output
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
SPLIT_KEYBOARD = yes SPLIT_KEYBOARD = yes

View File

@ -3,5 +3,3 @@ MCU = atmega32u4
# Bootloader selection # Bootloader selection
BOOTLOADER = halfkay BOOTLOADER = halfkay
RGBLIGHT_ENABLE = yes