Skip to content

Commit 92bcbee

Browse files
authored
Fix up splittest/bluepill (#17897)
1 parent df8a538 commit 92bcbee

File tree

20 files changed

+57
-45
lines changed

20 files changed

+57
-45
lines changed

keyboards/handwired/splittest/bluepill/chconf.h

-23
This file was deleted.

keyboards/handwired/splittest/bluepill/config.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313

1414
#if !(defined(USE_SDI1_ON_STANDARD_ROLE_PINS) || defined(USE_SDI1_ON_ALTERNATE_ROLE_PINS) || defined(USE_SDI2))
1515
#define USE_SDI1_ON_STANDARD_ROLE_PINS
16-
#endif
16+
#endif

keyboards/handwired/splittest/bluepill/halconf.h

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
// Copyright 2022 dvermd (@dvermd)
2+
// SPDX-License-Identifier: GPL-2.0-or-later
3+
4+
#pragma once
5+
16
/* Needed for serial bitbang, half-duplex and full-duplex */
27
#define HAL_USE_PAL TRUE
38
#define PAL_USE_WAIT TRUE

keyboards/handwired/splittest/bluepill/mcuconf.h

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2022 dvermd (@dvermd)
2+
// SPDX-License-Identifier: GPL-2.0-or-later
3+
14
#pragma once
25

36
#include_next <mcuconf.h>

keyboards/handwired/splittest/bluepill/post_config.h

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
// Copyright 2022 dvermd (@dvermd)
2+
// SPDX-License-Identifier: GPL-2.0-or-later
13

2-
#if defined(SPLIT_BITBANG)
4+
#pragma once
35

4-
#define SOFT_SERIAL_PIN B8
5-
6-
#elif defined(SPLIT_SERIAL_HALFDUPLEX)
6+
#if defined(SPLIT_SERIAL_HALFDUPLEX)
77

88
#if defined(USE_SDI1_ON_STANDARD_ROLE_PINS)
99
#define SOFT_SERIAL_PIN A9
@@ -35,4 +35,9 @@
3535
#else
3636
#error "splittest serial_fullduplex keymap is missing a configuration (USE_SDI1_ON_STANDARD_ROLE_PINS, USE_SDI1_ON_ALTERNATE_ROLE_PINS, USE_SDI2)"
3737
#endif
38+
39+
#else // defined(SPLIT_BITBANG)
40+
41+
#define SOFT_SERIAL_PIN B8
42+
3843
#endif

keyboards/handwired/splittest/bluepill/rules.mk

-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@ MCU = STM32F103
44
# Bootloader selection
55
BOOTLOADER = stm32duino
66

7-
CONSOLE_ENABLE = yes
8-
97
# Enter lower-power sleep mode when on the ChibiOS idle thread
108
OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

keyboards/handwired/splittest/keymaps/bitbang/config.h

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
#pragma once
55

6-
#include "config_common.h"
7-
86
#define SPLIT_BITBANG
97

108
#define FORCED_SYNC_THROTTLE_MS 100

keyboards/handwired/splittest/keymaps/bitbang/keymap.c

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2022 dvermd (@dvermd)
2+
// SPDX-License-Identifier: GPL-2.0-or-later
3+
14
#include QMK_KEYBOARD_H
25

36
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(KC_L, KC_R)};
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1+
// Copyright 2022 QMK
2+
// SPDX-License-Identifier: GPL-2.0-or-later
3+
14
#include QMK_KEYBOARD_H
25

36
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4-
[0] = LAYOUT(RGB_MOD, QK_BOOT)
7+
[0] = LAYOUT(KC_L, KC_R)
58
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// Copyright 2022 QMK
2+
// SPDX-License-Identifier: GPL-2.0-or-later
3+
4+
#include QMK_KEYBOARD_H
5+
6+
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
7+
[0] = LAYOUT(RGB_MOD, QK_BOOT)
8+
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
RGBLIGHT_ENABLE = yes

keyboards/handwired/splittest/keymaps/serial_fullduplex/config.h

-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@
33

44
#pragma once
55

6-
#include "config_common.h"
7-
86
#define SPLIT_SERIAL_FULLDUPLEX
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1+
// Copyright 2022 dvermd (@dvermd)
2+
// SPDX-License-Identifier: GPL-2.0-or-later
3+
4+
#pragma once
5+
16
#define HAL_USE_SERIAL TRUE
7+
28
#include_next <halconf.h>

keyboards/handwired/splittest/keymaps/serial_fullduplex/keymap.c

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// Copyright 2022 dvermd (@dvermd)
2+
// SPDX-License-Identifier: GPL-2.0-or-later
3+
14
#include QMK_KEYBOARD_H
25

36
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(KC_L, KC_R)};

keyboards/handwired/splittest/keymaps/serial_halfduplex/config.h

-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@
33

44
#pragma once
55

6-
#include "config_common.h"
7-
86
#define SPLIT_SERIAL_HALFDUPLEX
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1+
// Copyright 2022 dvermd (@dvermd)
2+
// SPDX-License-Identifier: GPL-2.0-or-later
3+
4+
#pragma once
5+
16
#define HAL_USE_SERIAL TRUE
7+
28
#include_next <halconf.h>

keyboards/handwired/splittest/keymaps/serial_halfduplex/keymap.c

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
// Copyright 2022 dvermd (@dvermd)
2+
// SPDX-License-Identifier: GPL-2.0-or-later
3+
4+
#pragma once
5+
16
#include QMK_KEYBOARD_H
27

38
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {[0] = LAYOUT(KC_L, KC_R)};

keyboards/handwired/splittest/promicro/rules.mk

-2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@ MCU = atmega32u4
33

44
# Bootloader selection
55
BOOTLOADER = caterina
6-
7-
RGBLIGHT_ENABLE = yes

keyboards/handwired/splittest/rules.mk

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
#
44
BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
55
MOUSEKEY_ENABLE = no # Mouse keys
6-
EXTRAKEY_ENABLE = yes # Audio control and System control
7-
CONSOLE_ENABLE = no # Console for debug
8-
COMMAND_ENABLE = yes # Commands for debug and configuration
6+
EXTRAKEY_ENABLE = no # Audio control and System control
7+
CONSOLE_ENABLE = yes # Console for debug
8+
COMMAND_ENABLE = no # Commands for debug and configuration
99
NKRO_ENABLE = no # Enable N-Key Rollover
1010
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
1111
AUDIO_ENABLE = no # Audio output
12-
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
1312

1413
SPLIT_KEYBOARD = yes
1514

keyboards/handwired/splittest/teensy_2/rules.mk

-2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@ MCU = atmega32u4
33

44
# Bootloader selection
55
BOOTLOADER = halfkay
6-
7-
RGBLIGHT_ENABLE = yes

0 commit comments

Comments
 (0)