diff options
Diffstat (limited to 'keyboards/torn')
-rw-r--r-- | keyboards/torn/config.h | 9 | ||||
-rw-r--r-- | keyboards/torn/info.json | 7 | ||||
-rw-r--r-- | keyboards/torn/keymaps/kinesish/config.h | 2 | ||||
-rw-r--r-- | keyboards/torn/keymaps/kinesish/keymap.c | 12 | ||||
-rw-r--r-- | keyboards/torn/rules.mk | 6 |
5 files changed, 14 insertions, 22 deletions
diff --git a/keyboards/torn/config.h b/keyboards/torn/config.h index b36ad9b1d9..0b56ef812d 100644 --- a/keyboards/torn/config.h +++ b/keyboards/torn/config.h @@ -17,7 +17,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 4 @@ -46,14 +45,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define ENCODERS_PAD_A \ - { B2 } -#define ENCODERS_PAD_B \ - { B1 } - #define USB_MAX_POWER_CONSUMPTION 100 -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - #define OLED_TIMEOUT 60000 diff --git a/keyboards/torn/info.json b/keyboards/torn/info.json index 26e6ade034..44b2f9a5dd 100644 --- a/keyboards/torn/info.json +++ b/keyboards/torn/info.json @@ -8,6 +8,13 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "B2", "pin_b": "B1"} + ] + }, + "processor": "atmega328p", + "bootloader": "usbasploader", "layouts": { "LAYOUT_split_3x6_4": { "layout": [ diff --git a/keyboards/torn/keymaps/kinesish/config.h b/keyboards/torn/keymaps/kinesish/config.h index 734512e6cd..5c4de67989 100644 --- a/keyboards/torn/keymaps/kinesish/config.h +++ b/keyboards/torn/keymaps/kinesish/config.h @@ -17,5 +17,5 @@ #pragma once #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY +#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY #define PERMISSIVE_HOLD_PER_KEY diff --git a/keyboards/torn/keymaps/kinesish/keymap.c b/keyboards/torn/keymaps/kinesish/keymap.c index 13f3304068..9ddbac3601 100644 --- a/keyboards/torn/keymaps/kinesish/keymap.c +++ b/keyboards/torn/keymaps/kinesish/keymap.c @@ -133,18 +133,18 @@ layer_state_t layer_state_set_user(layer_state_t state) { } /* - * Enable `IGNORE_MOD_TAP_INTERRUPT` for all modifiers except `Shift`. - * For more info see `IGNORE_MOD_TAP_INTERRUPT_PER_KEY` in `docs/tap_hold.md`. + * Enable `HOLD_ON_OTHER_KEY_PRESS` only for `Shift`. + * For more info see `HOLD_ON_OTHER_KEY_PRESS_PER_KEY` in `docs/tap_hold.md`. */ -bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { +bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case S_EQL: - return false; + return true; case S_MINS: - return false; - default: return true; + default: + return false; } } diff --git a/keyboards/torn/rules.mk b/keyboards/torn/rules.mk index 280eaf8da5..7d7b301589 100644 --- a/keyboards/torn/rules.mk +++ b/keyboards/torn/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega328p - -# Bootloader selection -BOOTLOADER = usbasploader - # Build Options # change yes to no to disable # |