diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2022-02-03 20:32:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-03 20:32:20 -0800 |
| commit | 1cb423c424363f758d0f988b3c7e7a4e16ced74b (patch) | |
| tree | 13de7368b18b6c9ebc9d397b8567483ede8201ed /keyboards/mokey | |
| parent | 3403f5813cc1daa29a2da0690341152abae3aa86 (diff) | |
| download | qmk_firmware-1cb423c424363f758d0f988b3c7e7a4e16ced74b.tar.gz qmk_firmware-1cb423c424363f758d0f988b3c7e7a4e16ced74b.zip | |
Mokey xox70hot: rename LAYOUT to LAYOUT_tkl_nofrow_ansi_tsangan (#16193)
Diffstat (limited to 'keyboards/mokey')
| -rw-r--r-- | keyboards/mokey/xox70hot/info.json | 15 | ||||
| -rw-r--r-- | keyboards/mokey/xox70hot/keymaps/default/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/mokey/xox70hot/keymaps/via/keymap.c | 8 | ||||
| -rw-r--r-- | keyboards/mokey/xox70hot/xox70hot.h | 2 |
4 files changed, 16 insertions, 13 deletions
diff --git a/keyboards/mokey/xox70hot/info.json b/keyboards/mokey/xox70hot/info.json index 08bcc556c..a1fc86924 100644 --- a/keyboards/mokey/xox70hot/info.json +++ b/keyboards/mokey/xox70hot/info.json | |||
| @@ -1,9 +1,12 @@ | |||
| 1 | { | 1 | { |
| 2 | "keyboard_name": "xox70hot", | 2 | "keyboard_name": "xox70hot", |
| 3 | "url": "", | 3 | "url": "", |
| 4 | "maintainer": "Mokey", | 4 | "maintainer": "rhmokey", |
| 5 | "layout_aliases": { | ||
| 6 | "LAYOUT": "LAYOUT_tkl_nofrow_ansi_tsangan" | ||
| 7 | }, | ||
| 5 | "layouts": { | 8 | "layouts": { |
| 6 | "LAYOUT": { | 9 | "LAYOUT_tkl_nofrow_ansi_tsangan": { |
| 7 | "layout": [ | 10 | "layout": [ |
| 8 | {"label":"k00", "x":0, "y":0}, | 11 | {"label":"k00", "x":0, "y":0}, |
| 9 | {"label":"k01", "x":1, "y":0}, | 12 | {"label":"k01", "x":1, "y":0}, |
| @@ -22,7 +25,7 @@ | |||
| 22 | {"label":"k0f", "x":15.25, "y":0}, | 25 | {"label":"k0f", "x":15.25, "y":0}, |
| 23 | {"label":"k0g", "x":16.25, "y":0}, | 26 | {"label":"k0g", "x":16.25, "y":0}, |
| 24 | {"label":"k0h", "x":17.25, "y":0}, | 27 | {"label":"k0h", "x":17.25, "y":0}, |
| 25 | 28 | ||
| 26 | {"label":"k10", "x":0, "y":1, "w":1.5}, | 29 | {"label":"k10", "x":0, "y":1, "w":1.5}, |
| 27 | {"label":"k12", "x":1.5, "y":1}, | 30 | {"label":"k12", "x":1.5, "y":1}, |
| 28 | {"label":"k13", "x":2.5, "y":1}, | 31 | {"label":"k13", "x":2.5, "y":1}, |
| @@ -40,7 +43,7 @@ | |||
| 40 | {"label":"k1f", "x":15.25, "y":1}, | 43 | {"label":"k1f", "x":15.25, "y":1}, |
| 41 | {"label":"k1g", "x":16.25, "y":1}, | 44 | {"label":"k1g", "x":16.25, "y":1}, |
| 42 | {"label":"k1h", "x":17.25, "y":1}, | 45 | {"label":"k1h", "x":17.25, "y":1}, |
| 43 | 46 | ||
| 44 | {"label":"k20", "x":0, "y":2, "w":1.75}, | 47 | {"label":"k20", "x":0, "y":2, "w":1.75}, |
| 45 | {"label":"k22", "x":1.75, "y":2}, | 48 | {"label":"k22", "x":1.75, "y":2}, |
| 46 | {"label":"k23", "x":2.75, "y":2}, | 49 | {"label":"k23", "x":2.75, "y":2}, |
| @@ -54,7 +57,7 @@ | |||
| 54 | {"label":"k2b", "x":10.75, "y":2}, | 57 | {"label":"k2b", "x":10.75, "y":2}, |
| 55 | {"label":"k2c", "x":11.75, "y":2}, | 58 | {"label":"k2c", "x":11.75, "y":2}, |
| 56 | {"label":"k2d", "x":12.75, "y":2, "w":2.25}, | 59 | {"label":"k2d", "x":12.75, "y":2, "w":2.25}, |
| 57 | 60 | ||
| 58 | {"label":"k30", "x":0, "y":3, "w":2.25}, | 61 | {"label":"k30", "x":0, "y":3, "w":2.25}, |
| 59 | {"label":"k32", "x":2.25, "y":3}, | 62 | {"label":"k32", "x":2.25, "y":3}, |
| 60 | {"label":"k33", "x":3.25, "y":3}, | 63 | {"label":"k33", "x":3.25, "y":3}, |
| @@ -82,4 +85,4 @@ | |||
| 82 | ] | 85 | ] |
| 83 | } | 86 | } |
| 84 | } | 87 | } |
| 85 | } \ No newline at end of file | 88 | } |
diff --git a/keyboards/mokey/xox70hot/keymaps/default/keymap.c b/keyboards/mokey/xox70hot/keymaps/default/keymap.c index 574639fee..e7955ce89 100644 --- a/keyboards/mokey/xox70hot/keymaps/default/keymap.c +++ b/keyboards/mokey/xox70hot/keymaps/default/keymap.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 20 | LAYOUT( | 20 | LAYOUT_tkl_nofrow_ansi_tsangan( |
| 21 | KC_GESC, 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_INSERT, KC_HOME, KC_PGUP, | 21 | KC_GESC, 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_INSERT, KC_HOME, KC_PGUP, |
| 22 | 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_DELETE, KC_END, KC_PGDOWN, | 22 | 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_DELETE, KC_END, KC_PGDOWN, |
| 23 | KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | 23 | KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 25 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_GRV, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT | 25 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_GRV, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT |
| 26 | ), | 26 | ), |
| 27 | 27 | ||
| 28 | LAYOUT( | 28 | LAYOUT_tkl_nofrow_ansi_tsangan( |
| 29 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, | 29 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, |
| 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
diff --git a/keyboards/mokey/xox70hot/keymaps/via/keymap.c b/keyboards/mokey/xox70hot/keymaps/via/keymap.c index 4af0d343a..53f66e521 100644 --- a/keyboards/mokey/xox70hot/keymaps/via/keymap.c +++ b/keyboards/mokey/xox70hot/keymaps/via/keymap.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 18 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 19 | 19 | ||
| 20 | LAYOUT( | 20 | LAYOUT_tkl_nofrow_ansi_tsangan( |
| 21 | KC_GESC, 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_INSERT, KC_HOME, KC_PGUP, | 21 | KC_GESC, 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_INSERT, KC_HOME, KC_PGUP, |
| 22 | 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_DELETE, KC_END, KC_PGDOWN, | 22 | 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_DELETE, KC_END, KC_PGDOWN, |
| 23 | KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | 23 | KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, |
| @@ -25,21 +25,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 25 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_GRV, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT | 25 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_GRV, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT |
| 26 | ), | 26 | ), |
| 27 | 27 | ||
| 28 | LAYOUT( | 28 | LAYOUT_tkl_nofrow_ansi_tsangan( |
| 29 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, | 29 | _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, |
| 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 32 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 32 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 33 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | 33 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 34 | ), | 34 | ), |
| 35 | LAYOUT( | 35 | LAYOUT_tkl_nofrow_ansi_tsangan( |
| 36 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 36 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 37 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 38 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 38 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 39 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 39 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 40 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | 40 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ |
| 41 | ), | 41 | ), |
| 42 | LAYOUT( | 42 | LAYOUT_tkl_nofrow_ansi_tsangan( |
| 43 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 43 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 44 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 44 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
| 45 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | 45 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, |
diff --git a/keyboards/mokey/xox70hot/xox70hot.h b/keyboards/mokey/xox70hot/xox70hot.h index e4ed4bff5..5e6f9665c 100644 --- a/keyboards/mokey/xox70hot/xox70hot.h +++ b/keyboards/mokey/xox70hot/xox70hot.h | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #define xxx KC_NO | 21 | #define xxx KC_NO |
| 22 | 22 | ||
| 23 | #define LAYOUT(\ | 23 | #define LAYOUT_tkl_nofrow_ansi_tsangan(\ |
| 24 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, k0f, k0g, k0h, \ | 24 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, k0f, k0g, k0h, \ |
| 25 | k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \ | 25 | k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \ |
| 26 | k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ | 26 | k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ |
