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

20 files changed, 57 insertions, 45 deletions

diff --git a/keyboards/handwired/splittest/bluepill/chconf.h b/keyboards/handwired/splittest/bluepill/chconf.h
deleted file mode 100644
index 73c7d64e3a..0000000000
--- a/keyboards/handwired/splittest/bluepill/chconf.h
+++ /dev/null
@@ -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>
diff --git a/keyboards/handwired/splittest/bluepill/config.h b/keyboards/handwired/splittest/bluepill/config.h
index 92766b3de4..b1315ee3c7 100644
--- a/keyboards/handwired/splittest/bluepill/config.h
+++ b/keyboards/handwired/splittest/bluepill/config.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
\ No newline at end of file
+#endif
diff --git a/keyboards/handwired/splittest/bluepill/halconf.h b/keyboards/handwired/splittest/bluepill/halconf.h
index d85c8b842e..e11e5b637a 100644
--- a/keyboards/handwired/splittest/bluepill/halconf.h
+++ b/keyboards/handwired/splittest/bluepill/halconf.h
@@ -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
diff --git a/keyboards/handwired/splittest/bluepill/mcuconf.h b/keyboards/handwired/splittest/bluepill/mcuconf.h
index 875819537f..af2f14a9d3 100644
--- a/keyboards/handwired/splittest/bluepill/mcuconf.h
+++ b/keyboards/handwired/splittest/bluepill/mcuconf.h
@@ -1,3 +1,6 @@
+// Copyright 2022 dvermd (@dvermd)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #pragma once
 
 #include_next <mcuconf.h>
diff --git a/keyboards/handwired/splittest/bluepill/post_config.h b/keyboards/handwired/splittest/bluepill/post_config.h
index b866805a64..be9dd398ff 100644
--- a/keyboards/handwired/splittest/bluepill/post_config.h
+++ b/keyboards/handwired/splittest/bluepill/post_config.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
diff --git a/keyboards/handwired/splittest/bluepill/rules.mk b/keyboards/handwired/splittest/bluepill/rules.mk
index 1d2ff9419e..019b1130d9 100644
--- a/keyboards/handwired/splittest/bluepill/rules.mk
+++ b/keyboards/handwired/splittest/bluepill/rules.mk
@@ -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
diff --git a/keyboards/handwired/splittest/keymaps/bitbang/config.h b/keyboards/handwired/splittest/keymaps/bitbang/config.h
index c21a363855..fddd3d88b2 100644
--- a/keyboards/handwired/splittest/keymaps/bitbang/config.h
+++ b/keyboards/handwired/splittest/keymaps/bitbang/config.h
@@ -3,8 +3,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
 #define SPLIT_BITBANG
 
 #define FORCED_SYNC_THROTTLE_MS 100
diff --git a/keyboards/handwired/splittest/keymaps/bitbang/keymap.c b/keyboards/handwired/splittest/keymaps/bitbang/keymap.c
index 9875000319..8a83e19850 100644
--- a/keyboards/handwired/splittest/keymaps/bitbang/keymap.c
+++ b/keyboards/handwired/splittest/keymaps/bitbang/keymap.c
@@ -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)};
diff --git a/keyboards/handwired/splittest/keymaps/default/keymap.c b/keyboards/handwired/splittest/keymaps/default/keymap.c
index 0057478c1c..fcef718983 100644
--- a/keyboards/handwired/splittest/keymaps/default/keymap.c
+++ b/keyboards/handwired/splittest/keymaps/default/keymap.c
@@ -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)
 };
diff --git a/keyboards/handwired/splittest/keymaps/rgb/keymap.c b/keyboards/handwired/splittest/keymaps/rgb/keymap.c
new file mode 100644
index 0000000000..1fa86057c9
--- /dev/null
+++ b/keyboards/handwired/splittest/keymaps/rgb/keymap.c
@@ -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)
+};
diff --git a/keyboards/handwired/splittest/keymaps/rgb/rules.mk b/keyboards/handwired/splittest/keymaps/rgb/rules.mk
new file mode 100644
index 0000000000..1e3cebb145
--- /dev/null
+++ b/keyboards/handwired/splittest/keymaps/rgb/rules.mk
@@ -0,0 +1 @@
+RGBLIGHT_ENABLE = yes
diff --git a/keyboards/handwired/splittest/keymaps/serial_fullduplex/config.h b/keyboards/handwired/splittest/keymaps/serial_fullduplex/config.h
index b83dc43a1f..1a2899751b 100644
--- a/keyboards/handwired/splittest/keymaps/serial_fullduplex/config.h
+++ b/keyboards/handwired/splittest/keymaps/serial_fullduplex/config.h
@@ -3,6 +3,4 @@
 
 #pragma once
 
-#include "config_common.h"
-
 #define SPLIT_SERIAL_FULLDUPLEX
diff --git a/keyboards/handwired/splittest/keymaps/serial_fullduplex/halconf.h b/keyboards/handwired/splittest/keymaps/serial_fullduplex/halconf.h
index 35ae5bf214..58840c28a7 100644
--- a/keyboards/handwired/splittest/keymaps/serial_fullduplex/halconf.h
+++ b/keyboards/handwired/splittest/keymaps/serial_fullduplex/halconf.h
@@ -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>
diff --git a/keyboards/handwired/splittest/keymaps/serial_fullduplex/keymap.c b/keyboards/handwired/splittest/keymaps/serial_fullduplex/keymap.c
index 84919f53a7..7535715da1 100644
--- a/keyboards/handwired/splittest/keymaps/serial_fullduplex/keymap.c
+++ b/keyboards/handwired/splittest/keymaps/serial_fullduplex/keymap.c
@@ -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)};
diff --git a/keyboards/handwired/splittest/keymaps/serial_halfduplex/config.h b/keyboards/handwired/splittest/keymaps/serial_halfduplex/config.h
index 96dcf0dc42..3cb68f6e7d 100644
--- a/keyboards/handwired/splittest/keymaps/serial_halfduplex/config.h
+++ b/keyboards/handwired/splittest/keymaps/serial_halfduplex/config.h
@@ -3,6 +3,4 @@
 
 #pragma once
 
-#include "config_common.h"
-
 #define SPLIT_SERIAL_HALFDUPLEX
diff --git a/keyboards/handwired/splittest/keymaps/serial_halfduplex/halconf.h b/keyboards/handwired/splittest/keymaps/serial_halfduplex/halconf.h
index 35ae5bf214..58840c28a7 100644
--- a/keyboards/handwired/splittest/keymaps/serial_halfduplex/halconf.h
+++ b/keyboards/handwired/splittest/keymaps/serial_halfduplex/halconf.h
@@ -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>
diff --git a/keyboards/handwired/splittest/keymaps/serial_halfduplex/keymap.c b/keyboards/handwired/splittest/keymaps/serial_halfduplex/keymap.c
index 84919f53a7..d65d04b623 100644
--- a/keyboards/handwired/splittest/keymaps/serial_halfduplex/keymap.c
+++ b/keyboards/handwired/splittest/keymaps/serial_halfduplex/keymap.c
@@ -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)};
diff --git a/keyboards/handwired/splittest/promicro/rules.mk b/keyboards/handwired/splittest/promicro/rules.mk
index d29dbc8596..cf663a7ed6 100644
--- a/keyboards/handwired/splittest/promicro/rules.mk
+++ b/keyboards/handwired/splittest/promicro/rules.mk
@@ -3,5 +3,3 @@ MCU = atmega32u4
 
 # Bootloader selection
 BOOTLOADER = caterina
-
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/handwired/splittest/rules.mk b/keyboards/handwired/splittest/rules.mk
index 18300431b2..cc924d61d8 100644
--- a/keyboards/handwired/splittest/rules.mk
+++ b/keyboards/handwired/splittest/rules.mk
@@ -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
 
diff --git a/keyboards/handwired/splittest/teensy_2/rules.mk b/keyboards/handwired/splittest/teensy_2/rules.mk
index a88fa054ee..320633f80f 100644
--- a/keyboards/handwired/splittest/teensy_2/rules.mk
+++ b/keyboards/handwired/splittest/teensy_2/rules.mk
@@ -3,5 +3,3 @@ MCU = atmega32u4
 
 # Bootloader selection
 BOOTLOADER = halfkay
-
-RGBLIGHT_ENABLE = yes