diff options
| author | QMK Bot <[email protected]> | 2021-07-07 01:28:42 +0000 | 
|---|---|---|
| committer | QMK Bot <[email protected]> | 2021-07-07 01:28:42 +0000 | 
| commit | 90af59ea9d8f178d367baf669870ea65b4c87a4d (patch) | |
| tree | 81718841219f9d225a2e57057629fdfc50f4ef1e | |
| parent | dd0df14d890e986c043ab749a51d8e1bdd64c25c (diff) | |
| parent | 72540f7d837550d2c54f4069b11b1e5d9fcf374c (diff) | |
| download | qmk_firmware-90af59ea9d8f178d367baf669870ea65b4c87a4d.tar.gz qmk_firmware-90af59ea9d8f178d367baf669870ea65b4c87a4d.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/xelus/ninjin/info.json | 107 | ||||
| -rw-r--r-- | keyboards/xelus/ninjin/keymaps/default/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/xelus/ninjin/keymaps/via/keymap.c | 6 | ||||
| -rw-r--r-- | keyboards/xelus/ninjin/ninjin.h | 2 | 
4 files changed, 113 insertions, 6 deletions
| diff --git a/keyboards/xelus/ninjin/info.json b/keyboards/xelus/ninjin/info.json new file mode 100644 index 0000000000..e5216e12f9 --- /dev/null +++ b/keyboards/xelus/ninjin/info.json @@ -0,0 +1,107 @@ +{ +    "keyboard_name": "Ninjin", +    "url": "", +    "maintainer": "Xelus", +    "width": 18.25, +    "height": 6.25, +    "layout_aliases": { +        "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan" +    }, +    "layouts": { +        "LAYOUT_tkl_ansi_tsangan": { +            "layout": [ +                {"x":0, "y":0}, +                {"x":2, "y":0}, +                {"x":3, "y":0}, +                {"x":4, "y":0}, +                {"x":5, "y":0}, +                {"x":6.5, "y":0}, +                {"x":7.5, "y":0}, +                {"x":8.5, "y":0}, +                {"x":9.5, "y":0}, +                {"x":11, "y":0}, +                {"x":12, "y":0}, +                {"x":13, "y":0}, +                {"x":14, "y":0}, +                {"x":15.25, "y":0}, +                {"x":16.25, "y":0}, +                {"x":17.25, "y":0}, + +                {"x":0, "y":1.25}, +                {"x":1, "y":1.25}, +                {"x":2, "y":1.25}, +                {"x":3, "y":1.25}, +                {"x":4, "y":1.25}, +                {"x":5, "y":1.25}, +                {"x":6, "y":1.25}, +                {"x":7, "y":1.25}, +                {"x":8, "y":1.25}, +                {"x":9, "y":1.25}, +                {"x":10, "y":1.25}, +                {"x":11, "y":1.25}, +                {"x":12, "y":1.25}, +                {"x":13, "y":1.25, "w":2}, +                {"x":15.25, "y":1.25}, +                {"x":16.25, "y":1.25}, +                {"x":17.25, "y":1.25}, + +                {"x":0, "y":2.25, "w":1.5}, +                {"x":1.5, "y":2.25}, +                {"x":2.5, "y":2.25}, +                {"x":3.5, "y":2.25}, +                {"x":4.5, "y":2.25}, +                {"x":5.5, "y":2.25}, +                {"x":6.5, "y":2.25}, +                {"x":7.5, "y":2.25}, +                {"x":8.5, "y":2.25}, +                {"x":9.5, "y":2.25}, +                {"x":10.5, "y":2.25}, +                {"x":11.5, "y":2.25}, +                {"x":12.5, "y":2.25}, +                {"x":13.5, "y":2.25, "w":1.5}, +                {"x":15.25, "y":2.25}, +                {"x":16.25, "y":2.25}, +                {"x":17.25, "y":2.25}, + +                {"x":0, "y":3.25, "w":1.75}, +                {"x":1.75, "y":3.25}, +                {"x":2.75, "y":3.25}, +                {"x":3.75, "y":3.25}, +                {"x":4.75, "y":3.25}, +                {"x":5.75, "y":3.25}, +                {"x":6.75, "y":3.25}, +                {"x":7.75, "y":3.25}, +                {"x":8.75, "y":3.25}, +                {"x":9.75, "y":3.25}, +                {"x":10.75, "y":3.25}, +                {"x":11.75, "y":3.25}, +                {"x":12.75, "y":3.25, "w":2.25}, + +                {"x":0, "y":4.25, "w":2.25}, +                {"x":2.25, "y":4.25}, +                {"x":3.25, "y":4.25}, +                {"x":4.25, "y":4.25}, +                {"x":5.25, "y":4.25}, +                {"x":6.25, "y":4.25}, +                {"x":7.25, "y":4.25}, +                {"x":8.25, "y":4.25}, +                {"x":9.25, "y":4.25}, +                {"x":10.25, "y":4.25}, +                {"x":11.25, "y":4.25}, +                {"x":12.25, "y":4.25, "w":2.75}, +                {"x":16.25, "y":4.25}, + +                {"x":0, "y":5.25, "w":1.5}, +                {"x":1.5, "y":5.25}, +                {"x":2.5, "y":5.25, "w":1.5}, +                {"x":4, "y":5.25, "w":7}, +                {"x":11, "y":5.25, "w":1.5}, +                {"x":12.5, "y":5.25}, +                {"x":13.5, "y":5.25, "w":1.5}, +                {"x":15.25, "y":5.25}, +                {"x":16.25, "y":5.25}, +                {"x":17.25, "y":5.25} +            ] +        } +    } +} diff --git a/keyboards/xelus/ninjin/keymaps/default/keymap.c b/keyboards/xelus/ninjin/keymaps/default/keymap.c index 9a3f4896ed..2bc991e42c 100644 --- a/keyboards/xelus/ninjin/keymaps/default/keymap.c +++ b/keyboards/xelus/ninjin/keymaps/default/keymap.c @@ -17,7 +17,7 @@  #include QMK_KEYBOARD_H  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -	  [0] = LAYOUT_all( +	  [0] = LAYOUT_tkl_ansi_tsangan(  	    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,  	    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,  	    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN, @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  	    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                      KC_UP,  	    KC_LCTL, KC_LWIN, KC_LALT,                   KC_SPC,                                      KC_RALT,          MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT), -	  [1] = LAYOUT_all( +	  [1] = LAYOUT_tkl_ansi_tsangan(  	    RESET,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  	    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  	    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/xelus/ninjin/keymaps/via/keymap.c b/keyboards/xelus/ninjin/keymaps/via/keymap.c index 4422a59958..0af46375c4 100644 --- a/keyboards/xelus/ninjin/keymaps/via/keymap.c +++ b/keyboards/xelus/ninjin/keymaps/via/keymap.c @@ -17,7 +17,7 @@  #include QMK_KEYBOARD_H  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -	  [0] = LAYOUT_all( +	  [0] = LAYOUT_tkl_ansi_tsangan(  	    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,  	    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,    KC_INS,  KC_HOME, KC_PGUP,  	    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN, @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  	    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,                      KC_UP,  	    KC_LCTL, KC_LWIN, KC_LALT,                   KC_SPC,                                      KC_RALT,          MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT), -	  [1] = LAYOUT_all( +	  [1] = LAYOUT_tkl_ansi_tsangan(  	    RESET,            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  	    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  	    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  	    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,                      KC_TRNS,  	    KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS), -	  [2] = LAYOUT_all( +	  [2] = LAYOUT_tkl_ansi_tsangan(  	    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  	    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS,  	    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/xelus/ninjin/ninjin.h b/keyboards/xelus/ninjin/ninjin.h index 40a01ea5aa..f43c028286 100644 --- a/keyboards/xelus/ninjin/ninjin.h +++ b/keyboards/xelus/ninjin/ninjin.h @@ -20,7 +20,7 @@  #define ____ KC_NO -#define LAYOUT_all( \ +#define LAYOUT_tkl_ansi_tsangan( \      K000,       K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,    K014, K015, K016, \      K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,    K114, K115, K116, \      K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,    K214, K215, K216, \ | 
