diff options
Diffstat (limited to 'keyboards/kinesis')
22 files changed, 33 insertions, 90 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/config.h b/keyboards/kinesis/config.h index aa42ade2a7..52ea641d6e 100644 --- a/keyboards/kinesis/config.h +++ b/keyboards/kinesis/config.h @@ -26,36 +26,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MOUSEKEY_WHEEL_DELTA 1 #define MOUSEKEY_WHEEL_TIME_TO_MAX 1 -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not 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 */ #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/kinesis/keymaps/farmergreg/keymap.c b/keyboards/kinesis/keymaps/farmergreg/keymap.c index 393b7c074b..554f6f8f58 100644 --- a/keyboards/kinesis/keymaps/farmergreg/keymap.c +++ b/keyboards/kinesis/keymaps/farmergreg/keymap.c @@ -45,7 +45,7 @@ enum tap_dances { TD_CAPS, // ESC on tap, CAPS on double tap }; -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [TD_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS), }; diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c index 0888f3f8cd..04fa8d39bc 100644 --- a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c +++ b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c @@ -47,20 +47,20 @@ enum { PSLPAS }; -void dance_LAYER_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_LAYER_finished(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { layer_on(_ADJUST2); set_oneshot_layer(_ADJUST2, ONESHOT_START); } } -void dance_LAYER_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_LAYER_reset(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { layer_off(_ADJUST2); clear_oneshot_layer_state(ONESHOT_PRESSED); } } -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [ADJ] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_LAYER_finished, dance_LAYER_reset), // Double-tap to activate Adjust layer via oneshot layer [LBCB] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_LCBR), // Left bracket on a single-tap, left brace on a double-tap [RBCB] = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, KC_RCBR), // Right bracket on a single-tap, right brace on a double-tap diff --git a/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c b/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c index 5fdbbcd902..6a7a6cc68e 100644 --- a/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c +++ b/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c @@ -36,20 +36,20 @@ enum { PSPA }; -void dance_LAYER_finished(qk_tap_dance_state_t *state, void *user_data) { +void dance_LAYER_finished(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { layer_on(_ADJUST2); set_oneshot_layer(_ADJUST2, ONESHOT_START); } } -void dance_LAYER_reset(qk_tap_dance_state_t *state, void *user_data) { +void dance_LAYER_reset(tap_dance_state_t *state, void *user_data) { if (state->count == 2) { layer_off(_ADJUST2); clear_oneshot_layer_state(ONESHOT_PRESSED); } } -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { [ADJ] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, dance_LAYER_finished, dance_LAYER_reset), // Double-tap to activate Adjust layer via oneshot layer [LBCB] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_LCBR), // Left bracket on a single-tap, left brace on a double-tap [RBCB] = ACTION_TAP_DANCE_DOUBLE(KC_RBRC, KC_RCBR), // Right bracket on a single-tap, right brace on a double-tap diff --git a/keyboards/kinesis/kint2pp/config.h b/keyboards/kinesis/kint2pp/config.h index 4bbc59e44c..7dad99db7a 100644 --- a/keyboards/kinesis/kint2pp/config.h +++ b/keyboards/kinesis/kint2pp/config.h @@ -27,13 +27,6 @@ #define LED_COMPOSE_PIN C3 #define LED_PIN_ON_STATE 0 -/* Well-worn Cherry MX key switches can bounce for up to 20ms, despite the - * Cherry data sheet specifying 5ms. Because we use the sym_eager_pk debounce - * algorithm, this debounce latency only affects key releases (not key - * presses). */ -#undef DEBOUNCE -#define DEBOUNCE 20 - #define IGNORE_MOD_TAP_INTERRUPT // The Teensy 2++ consumes about 60 mA of current at its full speed of 16 MHz as diff --git a/keyboards/kinesis/kint2pp/info.json b/keyboards/kinesis/kint2pp/info.json index b44abddfdf..e31d3490a0 100644 --- a/keyboards/kinesis/kint2pp/info.json +++ b/keyboards/kinesis/kint2pp/info.json @@ -5,5 +5,8 @@ "vid": "0xFEED", "pid": "0x6060", "device_version": "0.0.2" - } + }, + "processor": "at90usb1286", + "bootloader": "halfkay", + "debounce": 20 } diff --git a/keyboards/kinesis/kint36/config.h b/keyboards/kinesis/kint36/config.h index 9b45484b55..76d3ff31ae 100644 --- a/keyboards/kinesis/kint36/config.h +++ b/keyboards/kinesis/kint36/config.h @@ -37,13 +37,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Well-worn Cherry MX key switches can bounce for up to 20ms, despite the - * Cherry data sheet specifying 5ms. Because we use the sym_eager_pk debounce - * algorithm, this debounce latency only affects key releases (not key - * presses). */ -#undef DEBOUNCE -#define DEBOUNCE 20 - #define IGNORE_MOD_TAP_INTERRUPT // The Teensy 3.6 consumes about 80 mA of current at its full speed of 180 MHz: diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/info.json index 2fbfcc5661..fca353504f 100644 --- a/keyboards/kinesis/kint36/info.json +++ b/keyboards/kinesis/kint36/info.json @@ -5,5 +5,8 @@ "vid": "0x1209", "pid": "0x345C", "device_version": "0.0.1" - } + }, + "processor": "MK66FX1M0", + "bootloader": "halfkay", + "debounce": 20 } diff --git a/keyboards/kinesis/kint36/rules.mk b/keyboards/kinesis/kint36/rules.mk index d495568dd3..7c48a98bfc 100644 --- a/keyboards/kinesis/kint36/rules.mk +++ b/keyboards/kinesis/kint36/rules.mk @@ -1,6 +1,3 @@ -# MCU name -MCU = MK66FX1M0 - # Debounce eagerly (report change immediately), keep per-key timers. We can use # this because the kinT does not have to deal with noise. DEBOUNCE_TYPE = sym_eager_pk diff --git a/keyboards/kinesis/kint41/config.h b/keyboards/kinesis/kint41/config.h index 6df789d631..7050eadd41 100644 --- a/keyboards/kinesis/kint41/config.h +++ b/keyboards/kinesis/kint41/config.h @@ -64,13 +64,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Well-worn Cherry MX key switches can bounce for up to 20ms, despite the - * Cherry data sheet specifying 5ms. Because we use the sym_eager_pk debounce - * algorithm, this debounce latency only affects key releases (not key - * presses). */ -#undef DEBOUNCE -#define DEBOUNCE 20 - #define IGNORE_MOD_TAP_INTERRUPT // The Teensy 4.1 consumes about 100 mA of current at its full speed of 600 MHz diff --git a/keyboards/kinesis/kint41/info.json b/keyboards/kinesis/kint41/info.json index 45481a5b84..70ee14bad3 100644 --- a/keyboards/kinesis/kint41/info.json +++ b/keyboards/kinesis/kint41/info.json @@ -5,5 +5,6 @@ "vid": "0x1209", "pid": "0x345C", "device_version": "0.0.1" - } + }, + "debounce": 20 } diff --git a/keyboards/kinesis/kint41/rules.mk b/keyboards/kinesis/kint41/rules.mk index 4b39b87be6..99c7c0f7d6 100644 --- a/keyboards/kinesis/kint41/rules.mk +++ b/keyboards/kinesis/kint41/rules.mk @@ -6,9 +6,10 @@ BOARD = IC_TEENSY_4_1 MCU = cortex-m4 ARMV = 7 +# Bootloader selection +BOOTLOADER = halfkay + # Debounce eagerly (report change immediately), keep per-key timers. We can use # this because the Cherry MX keyswitches on the Kinesis only produce noise while # pressed. DEBOUNCE_TYPE = sym_eager_pk - -FIRMWARE_FORMAT = hex diff --git a/keyboards/kinesis/kintlc/config.h b/keyboards/kinesis/kintlc/config.h index 4ee9f9ca6f..537cb399d8 100644 --- a/keyboards/kinesis/kintlc/config.h +++ b/keyboards/kinesis/kintlc/config.h @@ -64,13 +64,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* Well-worn Cherry MX key switches can bounce for up to 20ms, despite the - * Cherry data sheet specifying 5ms. Because we use the sym_eager_pk debounce - * algorithm, this debounce latency only affects key releases (not key - * presses). */ -#undef DEBOUNCE -#define DEBOUNCE 20 - #define IGNORE_MOD_TAP_INTERRUPT // The Teensy LC power consumption is unknown as per diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/info.json index 721ebbfe82..d05b01ec09 100644 --- a/keyboards/kinesis/kintlc/info.json +++ b/keyboards/kinesis/kintlc/info.json @@ -5,5 +5,8 @@ "vid": "0x1209", "pid": "0x345C", "device_version": "0.0.1" - } + }, + "processor": "MKL26Z64", + "bootloader": "halfkay", + "debounce": 20 } diff --git a/keyboards/kinesis/kintlc/rules.mk b/keyboards/kinesis/kintlc/rules.mk index bfc10748ab..a6a1eafbfc 100644 --- a/keyboards/kinesis/kintlc/rules.mk +++ b/keyboards/kinesis/kintlc/rules.mk @@ -1,5 +1,3 @@ -# MCU name -MCU = MKL26Z64 # This MCU is not in the main CHIBIOS repo but in the CHIBIOS_CONTRIB repo. USE_CHIBIOS_CONTRIB = yes diff --git a/keyboards/kinesis/nguyenvietyen/info.json b/keyboards/kinesis/nguyenvietyen/info.json index 4035bb8e11..7a48682684 100644 --- a/keyboards/kinesis/nguyenvietyen/info.json +++ b/keyboards/kinesis/nguyenvietyen/info.json @@ -5,5 +5,7 @@ "vid": "0xFEED", "pid": "0x6060", "device_version": "0.0.3" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/kinesis/nguyenvietyen/rules.mk b/keyboards/kinesis/nguyenvietyen/rules.mk index 65018bc3cc..3e0a265135 100644 --- a/keyboards/kinesis/nguyenvietyen/rules.mk +++ b/keyboards/kinesis/nguyenvietyen/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/kinesis/rules.mk b/keyboards/kinesis/rules.mk index 129e08635d..2090c50d47 100644 --- a/keyboards/kinesis/rules.mk +++ b/keyboards/kinesis/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = at90usb1286 - -# Bootloader selection -BOOTLOADER = halfkay - # Build Options # change yes to no to disable # diff --git a/keyboards/kinesis/stapelberg/config.h b/keyboards/kinesis/stapelberg/config.h index ccf6a20e7a..01108b8e89 100644 --- a/keyboards/kinesis/stapelberg/config.h +++ b/keyboards/kinesis/stapelberg/config.h @@ -1,7 +1,6 @@ #pragma once #include "../config.h" -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 15 @@ -29,9 +28,6 @@ #define LED_COMPOSE_PIN F0 #define LED_PIN_ON_STATE 0 -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* don't know if this should be defined at the board or top level. Assuming board #define MOUSEKEY_DELAY 100 #define MOUSEKEY_INTERVAL 20 diff --git a/keyboards/kinesis/stapelberg/info.json b/keyboards/kinesis/stapelberg/info.json index b44abddfdf..ba14567443 100644 --- a/keyboards/kinesis/stapelberg/info.json +++ b/keyboards/kinesis/stapelberg/info.json @@ -5,5 +5,7 @@ "vid": "0xFEED", "pid": "0x6060", "device_version": "0.0.2" - } + }, + "processor": "at90usb1286", + "bootloader": "halfkay" } |