diff options
| -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 08bcc556c2..a1fc86924f 100644 --- a/keyboards/mokey/xox70hot/info.json +++ b/keyboards/mokey/xox70hot/info.json @@ -1,9 +1,12 @@  {      "keyboard_name": "xox70hot",      "url": "", -    "maintainer": "Mokey", +    "maintainer": "rhmokey", +    "layout_aliases": { +        "LAYOUT": "LAYOUT_tkl_nofrow_ansi_tsangan" +    },      "layouts": { -        "LAYOUT": { +        "LAYOUT_tkl_nofrow_ansi_tsangan": {              "layout": [                  {"label":"k00", "x":0, "y":0},                  {"label":"k01", "x":1, "y":0}, @@ -22,7 +25,7 @@                  {"label":"k0f", "x":15.25, "y":0},                  {"label":"k0g", "x":16.25, "y":0},                  {"label":"k0h", "x":17.25, "y":0}, -                 +                  {"label":"k10", "x":0, "y":1, "w":1.5},                  {"label":"k12", "x":1.5, "y":1},                  {"label":"k13", "x":2.5, "y":1}, @@ -40,7 +43,7 @@                  {"label":"k1f", "x":15.25, "y":1},                  {"label":"k1g", "x":16.25, "y":1},                  {"label":"k1h", "x":17.25, "y":1}, -                 +                  {"label":"k20", "x":0, "y":2, "w":1.75},                  {"label":"k22", "x":1.75, "y":2},                  {"label":"k23", "x":2.75, "y":2}, @@ -54,7 +57,7 @@                  {"label":"k2b", "x":10.75, "y":2},                  {"label":"k2c", "x":11.75, "y":2},                  {"label":"k2d", "x":12.75, "y":2, "w":2.25}, -                 +                  {"label":"k30", "x":0, "y":3, "w":2.25},                  {"label":"k32", "x":2.25, "y":3},                  {"label":"k33", "x":3.25, "y":3}, @@ -82,4 +85,4 @@              ]          }      } -}
\ No newline at end of file +} diff --git a/keyboards/mokey/xox70hot/keymaps/default/keymap.c b/keyboards/mokey/xox70hot/keymaps/default/keymap.c index 574639fee9..e7955ce89b 100644 --- a/keyboards/mokey/xox70hot/keymaps/default/keymap.c +++ b/keyboards/mokey/xox70hot/keymaps/default/keymap.c @@ -17,7 +17,7 @@  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -    LAYOUT( +    LAYOUT_tkl_nofrow_ansi_tsangan(          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,          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,          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] = {          KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_GRV,  KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT      ), -    LAYOUT( +    LAYOUT_tkl_nofrow_ansi_tsangan(          _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,   _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, diff --git a/keyboards/mokey/xox70hot/keymaps/via/keymap.c b/keyboards/mokey/xox70hot/keymaps/via/keymap.c index 4af0d343a8..53f66e5214 100644 --- a/keyboards/mokey/xox70hot/keymaps/via/keymap.c +++ b/keyboards/mokey/xox70hot/keymaps/via/keymap.c @@ -17,7 +17,7 @@  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -    LAYOUT( +    LAYOUT_tkl_nofrow_ansi_tsangan(          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,          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,          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] = {          KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_GRV,  KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT      ), -    LAYOUT( +    LAYOUT_tkl_nofrow_ansi_tsangan(          _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,   _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,          _______, _______, _______,                   _______,                            _______, _______, _______,                     _______, _______, _______      ), -    LAYOUT( +    LAYOUT_tkl_nofrow_ansi_tsangan(          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                              _______,          _______, _______, _______,                   _______,                            _______, _______, _______,                     _______, _______, _______      ), -    LAYOUT( +    LAYOUT_tkl_nofrow_ansi_tsangan(          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, diff --git a/keyboards/mokey/xox70hot/xox70hot.h b/keyboards/mokey/xox70hot/xox70hot.h index e4ed4bff5c..5e6f9665c8 100644 --- a/keyboards/mokey/xox70hot/xox70hot.h +++ b/keyboards/mokey/xox70hot/xox70hot.h @@ -20,7 +20,7 @@  #define xxx KC_NO -#define LAYOUT(\ +#define LAYOUT_tkl_nofrow_ansi_tsangan(\      k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, k0f, k0g, k0h, \      k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, k1h, \      k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ | 
