summaryrefslogtreecommitdiff
path: root/keyboards/nack
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2023-02-28 11:22:29 +1100
committerNick Brassel <nick@tzarc.org>2023-02-28 11:22:29 +1100
commitbacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch)
treed4e3e57aac1a829a191831efd2e62c8a43217885 /keyboards/nack
parentd70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff)
parentb865b9e1706ad28ae4882bd2e0331e98808295fa (diff)
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/nack')
-rw-r--r--keyboards/nack/config.h5
-rw-r--r--keyboards/nack/info.json3
-rw-r--r--keyboards/nack/rules.mk7
3 files changed, 3 insertions, 12 deletions
diff --git a/keyboards/nack/config.h b/keyboards/nack/config.h
index ad7c7d423f..95bf0d9b87 100644
--- a/keyboards/nack/config.h
+++ b/keyboards/nack/config.h
@@ -16,16 +16,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#include "config_common.h"
-
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 13
#define MATRIX_ROW_PINS { A0, A1, A2, A3 }
#define MATRIX_COL_PINS { A6, A7, A8, A9, A10, B0, B1, B2, B6, B7, C13, C14, C15 }
#define DIODE_DIRECTION ROW2COL
-#define DEBOUNCE 5
#define TAPPING_TOGGLE 2
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/nack/info.json b/keyboards/nack/info.json
index 9444eb3ad3..3ece3f5dba 100644
--- a/keyboards/nack/info.json
+++ b/keyboards/nack/info.json
@@ -8,6 +8,9 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "processor": "STM32F303",
+ "bootloader": "stm32-dfu",
+ "board": "QMK_PROTON_C",
"layout_aliases": {
"LAYOUT": "LAYOUT_ortho_4x13"
},
diff --git a/keyboards/nack/rules.mk b/keyboards/nack/rules.mk
index 7704d802ab..ff4148699a 100644
--- a/keyboards/nack/rules.mk
+++ b/keyboards/nack/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F303
-BOARD = QMK_PROTON_C
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
# Build Options
# change yes to no to disable
#