diff options
| -rw-r--r-- | keyboards/keyten/aperture/aperture.h | 20 | ||||
| -rw-r--r-- | keyboards/keyten/aperture/keymaps/default/keymap.c | 27 | ||||
| -rw-r--r-- | keyboards/keyten/aperture/keymaps/via/keymap.c | 55 | ||||
| -rw-r--r-- | keyboards/soda/cherish/cherish.h | 2 | ||||
| -rw-r--r-- | keyboards/soda/cherish/info.json | 157 | ||||
| -rwxr-xr-x | keyboards/soda/cherish/keymaps/default/keymap.c | 33 | ||||
| -rwxr-xr-x | keyboards/soda/cherish/keymaps/via/keymap.c | 33 | 
7 files changed, 174 insertions, 153 deletions
| diff --git a/keyboards/keyten/aperture/aperture.h b/keyboards/keyten/aperture/aperture.h index 09851fb4b2..3dd6081f7e 100644 --- a/keyboards/keyten/aperture/aperture.h +++ b/keyboards/keyten/aperture/aperture.h @@ -34,15 +34,15 @@   * └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘   */  #define LAYOUT_65_ansi_blocker_tsangan_split_bs( \ -	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ -	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ -	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ -	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3C, K3D, K3E, \ -	K40, K41, K42,                K46,                K4A,      K4C, K4D, K4E  \ +    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K0E, \ +    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ +    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, K2E, \ +    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3C, K3D, K3E, \ +    K40, K41, K42,                K46,                K4A,      K4C, K4D, K4E  \  ) { \ -	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ -	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ -	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ -	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, XXX, K3C, K3D, K3E }, \ -	{ K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, XXX, K4C, K4D, K4E }  \ +    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ +    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ +    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ +    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, XXX, K3C, K3D, K3E }, \ +    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, XXX, K4C, K4D, K4E }  \  } diff --git a/keyboards/keyten/aperture/keymaps/default/keymap.c b/keyboards/keyten/aperture/keymaps/default/keymap.c index f2cc99316d..174372aa94 100644 --- a/keyboards/keyten/aperture/keymaps/default/keymap.c +++ b/keyboards/keyten/aperture/keymaps/default/keymap.c @@ -18,17 +18,20 @@  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -	[0] = LAYOUT_65_ansi_blocker_tsangan_split_bs( -		KC_ESC,  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_BSLS, KC_HOME, -		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_BSPC, KC_PGUP, -		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,  KC_DEL,  KC_PGDN, -		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,   MO(1), -		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT), +    [0] = LAYOUT_65_ansi_blocker_tsangan_split_bs( +        KC_ESC,  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_BSLS, KC_DEL,  KC_HOME, +        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_BSPC, KC_PGUP, +        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,  KC_PGDN, +        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,   MO(1), +        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT +    ), + +    [1] = LAYOUT_65_ansi_blocker_tsangan_split_bs( +        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, +        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, +        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +        _______, _______, _______,                            _______,                            _______,          _______, _______, _______ +    ), -	[1] = LAYOUT_65_ansi_blocker_tsangan_split_bs( -		_______, 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/keyten/aperture/keymaps/via/keymap.c b/keyboards/keyten/aperture/keymaps/via/keymap.c index 187b664fc1..917ef1eaab 100644 --- a/keyboards/keyten/aperture/keymaps/via/keymap.c +++ b/keyboards/keyten/aperture/keymaps/via/keymap.c @@ -18,31 +18,36 @@  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -	[0] = LAYOUT_65_ansi_blocker_tsangan_split_bs( -		KC_ESC,  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_BSLS, KC_HOME, -		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_BSPC, KC_PGUP, -		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,  KC_DEL,  KC_PGDN, -		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,   MO(1), -		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT), +    [0] = LAYOUT_65_ansi_blocker_tsangan_split_bs( +        KC_ESC,  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_BSLS, KC_DEL,  KC_HOME, +        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_BSPC, KC_PGUP, +        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,  KC_PGDN, +        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,   MO(1), +        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT,          KC_LEFT, KC_DOWN, KC_RGHT +    ), -	[1] = LAYOUT_65_ansi_blocker_tsangan_split_bs( -		_______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, -		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, -		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, -		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, -		_______, _______, _______,                            _______,                            _______,          _______, _______, _______), +    [1] = LAYOUT_65_ansi_blocker_tsangan_split_bs( +        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, +        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, +        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +        _______, _______, _______,                            _______,                            _______,          _______, _______, _______ +    ), + +    [2] = LAYOUT_65_ansi_blocker_tsangan_split_bs( +        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, +        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +        _______, _______, _______,                            _______,                            _______,          _______, _______, _______ +    ), + +    [3] = LAYOUT_65_ansi_blocker_tsangan_split_bs( +        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, +        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, +        _______, _______, _______,                            _______,                            _______,          _______, _______, _______ +    ), -	[2] = LAYOUT_65_ansi_blocker_tsangan_split_bs( -		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, -		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, -		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, -		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, -		_______, _______, _______,                            _______,                            _______,          _______, _______, _______), -		 -	[3] = LAYOUT_65_ansi_blocker_tsangan_split_bs( -		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, -		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, -		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, -		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, -		_______, _______, _______,                            _______,                            _______,          _______, _______, _______)	  }; diff --git a/keyboards/soda/cherish/cherish.h b/keyboards/soda/cherish/cherish.h index e50da38177..59c75db6c9 100644 --- a/keyboards/soda/cherish/cherish.h +++ b/keyboards/soda/cherish/cherish.h @@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define ___ KC_NO -#define LAYOUT_75_ansi( \ +#define LAYOUT( \  	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, \  	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \  	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ diff --git a/keyboards/soda/cherish/info.json b/keyboards/soda/cherish/info.json index 0b3914eb63..8d6bea8947 100644 --- a/keyboards/soda/cherish/info.json +++ b/keyboards/soda/cherish/info.json @@ -1,102 +1,105 @@  {      "keyboard_name": "Cherish-75",      "url": "", -    "maintainer": "qmk", +    "maintainer": "gezhaoyou",      "manufacturer": "gezhaoyou",      "usb": {          "vid": "0xEB50",          "pid": "0xEB52",          "device_version": "0.0.1"      }, +    "layout_aliases": { +        "LAYOUT_75_ansi": "LAYOUT" +    },      "layouts": { -        "LAYOUT_75_ansi": { +        "LAYOUT": {              "layout": [                  {"x":0, "y":0}, -                {"x":1, "y":0}, -                {"x":2, "y":0}, -                {"x":3, "y":0}, -                {"x":4, "y":0}, -                {"x":5, "y":0}, +                {"x":1.5, "y":0}, +                {"x":2.5, "y":0}, +                {"x":3.5, "y":0}, +                {"x":4.5, "y":0},                  {"x":6, "y":0},                  {"x":7, "y":0},                  {"x":8, "y":0},                  {"x":9, "y":0}, -                {"x":10, "y":0}, -                {"x":11, "y":0}, -                {"x":12, "y":0}, -                {"x":13, "y":0}, -                {"x":14, "y":0}, +                {"x":10.5, "y":0}, +                {"x":11.5, "y":0}, +                {"x":12.5, "y":0}, +                {"x":13.5, "y":0},                  {"x":15, "y":0}, -                {"x":0, "y":1}, -                {"x":1, "y":1}, -                {"x":2, "y":1}, -                {"x":3, "y":1}, -                {"x":4, "y":1}, -                {"x":5, "y":1}, -                {"x":6, "y":1}, -                {"x":7, "y":1}, -                {"x":8, "y":1}, -                {"x":9, "y":1}, -                {"x":10, "y":1}, -                {"x":11, "y":1}, -                {"x":12, "y":1}, -                {"x":13, "y":1, "w":2}, -                {"x":15, "y":1}, +                {"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, "y":1.25}, -                {"x":0, "y":2, "w":1.5}, -                {"x":1.5, "y":2}, -                {"x":2.5, "y":2}, -                {"x":3.5, "y":2}, -                {"x":4.5, "y":2}, -                {"x":5.5, "y":2}, -                {"x":6.5, "y":2}, -                {"x":7.5, "y":2}, -                {"x":8.5, "y":2}, -                {"x":9.5, "y":2}, -                {"x":10.5, "y":2}, -                {"x":11.5, "y":2}, -                {"x":12.5, "y":2}, -                {"x":13.5, "y":2, "w":1.5}, -                {"x":15, "y":2}, +                {"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, "y":2.25}, -                {"x":0, "y":3, "w":1.75}, -                {"x":1.75, "y":3}, -                {"x":2.75, "y":3}, -                {"x":3.75, "y":3}, -                {"x":4.75, "y":3}, -                {"x":5.75, "y":3}, -                {"x":6.75, "y":3}, -                {"x":7.75, "y":3}, -                {"x":8.75, "y":3}, -                {"x":9.75, "y":3}, -                {"x":10.75, "y":3}, -                {"x":11.75, "y":3}, -                {"x":12.75, "y":3, "w":2.25}, -                {"x":15, "y":3}, +                {"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":15, "y":3.25}, -                {"x":0, "y":4, "w":2.25}, -                {"x":2.25, "y":4}, -                {"x":3.25, "y":4}, -                {"x":4.25, "y":4}, -                {"x":5.25, "y":4}, -                {"x":6.25, "y":4}, -                {"x":7.25, "y":4}, -                {"x":8.25, "y":4}, -                {"x":9.25, "y":4}, -                {"x":10.25, "y":4}, -                {"x":11.25, "y":4}, -                {"x":12.25, "y":4, "w":1.75}, -                {"x":14, "y":4}, -                {"x":15, "y":4}, +                {"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":1.75}, +                {"x":14, "y":4.25}, +                {"x":15, "y":4.25}, -                {"x":0, "y":5, "w":1.25}, -                {"x":1.25, "y":5, "w":1.25}, -                {"x":2.5, "y":5, "w":1.25}, -                {"x":3.75, "y":5, "w":6.25}, -                {"x":10, "y":5}, -                {"x":11, "y":5}, -                {"x":12, "y":5} +                {"x":0, "y":5.25, "w":1.25}, +                {"x":1.25, "y":5.25, "w":1.25}, +                {"x":2.5, "y":5.25, "w":1.25}, +                {"x":3.75, "y":5.25, "w":6.25}, +                {"x":10, "y":5.25, "w":1.25}, +                {"x":11.25, "y":5.25, "w":1.25}, +                {"x":13, "y":5.25}, +                {"x":14, "y":5.25}, +                {"x":15, "y":5.25}              ]          }      } diff --git a/keyboards/soda/cherish/keymaps/default/keymap.c b/keyboards/soda/cherish/keymaps/default/keymap.c index 3927f7f222..3435e8ff06 100755 --- a/keyboards/soda/cherish/keymaps/default/keymap.c +++ b/keyboards/soda/cherish/keymaps/default/keymap.c @@ -16,18 +16,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */  #include QMK_KEYBOARD_H  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -   [0] = LAYOUT_75_ansi( -    	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_DEL,  -		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_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_PGDN,  -		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, KC_HOME,  -		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_END,  -		KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT), -   [1] = LAYOUT_75_ansi( -   		RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_MOD,  -		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,  -		MO(2), 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, RGB_HUI, KC_TRNS,  -		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, RGB_HUD, RGB_SAD), + +    [0] = LAYOUT( +        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_DEL, +        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_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_PGDN, +        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,  KC_HOME, +        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_END, +        KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                    KC_RGUI, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT +    ), + +    [1] = LAYOUT( +        RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,          RGB_MOD, +        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, +        MO(2),   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, RGB_HUI, KC_TRNS, +        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          RGB_SAI, RGB_HUD, RGB_SAD +    ), +  }; diff --git a/keyboards/soda/cherish/keymaps/via/keymap.c b/keyboards/soda/cherish/keymaps/via/keymap.c index 3927f7f222..3435e8ff06 100755 --- a/keyboards/soda/cherish/keymaps/via/keymap.c +++ b/keyboards/soda/cherish/keymaps/via/keymap.c @@ -16,18 +16,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */  #include QMK_KEYBOARD_H  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -   [0] = LAYOUT_75_ansi( -    	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_DEL,  -		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_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_PGDN,  -		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, KC_HOME,  -		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_END,  -		KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT), -   [1] = LAYOUT_75_ansi( -   		RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_MOD,  -		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,  -		MO(2), 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, RGB_HUI, KC_TRNS,  -		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAI, RGB_HUD, RGB_SAD), + +    [0] = LAYOUT( +        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_DEL, +        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_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_PGDN, +        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,  KC_HOME, +        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_END, +        KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                    KC_RGUI, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT +    ), + +    [1] = LAYOUT( +        RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,          RGB_MOD, +        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, +        MO(2),   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, RGB_HUI, KC_TRNS, +        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS,          RGB_SAI, RGB_HUD, RGB_SAD +    ), +  }; | 
