aboutsummaryrefslogtreecommitdiff
path: root/keyboards/phoenix
diff options
context:
space:
mode:
authorNick Brassel <[email protected]>2023-02-28 11:22:29 +1100
committerNick Brassel <[email protected]>2023-02-28 11:22:29 +1100
commitbacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch)
treed4e3e57aac1a829a191831efd2e62c8a43217885 /keyboards/phoenix
parentd70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff)
parentb865b9e1706ad28ae4882bd2e0331e98808295fa (diff)
downloadqmk_firmware-bacec14073b2e897d5a52caf12de5a6a1f7b4078.tar.gz
qmk_firmware-bacec14073b2e897d5a52caf12de5a6a1f7b4078.zip
Merge remote-tracking branch 'upstream/develop'0.20.0
Diffstat (limited to 'keyboards/phoenix')
-rw-r--r--keyboards/phoenix/config.h6
-rw-r--r--keyboards/phoenix/info.json6
-rw-r--r--keyboards/phoenix/rules.mk7
3 files changed, 6 insertions, 13 deletions
diff --git a/keyboards/phoenix/config.h b/keyboards/phoenix/config.h
index 9fb090dec0..2ada33779d 100644
--- a/keyboards/phoenix/config.h
+++ b/keyboards/phoenix/config.h
@@ -16,11 +16,6 @@
*/
#pragma once
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 7
#define MOUSEKEY_INTERVAL 10
#define MOUSEKEY_DELAY 0
@@ -38,6 +33,5 @@
#define HAL_USE_SERIAL TRUE
#define SPLIT_HAND_PIN B9
-#define SOFT_SERIAL_PIN A9
#define SERIAL_USART_DRIVER SD1
#define SERIAL_USART_TX_PAL_MODE 7
diff --git a/keyboards/phoenix/info.json b/keyboards/phoenix/info.json
index 85cffa1c31..c9147ab8d8 100644
--- a/keyboards/phoenix/info.json
+++ b/keyboards/phoenix/info.json
@@ -8,6 +8,12 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "split": {
+ "soft_serial_pin": "A9"
+ },
+ "processor": "STM32F401",
+ "bootloader": "stm32-dfu",
+ "board": "BLACKPILL_STM32_F401",
"layouts": {
"LAYOUT_ergodox": {
"layout": [
diff --git a/keyboards/phoenix/rules.mk b/keyboards/phoenix/rules.mk
index c155cd0988..a83da5e996 100644
--- a/keyboards/phoenix/rules.mk
+++ b/keyboards/phoenix/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F401
-BOARD = BLACKPILL_STM32_F401
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
# Build Options
# change yes to no to disable
#