diff options
Diffstat (limited to 'keyboards/kmac')
| -rw-r--r-- | keyboards/kmac/config.h | 33 | ||||
| -rw-r--r-- | keyboards/kmac/info.json | 3 | ||||
| -rw-r--r-- | keyboards/kmac/matrix.c | 8 | ||||
| -rw-r--r-- | keyboards/kmac/rules.mk | 9 |
4 files changed, 5 insertions, 48 deletions
diff --git a/keyboards/kmac/config.h b/keyboards/kmac/config.h index 3d1b8eb5d5..5db54daf43 100644 --- a/keyboards/kmac/config.h +++ b/keyboards/kmac/config.h @@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 6 @@ -40,44 +39,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LED_SCROLL_LOCK_PIN E6 #define LED_PIN_ON_STATE 0 -/* number of backlight levels */ -//#define BACKLIGHT_LEVELS 3 -// #define BACKLIGHT_PIN B7 -// #define BACKLIGHT_BREATHING - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE /* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - * - */ -//#define FORCE_NKRO - -/* * Feature disable options * These options are also useful to firmware size reduction. */ diff --git a/keyboards/kmac/info.json b/keyboards/kmac/info.json index 27e6c03524..b8e5497e28 100644 --- a/keyboards/kmac/info.json +++ b/keyboards/kmac/info.json @@ -7,6 +7,9 @@ "pid": "0x4143", "device_version": "1.0.4" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { "layout": [ diff --git a/keyboards/kmac/matrix.c b/keyboards/kmac/matrix.c index 2052a9be71..6569867032 100644 --- a/keyboards/kmac/matrix.c +++ b/keyboards/kmac/matrix.c @@ -45,10 +45,6 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; static matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values static matrix_row_t matrix[MATRIX_ROWS]; // debounced values -__attribute__((weak)) void matrix_init_quantum(void) { matrix_init_kb(); } - -__attribute__((weak)) void matrix_scan_quantum(void) { matrix_scan_kb(); } - __attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); } __attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); } @@ -191,7 +187,7 @@ void matrix_init(void) { debounce_init(MATRIX_ROWS); - matrix_init_quantum(); + matrix_init_kb(); } uint8_t matrix_scan(void) { @@ -203,7 +199,7 @@ uint8_t matrix_scan(void) { debounce(raw_matrix, matrix, MATRIX_ROWS, changed); - matrix_scan_quantum(); + matrix_scan_kb(); return (uint8_t)changed; } diff --git a/keyboards/kmac/rules.mk b/keyboards/kmac/rules.mk index 2eb2e6d5e2..b1bd80232c 100644 --- a/keyboards/kmac/rules.mk +++ b/keyboards/kmac/rules.mk @@ -1,12 +1,6 @@ -# MCU name -MCU = atmega32u4 - # Processor frequency F_CPU = 8000000 -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # @@ -23,6 +17,3 @@ AUDIO_ENABLE = no # Audio output # Project specific files SRC += matrix.c - -# Supported layouts -LAYOUTS = tkl_ansi |