~ruther/qmk_firmware

e322462cd457b7fc32b30e6916079d363b8aa6e8 — James Young 4 years ago a001df5 
Illusion Rosa: correct layout macro names (#13387)
patch browse .tar.gz 
8 files changed, 19 insertions(+), 17 deletions(-)

M keyboards/illusion/rosa/info.json
M keyboards/illusion/rosa/keymaps/default/keymap.c
M keyboards/illusion/rosa/keymaps/oggi/keymap.c
M keyboards/illusion/rosa/keymaps/split_bs_rshift/keymap.c
M keyboards/illusion/rosa/keymaps/split_rshift/keymap.c
M keyboards/illusion/rosa/keymaps/via/keymap.c
M keyboards/illusion/rosa/rosa.h
M keyboards/illusion/rosa/rules.mk

M keyboards/illusion/rosa/info.json => keyboards/illusion/rosa/info.json +3 -3
@@ 5,7 5,7 @@
    "width": 15, 
    "height": 5, 
    "layouts": {
        "LAYOUT_60_ansi": {
        "LAYOUT_60_ansi_tsangan": {
            "layout": [
                {"label":"Esc", "x":0, "y":0},
                {"label":"!", "x":1, "y":0}, 


@@ 73,7 73,7 @@
                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
            ]
        },
        "LAYOUT_60_ansi_split_rshift": {
        "LAYOUT_60_ansi_tsangan_split_rshift": {
            "layout": [
                {"label":"Esc", "x":0, "y":0},
                {"label":"1", "x":1, "y":0},


@@ 141,7 141,7 @@
                {"label":"Win", "x":12.5, "y":4}, 
                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
        },
        "LAYOUT_60_ansi_split_bs_rshift": {
        "LAYOUT_60_ansi_tsangan_split_bs_rshift": {
            "layout": [
                {"label":"Esc", "x":0, "y":0}, 
                {"label":"1", "x":1, "y":0}, 


M keyboards/illusion/rosa/keymaps/default/keymap.c => keyboards/illusion/rosa/keymaps/default/keymap.c +1 -1
@@ 23,7 23,7 @@ enum layer_names {
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [_BASE] = LAYOUT_60_ansi(
    [_BASE] = LAYOUT_60_ansi_tsangan(
        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_BSPC,
        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_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,


M keyboards/illusion/rosa/keymaps/oggi/keymap.c => keyboards/illusion/rosa/keymaps/oggi/keymap.c +2 -2
@@ 23,14 23,14 @@ enum layer_names {
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [_BASE] = LAYOUT_60_ansi_split_rshift(
    [_BASE] = LAYOUT_60_ansi_tsangan_split_rshift(
        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_BSPC,
        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_LCTL, 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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,    MO(1),
        KC_LGUI, KC_TRNS, KC_LALT,                                    KC_SPC,                                      KC_RALT, KC_TRNS, KC_RCTL
    ),
    [_FN] = LAYOUT_60_ansi_split_rshift(
    [_FN] = LAYOUT_60_ansi_tsangan_split_rshift(
        KC_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS,
        KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RIGHT, KC_TRNS,


M keyboards/illusion/rosa/keymaps/split_bs_rshift/keymap.c => keyboards/illusion/rosa/keymaps/split_bs_rshift/keymap.c +2 -2
@@ 23,14 23,14 @@ enum layer_names {
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [_BASE] = LAYOUT_60_ansi_split_bs_rshift(
    [_BASE] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
        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_GRV,
        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_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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,     MO(1),
        KC_LCTL, KC_LGUI, KC_LALT,                                    KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL
    ),
    [_FN] = LAYOUT_60_ansi_split_bs_rshift(
    [_FN] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
        KC_TRNS, 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_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
        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,


M keyboards/illusion/rosa/keymaps/split_rshift/keymap.c => keyboards/illusion/rosa/keymaps/split_rshift/keymap.c +2 -2
@@ 23,14 23,14 @@ enum layer_names {
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [_BASE] = LAYOUT_60_ansi_split_rshift(
    [_BASE] = LAYOUT_60_ansi_tsangan_split_rshift(
        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_BSPC,
        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_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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,    MO(1),
        KC_LCTL, KC_LGUI, KC_LALT,                                    KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL
    ),
    [_FN] = LAYOUT_60_ansi_split_rshift(
    [_FN] = LAYOUT_60_ansi_tsangan_split_rshift(
        KC_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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,


M keyboards/illusion/rosa/keymaps/via/keymap.c => keyboards/illusion/rosa/keymaps/via/keymap.c +4 -4
@@ 25,28 25,28 @@ enum layer_names {
};

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    [_BASE] = LAYOUT_60_ansi(
    [_BASE] = LAYOUT_60_ansi_tsangan(
        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_BSPC,
        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_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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,
        KC_LCTL, KC_LGUI, KC_LALT,                                    KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL
    ),
    [_FN1] = LAYOUT_60_ansi(
    [_FN1] = LAYOUT_60_ansi_tsangan(
        KC_TRNS, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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
    ),
    [_FN2] = LAYOUT_60_ansi(
    [_FN2] = LAYOUT_60_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, KC_TRNS, KC_TRNS, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS,                                    KC_TRNS,                                      KC_TRNS, KC_TRNS, KC_TRNS
    ),
    [_FN3] = LAYOUT_60_ansi(
    [_FN3] = LAYOUT_60_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,


M keyboards/illusion/rosa/rosa.h => keyboards/illusion/rosa/rosa.h +3 -3
@@ 33,7 33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, K413} \
}

#define LAYOUT_60_ansi(\
#define LAYOUT_60_ansi_tsangan(\
    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       \


@@ 47,7 47,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, K413 } \
}

#define LAYOUT_60_ansi_split_rshift(\
#define LAYOUT_60_ansi_tsangan_split_rshift(\
    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       \


@@ 61,7 61,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, K413 } \
}

#define LAYOUT_60_ansi_split_bs_rshift(\
#define LAYOUT_60_ansi_tsangan_split_bs_rshift(\
    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K213, \
    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       \
    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             \


M keyboards/illusion/rosa/rules.mk => keyboards/illusion/rosa/rules.mk +2 -0
@@ 20,3 20,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no       # Enable Bluetooth
AUDIO_ENABLE = no           # Audio output

LAYOUTS = 60_ansi_tsangan