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/kinesis/alvicstep | |
parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/kinesis/alvicstep')
-rw-r--r-- | keyboards/kinesis/alvicstep/config.h | 1 | ||||
-rw-r--r-- | keyboards/kinesis/alvicstep/info.json | 4 | ||||
-rw-r--r-- | keyboards/kinesis/alvicstep/matrix.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/keyboards/kinesis/alvicstep/config.h b/keyboards/kinesis/alvicstep/config.h index c77eebb577..905c95a272 100644 --- a/keyboards/kinesis/alvicstep/config.h +++ b/keyboards/kinesis/alvicstep/config.h @@ -1,7 +1,6 @@ #pragma once #include "../config.h" -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 16 diff --git a/keyboards/kinesis/alvicstep/info.json b/keyboards/kinesis/alvicstep/info.json index 1db31a0429..009bfb8393 100644 --- a/keyboards/kinesis/alvicstep/info.json +++ b/keyboards/kinesis/alvicstep/info.json @@ -5,5 +5,7 @@ "vid": "0xFEED", "pid": "0x6060", "device_version": "0.0.1" - } + }, + "processor": "at90usb1286", + "bootloader": "halfkay" } diff --git a/keyboards/kinesis/alvicstep/matrix.c b/keyboards/kinesis/alvicstep/matrix.c index 5636418849..07df19e966 100644 --- a/keyboards/kinesis/alvicstep/matrix.c +++ b/keyboards/kinesis/alvicstep/matrix.c @@ -132,7 +132,7 @@ uint8_t matrix_scan(void) } } } - matrix_scan_quantum(); + matrix_scan_kb(); return 1; } |