diff options
author | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
---|---|---|
committer | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
commit | bacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch) | |
tree | d4e3e57aac1a829a191831efd2e62c8a43217885 /keyboards/bacca70 | |
parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/bacca70')
-rw-r--r-- | keyboards/bacca70/config.h | 11 | ||||
-rw-r--r-- | keyboards/bacca70/info.json | 2 | ||||
-rw-r--r-- | keyboards/bacca70/rules.mk | 6 |
3 files changed, 2 insertions, 17 deletions
diff --git a/keyboards/bacca70/config.h b/keyboards/bacca70/config.h index 9fd41650fb..a093c267a9 100644 --- a/keyboards/bacca70/config.h +++ b/keyboards/bacca70/config.h @@ -17,23 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 12 -#define MATRIX_COLS 8 // 0 1 2 3 4 5 6 7 8 9 A B #define MATRIX_ROW_PINS { A3, A4, A5, A6, A7, B0, B1, B2, B10, B11, A9, A10 } #define MATRIX_COL_PINS { A0, A1, A2, B12, B13, B14, B15, A8 } #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/bacca70/info.json b/keyboards/bacca70/info.json index 57840b4e12..8cff2b9060 100644 --- a/keyboards/bacca70/info.json +++ b/keyboards/bacca70/info.json @@ -8,6 +8,8 @@ "pid": "0x6970", "device_version": "0.0.1" }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT_default": { "layout": [ diff --git a/keyboards/bacca70/rules.mk b/keyboards/bacca70/rules.mk index a0b213f847..718a1e8d09 100644 --- a/keyboards/bacca70/rules.mk +++ b/keyboards/bacca70/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F072 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Build Options # change yes to no to disable # |