diff options
Diffstat (limited to 'keyboards/kinesis')
| -rw-r--r-- | keyboards/kinesis/alvicstep/config.h | 2 | ||||
| -rw-r--r-- | keyboards/kinesis/keymaps/insertsnideremarks/keymap.c | 38 | ||||
| -rw-r--r-- | keyboards/kinesis/keymaps/tuesdayjohn/keymap.c | 40 | ||||
| -rw-r--r-- | keyboards/kinesis/keymaps/tw1t611/keymap.c | 12 | ||||
| -rw-r--r-- | keyboards/kinesis/kinesis.h | 3 | ||||
| -rw-r--r-- | keyboards/kinesis/kint36/config.h | 2 | ||||
| -rw-r--r-- | keyboards/kinesis/kint41/chconf.h | 33 | ||||
| -rw-r--r-- | keyboards/kinesis/kint41/config.h | 105 | ||||
| -rw-r--r-- | keyboards/kinesis/kint41/kint41.c | 52 | ||||
| -rw-r--r-- | keyboards/kinesis/kint41/kint41.h | 92 | ||||
| -rw-r--r-- | keyboards/kinesis/kint41/mcuconf.h | 22 | ||||
| -rw-r--r-- | keyboards/kinesis/kint41/readme.md | 3 | ||||
| -rw-r--r-- | keyboards/kinesis/kint41/rules.mk | 12 | ||||
| -rw-r--r-- | keyboards/kinesis/nguyenvietyen/config.h | 2 | 
14 files changed, 371 insertions, 47 deletions
| diff --git a/keyboards/kinesis/alvicstep/config.h b/keyboards/kinesis/alvicstep/config.h index 73aa4dd4dc..02c7725cec 100644 --- a/keyboards/kinesis/alvicstep/config.h +++ b/keyboards/kinesis/alvicstep/config.h @@ -23,7 +23,7 @@   *  */  //Passed through the port multipler, so 4 pins =16 -#define MATRIX_ROW_PINS { F0,F1, F2, F3  } +#define MATRIX_ROW_PINS { F0, F1, F2, F3, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }  // May be upside down.   #define MATRIX_COL_PINS { B0,B1, B2, B3, B4, B5, B6, B7 } diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c index 10b0c2cb73..183b1c4303 100644 --- a/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c +++ b/keyboards/kinesis/keymaps/insertsnideremarks/keymap.c @@ -1,4 +1,4 @@ -#include QMK_KEYBOARD_H  +#include QMK_KEYBOARD_H  extern keymap_config_t keymap_config; @@ -61,7 +61,7 @@ void dance_LAYER_reset(qk_tap_dance_state_t *state, void *user_data) {  }  qk_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  +[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  [EQPL]   = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_PLUS),   // Plus sign on a single-tap, equal sign on a double-tap @@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  	                  | Space | Enter |App/Alt|                   |  RGUI | Delete|  Bspc |  	                  |   /   |   /   |-------|                   |-------|   /   |   /   |  	                  |  Fn   | Number|  Bspc |                   | Enter |Number2|  Fn2  | -	                  `-----------------------'                   `-----------------------'  +	                  `-----------------------'                   `-----------------------'  */  [_COLEMAK] = LAYOUT_pretty(    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST, @@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  	                  | Space | Enter |App/Alt|                   |  RGUI | Delete|  Bspc |  	                  |   /   |   /   |-------|                   |-------|   /   |   /   |  	                  |  Fn   | Number|  Bspc |                   | Enter |Number2|  Fn2  | -	                  `-----------------------'                   `-----------------------'  +	                  `-----------------------'                   `-----------------------'  */  [_QWERTY] = LAYOUT_pretty(    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST, @@ -169,15 +169,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  	                  |       |       |       |                   |       |       |       |  	                  |       |       |-------|                   |-------|       |       |  	                  |       |       |       |                   |       |       |       | -	                  `-----------------------'                   `-----------------------'  +	                  `-----------------------'                   `-----------------------'  */  [_NUMBERS] = LAYOUT_pretty(    _______, _______, _______, _______,  _______,  _______,  _______, _______, _______, _______, _______, _______, _______,  _______,  _______,  _______, _______, _______,    KC_F12,  KC_F1,   KC_F2,   KC_F3,    KC_F4,    KC_F5,                                                          KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  KC_F11, -  _______, KC_6,    KC_7,    KC_8,     KC_9,     KC_0,                                                           KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN, KC_RPRN, _______,  -  _______, KC_1,    KC_2,    KC_3,     KC_4,     KC_5,                                                           KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,  KC_PERC, _______,  +  _______, KC_6,    KC_7,    KC_8,     KC_9,     KC_0,                                                           KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN, KC_RPRN, _______, +  _______, KC_1,    KC_2,    KC_3,     KC_4,     KC_5,                                                           KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,  KC_PERC, _______,    _______, _______, KC_DOT,  TD(SLAS), TD(MNUN), TD(PLEQ),                                                       TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______, -           KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB),                                                                           _______,  _______,  _______, _______,  +           KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB),                                                                           _______,  _______,  _______, _______,                                                             _______, _______,                   _______, _______,                                                                      _______,                   _______,                                                   _______,  _______, _______,                   _______, _______, _______ @@ -186,10 +186,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  [_NUMBERS2] = LAYOUT_pretty(    _______, _______, _______, _______,  _______,  _______,  _______, _______, _______, _______, _______, _______, _______,  _______,  _______,  _______, _______, _______,    KC_F12,  KC_F1,   KC_F2,   KC_F3,    KC_F4,    KC_F5,                                                          KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,  KC_F11, -  _______, KC_6,    KC_7,    KC_8,     KC_9,     KC_0,                                                           KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN, KC_RPRN, _______,  -  _______, KC_1,    KC_2,    KC_3,     KC_4,     KC_5,                                                           KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,  KC_PERC, _______,  +  _______, KC_6,    KC_7,    KC_8,     KC_9,     KC_0,                                                           KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN, KC_RPRN, _______, +  _______, KC_1,    KC_2,    KC_3,     KC_4,     KC_5,                                                           KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,  KC_PERC, _______,    _______, _______, KC_DOT,  TD(SLAS), TD(MNUN), TD(PLEQ),                                                       TD(GVTL), TD(LBCB), TD(RBCB), _______, _______, _______, -           KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB),                                                                           _______,  _______,  _______, _______,  +           KC_LPRN, KC_RPRN, TD(LBCB), TD(RBCB),                                                                           _______,  _______,  _______, _______,                                                             _______, _______,                   _______, _______,                                                                      _______,                   _______,                                                   _______,  _______, _______,                   _______, _______, _______ @@ -216,7 +216,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  	                  |       |       |       |                   |       |       |       |  	                  |       |       |-------|                   |-------|       |       |  	                  |       |       |       |                   |       |       |       | -	                  `-----------------------'                   `-----------------------'  +	                  `-----------------------'                   `-----------------------'  */  [_FUNCTION] = LAYOUT_pretty(    _______, _______,    _______,    _______,    _______,    _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, @@ -264,7 +264,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  	                  |       |       |       |                   |       |       |       |  	                  |       |       |-------|                   |-------|       |       |  	                  |       |       |       |                   |       |       |       | -	                  `-----------------------'                   `-----------------------'  +	                  `-----------------------'                   `-----------------------'  */  [_NUMPAD] = LAYOUT_pretty(    _______, _______, _______, _______,    _______,   _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -300,7 +300,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  	                  |       |       |  LAlt |                   |  RGUI | Delete|  Bspc |  	                  | Space | Enter |-------|                   |-------|   /   |   /   |  	                  |       |       |  Bspc |                   | Ent/NS|Number2|  Fn2  | -	                  `-----------------------'                   `-----------------------'  +	                  `-----------------------'                   `-----------------------'  */  [_COLEMAKGM] = LAYOUT_pretty(    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST, @@ -336,7 +336,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  	                  |       |       |  LAlt |                   |  RGUI | Delete|  Bspc |  	                  | Space | Enter |-------|                   |-------|   /   |   /   |  	                  |       |       |  Bspc |                   | Ent/NS|Number2|  Fn2  | -	                  `-----------------------'                   `-----------------------'  +	                  `-----------------------'                   `-----------------------'  */  [_QWERTYGM] = LAYOUT_pretty(    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST, @@ -372,7 +372,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  	                  |       |       |       |                   |       |       |       |  	                  |       |       |-------|                   |-------|       |       |  	                  |       |       |       |                   |       |       |       | -	                  `-----------------------'                   `-----------------------'   +	                  `-----------------------'                   `-----------------------'  */  [_ADJUST] = LAYOUT_pretty(    _______, _______, _______, _______, _______,   _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -380,7 +380,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    _______, _______, _______, _______, _______,   _______,                                                         _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______,   _______,                                                         _______, NKROTG,  _______, _______, _______, _______,    _______, _______, _______, _______, _______,   _______,                                                         _______, _______, _______, _______, _______, _______, -           _______, _______, _______, _______,                                                                             _______, _______, _______, _______,  +           _______, _______, _______, _______,                                                                             _______, _______, _______, _______,                                                             _______, _______,                    _______, _______,                                                                      _______,                    _______,                                                   _______,  _______, _______,                    _______, _______, _______ @@ -392,7 +392,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    _______, _______, _______, _______, _______,   _______,                                                         _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______,   _______,                                                         _______, NKROTG,  _______, _______, _______, _______,    _______, _______, _______, _______, _______,   _______,                                                         _______, _______, _______, _______, _______, _______, -           _______, _______, _______, _______,                                                                             _______, _______, _______, _______,  +           _______, _______, _______, _______,                                                                             _______, _______, _______, _______,                                                             _______, _______,                    _______, _______,                                                                      _______,                    _______,                                                   _______,  _______, _______,                    _______, _______, _______ @@ -400,7 +400,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  }; -uint32_t layer_state_set_user(uint32_t state) { +layer_state_t layer_state_set_user(layer_state_t state) {    return update_tri_layer_state(state, _NUMBERS, _NUMBERS2, _ADJUST);  } diff --git a/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c b/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c index 0cdb7d584d..2e844f19b1 100644 --- a/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c +++ b/keyboards/kinesis/keymaps/tuesdayjohn/keymap.c @@ -1,4 +1,4 @@ -#include QMK_KEYBOARD_H  +#include QMK_KEYBOARD_H  extern keymap_config_t keymap_config; @@ -20,7 +20,7 @@ enum kinesis_keycodes {    QWERTY,    GAMING  }; -     +  //Tap Dance Declarations  enum {    ADJ = 0, @@ -50,7 +50,7 @@ void dance_LAYER_reset(qk_tap_dance_state_t *state, void *user_data) {  }  qk_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  +[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  [EQPL] = ACTION_TAP_DANCE_DOUBLE(KC_EQL, KC_PLUS),   // Plus sign on a single-tap, equal sign on a double-tap @@ -117,7 +117,7 @@ Colemak  	                                          |  Space |  Enter | App/Alt|                 |  RGUI  | Delete |  Bspc  |  	                                          |    /   |    /   |--------|                 |--------|    /   |    /   |  	                                          |   Fn   | Number |  Bspc  |                 |  Enter | Number2|   Fn2  | -	                                          `--------------------------'                 `--------------------------'  +	                                          `--------------------------'                 `--------------------------'  */  [_COLEMAK] = LAYOUT_pretty(    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST, @@ -154,7 +154,7 @@ QWERTY  	                                          |  Space |  Enter | App/Alt|                 |  RGUI  | Delete |  Bspc  |  	                                          |    /   |    /   |--------|                 |--------|    /   |    /   |  	                                          |   Fn   | Number |  Bspc  |                 |  Enter | Number2|   Fn2  | -	                                          `--------------------------'                 `--------------------------'  +	                                          `--------------------------'                 `--------------------------'  */  [_QWERTY] = LAYOUT_pretty(    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, NUMPAD,  ADJUST, @@ -168,7 +168,7 @@ QWERTY                                                 SPCFN,   ENTNS,   KC_BSPC,                   KC_ENT,  DELNS,   BSPCFN  ), -/*  +/*  Numbers/Symbols layer  (Multiple characters: single-tap for first, double-tap for second)  ,--------------------------------------------------------------.                                     ,--------------------------------------------------------------. @@ -191,15 +191,15 @@ Numbers/Symbols layer  	                                          |        |        |        |                 |        |        |        |  	                                          |        |        |--------|                 |--------|        |        |  	                                          |        |        |        |                 |        |        |        | -	                                          `--------------------------'                 `--------------------------'  +	                                          `--------------------------'                 `--------------------------'  */  [_NUMBERS] = LAYOUT_pretty(    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                                         KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, -  _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,                                                          KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,  -  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,  +  _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,                                                          KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, +  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,    _______, _______, KC_DOT,  TD_SLAS, TD_MNUN, TD_PLEQ,                                                       TD_GVTL, TD_LBCB, TD_RBCB, _______, _______, _______, -           KC_LPRN, KC_RPRN, TD_LBCB, TD_RBCB,                                                                         _______, _______, _______, _______,  +           KC_LPRN, KC_RPRN, TD_LBCB, TD_RBCB,                                                                         _______, _______, _______, _______,                                                          _______, _______,                   _______, _______,                                                                   _______,                   _______,                                                 _______, _______, _______,                   _______, _______, _______ @@ -208,10 +208,10 @@ Numbers/Symbols layer  [_NUMBERS2] = LAYOUT_pretty(    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                                                         KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, -  _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,                                                          KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,  -  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,  +  _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,                                                          KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, +  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                          KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______,    _______, _______, KC_DOT,  TD_SLAS, TD_MNUN, TD_PLEQ,                                                       TD_GVTL, TD_LBCB, TD_RBCB, _______, _______, _______, -           KC_LPRN, KC_RPRN, TD_LBCB, TD_RBCB,                                                                         _______, _______, _______, _______,  +           KC_LPRN, KC_RPRN, TD_LBCB, TD_RBCB,                                                                         _______, _______, _______, _______,                                                          _______, _______,                   _______, _______,                                                                   _______,                   _______,                                                 _______, _______, _______,                   _______, _______, _______ @@ -239,7 +239,7 @@ Function layer  	                                          |        |        |        |                 |        |        |        |  	                                          |        |        |--------|                 |--------|        |        |  	                                          |        |        |        |                 |        |        |        | -	                                          `--------------------------'                 `--------------------------'  +	                                          `--------------------------'                 `--------------------------'  */  [_FUNCTION] = LAYOUT_pretty(    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -288,7 +288,7 @@ Numpad layer  	                                          |        |        |        |                 |        |        |        |  	                                          |        |        |--------|                 |--------|        |        |  	                                          |        |        |        |                 |        |        |        | -	                                          `--------------------------'                 `--------------------------'  +	                                          `--------------------------'                 `--------------------------'  */  [_NUMPAD] = LAYOUT_pretty(    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -325,7 +325,7 @@ Gaming  	                                          |        |        |  LAlt  |                 |  RGUI  | Delete |  Bspc  |  	                                          |  Space |  Enter |--------|                 |--------|    /   |    /   |  	                                          |        |        |  Bspc  |                 |Enter/NS| Number2|   Fn2  | -	                                          `--------------------------'                 `--------------------------'  +	                                          `--------------------------'                 `--------------------------'  */  [_GAMING] = LAYOUT_pretty(    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -362,7 +362,7 @@ Adjust layer  	                                          |        |        |        |                 |        |        |        |  	                                          |        |        |--------|                 |--------|        |        |  	                                          |        |        |        |                 |        |        |        | -	                                          `--------------------------'                 `--------------------------'  +	                                          `--------------------------'                 `--------------------------'  */  [_ADJUST] = LAYOUT_pretty(    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -370,7 +370,7 @@ Adjust layer    _______, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______,                                                       _______, NKROTG,  _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, _______, -           _______, _______, _______, _______,                                                                         _______, _______, _______, _______,  +           _______, _______, _______, _______,                                                                         _______, _______, _______, _______,                                                          _______, _______,                   _______, _______,                                                                   _______,                   _______,                                                 _______, _______, _______,                   _______, _______, _______ @@ -382,7 +382,7 @@ Adjust layer    _______, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______,                                                       _______, NKROTG,  _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______,                                                       _______, _______, _______, _______, _______, _______, -           _______, _______, _______, _______,                                                                         _______, _______, _______, _______,  +           _______, _______, _______, _______,                                                                         _______, _______, _______, _______,                                                          _______, _______,                   _______, _______,                                                                   _______,                   _______,                                                 _______, _______, _______,                   _______, _______, _______ @@ -390,7 +390,7 @@ Adjust layer  }; -uint32_t layer_state_set_user(uint32_t state) { +layer_state_t layer_state_set_user(layer_state_t state) {    return update_tri_layer_state(state, _NUMBERS, _NUMBERS2, _ADJUST);  } diff --git a/keyboards/kinesis/keymaps/tw1t611/keymap.c b/keyboards/kinesis/keymaps/tw1t611/keymap.c index afeaf77114..c94f06bbb9 100644 --- a/keyboards/kinesis/keymaps/tw1t611/keymap.c +++ b/keyboards/kinesis/keymaps/tw1t611/keymap.c @@ -17,9 +17,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {                     KC_SPC ,KC_LSFT,KC_BSPC ,             KC_F9  ,KC_F10 ,KC_F11 ,KC_F12 ,KC_PSCR,KC_SLCK,KC_PAUS,KC_FN0 ,RESET,             KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,DE_SS  , -           KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,DE_AE  , -           KC_H   ,KC_J   ,KC_K   ,KC_L   ,DE_SLSH,DE_OE  , -           KC_N   ,KC_M   ,DE_COMM,DE_DOT ,DE_MINS,DE_UE  , +           KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,DE_ADIA, +           KC_H   ,KC_J   ,KC_K   ,KC_L   ,DE_SLSH,DE_ODIA, +           KC_N   ,KC_M   ,DE_COMM,DE_DOT ,DE_MINS,DE_UDIA,             _______,_______,_______,_______,                     KC_LGUI,KC_LCTL,                     KC_END , @@ -28,9 +28,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  [MOD] = LAYOUT(             _______,_______,_______,_______,_______,_______,_______,_______,_______,             _______,_______,_______,_______,_______,_______, -           DE_CIRC,DE_QUOT,DE_DQOT,DE_LCBR,DE_RCBR,DE_GRV , +           DE_CIRC,DE_QUOT,DE_DQUO,DE_LCBR,DE_RCBR,DE_GRV ,             DE_TILD,DE_EXLM,DE_DLR ,DE_LPRN,DE_RPRN,DE_AMPR, -           DE_BSLS,DE_HASH,DE_LESS,DE_LBRC,DE_RBRC,DE_MORE, +           DE_BSLS,DE_HASH,DE_LABK,DE_LBRC,DE_RBRC,DE_RABK,             _______,_______,_______,_______,                     _______,_______,                     _______, @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {             _______,_______,_______,_______,_______,_______,_______,_______,_______,             _______,_______,_______,_______,_______,_______,             KC_HOME,KC_PGDN,KC_PGUP,KC_END ,DE_EQL ,DE_PERC, -           KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,DE_QST ,DE_ASTR, +           KC_LEFT,KC_DOWN,KC_UP  ,KC_RGHT,DE_QUES,DE_ASTR,             DE_AT  ,DE_EURO,DE_SCLN,DE_COLN,DE_UNDS,DE_PLUS,             _______,_______,_______,_______,                     _______,_______, diff --git a/keyboards/kinesis/kinesis.h b/keyboards/kinesis/kinesis.h index 0833992b81..1635c34436 100644 --- a/keyboards/kinesis/kinesis.h +++ b/keyboards/kinesis/kinesis.h @@ -16,6 +16,9 @@  #ifdef KEYBOARD_kinesis_kint36  	#include "kint36.h"  #endif +#ifdef KEYBOARD_kinesis_kint41 +	#include "kint41.h" +#endif  #include "quantum.h" diff --git a/keyboards/kinesis/kint36/config.h b/keyboards/kinesis/kint36/config.h index 17a2b715f0..ab34daa7b8 100644 --- a/keyboards/kinesis/kint36/config.h +++ b/keyboards/kinesis/kint36/config.h @@ -68,3 +68,5 @@  #define LED_CAPS_LOCK_PIN C7  #define LED_SCROLL_LOCK_PIN A5  #define LED_COMPOSE_PIN E26 + +#define EEPROM_SIZE 4096 diff --git a/keyboards/kinesis/kint41/chconf.h b/keyboards/kinesis/kint41/chconf.h new file mode 100644 index 0000000000..0cd253b95d --- /dev/null +++ b/keyboards/kinesis/kint41/chconf.h @@ -0,0 +1,33 @@ +/* Copyright 2020 QMK + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program.  If not, see <http://www.gnu.org/licenses/>. + */ + +/* + * This file was auto-generated by: + *    `qmk chibios-confmigrate -i keyboards/kinesis/kint36/chconf.h -r platforms/chibios/common/configs/chconf.h` + */ + +#pragma once + +#define CH_CFG_ST_TIMEDELTA 0 + +#define CH_CFG_TIME_QUANTUM 20 + +// One tick (minimum sleep interval) will be 100 μs. This value cannot be +// increased arbitrarily: chSysTimerHandlerI() must be executed in less than one +// tick as per http://forum.chibios.org/viewtopic.php?t=3712#p27851 +#define CH_CFG_ST_FREQUENCY 10000 + +#include_next <chconf.h> diff --git a/keyboards/kinesis/kint41/config.h b/keyboards/kinesis/kint41/config.h new file mode 100644 index 0000000000..349d3ee364 --- /dev/null +++ b/keyboards/kinesis/kint41/config.h @@ -0,0 +1,105 @@ +/* Copyright 2020 QMK + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program.  If not, see <http://www.gnu.org/licenses/>. + */ + +#pragma once + +/* USB Device descriptor parameter */ +#undef VENDOR_ID +#define VENDOR_ID 0x1209 +#undef PRODUCT_ID +#define PRODUCT_ID 0x345C +#undef DEVICE_VER +#define DEVICE_VER 0x0001 +#undef MANUFACTURER +#define MANUFACTURER "https://github.com/stapelberg" +#undef PRODUCT +#define PRODUCT "kinT (kint41)" + +/* key matrix size */ +#define MATRIX_ROWS 15 +#define MATRIX_COLS 7 + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS               \ +    {                                 \ +        LINE_PIN8,      /* ROW_EQL */ \ +            LINE_PIN9,  /* ROW_1 */   \ +            LINE_PIN10, /* ROW_2 */   \ +            LINE_PIN11, /* ROW_3 */   \ +            LINE_PIN7,  /* ROW_4 */   \ +            LINE_PIN16, /* ROW_5 */   \ +            LINE_PIN5,  /* ROW_6 */   \ +            LINE_PIN3,  /* ROW_7 */   \ +            LINE_PIN4,  /* ROW_8 */   \ +            LINE_PIN1,  /* ROW_9 */   \ +            LINE_PIN0,  /* ROW_0 */   \ +            LINE_PIN2,  /* ROW_MIN */ \ +            LINE_PIN17, /* ROW_ESC */ \ +            LINE_PIN23, /* ROW_F1 */  \ +            LINE_PIN21 /* ROW_F2 */  \ +    } + +#define MATRIX_COL_PINS             \ +    {                               \ +        LINE_PIN18,     /* COL_0 */ \ +            LINE_PIN14, /* COL_1 */ \ +            LINE_PIN15, /* COL_2 */ \ +            LINE_PIN20, /* COL_3 */ \ +            LINE_PIN22, /* COL_4 */ \ +            LINE_PIN19, /* COL_5 */ \ +            LINE_PIN6   /* COL_6 */ \ +    } + +#define UNUSED_PINS + +/* 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 + +// Reduce input latency by lowering the USB polling interval +// from its 10ms default to the 125μs minimum that USB 2.x (High Speed) allows: +#define USB_POLLING_INTERVAL_MS 1 + +/* We use the i.MX RT1060 high-speed GPIOs (GPIO6-9) which are connected to the + * AHB bus (AHB_CLK_ROOT), which runs at the same speed as the ARM Core Clock, + * i.e. 600 MHz. See MIMXRT1062, page 949, 12.1 Chip-specific GPIO information. + * No additional delay is necessary. */ + +// in clock cycles +#define GPIO_INPUT_PIN_DELAY 0 + +#define LED_PIN_ON_STATE 0 +#define LED_NUM_LOCK_PIN LINE_PIN26 +#define LED_CAPS_LOCK_PIN LINE_PIN12 +#define LED_SCROLL_LOCK_PIN LINE_PIN25 +#define LED_COMPOSE_PIN LINE_PIN24 diff --git a/keyboards/kinesis/kint41/kint41.c b/keyboards/kinesis/kint41/kint41.c new file mode 100644 index 0000000000..ab6567d097 --- /dev/null +++ b/keyboards/kinesis/kint41/kint41.c @@ -0,0 +1,52 @@ +/* Copyright 2020 QMK + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program.  If not, see <http://www.gnu.org/licenses/>. + */ + +#include "kint41.h" + +void matrix_init_kb(void) { +    matrix_init_user(); + +// Turn on the Teensy 4.x Power LED: +#define LED_POWER LINE_PIN13 +    setPinOutput(LED_POWER); +    writePinHigh(LED_POWER); +} + +// delay_inline sleeps for |cycles| (e.g. sleeping for F_CPU will sleep 1s). +// delay_inline assumes the cycle counter has already been initialized and +// should not be modified, i.e. it is safe to call during keyboard matrix scan. +// +// ChibiOS enables the cycle counter in chcore_v7m.c: +// https://github.com/ChibiOS/ChibiOS/blob/b63023915c304092acb9f33bbab40f3ec07a7f0e/os/common/ports/ARMCMx/chcore_v7m.c#L263 +static void delay_inline(const uint32_t cycles) { +    const uint32_t start = DWT->CYCCNT; +    while ((DWT->CYCCNT - start) < cycles) { +        // busy-loop until time has passed +    } +} + +void matrix_output_unselect_delay(uint8_t line, bool key_pressed) { +    // Use the cycle counter to do precise timing in microseconds. The ChibiOS +    // thread sleep functions only allow sleep durations starting at 1 tick, which +    // is 100μs in our configuration. + +    // Empirically: e.g. 5μs is not enough, will result in keys that don’t work +    // and ghost key presses. 10μs seems to work well. + +    // 600 cycles at 0.6 cycles/ns == 1μs +    const uint32_t cycles_per_us = 600; +    delay_inline(10 * cycles_per_us); +} diff --git a/keyboards/kinesis/kint41/kint41.h b/keyboards/kinesis/kint41/kint41.h new file mode 100644 index 0000000000..d427a1c2d6 --- /dev/null +++ b/keyboards/kinesis/kint41/kint41.h @@ -0,0 +1,92 @@ +/* Copyright 2020 QMK + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program.  If not, see <http://www.gnu.org/licenses/>. + */ + +#pragma once + +#include "quantum.h" + +#define ___ KC_NO + +// This a shortcut to help you visually see your layout. +// The first section contains all of the arguments as on the physical keyboard +// The second converts the arguments into the 2-D scanned array + +#define LAYOUT(                                   \ +    kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2,  \ +    k00, k10, k20, k30, k40, k50,                 \ +    k01, k11, k21, k31, k41, k51,                 \ +    k02, k12, k22, k32, k42, k52,                 \ +    k03, k13, k23, k33, k43, k53,                 \ +         k14, k24, k34, k54,                      \ +                             k56, k55,            \ +                                  k35,            \ +                        k36, k46, k25,            \ +                                                  \ +    kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5,  \ +                   k60, k70, k80, k90, kA0, kB0,  \ +                   k61, k71, k81, k91, kA1, kB1,  \ +                   k62, k72, k82, k92, kA2, kB2,  \ +                   k63, k73, k83, k93, kA3, kB3,  \ +                        k64, k84, k94, kA4,       \ +              k96, k85,                           \ +              k86,                                \ +              k66, k75, k65                       \ +) {                                              \ +    { k00,  k01,  k02,  k03,  ___,  ___,  ___ }, \ +    { k10,  k11,  k12,  k13,  k14,  ___,  ___ }, \ +    { k20,  k21,  k22,  k23,  k24,  k25,  ___ }, \ +    { k30,  k31,  k32,  k33,  k34,  k35,  k36 }, \ +    { k40,  k41,  k42,  k43,  ___,  ___,  k46 }, \ +    { k50,  k51,  k52,  k53,  k54,  k55,  k56 }, \ +    { k60,  k61,  k62,  k63,  k64,  k65,  k66 }, \ +    { k70,  k71,  k72,  k73,  ___,  k75,  ___ }, \ +    { k80,  k81,  k82,  k83,  k84,  k85,  k86 }, \ +    { k90,  k91,  k92,  k93,  k94,  ___,  k96 }, \ +    { kA0,  kA1,  kA2,  kA3,  kA4,  ___,  ___ }, \ +    { kB0,  kB1,  kB2,  kB3,  ___,  ___,  ___ }, \ +    { kC0,  kC1,  kC2,  kC3,  kC4,  kC5,  ___ }, \ +    { kD0,  kD1,  kD2,  kD3,  kD4,  kD5,  ___ }, \ +    { kE0,  kE1,  kE2,  kE3,  kE4,  kE5,  ___ }, \ +} + +/*  ---------------- LEFT HAND -----------------   ---------------- RIGHT HAND ---------------- */ +#define LAYOUT_pretty(                                                                           \ +    kC0, kD0, kE0, kC1, kD1, kE1, kC2, kD2, kE2,   kC3, kD3, kE3, kC4, kD4, kE4, kC5, kE5, kD5,  \ +    k00, k10, k20, k30, k40, k50,                            k60, k70, k80, k90, kA0, kB0,       \ +    k01, k11, k21, k31, k41, k51,                            k61, k71, k81, k91, kA1, kB1,       \ +    k02, k12, k22, k32, k42, k52,                            k62, k72, k82, k92, kA2, kB2,       \ +    k03, k13, k23, k33, k43, k53,                            k63, k73, k83, k93, kA3, kB3,       \ +         k14, k24, k34, k54,                                      k64, k84, k94, kA4,            \ +                             k56, k55,                  k96, k85,                                \ +                                  k35,                  k86,                                     \ +                        k36, k46, k25,                  k66, k75, k65                            \ +) {                                              \ +    { k00,  k01,  k02,  k03,  ___,  ___,  ___ }, \ +    { k10,  k11,  k12,  k13,  k14,  ___,  ___ }, \ +    { k20,  k21,  k22,  k23,  k24,  k25,  ___ }, \ +    { k30,  k31,  k32,  k33,  k34,  k35,  k36 }, \ +    { k40,  k41,  k42,  k43,  ___,  ___,  k46 }, \ +    { k50,  k51,  k52,  k53,  k54,  k55,  k56 }, \ +    { k60,  k61,  k62,  k63,  k64,  k65,  k66 }, \ +    { k70,  k71,  k72,  k73,  ___,  k75,  ___ }, \ +    { k80,  k81,  k82,  k83,  k84,  k85,  k86 }, \ +    { k90,  k91,  k92,  k93,  k94,  ___,  k96 }, \ +    { kA0,  kA1,  kA2,  kA3,  kA4,  ___,  ___ }, \ +    { kB0,  kB1,  kB2,  kB3,  ___,  ___,  ___ }, \ +    { kC0,  kC1,  kC2,  kC3,  kC4,  kC5,  ___ }, \ +    { kD0,  kD1,  kD2,  kD3,  kD4,  kD5,  ___ }, \ +    { kE0,  kE1,  kE2,  kE3,  kE4,  kE5,  ___ }  \ +} diff --git a/keyboards/kinesis/kint41/mcuconf.h b/keyboards/kinesis/kint41/mcuconf.h new file mode 100644 index 0000000000..1ab5054ff3 --- /dev/null +++ b/keyboards/kinesis/kint41/mcuconf.h @@ -0,0 +1,22 @@ +/* +    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + +    Licensed under the Apache License, Version 2.0 (the "License"); +    you may not use this file except in compliance with the License. +    You may obtain a copy of the License at + +        http://www.apache.org/licenses/LICENSE-2.0 + +    Unless required by applicable law or agreed to in writing, software +    distributed under the License is distributed on an "AS IS" BASIS, +    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +    See the License for the specific language governing permissions and +    limitations under the License. +*/ + +#ifndef _MCUCONF_H_ +#define _MCUCONF_H_ + +#define MIMXRT1062_MCUCONF + +#endif /* _MCUCONF_H_ */ diff --git a/keyboards/kinesis/kint41/readme.md b/keyboards/kinesis/kint41/readme.md new file mode 100644 index 0000000000..90781dc97d --- /dev/null +++ b/keyboards/kinesis/kint41/readme.md @@ -0,0 +1,3 @@ +# kinesis_kint41 keyboard firmware + +Please see https://github.com/kinx-project/kint for details. diff --git a/keyboards/kinesis/kint41/rules.mk b/keyboards/kinesis/kint41/rules.mk new file mode 100644 index 0000000000..4d77da4271 --- /dev/null +++ b/keyboards/kinesis/kint41/rules.mk @@ -0,0 +1,12 @@ +MCU_FAMILY = MIMXRT1062 +MCU_SERIES = MIMXRT1062 +MCU_LDSCRIPT = MIMXRT1062 +MCU_STARTUP = MIMXRT1062 +BOARD = IC_TEENSY_4_1 +MCU  = cortex-m4 +ARMV = 7 + +# 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 diff --git a/keyboards/kinesis/nguyenvietyen/config.h b/keyboards/kinesis/nguyenvietyen/config.h index 52f4c8054b..f1b41e61bc 100644 --- a/keyboards/kinesis/nguyenvietyen/config.h +++ b/keyboards/kinesis/nguyenvietyen/config.h @@ -19,7 +19,7 @@   *   */  // Passed through the port multipler, so 4 pins =16 -#define MATRIX_ROW_PINS { D0, D1, D2, D3 } +#define MATRIX_ROW_PINS { D0, D1, D2, D3, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }  #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }  #define UNUSED_PINS | 
