diff options
Diffstat (limited to 'layouts/community')
44 files changed, 578 insertions, 722 deletions
| diff --git a/layouts/community/ergodox/adnw_k_o_y/keymap.c b/layouts/community/ergodox/adnw_k_o_y/keymap.c index 6ade0001ce..589a9ea873 100644 --- a/layouts/community/ergodox/adnw_k_o_y/keymap.c +++ b/layouts/community/ergodox/adnw_k_o_y/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {          KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LEFT,          KC_DEL,         DE_K,         DE_DOT, DE_O,   DE_COMM,DE_Y,   TG(SYMB),          KC_BSPC,        DE_H,         DE_A,   DE_E,   DE_I,   DE_U, -        KC_LSFT,        CTL_T(DE_X),  DE_Q,   DE_AE,  DE_UE,  DE_OE,  ALL_T(KC_NO), +        KC_LSFT,        CTL_T(DE_X),  DE_Q,   DE_ADIA,DE_UDIA,DE_ODIA,ALL_T(KC_NO),          LT(SYMB,KC_GRV),KC_QUOT,      LALT(KC_LSFT),  KC_LEFT,KC_RGHT,                                                ALT_T(KC_APP),  KC_LGUI,                                                                KC_HOME, diff --git a/layouts/community/ergodox/adnw_p_u_q/keymap.c b/layouts/community/ergodox/adnw_p_u_q/keymap.c index a90fcbc2c7..cf2ab93589 100644 --- a/layouts/community/ergodox/adnw_p_u_q/keymap.c +++ b/layouts/community/ergodox/adnw_p_u_q/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {                           KC_H, KC_J, KC_K, KC_L, KC_RCTRL,  	// right thumb-cluster -        DE_QST, DE_DLR, +        DE_QUES, DE_DLR,          LCTL(DE_C),          KC_ESCAPE, KC_ENTER, KC_BSPACE  ), @@ -134,8 +134,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  // Diakritika  [DIAK] = LAYOUT_ergodox(         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -       KC_TRNS, KC_TRNS, DE_UE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DE_AE, DE_OE, +       KC_TRNS, KC_TRNS, DE_UDIA, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, +       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DE_ADIA, DE_ODIA,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                             KC_TRNS, KC_TRNS, @@ -218,8 +218,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  [SYMBOLS] = LAYOUT_ergodox(         // left hand         KC_TRNS,  KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,  KC_F6, //DE_LBRC, -       KC_TRNS,DE_SQ2, DE_RING, DE_TILD, DE_AT,   DE_EXLM, DE_LPRN, -       KC_TRNS,DE_ACUT,DE_QUOT, DE_COLN, DE_CIRC, DE_LESS, +       KC_TRNS,DE_SUP2,DE_DEG,  DE_TILD, DE_AT,   DE_EXLM, DE_LPRN, +       KC_TRNS,DE_ACUT,DE_QUOT, DE_COLN, DE_CIRC, DE_LABK,         KC_TRNS,DE_EURO,DE_PLUS, DE_EQL,  DE_ASTR, DE_SLSH, DE_LCBR,         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, @@ -230,8 +230,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {         // right hand         //DE_RBRC,          KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_TRNS, -       DE_RPRN, DE_QST,  DE_AMPR, DE_PARA, DE_DQOT,  DE_SQ3,  KC_TRNS, -                DE_MORE, DE_DLR,  DE_SCLN, DE_PIPE,  DE_GRV,  KC_TRNS, +       DE_RPRN, DE_QUES, DE_AMPR, DE_SECT, DE_DQUO,  DE_SUP3, KC_TRNS, +                DE_RABK, DE_DLR,  DE_SCLN, DE_PIPE,  DE_GRV,  KC_TRNS,         DE_RCBR, DE_BSLS, DE_PERC, DE_HASH, DE_MINS,  DE_UNDS, KC_TRNS,                           KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, diff --git a/layouts/community/ergodox/algernon/keymap.c b/layouts/community/ergodox/algernon/keymap.c index e6e9bdaf7f..0680870954 100644 --- a/layouts/community/ergodox/algernon/keymap.c +++ b/layouts/community/ergodox/algernon/keymap.c @@ -47,15 +47,15 @@ enum {    APP_SCL2, // Social #2    // Hungarian layer keys -  HU_AA, // Á -  HU_OO, // Ó -  HU_EE, // É -  HU_UU, // Ú -  HU_II, // Í -  HU_OE, // Ö -  HU_UE, // Ü -  HU_OEE, // Ő -  HU_UEE, // Ű +  HU_AACU, // Á +  HU_OACU, // Ó +  HU_EACU, // É +  HU_UACU, // Ú +  HU_IACU, // Í +  HU_ODIA, // Ö +  HU_UDIA, // Ü +  HU_ODAC, // Ő +  HU_UDAC, // Ű    // number/symbol keys    A_1, // 1 @@ -322,9 +322,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  [HUN] = LAYOUT_ergodox(  // left hand   KC_NO   ,KC_NO   ,KC_NO    ,KC_NO   ,KC_NO    ,KC_NO   ,KC_NO -,KC_NO   ,KC_NO   ,M(HU_OEE),KC_NO   ,M(HU_UEE),KC_NO   ,KC_NO -,KC_NO   ,M(HU_AA),M(HU_OO) ,M(HU_EE),M(HU_UU) ,M(HU_II) -,KC_NO   ,KC_NO   ,M(HU_OE) ,KC_NO   ,M(HU_UE) ,KC_NO   ,KC_NO +,KC_NO   ,KC_NO   ,M(HU_ODAC),KC_NO   ,M(HU_UDAC),KC_NO   ,KC_NO +,KC_NO   ,M(HU_AACU),M(HU_OACU) ,M(HU_EACU),M(HU_UACU) ,M(HU_IACU) +,KC_NO   ,KC_NO   ,M(HU_ODIA) ,KC_NO   ,M(HU_UDIA) ,KC_NO   ,KC_NO  ,KC_NO   ,KC_NO   ,KC_NO    ,KC_NO   ,KC_NO                                               ,KC_NO   ,KC_NO @@ -588,23 +588,23 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)          break;          /* Hungarian layer */ -      case HU_AA: +      case HU_AACU:          return ang_do_hun (record, KC_QUOT, KC_A); -      case HU_OO: +      case HU_OACU:          return ang_do_hun (record, KC_QUOT, KC_O); -      case HU_EE: +      case HU_EACU:          return ang_do_hun (record, KC_QUOT, KC_E); -      case HU_UU: +      case HU_UACU:          return ang_do_hun (record, KC_QUOT, KC_U); -      case HU_II: +      case HU_IACU:          return ang_do_hun (record, KC_QUOT, KC_I); -      case HU_OE: +      case HU_ODIA:          return ang_do_hun (record, KC_DQT, KC_O); -      case HU_UE: +      case HU_UDIA:          return ang_do_hun (record, KC_DQT, KC_U); -      case HU_OEE: +      case HU_ODAC:          return ang_do_hun (record, KC_EQL, KC_O); -      case HU_UEE: +      case HU_UDAC:          return ang_do_hun (record, KC_EQL, KC_U);          /* Plover base */ diff --git a/layouts/community/ergodox/bepo/keymap.c b/layouts/community/ergodox/bepo/keymap.c index 6ea8cba681..4090721d09 100644 --- a/layouts/community/ergodox/bepo/keymap.c +++ b/layouts/community/ergodox/bepo/keymap.c @@ -37,19 +37,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   */  [BEPO] = LAYOUT_ergodox(  // Left hand -BP_DOLLAR,	BP_DQOT,	BP_LGIL,	BP_RGIL,	BP_LPRN,	BP_RPRN,	KC_DEL, -BP_PERCENT,	BP_B,		BP_E_ACUTE,	BP_P,		BP_O,		BP_E_GRAVE,	KC_BSPC, -BP_W,		BP_A,		BP_U,		BP_I,		BP_E,		BP_COMMA, -BP_ECRC,	BP_A_GRAVE,	BP_Y,		BP_X,		BP_DOT,		BP_K,		KC_TAB, +BP_DLR,		BP_DQUO,	BP_LDAQ,	BP_RDAQ,	BP_LPRN,	BP_RPRN,	KC_DEL, +BP_PERC,	BP_B,		BP_EACU,	BP_P,		BP_O,		BP_EGRV,	KC_BSPC, +BP_W,		BP_A,		BP_U,		BP_I,		BP_E,		BP_COMM, +BP_ECIR,	BP_AGRV,	BP_Y,		BP_X,		BP_DOT,		BP_K,		KC_TAB,  KC_ESC,		KC_INS,		KC_LGUI,	KC_LCTL,	KC_LALT,  														DF(BEPO),	DF(QW_B),  																MO(NUMK),  												KC_SPC,		KC_LSHIFT,	MO(FNAV),  // Right hand -				KC_SLCK,	BP_AT,		BP_PLUS,	BP_MINUS,	BP_SLASH,	BP_ASTR,	BP_EQUAL, -				KC_CAPSLOCK,	BP_DCRC,	BP_V,		BP_D,		BP_L,		BP_J,		BP_Z, +				KC_SLCK,	BP_AT,		BP_PLUS,	BP_MINS,	BP_SLSH,	BP_ASTR,	BP_EQL, +				KC_CAPSLOCK,	BP_DCIR,	BP_V,		BP_D,		BP_L,		BP_J,		BP_Z,  						BP_C,		BP_T,		BP_S,		BP_R,		BP_N,		BP_M, -				KC_NUMLOCK,	BP_APOS,	BP_Q,		BP_G,		BP_H,		BP_F,		BP_CCED, +				KC_NUMLOCK,	BP_QUOT,	BP_Q,		BP_G,		BP_H,		BP_F,		BP_CCED,  								KC_ALGR,	KC_RCTL,	KC_RGUI,	KC_PSCREEN,	KC_PAUSE,  DF(AZ_B),	DF(BEPO),  MO(NUMK), @@ -74,7 +74,7 @@ MO(FNAV),	KC_RSHIFT,	KC_ENTER),   */  [QW_B] = LAYOUT_ergodox(  // Left hand -KC_DOLLAR,	S(KC_QUOT),	S(KC_COMM),	S(KC_DOT),	KC_LPRN,	KC_RPRN,	KC_DEL, +KC_DOLLAR,	S(KC_DQUO),	S(KC_COMM),	S(KC_DOT),	KC_LPRN,	KC_RPRN,	KC_DEL,  KC_PERCENT,	KC_B,		KC_E,		KC_P,		KC_O,		KC_E,		KC_BSPC,  KC_W,		KC_A,		KC_U,		KC_I,		KC_E,		KC_COMMA,  KC_E,		KC_A,		KC_Y,		KC_X,		KC_DOT,		KC_K,		KC_TAB, @@ -86,7 +86,7 @@ KC_ESC,		KC_INS,		KC_LGUI,	KC_LCTL,	KC_LALT,  				KC_SLCK,	KC_AT,		KC_PLUS,	KC_MINUS,	KC_SLASH,	KC_ASTR,	KC_EQUAL,  				KC_CAPSLOCK,	KC_CIRC,	KC_V,		KC_D,		KC_L,		KC_J,		KC_Z,  						KC_C,		KC_T,		KC_S,		KC_R,		KC_N,		KC_M, -				KC_NUMLOCK,	KC_QUOT,	KC_Q,		KC_G,		KC_H,		KC_F,		KC_C, +				KC_NUMLOCK,	KC_DQUO,	KC_Q,		KC_G,		KC_H,		KC_F,		KC_C,  								MO(QW_A),	KC_RCTL,	KC_RGUI,	KC_PSCREEN,	KC_PAUSE,  KC_TRNS,	KC_TRNS,  KC_TRNS, @@ -111,7 +111,7 @@ KC_TRNS,	MO(QW_S),	KC_ENTER),   */  [QW_A] = LAYOUT_ergodox(  // Left hand -KC_DOLLAR,	S(KC_QUOT),	S(KC_COMM),	S(KC_DOT),	KC_LBRC,	KC_RBRC,	KC_DEL, +KC_DOLLAR,	S(KC_DQUO),	S(KC_COMM),	S(KC_DOT),	KC_LBRC,	KC_RBRC,	KC_DEL,  KC_PERCENT,	KC_PIPE,	KC_E,		KC_AMPR,	KC_O,		KC_E,		KC_BSPC,  KC_W,		KC_A,		KC_U,		KC_I,		RALT(KC_5),	KC_COMMA,  KC_E,		KC_BSLASH,	KC_LCBR,	KC_RCBR,	KC_DOT,		KC_TILDE,	KC_TAB, @@ -123,7 +123,7 @@ KC_ESC,		KC_INS,		KC_LGUI,	KC_LCTL,	KC_LALT,  				KC_SLCK,	KC_AT,		KC_PLUS,	KC_MINUS,	KC_SLASH,	KC_ASTR,	KC_EQUAL,  				KC_CAPSLOCK,	KC_CIRC,	KC_V,		KC_D,		KC_L,		KC_J,		KC_Z,  						KC_C,		KC_T,		KC_S,		KC_R,		KC_N,		KC_M, -				KC_NUMLOCK,	KC_QUOT,	KC_Q,		KC_G,		KC_H,		KC_F,		KC_C, +				KC_NUMLOCK,	KC_DQUO,	KC_Q,		KC_G,		KC_H,		KC_F,		KC_C,  								KC_TRNS,	KC_RCTL,	KC_RGUI,	KC_PSCREEN,	KC_PAUSE,  KC_TRNS,	KC_TRNS,  KC_TRNS, @@ -185,7 +185,7 @@ KC_TRNS,	KC_TRNS,	KC_TRNS),   */  [AZ_B] = LAYOUT_ergodox(  // Left hand -FR_DLR,		FR_QUOT,	FR_LESS,	FR_GRTR,	FR_LPRN,	FR_RPRN,	KC_DEL, +FR_DLR,		FR_DQUO,	FR_LABK,	FR_RABK,	FR_LPRN,	FR_RPRN,	KC_DEL,  FR_PERC,	KC_B,		FR_EACU,	KC_P,		KC_O,		FR_EGRV,	KC_BSPC,  FR_W,		FR_A,		KC_U,		KC_I,		KC_E,		FR_COMM,  KC_E,		FR_AGRV,	KC_Y,		KC_X,		FR_DOT,		KC_K,		KC_TAB, @@ -197,7 +197,7 @@ KC_ESC,		KC_INS,		KC_LGUI,	KC_LCTL,	KC_LALT,  				KC_SLCK,	FR_AT,		FR_PLUS,	FR_MINS,	FR_SLSH,	FR_ASTR,	FR_EQL,  				KC_CAPSLOCK,	KC_LBRC,	KC_V,		KC_D,		KC_L,		KC_J,		FR_Z,  						KC_C,		KC_T,		KC_S,		KC_R,		KC_N,		FR_M, -				KC_NUMLOCK,	FR_APOS,	FR_Q,		KC_G,		KC_H,		KC_F,		FR_CCED, +				KC_NUMLOCK,	FR_QUOT,	FR_Q,		KC_G,		KC_H,		KC_F,		FR_CCED,  								MO(AZ_A),	KC_RCTL,	KC_RGUI,	KC_PSCREEN,	KC_PAUSE,  KC_TRNS,	KC_TRNS,  KC_TRNS, @@ -222,8 +222,8 @@ KC_TRNS,	MO(AZ_S),	KC_ENTER),   */  [AZ_A] = LAYOUT_ergodox(  // Left hand -FR_DLR,		FR_QUOT,	FR_LESS,	FR_GRTR,	FR_LBRC,	FR_RBRC,	KC_DEL, -FR_PERC,	FR_PIPE,	FR_EACU,	FR_AMP,		KC_O,		FR_EGRV,	KC_BSPC, +FR_DLR,		FR_DQUO,	FR_LABK,	FR_RABK,	FR_LBRC,	FR_RBRC,	KC_DEL, +FR_PERC,	FR_PIPE,	FR_EACU,	FR_AMPR,		KC_O,		FR_EGRV,	KC_BSPC,  FR_W,		FR_A,		FR_UGRV,	S(KC_LBRC),	FR_EURO,	FR_COMM,  FR_SLSH,	FR_BSLS,	FR_LCBR,	FR_RCBR,	FR_DOT,		FR_TILD,	KC_TAB,  KC_ESC,		KC_INS,		KC_LGUI,	KC_LCTL,	KC_LALT, @@ -234,7 +234,7 @@ KC_ESC,		KC_INS,		KC_LGUI,	KC_LCTL,	KC_LALT,  				KC_SLCK,	FR_AT,		FR_PLUS,	FR_MINS,	FR_SLSH,	FR_ASTR,	FR_EQL,  				KC_CAPSLOCK,	KC_LBRC,	KC_V,		KC_D,		KC_L,		KC_J,		FR_Z,  						KC_C,		KC_T,		KC_S,		KC_R,		KC_N,		FR_M, -				KC_NUMLOCK,	FR_APOS,	FR_Q,		KC_G,		KC_H,		KC_F,		FR_CCED, +				KC_NUMLOCK,	FR_QUOT,	FR_Q,		KC_G,		KC_H,		KC_F,		FR_CCED,  								KC_TRNS,	KC_RCTL,	KC_RGUI,	KC_PSCREEN,	KC_PAUSE,  KC_TRNS,	KC_TRNS,  KC_TRNS, @@ -268,7 +268,7 @@ S(KC_ESC),	S(KC_INS),	S(KC_LGUI),	S(KC_LCTL),	S(KC_LALT),  																KC_TRNS,  												KC_TRNS,	KC_TRNS,	KC_TRNS,  // Right hand -				KC_TRNS,	FR_6,		FR_7,		FR_8,		FR_9,		FR_0,		FR_OVRR, +				KC_TRNS,	FR_6,		FR_7,		FR_8,		FR_9,		FR_0,		FR_DEG,  				KC_TRNS,	FR_EXLM,	S(KC_V),	S(KC_D),	S(KC_L),	S(KC_J),	S(FR_Z),  						S(KC_C),	S(KC_T),	S(KC_S),	S(KC_R),	S(KC_N),	S(FR_M),  				KC_TRNS,	FR_QUES,	S(FR_Q),	S(KC_G),	S(KC_H),	S(KC_F),	S(KC_C), diff --git a/layouts/community/ergodox/bepo_alt/keymap.c b/layouts/community/ergodox/bepo_alt/keymap.c index fc40afd871..a3bb955abf 100644 --- a/layouts/community/ergodox/bepo_alt/keymap.c +++ b/layouts/community/ergodox/bepo_alt/keymap.c @@ -30,20 +30,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  [BEPO] = LAYOUT_ergodox(  /* Left hand */ -BP_DOLLAR,  BP_DQOT,  BP_LGIL,  BP_RGIL,  BP_LPRN,  BP_RPRN,  BP_AT, -KC_TAB, BP_B,   BP_E_ACUTE, BP_P,   BP_O,   BP_E_GRAVE, KC_BSPC, -BP_W,   BP_A,   BP_U,   BP_I,   BP_E,   BP_COMMA, -KC_LSHIFT,  BP_ECRC,  BP_A_GRAVE,   BP_Y,   BP_X,   BP_DOT,   BP_K, +BP_DLR,  BP_DQUO,  BP_LDAQ,  BP_RDAQ,  BP_LPRN,  BP_RPRN,  BP_AT, +KC_TAB, BP_B,   BP_EACU,    BP_P,   BP_O,   BP_EGRV, KC_BSPC, +BP_W,   BP_A,   BP_U,   BP_I,   BP_E,   BP_COMM, +KC_LSHIFT,  BP_ECIR,  BP_AGRV,   BP_Y,   BP_X,   BP_DOT,   BP_K,  KC_LCTL,    KC_LGUI,    KC_LGUI,  KC_LGUI,  KC_LALT,                              KC_PGUP,  KC_PGDOWN,                                  KC_INS,                          KC_SPC,   KC_LSHIFT,  DF(FNAV),  /* Right hand */ -                BP_PLUS, BP_MINUS,    BP_MINUS, BP_SLASH, BP_ASTR,  BP_EQUAL, BP_PERCENT, -        KC_CAPSLOCK,  BP_DCRC,  BP_V,   BP_D,   BP_L,   BP_J,   BP_Z, +                BP_PLUS, BP_MINS,    BP_MINS, BP_SLSH, BP_ASTR,  BP_EQL, BP_PERC, +        KC_CAPSLOCK,  BP_DCIR,  BP_V,   BP_D,   BP_L,   BP_J,   BP_Z,              BP_C,   BP_T,   BP_S,   BP_R,   BP_N,   BP_M, -        KC_ESC, BP_APOS,  BP_Q,   BP_G,   BP_H,   BP_F,   BP_CCED, +        KC_ESC, BP_QUOT,  BP_Q,   BP_G,   BP_H,   BP_F,   BP_CCED,                  KC_ALGR,  KC_RGUI,  KC_RGUI,  KC_RCTL,  KC_ENTER,  DF(BEPO), KC_DEL,  DF(FNAV), diff --git a/layouts/community/ergodox/bepo_csa/keymap.c b/layouts/community/ergodox/bepo_csa/keymap.c index c6d4f628ff..d869c5bb9f 100644 --- a/layouts/community/ergodox/bepo_csa/keymap.c +++ b/layouts/community/ergodox/bepo_csa/keymap.c @@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  [LR_BASE] = LAYOUT_ergodox(  // layer 0 : default          // left hand          BP_DLR,     KC_1,      KC_2,    KC_3,      KC_4,     KC_5,    KC_DEL, -        KC_TAB,     BP_B,      BP_ECUT, BP_P,      BP_O,     BP_EGRV, KC_BSPC, +        KC_TAB,     BP_B,      BP_EACU, BP_P,      BP_O,     BP_EGRV, KC_BSPC,          BP_EQL,     BP_A,      BP_U,    BP_I,      BP_E,     BP_COMM,          KC_LSFT,    BP_AGRV,   BP_Y,    BP_X,      BP_DOT,   BP_K,    KC_ENT,          KC_LCTL,    M(M_FNLR), KC_LGUI, M(M_NMAL), KC_LALT, @@ -102,9 +102,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {          // right hand          KC_DEL,    KC_6,     KC_7,    KC_8,    KC_9,    KC_0,     BP_W, -        KC_BSPC,   BP_DCRC,  BP_V,    BP_D,    BP_L,    BP_J,     BP_Z, +        KC_BSPC,   BP_DCIR,  BP_V,    BP_D,    BP_L,    BP_J,     BP_Z,                     BP_C,     BP_T,    BP_S,    BP_R,    BP_N,     BP_M, -        KC_ENT,    BP_APOS,  BP_Q,    BP_G,    BP_H,    BP_F,     KC_RSFT, +        KC_ENT,    BP_QUOT,  BP_Q,    BP_G,    BP_H,    BP_F,     KC_RSFT,                               KC_ALGR, BP_PERC, KC_APP,  BP_CCED,  KC_RCTL,          KC_LEFT, KC_RGHT, @@ -116,10 +116,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   */  [LR_CSA] = LAYOUT_ergodox(          // left hand -        KC_DLR,      CSA_DQOT,   CSA_LGIL,  CSA_RGIL,  KC_LPRN,  KC_RPRN,   KC_TRNS, -        KC_TRNS,     KC_B,       CSA_ECUT,  KC_P,      KC_O,     CSA_EGRV,  KC_TRNS, +        KC_DLR,      CA_DQUO,    CA_LDAQ,   CA_RDAQ,   KC_LPRN,  KC_RPRN,   KC_TRNS, +        KC_TRNS,     KC_B,       CA_EACU,   KC_P,      KC_O,     CA_EGRV,   KC_TRNS,          KC_EQL,      KC_A,       KC_U,      KC_I,      KC_E,     KC_COMM, -        CSA(SFT),    CSA_AGRV,   KC_Y,      KC_X,      KC_DOT,   KC_K,      KC_TRNS, +        CSA(SFT),    CA_AGRV,    KC_Y,      KC_X,      KC_DOT,   KC_K,      KC_TRNS,          KC_TRNS,     KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,                                                         KC_TRNS,  KC_TRNS, @@ -127,11 +127,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {                                              KC_TRNS,   KC_TRNS,  KC_TRNS,          // right hand -        KC_TRNS,  KC_AT,     KC_PLUS,  KC_MINS,  CSA_SLSH,  KC_ASTR,   KC_W, -        KC_TRNS,  CSA_DCRC,  KC_V,     KC_D,     KC_L,      KC_J,      KC_Z, +        KC_TRNS,  KC_AT,     KC_PLUS,  KC_MINS,  CA_SLSH,   KC_ASTR,   KC_W, +        KC_TRNS,  CA_CIRC,   KC_V,     KC_D,     KC_L,      KC_J,      KC_Z,                    KC_C,      KC_T,     KC_S,     KC_R,      KC_N,      KC_M, -        KC_TRNS,  CSA_APOS,  KC_Q,     KC_G,     KC_H,      KC_F,      CSA(SFT), -                      MO(LR_CSA_AGR),  KC_PERC,  KC_TRNS,   CSA_CCED,  KC_LCTL, // RCTL has a special behaviour in CSA so use LCTL +        KC_TRNS,  CA_QUOT,   KC_Q,     KC_G,     KC_H,      KC_F,      CSA(SFT), +                      MO(LR_CSA_AGR),  KC_PERC,  KC_TRNS,   CA_CCED,   KC_LCTL, // RCTL has a special behaviour in CSA so use LCTL          KC_TRNS,  KC_TRNS,          KC_TRNS, @@ -174,7 +174,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {          KC_TRNS,  M(M_6),    M(M_7),   M(M_8),   M(M_9),   M(M_0),   KC_TRNS,          KC_TRNS,  KC_EXLM,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, -        KC_TRNS,  CSA_QEST,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, +        KC_TRNS,  CA_QUES,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                          CSA(SFT_AGR),  M(M_GRV), KC_TRNS,  KC_TRNS,  KC_TRNS,          KC_TRNS,  KC_TRNS, @@ -205,10 +205,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   */  [LR_CSA_AGR] = LAYOUT_ergodox(          // left hand -        MUC(NDSH),    MUC(MDSH),  CSA_LESS,  CSA_GRTR,  CSA_LBRC,   CSA_RBRC,  KC_TRNS, -        KC_TRNS,      CSA_PIPE,   CSA_DACT,  KC_AMPR,   CSA_OE,     CSA_DGRV,  KC_TRNS, -        KC_NO,        CSA_AE,     CSA_UGRV,  CSA_DTRM,  CSA_EURO,   CSA_RQOT, -        CSA(AGR_SFT), CSA_BSLS,   CSA_LCBR,  CSA_RCBR,  MUC(ELPS),  CSA_TILD,  KC_TRNS, +        MUC(NDSH),    MUC(MDSH),  CA_LABK,   CA_RABK,   CA_LBRC,    CA_RBRC,   KC_TRNS, +        KC_TRNS,      CA_PIPE,    CA_ACUT,   KC_AMPR,   CA_OE,      CA_GRV,    KC_TRNS, +        KC_NO,        CA_AE,      CA_UGRV,   CA_DIAE,   CA_EURO,    CA_RQSU, +        CSA(AGR_SFT), CA_BSLS,    CA_LCBR,   CA_RCBR,   MUC(ELPS),  CA_TILD,   KC_TRNS,          KC_TRNS,      KC_TRNS,    KC_TRNS,   KC_TRNS,   KC_TRNS,                                                        KC_TRNS,  KC_TRNS, @@ -216,11 +216,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {                                          KC_UNDS, CSA(AGR_SFT),  KC_TRNS,          // right hand -        KC_TRNS,  M(M_CRC),  CSA_PSMS,  KC_NO,     CSA_DVSN, CSA_TIMS,  CSA_DBRV, -        KC_TRNS,  CSA_IXLM,  CSA_DCAR,  CSA_ETH,   KC_NO,    CSA_IJ,    KC_NO, -                  CSA_CPRT,  CSA_THRN,  CSA_SRPS,  CSA_RTM,  CSA_DTLD,  CSA_DMCR, -        KC_TRNS,  CSA_IQST,  CSA_DRNG,  CSA_MU,    KC_NO,    CSA_DOGO,  CSA(AGR_SFT), -                             KC_TRNS,   KC_NO,     KC_TRNS,  CSA_DCED,  KC_TRNS, +        KC_TRNS,  M(M_CRC),  CA_PLMN,   KC_NO,     CA_DIV,   CA_MUL,    CA_BREV, +        KC_TRNS,  CA_IEXL,   CA_CARN,   CA_ETH,    KC_NO,    CA_IJ,     KC_NO, +                  CA_COPY,   CA_THRN,   CA_SS,     CA_REGD,  CA_DTIL,   CA_MACR, +        KC_TRNS,  CA_IQUE,   CA_RNGA,   CA_MICR,   KC_NO,    CA_OGON,   CSA(AGR_SFT), +                             KC_TRNS,   KC_NO,     KC_TRNS,  CA_CEDL,   KC_TRNS,          KC_TRNS,  KC_TRNS,          KC_TRNS, @@ -250,10 +250,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   */  [LR_CSA_AGR_SFT] = LAYOUT_ergodox(          // left hand -        CSA_PARG,      KC_NO,     CSA_LDQT,    CSA_RDQT,  KC_NO,     KC_NO,     KC_TRNS, -        KC_TRNS,       CSA_BPIP,  CSA_DDCT,    CSA_SECT,  S(CSA_OE), M(M_GRV),  KC_TRNS, -        KC_NO,         S(CSA_AE), S(CSA_UGRV), CSA_DDTA,  KC_NO,     KC_NO, -        CSA(AGR_SFT),  KC_NO,     CSA_LQOT,    CSA_RQOT,  KC_NO,     KC_NO,     KC_TRNS, +        CA_PARA,       KC_NO,     CA_LDQU,     CA_RDQU,   KC_NO,     KC_NO,     KC_TRNS, +        KC_TRNS,       CA_BRKP,   CA_DACU,     CA_SECT,   S(CA_OE),  M(M_GRV),  KC_TRNS, +        KC_NO,         S(CA_AE),  S(CA_UGRV),  CA_DOTA,   KC_NO,     KC_NO, +        CSA(AGR_SFT),  KC_NO,     CA_LSQU,     CA_RSQU,   KC_NO,     KC_NO,     KC_TRNS,          KC_TRNS,       KC_TRNS,   KC_TRNS,     KC_TRNS,   KC_TRNS,          KC_TRNS,  KC_TRNS, @@ -261,10 +261,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {          KC_TRNS,  CSA(AGR_SFT),  KC_TRNS,          // right hand -        KC_TRNS,  KC_NO,     CSA_NEGT,    CSA_1QRT,    CSA_1HLF,  CSA_3QRT,   KC_NO, -        KC_TRNS,  KC_NO,     KC_NO,       S(CSA_ETH),  KC_NO,     S(CSA_IJ),  KC_NO, -                  KC_NO,     S(CSA_THRN), S(CSA_SRPS), CSA_TM,    KC_NO,      CSA_ORDO, -        KC_TRNS,  KC_NO,     KC_NO,       KC_NO,       KC_NO,     CSA_ORDA,   CSA(AGR_SFT), +        KC_TRNS,  KC_NO,     CA_NOT,      CA_QRTR,     CA_HALF,   CA_TQTR,    KC_NO, +        KC_TRNS,  KC_NO,     KC_NO,       S(CA_ETH),   KC_NO,     S(CA_IJ),   KC_NO, +                  KC_NO,     S(CA_THRN),  S(CA_SS),    CA_TM,     KC_NO,      CA_MORD, +        KC_TRNS,  KC_NO,     KC_NO,       KC_NO,       KC_NO,     CA_FORD,    CSA(AGR_SFT),                          CSA(SFT_AGR),     KC_TRNS,     KC_TRNS,   KC_TRNS,    KC_TRNS,          KC_TRNS,  KC_TRNS, @@ -450,7 +450,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)                      case M_SCLN:                          return MACRO(D(SCLN), END);                      case M_GRV: -                        return MACRO(I(75), DOWN(KC_ALGR), TYPE(CSA_DCRC), UP(KC_ALGR), T(SPACE), END); +                        return MACRO(I(75), DOWN(KC_ALGR), TYPE(CA_CIRC), UP(KC_ALGR), T(SPACE), END);                      case M_NBSP:                          // use weak mod such that pressing another key will not be affected                          add_weak_mods(MOD_BIT(KC_ALGR)); @@ -474,7 +474,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)              break;          case M_CRC:              if (record->event.pressed) { -                return MACRO(I(75), TYPE(CSA_DCRC), T(SPACE), END); +                return MACRO(I(75), TYPE(CA_CIRC), T(SPACE), END);              }              break;          case M_DBL0: diff --git a/layouts/community/ergodox/coderkun_neo2/keymap.c b/layouts/community/ergodox/coderkun_neo2/keymap.c index 638442676a..b731ab4950 100644 --- a/layouts/community/ergodox/coderkun_neo2/keymap.c +++ b/layouts/community/ergodox/coderkun_neo2/keymap.c @@ -33,20 +33,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   */  [BASE] = LAYOUT_ergodox(          // left hand -        KC_TAB,     KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   NEO_GRV, -        NEO_Y,      NEO_X,  NEO_V,  NEO_L,  NEO_C,  NEO_W,  KC_HOME, -        NEO_L1_L,   NEO_U,  NEO_I,  NEO_A,  NEO_E,  NEO_O, -        KC_LSFT,    NEO_UE, NEO_OE, NEO_AE, NEO_P,  NEO_Z,  TG(PMQ), -        KC_LCTL,    KC_LALT,MO(FMU),KC_LGUI,NEO_L2_L, +        KC_TAB,     KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   NE_GRV, +        NE_Y,      NE_X,  NE_V,  NE_L,  NE_C,  NE_W,  KC_HOME, +        NE_L3L,   NE_U,  NE_I,  NE_A,  NE_E,  NE_O, +        KC_LSFT,    NE_UDIA, NE_ODIA, NE_ADIA, NE_P,  NE_Z,  TG(PMQ), +        KC_LCTL,    KC_LALT,MO(FMU),KC_LGUI,NE_L4L,                                                      KC_LEFT,    KC_UP,                                                                  KC_MINS,                                              KC_SPC, KC_ENT,    ALL_T(KC_NO),          // right hand -        NEO_ACUT,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_BSPC, -        KC_END,     NEO_K,  NEO_H,  NEO_G,  NEO_F,  NEO_Q,  NEO_SS, -                    NEO_S,  NEO_N,  NEO_R,  NEO_T,  NEO_D,  NEO_L1_R, -        TG(PMN),    NEO_B,  NEO_M,  KC_COMM,KC_DOT, NEO_J,  KC_RSFT, -                            NEO_L2_R,KC_RGUI,MO(FMU),KC_LALT,KC_RCTL, +        NE_ACUT,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_BSPC, +        KC_END,     NE_K,  NE_H,  NE_G,  NE_F,  NE_Q,  NE_SS, +                    NE_S,  NE_N,  NE_R,  NE_T,  NE_D,  NE_L3R, +        TG(PMN),    NE_B,  NE_M,  KC_COMM,KC_DOT, NE_J,  KC_RSFT, +                            NE_L4R,KC_RGUI,MO(FMU),KC_LALT,KC_RCTL,          KC_DOWN,    KC_RGHT,          KC_MINS,          MEH_T(KC_NO),KC_ENT,KC_SPC @@ -76,8 +76,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {          // left hand          KC_TAB,     KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_EQL,          DE_C,       DE_P,   DE_T,   DE_F,   DE_K,   DE_L,   KC_HOME, -        NEO_L1_L,   DE_D,   DE_H,   DE_OE,  DE_O,   DE_I, -        KC_LSFT,    DE_AE,  DE_Q,   DE_R,   DE_W,   DE_N,   KC_TRNS, +        NE_L3L,   DE_D,   DE_H,   DE_ODIA,DE_O,   DE_I, +        KC_LSFT,    DE_ADIA,DE_Q,   DE_R,   DE_W,   DE_N,   KC_TRNS,          KC_LCTL,    KC_LALT,MO(FMU),KC_LGUI,MO(NHL),                                                      KC_LEFT,    KC_UP,                                                                  KC_MINS, @@ -85,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {          // right hand          DE_ACUT,    KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_BSPC,          KC_END,     DE_B,   DE_A,   DE_S,   DE_G,   DE_V,   DE_Y, -                    DE_U,   DE_MINS,DE_Z,   DE_E,   DE_X,   NEO_L1_R, +                    DE_U,   DE_MINS,DE_Z,   DE_E,   DE_X,   NE_L3R,          KC_TRNS,    DE_J,   DE_M,   DE_COMM,DE_DOT, DE_SS,  KC_RSFT,                              MO(NHL),KC_RGUI,MO(FMU),KC_LALT,KC_RCTL,          KC_DOWN,    KC_RGHT, @@ -117,7 +117,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {          KC_TAB,     KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_EQL,          DE_Y,       DE_X,   DE_V,   DE_L,   DE_C,   DE_W,   KC_HOME,          KC_NO,      DE_U,   DE_I,   DE_A,   DE_E,   DE_O, -        KC_LSFT,    DE_UE,  DE_OE,  DE_AE,  DE_P,   DE_Z,   KC_TRNS, +        KC_LSFT,    DE_UDIA,DE_ODIA,DE_ADIA,DE_P,   DE_Z,   KC_TRNS,          KC_LCTL,    KC_LALT,MO(FMU),KC_LGUI,MO(NHL),                                                      KC_LEFT,    KC_UP,                                                                  KC_MINS, @@ -215,12 +215,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {      ),  }; -const uint16_t PROGMEM fn_actions[] = { -    [BASE] = ACTION_FUNCTION(BASE), -    [PMQ]  = ACTION_FUNCTION(PMQ), -    [PMN]  = ACTION_FUNCTION(PMN), -}; -  // Runs just one time when the keyboard initializes.  void matrix_init_user(void) {      set_unicode_input_mode(UC_LNX); @@ -260,12 +254,12 @@ void matrix_scan_user(void)  }; -// Override Unicode start method to use NEO_U instead of KC_U +// Override Unicode start method to use NE_U instead of KC_U  void unicode_input_start (void) {      register_code(KC_LCTL);      register_code(KC_LSFT); -    register_code(NEO_U); -    unregister_code(NEO_U); +    register_code(NE_U); +    unregister_code(NE_U);      unregister_code(KC_LSFT);      unregister_code(KC_LCTL);  }; diff --git a/layouts/community/ergodox/colemak_osx_pc_no/keymap.c b/layouts/community/ergodox/colemak_osx_pc_no/keymap.c index a4a4533494..b9986e0e9d 100644 --- a/layouts/community/ergodox/colemak_osx_pc_no/keymap.c +++ b/layouts/community/ergodox/colemak_osx_pc_no/keymap.c @@ -9,6 +9,18 @@  #define NUMB_SYMB_MAC 3 // numbers and symbols mac  #define FUNCTION 4 // function keys +enum custom_keycodes { +    TILDE_NO = SAFE_RANGE, +    LESS_NO, +    GRTR_NO, +    CIRC_NO, +    ACUT_NO, +    GRV_NO, +    LESS_NO_MAC, +    GRTR_NO_MAC, +    ACUT_NO_MAC +}; +  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  /* Keymap 0: Basic layer PC @@ -35,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  [BASE] = LAYOUT_ergodox(          // left hand          NO_BSLS,       NO_LBRC, NO_RBRC, NO_LCBR,  NO_RCBR, NO_ASTR,  TG(1), -        NO_QUES,         KC_Q,         KC_W,    KC_F,   KC_P,   KC_G,   NO_QUO2, +        NO_QUES,         KC_Q,         KC_W,    KC_F,   KC_P,   KC_G,   NO_DQUO,          NO_COLN,         KC_A,         KC_R,    KC_S,   KC_T,   KC_D,          KC_EXLM,        KC_Z,         KC_X,    KC_C,   KC_V,   KC_B,   NO_SCLN,          MO(4),     KC_BTN1,      KC_BTN2, KC_TAB,GUI_T(KC_COMMA), @@ -43,11 +55,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {                                                                NO_PLUS,                                                 OSM(MOD_LSFT),CTL_T(KC_DOT),ALT_T(NO_MINS),          // right hand -             KC_FN5, NO_DLR, NO_LPRN, NO_RPRN ,KC_FN3, KC_FN4,NO_AT, -             NO_APOS,      KC_J,    KC_L,    KC_U,      KC_Y,     NO_AA,   NO_AE  , -                           KC_H,    KC_N,    KC_E,      KC_I,      KC_O,    NO_OSLH, +             CIRC_NO, NO_DLR, NO_LPRN, NO_RPRN ,LESS_NO, GRTR_NO,NO_AT, +             NO_QUOT,      KC_J,    KC_L,    KC_U,      KC_Y,     NO_ARNG, NO_AE  , +                           KC_H,    KC_N,    KC_E,      KC_I,      KC_O,    NO_OSTR,               NO_EQL,        KC_K,    KC_M, KC_RIGHT,  KC_DOWN,   KC_UP, NO_UNDS, -                                  KC_LEFT,  KC_ESC,   KC_FN7,   KC_HASH,   MO(2), +                                  KC_LEFT,  KC_ESC,   GRV_NO,   KC_HASH,   MO(2),               KC_INSERT,  NO_SLSH,               KC_DEL,               KC_BSPC,KC_ENT,KC_SPC @@ -74,20 +86,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   *                                 `--------------------'       `--------------------'   */  [BASE_MAC] = LAYOUT_ergodox( -       NO_BSLS_MAC, KC_TRNS,KC_TRNS, NO_LCBR_MAC,NO_RCBR_MAC, KC_TRNS, KC_TRNS, +       S(ALGR(NO_7)), KC_TRNS,KC_TRNS, S(ALGR(NO_8)),S(ALGR(NO_9)), KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, CTL_T(KC_COMMA), -                                           KC_TRNS, NO_PIPE_MAC, +                                           KC_TRNS, ALGR(NO_7),                                                      KC_TRNS,                                    KC_TRNS,GUI_T(KC_DOT) , KC_TRNS,      // right hand -       KC_TRNS,  NO_DLR_MAC, KC_TRNS,KC_TRNS,KC_FN8, KC_FN9,NO_AT_MAC, -       NO_APOS_MAC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, +       KC_TRNS,  S(NO_4), KC_TRNS,KC_TRNS,LESS_NO_MAC, GRTR_NO_MAC,NO_QUOT, +       NO_LABK,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -                          KC_TRNS, KC_TRNS, NO_GRV_MAC, KC_TRNS, MO(3), +                          KC_TRNS, KC_TRNS, ALGR(NO_BSLS), KC_TRNS, MO(3),         KC_TRNS, KC_TRNS,         KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS @@ -125,7 +137,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {                                    KC_TRNS, KC_TRNS, KC_TRNS,      // right hand         KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -       KC_TRNS,  KC_TRNS, KC_FN2, KC_FN6 , KC_TRNS, KC_TRNS, KC_TRNS, +       KC_TRNS,  KC_TRNS, TILDE_NO, ACUT_NO , KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_5, KC_6, KC_7, KC_8, KC_TRNS,         KC_TRNS,  KC_HOME, KC_9, KC_END, KC_PGDN, KC_PGUP, KC_TRNS,                            KC_HOME, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -166,7 +178,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {                                    KC_TRNS, KC_TRNS, KC_TRNS,      // right hand         KC_TRNS,  KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS , KC_TRNS, KC_TRNS, -       KC_TRNS,  KC_TRNS, KC_FN2, KC_FN10, KC_TRNS, KC_TRNS, KC_TRNS, +       KC_TRNS,  KC_TRNS, TILDE_NO, ACUT_NO_MAC, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_5, KC_6, KC_7, KC_8, KC_TRNS,         KC_TRNS,  KC_HOME, KC_9, KC_END, KC_PGDN, KC_PGUP, KC_TRNS,                            KC_HOME, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -217,47 +229,57 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  )  }; -enum macro_id { -    TILDE_NO, LESS_NO, GRTR_NO, CIRC_NO, ACUT_NO,  GRV_NO, LESS_NO_MAC, GRTR_NO_MAC, ACUT_NO_MAC -}; - -const uint16_t PROGMEM fn_actions[] = { -    [2] = ACTION_MACRO(TILDE_NO), // Completed ~ character(pc and mac), no space needed. -    [3] = ACTION_MACRO(LESS_NO), // < completed on keypress down, to avoid shifting the next character if it is not released first. -    [4] = ACTION_MACRO(GRTR_NO), // > completed on keypress down, to avoid shifting the next character if it is not released first. -    [5] = ACTION_MACRO(CIRC_NO), // Completed ^ character, no space needed. -    [6] = ACTION_MACRO(ACUT_NO), // Completed ´ character, no space needed. -    [7] = ACTION_MACRO(GRV_NO), // Completed ` character, no space needed. -    [8] = ACTION_MACRO(LESS_NO_MAC), // < completed on keypress down, to avoid same button problem when typing <> quickly -    [9] = ACTION_MACRO(GRTR_NO_MAC), // > completed on keypress down, to avoid same button problem when typing <> quickly -    [10] = ACTION_MACRO(ACUT_NO_MAC), // Completed ´ character, no space needed -}; - - - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ -    keyevent_t event = record->event; - -    switch (id) { +bool process_record_user(uint16_t keycode, keyrecord_t *record) { +    switch (keycode) {          case TILDE_NO: -            return (event.pressed ? MACRO( D(RALT), T(RBRC), U(RALT), T(SPC), END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code16(ALGR(KC_RBRC)); +                tap_code(KC_SPC); +            } +            return false;          case LESS_NO: -            return (event.pressed ? MACRO( T(NUBS), END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code(KC_NUBS); +            } +            return false;          case GRTR_NO: -            return (event.pressed ? MACRO( D(LSFT), T(NUBS), U(LSFT), END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code16(S(KC_NUBS)); +            } +            return false;          case CIRC_NO: -            return (event.pressed ? MACRO( D(LSFT), T(RBRC), U(LSFT), T(SPC), END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code16(S(KC_RBRC)); +                tap_code(KC_SPC); +            } +            return false;          case ACUT_NO: -            return (event.pressed ? MACRO( D(RALT), T(EQL), U(RALT), T(SPC),  END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code16(ALGR(KC_EQL)); +                tap_code(KC_SPC); +            } +            return false;          case GRV_NO: -            return (event.pressed ? MACRO( D(LSFT), T(EQL), T(SPC), U(LSFT),  END ) : MACRO_NONE); +            if (record->event.pressed) { +                SEND_STRING(SS_LSFT("= ")); +            } +            return false;          case LESS_NO_MAC: -            return (event.pressed ? MACRO( T(GRV), END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code(KC_GRV); +            } +            return false;          case GRTR_NO_MAC: -            return (event.pressed ? MACRO( D(LSFT), T(GRV), U(LSFT), END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code16(S(KC_GRV)); +            } +            return false;          case ACUT_NO_MAC: -            return (event.pressed ? MACRO( T(EQL), T(SPC),  END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code(KC_EQL); +                tap_code(KC_SPC); +            } +            return false;      } -    return MACRO_NONE; -}; +    return true; +} diff --git a/layouts/community/ergodox/deadcyclo/keymap.c b/layouts/community/ergodox/deadcyclo/keymap.c index 0ae1ef7fb2..345e25e03e 100644 --- a/layouts/community/ergodox/deadcyclo/keymap.c +++ b/layouts/community/ergodox/deadcyclo/keymap.c @@ -1,6 +1,4 @@  #include QMK_KEYBOARD_H -#include "debug.h" -#include "action_layer.h"  #include "version.h"  #define BASE 0 // default layer @@ -9,45 +7,19 @@  #define UNI 3  // unicode 1  #define UNI2 4 // unicode 2 -enum macros { -  RUN -}; - -enum function_ids { -  EMOJI, -  EMOJI2, -  EPRM, +enum custom_keycodes { +  I3_RUN = SAFE_RANGE,    VRSN, -  RGB_SLD, -  GO_GROUP -}; - -/* opt can only be 0-15 */ -enum emojis { -  SHRUG, -  YAY, -  HUG, -  SMILE, -  SMILE2, -  HMM1, -  HMM2, -  BEAR1, -  BEAR2, -  FUU, -  EGGY1, -  EGGY2, -  FACE1, -  FACE2, -  UHU, -  SMRK1 -}; - -enum emojis2 { -  SMRK2, -  LOVE -}; - -enum progmem_ids { +  I3_GO_GROUP_1, +  I3_GO_GROUP_2, +  I3_GO_GROUP_3, +  I3_GO_GROUP_4, +  I3_GO_GROUP_5, +  I3_GO_GROUP_6, +  I3_GO_GROUP_7, +  I3_GO_GROUP_8, +  I3_GO_GROUP_9, +  I3_GO_GROUP_10,    EMOJI_SHRUG,    EMOJI_YAY,    EMOJI_HUG, @@ -65,20 +37,7 @@ enum progmem_ids {    EMOJI_UHU,    EMOJI_SMRK1,    EMOJI_SMRK2, -  EMOJI_LOVE, -  F_EPRM, -  F_VRSN, -  F_RGB_SLD, -  I3_GO_GROUP_10, -  I3_GO_GROUP_1, -  I3_GO_GROUP_2, -  I3_GO_GROUP_3, -  I3_GO_GROUP_4, -  I3_GO_GROUP_5, -  I3_GO_GROUP_6, -  I3_GO_GROUP_7, -  I3_GO_GROUP_8, -  I3_GO_GROUP_9, +  EMOJI_LOVE  };  // TODO: Finish the macros for i3 (Macros should potentially be own function instead to make things easier? some of them at least, f. ex. the ones that use 1-0 keys so we can have a single switch) @@ -163,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {         KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,         KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,                                         RGB_TOG,RGB_MOD, -       F(F_RGB_SLD), +       RGB_M_P,                                 RGB_VAD,RGB_VAI,KC_TRNS,         // right hand         KC_F6, KC_F7,   KC_F8,  KC_F9,   KC_F10,   KC_F11,  KC_F12, @@ -173,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {                           KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,         RGB_HUD, RGB_HUI,         KC_TRNS, -       F(F_EPRM), KC_DEL, KC_TRNS +       EEP_RST, KC_DEL, KC_TRNS  ),  /* Keymap 2: Media, mouse and navigation   * @@ -198,8 +157,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   */  // MEDIA , MOUSE and NAVIGATION  [MDIA] = LAYOUT_ergodox( -		KC_TRNS, F(I3_GO_GROUP_1), F(I3_GO_GROUP_2), F(I3_GO_GROUP_3), F(I3_GO_GROUP_4), F(I3_GO_GROUP_5), F(I3_GO_GROUP_6), -KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, M(RUN), KC_TRNS, KC_TRNS, +		KC_TRNS, I3_GO_GROUP_1, I3_GO_GROUP_2, I3_GO_GROUP_3, I3_GO_GROUP_4, I3_GO_GROUP_5, I3_GO_GROUP_6, +KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, I3_RUN, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, @@ -207,7 +166,7 @@ KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, M(RUN), KC_TRNS, KC_TRNS,                                                      KC_TRNS,                                    KC_TRNS, KC_TRNS, KC_TRNS,      // right hand -		F(I3_GO_GROUP_6), F(I3_GO_GROUP_7), F(I3_GO_GROUP_8), F(I3_GO_GROUP_9), F(I3_GO_GROUP_10), KC_TRNS, KC_TRNS, +		I3_GO_GROUP_6, I3_GO_GROUP_7, I3_GO_GROUP_8, I3_GO_GROUP_9, I3_GO_GROUP_10, KC_TRNS, KC_TRNS,         KC_TRNS,  KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS,  KC_TRNS, KC_TRNS,                   KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_MPLY,         KC_TRNS,  KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS,  KC_TRNS, KC_TRNS, @@ -241,10 +200,10 @@ KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, M(RUN), KC_TRNS, KC_TRNS,  // Unicode  [UNI] = LAYOUT_ergodox(  		KC_TRNS, UC(0x250c), UC(0x2510), UC(0x2514), UC(0x2518), UC(0x2502), UC(0x2500), -		KC_TRNS, F(EMOJI_SHRUG), F(EMOJI_YAY), F(EMOJI_HUG), F(EMOJI_SMILE), F(EMOJI_SMILE2), KC_TRNS, -		KC_TRNS, F(EMOJI_HMM1), F(EMOJI_HMM2), F(EMOJI_BEAR1), F(EMOJI_BEAR2), F(EMOJI_FUU), -		KC_TRNS, F(EMOJI_EGGY1), F(EMOJI_EGGY2), F(EMOJI_FACE1), F(EMOJI_FACE2), F(EMOJI_UHU), KC_TRNS, -		KC_TRNS, F(EMOJI_SMRK1), F(EMOJI_SMRK2), F(EMOJI_LOVE), F(F_VRSN), +		KC_TRNS, EMOJI_SHRUG, EMOJI_YAY, EMOJI_HUG, EMOJI_SMILE, EMOJI_SMILE2, KC_TRNS, +		KC_TRNS, EMOJI_HMM1, EMOJI_HMM2, EMOJI_BEAR1, EMOJI_BEAR2, EMOJI_FUU, +		KC_TRNS, EMOJI_EGGY1, EMOJI_EGGY2, EMOJI_FACE1, EMOJI_FACE2, EMOJI_UHU, KC_TRNS, +		KC_TRNS, EMOJI_SMRK1, EMOJI_SMRK2, EMOJI_LOVE, VRSN,  		KC_TRNS, KC_TRNS,                                                      KC_TRNS,                                    KC_TRNS, KC_TRNS, KC_TRNS, @@ -302,220 +261,84 @@ KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, M(RUN), KC_TRNS, KC_TRNS,  ),  }; -const uint16_t PROGMEM fn_actions[] = { -  [EMOJI_SHRUG]   = ACTION_FUNCTION_OPT(EMOJI, SHRUG), -  [EMOJI_YAY]     = ACTION_FUNCTION_OPT(EMOJI, YAY), -  [EMOJI_HUG]     = ACTION_FUNCTION_OPT(EMOJI,HUG), -  [EMOJI_SMILE]   = ACTION_FUNCTION_OPT(EMOJI,SMILE), -  [EMOJI_SMILE2]  = ACTION_FUNCTION_OPT(EMOJI,SMILE2), -  [EMOJI_HMM1]    = ACTION_FUNCTION_OPT(EMOJI,HMM1), -  [EMOJI_HMM2]    = ACTION_FUNCTION_OPT(EMOJI,HMM2), -  [EMOJI_BEAR1]   = ACTION_FUNCTION_OPT(EMOJI,BEAR1), -  [EMOJI_BEAR2]   = ACTION_FUNCTION_OPT(EMOJI,BEAR2), -  [EMOJI_FUU]     = ACTION_FUNCTION_OPT(EMOJI,FUU), -  [EMOJI_EGGY1]   = ACTION_FUNCTION_OPT(EMOJI,EGGY1), -  [EMOJI_EGGY2]   = ACTION_FUNCTION_OPT(EMOJI,EGGY2), -  [EMOJI_FACE1]   = ACTION_FUNCTION_OPT(EMOJI,FACE1), -  [EMOJI_FACE2]   = ACTION_FUNCTION_OPT(EMOJI,FACE2), -  [EMOJI_UHU]     = ACTION_FUNCTION_OPT(EMOJI,UHU), -  [EMOJI_SMRK1]   = ACTION_FUNCTION_OPT(EMOJI,SMRK1), -  [EMOJI_SMRK2]   = ACTION_FUNCTION_OPT(EMOJI2,SMRK2), -  [EMOJI_LOVE]    = ACTION_FUNCTION_OPT(EMOJI2,LOVE), -  [F_EPRM]        = ACTION_FUNCTION(EPRM), -  [F_VRSN]        = ACTION_FUNCTION(VRSN), -  [F_RGB_SLD]     = ACTION_FUNCTION(RGB_SLD), -  [I3_GO_GROUP_10]= ACTION_FUNCTION_OPT(GO_GROUP,0), -  [I3_GO_GROUP_1] = ACTION_FUNCTION_OPT(GO_GROUP,1), -  [I3_GO_GROUP_2] = ACTION_FUNCTION_OPT(GO_GROUP,2), -  [I3_GO_GROUP_3] = ACTION_FUNCTION_OPT(GO_GROUP,3), -  [I3_GO_GROUP_4] = ACTION_FUNCTION_OPT(GO_GROUP,4), -  [I3_GO_GROUP_5] = ACTION_FUNCTION_OPT(GO_GROUP,5), -  [I3_GO_GROUP_6] = ACTION_FUNCTION_OPT(GO_GROUP,6), -  [I3_GO_GROUP_7] = ACTION_FUNCTION_OPT(GO_GROUP,7), -  [I3_GO_GROUP_8] = ACTION_FUNCTION_OPT(GO_GROUP,8), -  [I3_GO_GROUP_9] = ACTION_FUNCTION_OPT(GO_GROUP,9), -}; - -#define TAP_ONCE(code)  \ -  register_code (code); \ -  unregister_code (code) - -void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { -  if (record->event.pressed) { -    switch(id) { -    case EPRM: -      eeconfig_init(); -      break; -    case VRSN: -      SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); -      break; -    case RGB_SLD: -#ifdef RGBLIGHT_ENABLE -      rgblight_mode(1); -#endif -      break; -    case GO_GROUP: -      register_code(KC_LCTL); TAP_ONCE(KC_I); unregister_code(KC_LCTL); -      TAP_ONCE(KC_G); -      if (opt == 0) { -	TAP_ONCE(39); -      } else { -	TAP_ONCE(29+opt); -      } -      break; -    case EMOJI: -      switch(opt) { -      case SHRUG: -	unicode_input_start(); register_hex(0xaf); unicode_input_finish(); -	TAP_ONCE (KC_BSLS); -	register_code (KC_RSFT); TAP_ONCE (KC_MINS); TAP_ONCE (KC_9); unregister_code (KC_RSFT); -	unicode_input_start (); register_hex(0x30c4); unicode_input_finish(); -	register_code (KC_RSFT); TAP_ONCE (KC_0); TAP_ONCE (KC_MINS); unregister_code (KC_RSFT); -	TAP_ONCE (KC_SLSH); -	unicode_input_start (); register_hex(0xaf); unicode_input_finish(); -	break; -      case YAY: -	SEND_STRING ("\\o/");	 -	break; -      case HUG: -	unicode_input_start(); register_hex(0x0f3c); unicode_input_finish(); -	TAP_ONCE (KC_SPC); -	unicode_input_start(); register_hex(0x3064); unicode_input_finish(); -	TAP_ONCE (KC_SPC); -	unicode_input_start(); register_hex(0x25d5); unicode_input_finish(); -	unicode_input_start(); register_hex(0x005f); unicode_input_finish(); -	unicode_input_start(); register_hex(0x25d5); unicode_input_finish(); -	TAP_ONCE (KC_SPC); -	unicode_input_start(); register_hex(0x0f3d); unicode_input_finish(); -	unicode_input_start(); register_hex(0x3064); unicode_input_finish(); -	break; -      case SMILE: -	unicode_input_start(); register_hex(0x0298); unicode_input_finish(); -	unicode_input_start(); register_hex(0x203f); unicode_input_finish(); -	unicode_input_start(); register_hex(0x0298); unicode_input_finish(); -	break; -      case SMILE2: -	unicode_input_start(); register_hex(0x0028); unicode_input_finish(); -	unicode_input_start(); register_hex(0x0298); unicode_input_finish(); -	unicode_input_start(); register_hex(0x203f); unicode_input_finish(); -	unicode_input_start(); register_hex(0x0298); unicode_input_finish(); -	unicode_input_start(); register_hex(0x0029); unicode_input_finish(); -	break; -      case HMM1: -	unicode_input_start(); register_hex(0x0ca0); unicode_input_finish(); -	unicode_input_start(); register_hex(0x005f); unicode_input_finish(); -	unicode_input_start(); register_hex(0x0ca0); unicode_input_finish(); -	break; -      case HMM2: -	unicode_input_start(); register_hex(0x0028); unicode_input_finish(); -	unicode_input_start(); register_hex(0x0ca0); unicode_input_finish(); -	unicode_input_start(); register_hex(0x005f); unicode_input_finish(); -	unicode_input_start(); register_hex(0x0ca0); unicode_input_finish(); -	unicode_input_start(); register_hex(0x0029); unicode_input_finish(); -	break; -      case BEAR1: -	unicode_input_start(); register_hex(0x0295); unicode_input_finish(); -	unicode_input_start(); register_hex(0x2022); unicode_input_finish(); -	unicode_input_start(); register_hex(0x1d25); unicode_input_finish(); -	unicode_input_start(); register_hex(0x2022); unicode_input_finish(); -	unicode_input_start(); register_hex(0x0294); unicode_input_finish(); -	break; -      case BEAR2: -	unicode_input_start(); register_hex(0x0028); unicode_input_finish(); -	unicode_input_start(); register_hex(0x1d54); unicode_input_finish(); -	unicode_input_start(); register_hex(0x1d25); unicode_input_finish(); -	unicode_input_start(); register_hex(0x1d54); unicode_input_finish(); -	unicode_input_start(); register_hex(0x0029); unicode_input_finish(); -	break; -      case FUU: -	unicode_input_start(); register_hex(0x256d); unicode_input_finish(); -	unicode_input_start(); register_hex(0x2229); unicode_input_finish(); -	unicode_input_start(); register_hex(0x256e); unicode_input_finish(); -	unicode_input_start(); register_hex(0x0028); unicode_input_finish(); -	unicode_input_start(); register_hex(0x002d); unicode_input_finish(); -	unicode_input_start(); register_hex(0x005f); unicode_input_finish(); -	unicode_input_start(); register_hex(0x002d); unicode_input_finish(); -	unicode_input_start(); register_hex(0x0029); unicode_input_finish(); -	unicode_input_start(); register_hex(0x256d); unicode_input_finish(); -	unicode_input_start(); register_hex(0x2229); unicode_input_finish(); -	unicode_input_start(); register_hex(0x256e); unicode_input_finish(); -	break; -      case EGGY1: -	unicode_input_start(); register_hex(0x0028); unicode_input_finish(); -	unicode_input_start(); register_hex(0x256f); unicode_input_finish(); -	unicode_input_start(); register_hex(0x00b0); unicode_input_finish(); -	unicode_input_start(); register_hex(0x25a1); unicode_input_finish(); -	unicode_input_start(); register_hex(0x00b0); unicode_input_finish(); -	unicode_input_start(); register_hex(0xff09); unicode_input_finish(); -	unicode_input_start(); register_hex(0x256f); unicode_input_finish(); -	break; -      case EGGY2: -	unicode_input_start(); register_hex(0x30ce); unicode_input_finish(); -	unicode_input_start(); register_hex(0x0028); unicode_input_finish(); -	unicode_input_start(); register_hex(0x0020); unicode_input_finish(); -	unicode_input_start(); register_hex(0x309c); unicode_input_finish(); -	unicode_input_start(); register_hex(0x002d); unicode_input_finish(); -	unicode_input_start(); register_hex(0x309c); unicode_input_finish(); -	unicode_input_start(); register_hex(0x30ce); unicode_input_finish(); -	unicode_input_start(); register_hex(0x0029); unicode_input_finish(); -	break; -      case FACE1: -	unicode_input_start(); register_hex(0x0028); unicode_input_finish(); -	unicode_input_start(); register_hex(0x002d); unicode_input_finish(); -	unicode_input_start(); register_hex(0x005f); unicode_input_finish(); -	unicode_input_start(); register_hex(0x002d); unicode_input_finish(); -	unicode_input_start(); register_hex(0x0029); unicode_input_finish(); -	break; -      case FACE2: -	unicode_input_start(); register_hex(0x0028); unicode_input_finish(); -	unicode_input_start(); register_hex(0x2022); unicode_input_finish(); -	unicode_input_start(); register_hex(0x005f); unicode_input_finish(); -	unicode_input_start(); register_hex(0x2022); unicode_input_finish(); -	unicode_input_start(); register_hex(0x0029); unicode_input_finish(); -	break; -      case UHU: -	unicode_input_start(); register_hex(0x2299); unicode_input_finish(); -	unicode_input_start(); register_hex(0xfe4f); unicode_input_finish(); -	unicode_input_start(); register_hex(0x2299); unicode_input_finish(); -	break; -      case SMRK1: -	unicode_input_start(); register_hex(0x005e); unicode_input_finish(); -	unicode_input_start(); register_hex(0x032e); unicode_input_finish(); -	unicode_input_start(); register_hex(0x005e); unicode_input_finish(); -	break; -      } -      break; -    case EMOJI2: -      switch(opt) { -	case SMRK2: -	  unicode_input_start(); register_hex(0x0028); unicode_input_finish(); -	  unicode_input_start(); register_hex(0x005e); unicode_input_finish(); -	  unicode_input_start(); register_hex(0x032e); unicode_input_finish(); -	  unicode_input_start(); register_hex(0x005e); unicode_input_finish(); -	  unicode_input_start(); register_hex(0x0029); unicode_input_finish(); -	  break; -      case LOVE: -	unicode_input_start(); register_hex(0x2665); unicode_input_finish(); -	unicode_input_start(); register_hex(0x203f); unicode_input_finish(); -	unicode_input_start(); register_hex(0x2665); unicode_input_finish(); -	break; -      } -      break;    +bool process_record_user(uint16_t keycode, keyrecord_t *record) { +    if (record->event.pressed) { +        switch (keycode) { +            case I3_RUN: +                tap_code16(C(KC_I)); +                tap_code(KC_R); +                return false; +            case VRSN: +                SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); +                return false; +            case I3_GO_GROUP_1 ... I3_GO_GROUP_10: +                tap_code16(C(KC_I)); +                tap_code(KC_G); +                if (keycode == I3_GO_GROUP_10) { +                    tap_code(KC_0); +                } else { +                    tap_code(KC_1 + (keycode - I3_GO_GROUP_1)); +                } +                return false; +            case EMOJI_SHRUG: +                send_unicode_string("¯\\_(ツ)_/¯"); +                return false; +            case EMOJI_YAY: +                SEND_STRING("\\o/"); +                return false; +            case EMOJI_HUG: +                send_unicode_string("༼ つ ◕_◕ ༽つ"); +                return false; +            case EMOJI_SMILE: +                send_unicode_string("ʘ‿ʘ"); +                return false; +            case EMOJI_SMILE2: +                send_unicode_string("(ʘ‿ʘ)"); +                return false; +            case EMOJI_HMM1: +                send_unicode_string("ಠ_ಠ"); +                return false; +            case EMOJI_HMM2: +                send_unicode_string("(ಠ_ಠ)"); +                return false; +            case EMOJI_BEAR1: +                send_unicode_string("ʕ•ᴥ•ʔ"); +                return false; +            case EMOJI_BEAR2: +                send_unicode_string("(ᵔᴥᵔ)"); +                return false; +            case EMOJI_FUU: +                send_unicode_string("╭∩╮(-_-)╭∩╮"); +                return false; +            case EMOJI_EGGY1: +                send_unicode_string("(╯°□°)╯"); +                return false; +            case EMOJI_EGGY2: +                send_unicode_string("ノ( ゜-゜ノ)"); +                return false; +            case EMOJI_FACE1: +                SEND_STRING("(-_-)"); +                return false; +            case EMOJI_FACE2: +                send_unicode_string("(•_•)"); +                return false; +            case EMOJI_UHU: +                send_unicode_string("⊙﹏⊙"); +                return false; +            case EMOJI_SMRK1: +                send_unicode_string("^̮^"); +                return false; +            case EMOJI_SMRK2: +                send_unicode_string("(^̮^)"); +                return false; +            case EMOJI_LOVE: +                send_unicode_string("♥‿♥"); +                return false; +        }      } -  } +    return true;  } -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { -  if (record->event.pressed) { -    switch(id) { -      case RUN: -	return MACRO( D(LCTL), T(I), U(LCTL), T(R), END  ); -      break; -    } -  } -  return MACRO_NONE; -}; -  // Runs just one time when the keyboard initializes.  void matrix_init_user(void) {    set_unicode_input_mode(UC_LNX); diff --git a/layouts/community/ergodox/drashna/config.h b/layouts/community/ergodox/drashna/config.h index 4ccba8f04b..f9daf277fb 100644 --- a/layouts/community/ergodox/drashna/config.h +++ b/layouts/community/ergodox/drashna/config.h @@ -47,3 +47,4 @@  #define PIMORONI_TRACKBALL_INVERT_X  #define PIMORONI_TRACKBALL_INVERT_Y +#define PIMORONI_TRACKBALL_CLICK diff --git a/layouts/community/ergodox/drashna/keymap.c b/layouts/community/ergodox/drashna/keymap.c index 3e14606060..600e29020d 100644 --- a/layouts/community/ergodox/drashna/keymap.c +++ b/layouts/community/ergodox/drashna/keymap.c @@ -19,7 +19,7 @@  #ifdef UNICODEMAP_ENABLE  #    include "drashna_unicode.h"  #endif  // UNICODEMAP_ENABLE - +#include "drivers/sensors/pimoroni_trackball.h"  enum more_custom_keycodes {      KC_SWAP_NUM = NEW_SAFE_RANGE,      PM_SCROLL, @@ -317,13 +317,14 @@ void shutdown_keymap(void) {  static bool mouse_button_one, trackball_button_one; -void trackball_check_click(bool pressed, report_mouse_t* mouse) { -    if (mouse_button_one | pressed) { -        mouse->buttons |= MOUSE_BTN1; +void trackball_register_button(bool pressed, enum mouse_buttons button) { +    report_mouse_t currentReport = pointing_device_get_report(); +    if (pressed) { +        currentReport.buttons |= button;      } else { -        mouse->buttons &= ~MOUSE_BTN1; +        currentReport.buttons &= ~button;      } -    trackball_button_one = pressed; +    pointing_device_set_report(currentReport);  }  #endif diff --git a/layouts/community/ergodox/drashna/visualizer.c b/layouts/community/ergodox/drashna/visualizer.c_old index 6b1c3ff498..6b1c3ff498 100644 --- a/layouts/community/ergodox/drashna/visualizer.c +++ b/layouts/community/ergodox/drashna/visualizer.c_old diff --git a/layouts/community/ergodox/dvorak_programmer_swe/keymap.c b/layouts/community/ergodox/dvorak_programmer_swe/keymap.c index bb27f18e80..a8a428a04b 100644 --- a/layouts/community/ergodox/dvorak_programmer_swe/keymap.c +++ b/layouts/community/ergodox/dvorak_programmer_swe/keymap.c @@ -69,8 +69,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {                                                 KC_SPC,KC_BSPC,KC_END,          // right hand               KC_RGHT,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_BSLASH, -             TG(1),       KC_F,   KC_G,   KC_C,   KC_R,   KC_L,             SE_AM, -                          KC_D,   KC_H,   KC_T,   KC_N,   KC_S,             SE_AE, +             TG(1),       KC_F,   KC_G,   KC_C,   KC_R,   KC_L,             SE_ARNG, +                          KC_D,   KC_H,   KC_T,   KC_N,   KC_S,             SE_ADIA,               TG(MDIA),KC_B,   KC_M,   KC_W,   KC_V,   CTL_T(KC_Z),      KC_RSFT,                                    KC_UP,  KC_DOWN,KC_LBRC,KC_RBRC,          TT(SYMB),               LALT(KC_LSFT),        CTL_T(KC_ESC), @@ -111,8 +111,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {                                 KC_TRNS,KC_TRNS,KC_TRNS,         // right hand         KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11, -       KC_TRNS, SE_LESS,   KC_7,   KC_8,    KC_9,    KC_KP_ASTERISK, KC_F12, -                LSFT(SE_LESS), KC_4,   KC_5,    KC_6,    KC_KP_PLUS, KC_TRNS, +       KC_TRNS, SE_LABK,   KC_7,   KC_8,    KC_9,    KC_KP_ASTERISK, KC_F12, +                SE_RABK, KC_4,   KC_5,    KC_6,    KC_KP_PLUS, KC_TRNS,         KC_TRNS, SE_QUES, KC_1,   KC_2,    KC_3,    LSFT(KC_5), KC_TRNS,                           KC_DOT,KC_0,  LSFT(KC_0),    KC_TRNS,  KC_TRNS,         KC_TRNS, KC_TRNS, @@ -186,7 +186,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  [DEVL] = LAYOUT_ergodox(         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, M(MACRO_SAVE), M(MACRO_BUILD), M(MACRO_DEBUG), KC_PSCR, ALGR(KC_4), KC_TRNS, -       KC_TRNS, SE_ACUT, SE_APOS, SE_PIPE, KC_TRNS, ALGR(KC_3), +       KC_TRNS, SE_ACUT, SE_QUOT, SE_PIPE, KC_TRNS, ALGR(KC_3),         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, ALGR(KC_5), KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                             KC_TRNS, KC_TRNS, diff --git a/layouts/community/ergodox/dvorak_programmer_swe/readme.md b/layouts/community/ergodox/dvorak_programmer_swe/readme.md index 3bedf50d74..78d872ab5b 100644 --- a/layouts/community/ergodox/dvorak_programmer_swe/readme.md +++ b/layouts/community/ergodox/dvorak_programmer_swe/readme.md @@ -25,7 +25,7 @@ Known issues:    * Switched position on Alt and Alt-shift    * Added tilde character to symbol layer    * Added Print Screen to keymap 3 -  * Added ' (NO_APOS) to keymap 3 +  * Added ' (NO_QUOT) to keymap 3    * Added how to install help in this readme  * 2017-05-16 diff --git a/layouts/community/ergodox/dvorak_svorak_a5/keymap.c b/layouts/community/ergodox/dvorak_svorak_a5/keymap.c index 4ca20bd48c..3ecef9d9b6 100644 --- a/layouts/community/ergodox/dvorak_svorak_a5/keymap.c +++ b/layouts/community/ergodox/dvorak_svorak_a5/keymap.c @@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  [BASE] = LAYOUT_ergodox(  // layer 0 : default          // left hand          KC_NO,    KC_1,   KC_2,     KC_3,    KC_4,    KC_5,      MO(MOUS), -        KC_TAB,   SE_AA,  SE_AE,    SE_OSLH, KC_P,    KC_Y,      KC_NO, +        KC_TAB,   SE_ARNG,SE_ADIA,  SE_ODIA, KC_P,    KC_Y,      KC_NO,          KC_ESC,   KC_A,   KC_O,     KC_E,    KC_U,    KC_I,          KC_LSFT,  KC_DOT, KC_Q,     KC_J,    KC_K,    KC_X,      KC_NO,          KC_LCTRL, KC_NO,  KC_NO,    KC_LALT, KC_LCMD, @@ -84,9 +84,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {                                               KC_TRNS, KC_NO,   KC_NO,         // right hand         KC_NO, KC_NO,         KC_NO,       KC_NO,       KC_NO,       KC_NO,   KC_NO, -       KC_NO, LSFT(KC_2),    SE_QUES,     LSFT(KC_6),  SE_LESS,     SE_GRTR, KC_NO, +       KC_NO, LSFT(KC_2),    SE_QUES,     LSFT(KC_6),  SE_LABK,     SE_RABK, KC_NO,                KC_HASH,       SE_CIRC,     KC_HASH,     LSFT(KC_2),  SE_TILD, KC_NO, -       KC_NO, KC_PERC,       SE_ACUT,     SE_APOS,     SE_ASTR,     SE_GRV,  KC_NO, +       KC_NO, KC_PERC,       SE_ACUT,     SE_QUOT,     SE_ASTR,     SE_GRV,  KC_NO,                               KC_NO,       KC_NO,       KC_NO,       KC_NO,   KC_NO,         KC_NO, KC_NO,         KC_NO, @@ -162,14 +162,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {      KC_TAB,         KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_TRNS,      KC_CAPS,        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,      KC_LSFT,        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     SE_ACUT, -    CTL_T(SE_APOS), SE_CIRC, SE_ASTR, KC_LALT, KC_LGUI, +    CTL_T(SE_QUOT), SE_CIRC, SE_ASTR, KC_LALT, KC_LGUI,                                                          KC_LCTRL, KC_LALT,                                                                    SE_TILD,                                                 KC_BSPC, KC_TAB,   KC_ESC,      // right hand      KC_TRNS,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     SE_PLUS, -    KC_TRNS,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     SE_AA, -                    KC_H,    KC_J,    KC_K,    KC_L,    SE_OSLH,  SE_AE, +    KC_TRNS,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     SE_ARNG, +                    KC_H,    KC_J,    KC_K,    KC_L,    SE_ODIA,  SE_ADIA,      KC_DEL,         KC_N,    KC_M,    KC_COMM, KC_DOT,  SE_MINS,  KC_RSFT,                               KC_ALGR, KC_DOWN, KC_UP,   KC_LEFT,  KC_RGHT,      KC_HOME,        KC_END, diff --git a/layouts/community/ergodox/french_hacker/keymap.c b/layouts/community/ergodox/french_hacker/keymap.c index 731d917fd9..b4c8e37bd9 100644 --- a/layouts/community/ergodox/french_hacker/keymap.c +++ b/layouts/community/ergodox/french_hacker/keymap.c @@ -96,8 +96,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  [SYMB] = LAYOUT_ergodox(         // left hand         M(0),   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS, -       KC_TRNS,FR_SECT,FR_LESS,  FR_LCBR,FR_BSLS,FR_TILD,KC_TRNS, -       KC_TRNS,FR_APOS,FR_EQL, FR_MINS,FR_LPRN,FR_PLUS, +       KC_TRNS,FR_SECT,FR_LABK,  FR_LCBR,FR_BSLS,FR_TILD,KC_TRNS, +       KC_TRNS,FR_QUOT,FR_EQL, FR_MINS,FR_LPRN,FR_PLUS,         KC_TRNS,FR_GRV,FR_QUES,FR_HASH,FR_LBRC,FR_PIPE,KC_TRNS,            FR_EURO,FR_PND,FR_DLR,KC_TRNS,KC_TRNS,                                         KC_TRNS,KC_TRNS, @@ -105,9 +105,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {                                 KC_TRNS,KC_TRNS,KC_TRNS,         // right hand         KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11, -       KC_TRNS, FR_PERC, FR_AT,  FR_RCBR, FR_GRTR, FR_MU, KC_F12, -                FR_ASTR,   FR_RPRN, FR_UNDS, FR_SLSH, FR_QUOT, KC_TRNS, -       KC_TRNS, FR_AMP,  FR_RBRC, FR_DLR,  FR_EXLM,  FR_CIRC, KC_TRNS, +       KC_TRNS, FR_PERC, FR_AT,  FR_RCBR, FR_RABK, FR_MICR, KC_F12, +                FR_ASTR,   FR_RPRN, FR_UNDS, FR_SLSH, FR_DQUO, KC_TRNS, +       KC_TRNS, FR_AMPR, FR_RBRC, FR_DLR,  FR_EXLM,  FR_CIRC, KC_TRNS,                           KC_TRNS, KC_TRNS, KC_TRNS,  ALGR(KC_S),  KC_TRNS,         KC_TRNS, KC_TRNS,         KC_TRNS, diff --git a/layouts/community/ergodox/german-kinergo/keymap.c b/layouts/community/ergodox/german-kinergo/keymap.c index d9c2978140..9f8b72596e 100644 --- a/layouts/community/ergodox/german-kinergo/keymap.c +++ b/layouts/community/ergodox/german-kinergo/keymap.c @@ -43,14 +43,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {          KC_TAB,         KC_Q,           KC_W,     KC_E,     KC_R,     KC_T,   MO(1),          KC_CAPS,         KC_A,           KC_S,     KC_D,     KC_F,     KC_G,          KC_LSFT,         DE_Y,           KC_X,     KC_C,     KC_V,     KC_B,   MO(2), -        KC_LGUI,      DE_CIRC, DE_LESS,  KC_LEFT,  KC_RIGHT, +        KC_LGUI,      DE_CIRC, DE_LABK,  KC_LEFT,  KC_RIGHT,                                                 KC_LCTRL, KC_LALT,                                                                KC_HOME,                                                 KC_BSPC,KC_DEL,KC_END,          // right hand          KC_PSCREEN,  KC_6,   KC_7,    KC_8,    KC_9,   KC_0,             KC_MINS, -        MO(1),       DE_Z,   KC_U,    KC_I,    KC_O,   KC_P,             DE_UE, -                     KC_H,   KC_J,    KC_K,    KC_L,   DE_OE,            LT(MDIA,DE_AE), +        MO(1),       DE_Z,   KC_U,    KC_I,    KC_O,   KC_P,             DE_UDIA, +                     KC_H,   KC_J,    KC_K,    KC_L,   DE_ODIA,          LT(MDIA,DE_ADIA),          MO(2),       KC_N,   KC_M,    KC_COMM, KC_DOT, DE_MINS,          KC_RSFT,                               KC_DOWN, KC_UP,   DE_HASH,  DE_PLUS,          KC_RGUI,          KC_RALT, KC_RCTRL, @@ -63,14 +63,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  //         KC_DEL,          KC_Q,           KC_W,     KC_E,     KC_R,     KC_T,   TG(1),  //         KC_CAPS,         KC_A,           KC_S,     KC_D,     KC_F,     KC_G,  //         KC_LSFT,         DE_Y,           KC_X,     KC_C,     KC_V,     KC_B,   ALL_T(KC_NO), -//         LT(SYMB,DE_LESS),CTL_T(DE_HASH), DE_ACUT,  DE_MINS,  DE_PLUS, +//         LT(SYMB,DE_LABK),CTL_T(DE_HASH), DE_ACUT,  DE_MINS,  DE_PLUS,  //                                                ALT_T(KC_APP), KC_LGUI,  //                                                               KC_HOME,  //                                                KC_SPC,KC_BSPC,KC_END,  //         // right hand  //         KC_MNXT,     KC_6,   KC_7,    KC_8,    KC_9,   KC_0,             KC_MINS, -//         TG(2),       DE_Z,   KC_U,    KC_I,    KC_O,   KC_P,             DE_UE, -//                      KC_H,   KC_J,    KC_K,    KC_L,   DE_OE,            LT(MDIA,DE_AE), +//         TG(2),       DE_Z,   KC_U,    KC_I,    KC_O,   KC_P,             DE_UDIA, +//                      KC_H,   KC_J,    KC_K,    KC_L,   DE_ODIA,          LT(MDIA,DE_ADIA),  //         MEH_T(KC_NO),KC_N,   KC_M,    KC_COMM, KC_DOT, CTL_T(DE_MINS),   KC_RSFT,  //                              KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT,          TT(SYMB),  //         KC_LALT,CTL_T(KC_ESC), diff --git a/layouts/community/ergodox/german-lukas/keymap.c b/layouts/community/ergodox/german-lukas/keymap.c index cbc51c6959..76a77acdb2 100644 --- a/layouts/community/ergodox/german-lukas/keymap.c +++ b/layouts/community/ergodox/german-lukas/keymap.c @@ -40,14 +40,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {          KC_TAB,          KC_Q,           KC_W,     KC_E,     KC_R,     KC_T,   TG(SYMB),          KC_ESC,          KC_A,           KC_S,     KC_D,     KC_F,     KC_G,          KC_LSFT,         DE_Y,           KC_X,     KC_C,     KC_V,     KC_B,   ALL_T(KC_NO), -        KC_LGUI,      DE_CIRC, DE_LESS,  KC_LEFT,  KC_RIGHT, +        KC_LGUI,      DE_CIRC, DE_LABK,  KC_LEFT,  KC_RIGHT,                                                 KC_LCTRL, KC_LALT,                                                                KC_HOME,                                                 KC_SPC ,KC_DEL,KC_END,          // right hand          KC_PSCREEN,   KC_6,   KC_7,    KC_8,    KC_9,    KC_0,        KC_MINS, -        TG(MDIA),     DE_Z,   KC_U,    KC_I,    KC_O,    KC_P,        LT(SHRT,DE_UE), -                      KC_H,   KC_J,    KC_K,    KC_L,    DE_OE,       LT(MDIA,DE_AE), +        TG(MDIA),     DE_Z,   KC_U,    KC_I,    KC_O,    KC_P,        LT(SHRT,DE_UDIA), +                      KC_H,   KC_J,    KC_K,    KC_L,    DE_ODIA,     LT(MDIA,DE_ADIA),          MEH_T(KC_NO),     KC_N,   KC_M,    KC_COMM, KC_DOT,  DE_MINS,     KC_RSFT,                                KC_UP,   KC_DOWN, DE_HASH, DE_PLUS,     LCA_T(KC_NO),          KC_RALT, KC_RCTRL, diff --git a/layouts/community/ergodox/german-manuneo/keymap.c b/layouts/community/ergodox/german-manuneo/keymap.c index d1e48e1102..9b24df83db 100644 --- a/layouts/community/ergodox/german-manuneo/keymap.c +++ b/layouts/community/ergodox/german-manuneo/keymap.c @@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   MO(5),   DE_1,     DE_2,     DE_3,    DE_4,    DE_5,    DE_ACUT,   MO(4),   DE_X,     DE_P,     DE_F,    DE_W,    DE_G,    KC_HOME,   MO(1),   DE_U,     DE_I,     DE_A,    DE_E,    DE_O, - MO(3),   DE_UE,    DE_OE,    DE_AE,   DE_C,    DE_V,    KC_END, + MO(3),   DE_UDIA,  DE_ODIA,  DE_ADIA, DE_C,    DE_V,    KC_END,   KC_TRNS, KC_TRNS,  KC_LGUI,  KC_LALT, KC_LCTL,   /*-*/    /*-*/     /*-*/     /*-*/    /*-*/    KC_INS,  TG(2),   /*-*/    /*-*/     /*-*/     /*-*/    /*-*/    /*-*/    KC_APP, @@ -167,7 +167,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   *                   '-----------------' '-----------------'   */  [L1] = LAYOUT_ergodox( - KC_TRNS, DE_EXLM, DE_DQOT, DE_PARA, KC_TRNS,               KC_TRNS,               KC_TRNS, + KC_TRNS, DE_EXLM, DE_DQUO, DE_SECT, KC_TRNS,               KC_TRNS,               KC_TRNS,   KC_TRNS, DE_ASTR, DE_PIPE, DE_SLSH, DE_LCBR,               DE_RCBR,               KC_TRNS,   KC_TRNS, DE_UNDS, DE_MINS, DE_AMPR, DE_LBRC,               DE_RBRC,   KC_TRNS, KC_TRNS, DE_PLUS, DE_EQL,  KC_TRNS,               KC_TRNS,               KC_TRNS, @@ -175,9 +175,9 @@ 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,               DE_RING,               KC_TRNS, - KC_TRNS, DE_HASH, DE_LESS, DE_MORE, KC_TRNS,               DE_DQOT,               KC_TRNS, - /*-*/    DE_DLR,  DE_LPRN, DE_RPRN, DE_TILD,               DE_QUOT,               DE_QST, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,               DE_DEG,                KC_TRNS, + KC_TRNS, DE_HASH, DE_LABK, DE_RABK, KC_TRNS,               DE_DQUO,               KC_TRNS, + /*-*/    DE_DLR,  DE_LPRN, DE_RPRN, DE_TILD,               DE_QUOT,               DE_QUES,   KC_TRNS, DE_BSLS, DE_PERC, DE_SCLN, DE_COLN,               M(UC_UPWARDS_ARROW),   KC_TRNS,   /*-*/    /*-*/    KC_TRNS, KC_TRNS, M(UC_LEFTWARDS_ARROW), M(UC_DOWNWARDS_ARROW), M(UC_RIGHTWARDS_ARROW),   KC_TRNS, KC_TRNS, diff --git a/layouts/community/ergodox/german/keymap.c b/layouts/community/ergodox/german/keymap.c index c64057dc4c..99dda5185c 100644 --- a/layouts/community/ergodox/german/keymap.c +++ b/layouts/community/ergodox/german/keymap.c @@ -38,14 +38,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {          KC_DEL,          KC_Q,           KC_W,     KC_E,     KC_R,     KC_T,   TG(1),          KC_CAPS,         KC_A,           KC_S,     KC_D,     KC_F,     KC_G,          KC_LSFT,         DE_Y,           KC_X,     KC_C,     KC_V,     KC_B,   ALL_T(KC_NO), -        LT(SYMB,DE_LESS),CTL_T(DE_HASH), DE_ACUT,  DE_MINS,  DE_PLUS, +        LT(SYMB,DE_LABK),CTL_T(DE_HASH), DE_ACUT,  DE_MINS,  DE_PLUS,                                                 ALT_T(KC_APP), KC_LGUI,                                                                KC_HOME,                                                 KC_SPC,KC_BSPC,KC_END,          // right hand          KC_MNXT,     KC_6,   KC_7,    KC_8,    KC_9,   KC_0,             KC_MINS, -        TG(2),       DE_Z,   KC_U,    KC_I,    KC_O,   KC_P,             DE_UE, -                     KC_H,   KC_J,    KC_K,    KC_L,   DE_OE,            LT(MDIA,DE_AE), +        TG(2),       DE_Z,   KC_U,    KC_I,    KC_O,   KC_P,             DE_UDIA, +                     KC_H,   KC_J,    KC_K,    KC_L,   DE_ODIA,          LT(MDIA,DE_ADIA),          MEH_T(KC_NO),KC_N,   KC_M,    KC_COMM, KC_DOT, CTL_T(DE_MINS),   KC_RSFT,                               KC_LEFT, KC_DOWN, KC_UP,  KC_RGHT,          TT(SYMB),          KC_LALT,CTL_T(KC_ESC), diff --git a/layouts/community/ergodox/guni/keymap.c b/layouts/community/ergodox/guni/keymap.c index 0707bcf774..cc67fbdeaa 100644 --- a/layouts/community/ergodox/guni/keymap.c +++ b/layouts/community/ergodox/guni/keymap.c @@ -1,7 +1,4 @@  #include QMK_KEYBOARD_H -#include "debug.h" -#include "action_layer.h" -#include "bootloader.h"  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {      LAYOUT_ergodox(  // layer 0 : default @@ -13,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {          KC_LGUI , KC_GRV,KC_LEFT,KC_RGHT,KC_LALT,                                            KC_NO , KC_NO  ,                                                 KC_NO  , -                                     KC_BSPC,KC_DEL ,KC_FN23, +                                     KC_BSPC,KC_DEL ,TO(3),          // right hand               KC_RBRC , KC_6,   KC_7 ,  KC_8,   KC_9,   KC_0,   KC_MINS,               KC_END  , KC_Y,   KC_U ,  KC_I,   KC_O,   KC_P,   MT(MOD_RCTL, KC_BSLS), @@ -34,7 +31,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_FN1, +                                 KC_TRNS,KC_TRNS,TO(0),          // right hand               KC_F12, KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_TRNS,               KC_TRNS,KC_EXLM,LSFT(KC_COMM),LSFT(KC_DOT),KC_EQL,KC_AMPR, KC_TRNS, @@ -55,7 +52,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_FN1 , +                                 KC_TRNS,KC_TRNS,TO(0) ,          // right hand               KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,               KC_TRNS ,KC_TRNS,  KC_HOME,  KC_TRNS,  KC_TRNS, KC_END ,KC_TRNS, @@ -68,14 +65,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {      ),      LAYOUT_ergodox(  // layer 3 : teensy bootloader functions          // left hand -        KC_FN0, 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_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,          KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,          KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,          KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,                                        KC_TRNS,KC_TRNS,                                             KC_TRNS, -                                 KC_TRNS,KC_TRNS,KC_FN1 , +                                 KC_TRNS,KC_TRNS,TO(0) ,          // right hand               KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,               KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, @@ -110,31 +107,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {      ),  }; - -/* id for user defined functions */ -enum function_id { -    TEENSY_KEY, -}; - -/* - * Fn action definition - */ -const uint16_t PROGMEM fn_actions[] = { -   	[0]   =  ACTION_FUNCTION(TEENSY_KEY),                    // FN0 - Teensy key -	[1]   =  ACTION_LAYER_SET(0, ON_PRESS),               -	[23]  =  ACTION_LAYER_SET(3, ON_PRESS), -        [24]  =  ACTION_LAYER_SET(2, ON_PRESS),    -	[26]  =  ACTION_LAYER_SET(1, ON_PRESS), -}; - -void action_function(keyrecord_t *event, uint8_t id, uint8_t opt) -{ -    -    if (id == TEENSY_KEY) { -        clear_keyboard(); -        print("\n\nJump to bootloader... "); -        wait_ms(250); -        bootloader_jump(); // should not return -        print("not supported.\n"); -    } -} diff --git a/layouts/community/ergodox/ishigoya-jp/keymap.c b/layouts/community/ergodox/ishigoya-jp/keymap.c index 59040cd50c..c70cbba819 100644 --- a/layouts/community/ergodox/ishigoya-jp/keymap.c +++ b/layouts/community/ergodox/ishigoya-jp/keymap.c @@ -396,7 +396,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  [NUM] = LAYOUT_ergodox(         // left hand  	   KC_NO, KC_F1,      KC_F2,          KC_F3,      KC_F4,   KC_F5,   KC_NO, -	   KC_NO, KC_NO,    KC_NO,        JP_DQT,    KC_RBRACKET,   KC_BSPC, KC_SCLN, +	   KC_NO, KC_NO,    KC_NO,        JP_DQUO,   KC_RBRACKET,   KC_BSPC, KC_SCLN,         KC_NO, KC_NO,    KC_SLSH,        JP_PLUS,    LSFT(KC_RBRACKET),   JP_RCBR,          KC_NO, KC_NO,    JP_ASTR,        KC_MINS,    LSFT(KC_8), LSFT(KC_9), JP_COLN,         KC_TRNS, KC_NO,    KC_NO,        KC_NO,    KC_HASH, diff --git a/layouts/community/ergodox/issmirnov/keymap.c b/layouts/community/ergodox/issmirnov/keymap.c index ce853f3d32..b129148b08 100644 --- a/layouts/community/ergodox/issmirnov/keymap.c +++ b/layouts/community/ergodox/issmirnov/keymap.c @@ -201,7 +201,7 @@ void matrix_scan_user(void) {  }  // only runs when when the layer is changed, good for updating LED's and clearing sticky state -uint32_t layer_state_set_user(uint32_t state) { +layer_state_t layer_state_set_user(layer_state_t state) {    uint8_t layer = biton32(state);    ergodox_board_led_off(); diff --git a/layouts/community/ergodox/kristian/keymap.c b/layouts/community/ergodox/kristian/keymap.c index b56e880c0e..c3bb9e047a 100644 --- a/layouts/community/ergodox/kristian/keymap.c +++ b/layouts/community/ergodox/kristian/keymap.c @@ -13,7 +13,7 @@  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT_ergodox(NO_LESS,KC_1,KC_2,KC_3,KC_4,KC_5,KC_BSPACE,KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,TG(1),KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G,SFT_T(NO_APOS),CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,SFT_T(KC_EQUAL),MO(1),CTL_T(KC_GRAVE),KC_LGUI,KC_LEFT,KC_RIGHT,KC_ESCAPE,KC_CAPSLOCK,KC_HOME,KC_SPACE,KC_LGUI,KC_LALT,KC_DELETE,KC_6,KC_7,KC_8,KC_9,KC_0,NO_PLUS,TG(1),KC_Y,KC_U,KC_I,KC_O,KC_P,NO_AM,KC_H,KC_J,KC_K,KC_L,LT(2,NO_OSLH),NO_AE,SFT_T(KC_RBRC),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),SFT_T(NO_APOS),KC_DOWN,KC_UP,NO_LPRN,NO_RPRN,MO(1),NO_QUOT,CTL_T(KC_ESCAPE),NO_APOS,KC_LALT,KC_LGUI,KC_ENTER), +[0] = LAYOUT_ergodox(NO_LABK,KC_1,KC_2,KC_3,KC_4,KC_5,KC_BSPACE,KC_TAB,KC_Q,KC_W,KC_E,KC_R,KC_T,TG(1),KC_BSPACE,KC_A,KC_S,KC_D,KC_F,KC_G,SFT_T(NO_QUOT),CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,SFT_T(KC_EQUAL),MO(1),CTL_T(KC_GRAVE),KC_LGUI,KC_LEFT,KC_RIGHT,KC_ESCAPE,KC_CAPSLOCK,KC_HOME,KC_SPACE,KC_LGUI,KC_LALT,KC_DELETE,KC_6,KC_7,KC_8,KC_9,KC_0,NO_PLUS,TG(1),KC_Y,KC_U,KC_I,KC_O,KC_P,NO_ARNG,KC_H,KC_J,KC_K,KC_L,LT(2,NO_OSTR),NO_AE,SFT_T(KC_RBRC),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),SFT_T(NO_QUOT),KC_DOWN,KC_UP,NO_LPRN,NO_RPRN,MO(1),NO_QUOT,CTL_T(KC_ESCAPE),NO_QUOT,KC_LALT,KC_LGUI,KC_ENTER),  [1] = LAYOUT_ergodox(M(0),KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_BSPACE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_BSPACE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LSHIFT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LCTL,KC_LGUI,KC_LEFT,KC_RIGHT,KC_ESCAPE,KC_TRANSPARENT,KC_HOME,KC_SPACE,KC_LGUI,KC_LALT,KC_DELETE,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_7,KC_8,KC_9,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_4,KC_5,KC_6,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_0,KC_1,KC_2,KC_3,NO_LBRC,NO_RBRC,KC_LSHIFT,KC_COMMA,KC_DOT,LSFT(NO_LBRC),LSFT(NO_RBRC),KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_LALT,KC_LGUI,KC_ENTER), diff --git a/layouts/community/ergodox/neo2_on_qwertz_hardware/keymap.c b/layouts/community/ergodox/neo2_on_qwertz_hardware/keymap.c index 85782dda74..7c91b3fbb0 100644 --- a/layouts/community/ergodox/neo2_on_qwertz_hardware/keymap.c +++ b/layouts/community/ergodox/neo2_on_qwertz_hardware/keymap.c @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   KC_ESC,  DE_1,    DE_2,     DE_3,    DE_4,     DE_5,    DE_ACUT,   KC_TAB,  DE_X,    DE_V,     DE_L,    DE_C,     DE_W,    KC_PSCR,   MO(1),   DE_U,    DE_I,     DE_A,    DE_E,     DE_O, - KC_LSFT, DE_UE,   DE_OE,    DE_AE,   DE_P,     DE_Z,    KC_SPACE, + KC_LSFT, DE_UDIA, DE_ODIA,  DE_ADIA, DE_P,     DE_Z,    KC_SPACE,   KC_LCTL, KC_LGUI, KC_LALT,  MO(3),   MO(2),   /*-*/    /*-*/    /*-*/     /*-*/    /*-*/     KC_VOLD, KC_VOLU,   /*-*/    /*-*/    /*-*/     /*-*/    /*-*/     /*-*/    KC_TRNS, @@ -82,9 +82,9 @@ 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, DE_EXLM, DE_LESS, DE_MORE, DE_EQL,  DE_AMPR, KC_TRNS, - /*-*/    DE_QST,  DE_LPRN, DE_RPRN, DE_MINS, DE_COLN, DE_AT, - KC_TRNS, DE_PLUS, DE_PERC, DE_DQOT, DE_QUOT, DE_SCLN, KC_TRNS, + KC_TRNS, DE_EXLM, DE_LABK, DE_RABK, DE_EQL,  DE_AMPR, KC_TRNS, + /*-*/    DE_QUES, DE_LPRN, DE_RPRN, DE_MINS, DE_COLN, DE_AT, + KC_TRNS, DE_PLUS, DE_PERC, DE_DQUO, DE_QUOT, DE_SCLN, KC_TRNS,   /*-*/    /*-*/    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS,   KC_TRNS, diff --git a/layouts/community/ergodox/norwegian_programmer_osx_pc/keymap.c b/layouts/community/ergodox/norwegian_programmer_osx_pc/keymap.c index ee9a9d1802..2ddd7ab209 100644 --- a/layouts/community/ergodox/norwegian_programmer_osx_pc/keymap.c +++ b/layouts/community/ergodox/norwegian_programmer_osx_pc/keymap.c @@ -7,6 +7,18 @@  #define BASE_MAC 1 // default layer mac  #define NUMB_FUNC 2 // numbers and function keys +enum custom_keycodes { +    TILDE_NO = SAFE_RANGE, +    LESS_NO, +    GRTR_NO, +    CIRC_NO, +    ACUT_NO, +    GRV_NO, +    LESS_NO_MAC, +    GRTR_NO_MAC, +    ACUT_NO_MAC +}; +  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  /* Keymap 0: Basic layer PC @@ -32,18 +44,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   */  [BASE] = LAYOUT_ergodox(          // left hand -        KC_PAST,       NO_LBRC, NO_RBRC, NO_LCBR,  NO_RCBR, KC_FN2,  TG(1), -        KC_PPLS,         KC_Q,         KC_W,    KC_E,   KC_R,   KC_T,   NO_QUO2, +        KC_PAST,       NO_LBRC, NO_RBRC, NO_LCBR,  NO_RCBR, TILDE_NO,  TG(1), +        KC_PPLS,         KC_Q,         KC_W,    KC_E,   KC_R,   KC_T,   NO_DQUO,          KC_PSLS,         KC_A,         KC_S,    KC_D,   KC_F,   KC_G,          KC_PMNS,        KC_Z,         KC_X,    KC_C,   KC_V,   KC_B,   NO_SCLN,          ALT_T(KC_ESC), KC_EXLM , NO_QUES, NO_COLN, KC_TAB, -                                                      KC_HASH, KC_FN7, -                                                              KC_FN6, +                                                      KC_HASH, GRV_NO, +                                                              ACUT_NO,                                                 OSM(MOD_LSFT),CTL_T(KC_DOT),GUI_T(KC_COMMA),          // right hand -             KC_FN5, NO_DLR, NO_LPRN, NO_RPRN ,KC_FN3, KC_FN4,NO_AT, -             NO_APOS,      KC_Y,    KC_U,    KC_I,      KC_O,     KC_P,   NO_AA  , -                           KC_H,    KC_J,    KC_K,      KC_L,  NO_OSLH,    NO_AE, +             CIRC_NO, NO_DLR, NO_LPRN, NO_RPRN ,LESS_NO, GRTR_NO,NO_AT, +             NO_QUOT,      KC_Y,    KC_U,    KC_I,      KC_O,     KC_P,   NO_ARNG, +                           KC_H,    KC_J,    KC_K,      KC_L,  NO_OSTR,    NO_AE,               NO_EQL,        KC_N,    KC_M, KC_RIGHT,  KC_DOWN,   KC_UP,    NO_BSLS,                                    KC_LEFT,  NO_UNDS, NO_AMPR,  NO_PIPE,    OSL(2),               KC_INSERT,  KC_PERC, @@ -72,20 +84,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   *                                 `--------------------'       `--------------------'   */  [BASE_MAC] = LAYOUT_ergodox( -       KC_TRNS, KC_TRNS,KC_TRNS, NO_LCBR_MAC,NO_RCBR_MAC, KC_TRNS, KC_TRNS, +       KC_TRNS, KC_TRNS,KC_TRNS, S(ALGR(NO_8)),S(ALGR(NO_9)), KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -                                           KC_TRNS, NO_GRV_MAC, -                                                    KC_FN10, +                                           KC_TRNS, ALGR(NO_BSLS), +                                                    ACUT_NO_MAC,                                    KC_TRNS,GUI_T(KC_DOT) , CTL_T(KC_COMMA),      // right hand -       KC_TRNS,  NO_DLR_MAC, KC_TRNS,KC_TRNS,KC_FN8, KC_FN9,NO_AT_MAC, -       NO_APOS_MAC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, +       KC_TRNS,  S(NO_4), KC_TRNS,KC_TRNS,LESS_NO_MAC, GRTR_NO_MAC,NO_QUOT, +       NO_LABK,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NO_BSLS_MAC, -                          KC_TRNS, KC_TRNS, KC_TRNS, NO_PIPE_MAC, OSL(2), +       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S(ALGR(NO_7)), +                          KC_TRNS, KC_TRNS, KC_TRNS, ALGR(NO_7), OSL(2),         KC_TRNS, KC_TRNS,         KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS @@ -133,47 +145,57 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  )  }; -enum macro_id { -    TILDE_NO, LESS_NO, GRTR_NO, CIRC_NO, ACUT_NO,  GRV_NO, LESS_NO_MAC, GRTR_NO_MAC, ACUT_NO_MAC -}; - -const uint16_t PROGMEM fn_actions[] = { -    [2] = ACTION_MACRO(TILDE_NO), // Completed ~ character(pc and mac), no space needed. -    [3] = ACTION_MACRO(LESS_NO), // < completed on keypress down, to avoid shifting the next character if it is not released first. -    [4] = ACTION_MACRO(GRTR_NO), // > completed on keypress down, to avoid shifting the next character if it is not released first. -    [5] = ACTION_MACRO(CIRC_NO), // Completed ^ character, no space needed. -    [6] = ACTION_MACRO(ACUT_NO), // Completed ´ character, no space needed. -    [7] = ACTION_MACRO(GRV_NO), // Completed ` character, no space needed. -    [8] = ACTION_MACRO(LESS_NO_MAC), // < completed on keypress down, to avoid same button problem when typing <> quickly -    [9] = ACTION_MACRO(GRTR_NO_MAC), // > completed on keypress down, to avoid same button problem when typing <> quickly -    [10] = ACTION_MACRO(ACUT_NO_MAC), // Completed ´ character, no space needed -}; - - - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ -    keyevent_t event = record->event; - -    switch (id) { +bool process_record_user(uint16_t keycode, keyrecord_t *record) { +    switch (keycode) {          case TILDE_NO: -            return (event.pressed ? MACRO( D(RALT), T(RBRC), U(RALT), T(SPC), END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code16(ALGR(KC_RBRC)); +                tap_code(KC_SPC); +            } +            return false;          case LESS_NO: -            return (event.pressed ? MACRO( T(NUBS), END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code(KC_NUBS); +            } +            return false;          case GRTR_NO: -            return (event.pressed ? MACRO( D(LSFT), T(NUBS), U(LSFT), END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code16(S(KC_NUBS)); +            } +            return false;          case CIRC_NO: -            return (event.pressed ? MACRO( D(LSFT), T(RBRC), U(LSFT), T(SPC), END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code16(S(KC_RBRC)); +                tap_code(KC_SPC); +            } +            return false;          case ACUT_NO: -            return (event.pressed ? MACRO( D(RALT), T(EQL), U(RALT), T(SPC),  END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code16(ALGR(KC_EQL)); +                tap_code(KC_SPC); +            } +            return false;          case GRV_NO: -            return (event.pressed ? MACRO( D(LSFT), T(EQL), T(SPC), U(LSFT),  END ) : MACRO_NONE); +            if (record->event.pressed) { +                SEND_STRING(SS_LSFT("= ")); +            } +            return false;          case LESS_NO_MAC: -            return (event.pressed ? MACRO( T(GRV), END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code(KC_GRV); +            } +            return false;          case GRTR_NO_MAC: -            return (event.pressed ? MACRO( D(LSFT), T(GRV), U(LSFT), END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code16(S(KC_GRV)); +            } +            return false;          case ACUT_NO_MAC: -            return (event.pressed ? MACRO( T(EQL), T(SPC),  END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code(KC_EQL); +                tap_code(KC_SPC); +            } +            return false;      } -    return MACRO_NONE; -}; +    return true; +} diff --git a/layouts/community/ergodox/norwegian_programmer_osx_pc_colemak/keymap.c b/layouts/community/ergodox/norwegian_programmer_osx_pc_colemak/keymap.c index af1d268bd9..5ca8d40db0 100644 --- a/layouts/community/ergodox/norwegian_programmer_osx_pc_colemak/keymap.c +++ b/layouts/community/ergodox/norwegian_programmer_osx_pc_colemak/keymap.c @@ -7,6 +7,18 @@  #define BASE_MAC 1 // default layer mac  #define NUMB_FUNC 2 // numbers and function keys +enum custom_keycodes { +    TILDE_NO = SAFE_RANGE, +    LESS_NO, +    GRTR_NO, +    CIRC_NO, +    ACUT_NO, +    GRV_NO, +    LESS_NO_MAC, +    GRTR_NO_MAC, +    ACUT_NO_MAC +}; +  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  /* Keymap 0: Basic layer PC @@ -32,18 +44,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   */  [BASE] = LAYOUT_ergodox(          // left hand -        KC_PAST,       NO_LBRC, NO_RBRC, NO_LCBR,  NO_RCBR, KC_FN2,  TG(1), -        KC_PPLS,         KC_Q,         KC_W,    KC_F,   KC_P,   KC_G,   NO_QUO2, +        KC_PAST,       NO_LBRC, NO_RBRC, NO_LCBR,  NO_RCBR, TILDE_NO,  TG(1), +        KC_PPLS,         KC_Q,         KC_W,    KC_F,   KC_P,   KC_G,   NO_DQUO,          KC_PSLS,         KC_A,         KC_R,    KC_S,   KC_T,   KC_D,          KC_PMNS,        KC_Z,         KC_X,    KC_C,   KC_V,   KC_B,   NO_SCLN,          ALT_T(KC_ESC), KC_EXLM , NO_QUES, NO_COLN, KC_TAB, -                                                      KC_HASH, KC_FN7, -                                                              KC_FN6, +                                                      KC_HASH, GRV_NO, +                                                              ACUT_NO,                                                 OSM(MOD_LSFT),CTL_T(KC_DOT),GUI_T(KC_COMMA),          // right hand -             KC_FN5, NO_DLR, NO_LPRN, NO_RPRN ,KC_FN3, KC_FN4,NO_AT, -             NO_APOS,      KC_J,    KC_L,    KC_U,      KC_Y,     NO_AA,   NO_AE  , -                           KC_H,    KC_N,    KC_E,      KC_I,      KC_O,    NO_OSLH, +             CIRC_NO, NO_DLR, NO_LPRN, NO_RPRN ,LESS_NO, GRTR_NO,NO_AT, +             NO_QUOT,      KC_J,    KC_L,    KC_U,      KC_Y,     NO_ARNG, NO_AE  , +                           KC_H,    KC_N,    KC_E,      KC_I,      KC_O,    NO_OSTR,               NO_EQL,        KC_K,    KC_M, KC_RIGHT,  KC_DOWN,   KC_UP,    NO_BSLS,                                    KC_LEFT,  NO_UNDS, NO_AMPR,  NO_PIPE,    OSL(2),               KC_INSERT,  KC_PERC, @@ -72,20 +84,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   *                                 `--------------------'       `--------------------'   */  [BASE_MAC] = LAYOUT_ergodox( -       KC_TRNS, KC_TRNS,KC_TRNS, NO_LCBR_MAC,NO_RCBR_MAC, KC_TRNS, KC_TRNS, +       KC_TRNS, KC_TRNS,KC_TRNS, S(ALGR(NO_8)),S(ALGR(NO_9)), KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS , KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -                                           KC_TRNS, NO_GRV_MAC, -                                                    KC_FN10, +                                           KC_TRNS, ALGR(NO_BSLS), +                                                    ACUT_NO_MAC,                                    KC_TRNS,GUI_T(KC_DOT) , CTL_T(KC_COMMA),      // right hand -       KC_TRNS,  NO_DLR_MAC, KC_TRNS,KC_TRNS,KC_FN8, KC_FN9,NO_AT_MAC, -       NO_APOS_MAC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, +       KC_TRNS,  S(NO_4), KC_TRNS,KC_TRNS,LESS_NO_MAC, GRTR_NO_MAC,NO_QUOT, +       NO_LABK,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, -       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NO_BSLS_MAC, -                          KC_TRNS, KC_TRNS, KC_TRNS, NO_PIPE_MAC, OSL(2), +       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S(ALGR(NO_7)), +                          KC_TRNS, KC_TRNS, KC_TRNS, ALGR(NO_7), OSL(2),         KC_TRNS, KC_TRNS,         KC_TRNS,         KC_TRNS, KC_TRNS, KC_TRNS @@ -133,47 +145,57 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  )  }; -enum macro_id { -    TILDE_NO, LESS_NO, GRTR_NO, CIRC_NO, ACUT_NO,  GRV_NO, LESS_NO_MAC, GRTR_NO_MAC, ACUT_NO_MAC -}; - -const uint16_t PROGMEM fn_actions[] = { -    [2] = ACTION_MACRO(TILDE_NO), // Completed ~ character(pc and mac), no space needed. -    [3] = ACTION_MACRO(LESS_NO), // < completed on keypress down, to avoid shifting the next character if it is not released first. -    [4] = ACTION_MACRO(GRTR_NO), // > completed on keypress down, to avoid shifting the next character if it is not released first. -    [5] = ACTION_MACRO(CIRC_NO), // Completed ^ character, no space needed. -    [6] = ACTION_MACRO(ACUT_NO), // Completed ´ character, no space needed. -    [7] = ACTION_MACRO(GRV_NO), // Completed ` character, no space needed. -    [8] = ACTION_MACRO(LESS_NO_MAC), // < completed on keypress down, to avoid same button problem when typing <> quickly -    [9] = ACTION_MACRO(GRTR_NO_MAC), // > completed on keypress down, to avoid same button problem when typing <> quickly -    [10] = ACTION_MACRO(ACUT_NO_MAC), // Completed ´ character, no space needed -}; - - - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ -    keyevent_t event = record->event; - -    switch (id) { +bool process_record_user(uint16_t keycode, keyrecord_t *record) { +    switch (keycode) {          case TILDE_NO: -            return (event.pressed ? MACRO( D(RALT), T(RBRC), U(RALT), T(SPC), END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code16(ALGR(KC_RBRC)); +                tap_code(KC_SPC); +            } +            return false;          case LESS_NO: -            return (event.pressed ? MACRO( T(NUBS), END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code(KC_NUBS); +            } +            return false;          case GRTR_NO: -            return (event.pressed ? MACRO( D(LSFT), T(NUBS), U(LSFT), END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code16(S(KC_NUBS)); +            } +            return false;          case CIRC_NO: -            return (event.pressed ? MACRO( D(LSFT), T(RBRC), U(LSFT), T(SPC), END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code16(S(KC_RBRC)); +                tap_code(KC_SPC); +            } +            return false;          case ACUT_NO: -            return (event.pressed ? MACRO( D(RALT), T(EQL), U(RALT), T(SPC),  END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code16(ALGR(KC_EQL)); +                tap_code(KC_SPC); +            } +            return false;          case GRV_NO: -            return (event.pressed ? MACRO( D(LSFT), T(EQL), T(SPC), U(LSFT),  END ) : MACRO_NONE); +            if (record->event.pressed) { +                SEND_STRING(SS_LSFT("= ")); +            } +            return false;          case LESS_NO_MAC: -            return (event.pressed ? MACRO( T(GRV), END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code(KC_GRV); +            } +            return false;          case GRTR_NO_MAC: -            return (event.pressed ? MACRO( D(LSFT), T(GRV), U(LSFT), END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code16(S(KC_GRV)); +            } +            return false;          case ACUT_NO_MAC: -            return (event.pressed ? MACRO( T(EQL), T(SPC),  END ) : MACRO_NONE); +            if (record->event.pressed) { +                tap_code(KC_EQL); +                tap_code(KC_SPC); +            } +            return false;      } -    return MACRO_NONE; -}; +    return true; +} diff --git a/layouts/community/ergodox/osx_de/keymap.c b/layouts/community/ergodox/osx_de/keymap.c index cd9a35e212..581aecf2d3 100644 --- a/layouts/community/ergodox/osx_de/keymap.c +++ b/layouts/community/ergodox/osx_de/keymap.c @@ -15,8 +15,8 @@  #define M_MEH_SH_ACUT 2  #define M_LGUI_SHFT 3  #define M_CTL_SFT_HASH 4 -#define M_DE_OSX_CIRC_CTRLCMD 5 -#define M_DE_OSX_PLUS_CTRLALT 6 +#define M_DE_CIRC_CTRLCMD 5 +#define M_DE_PLUS_CTRLALT 6  #define SM_SMILE 7  #define SM_SMIRK 8  #define SM_CRY 9 @@ -31,39 +31,39 @@  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  [BASE]=LAYOUT_ergodox(  //left half -    KC_ESC, DE_OSX_1, DE_OSX_2, DE_OSX_3, DE_OSX_4, DE_OSX_5, M(M_CTL_SFT_HASH),  -    KC_TAB, DE_OSX_Q, DE_OSX_W, DE_OSX_E, DE_OSX_R, DE_OSX_T, KC_LGUI,  -    KC_LALT, DE_OSX_A, DE_OSX_S, DE_OSX_D, DE_OSX_F, DE_OSX_G,  -    KC_LSFT, CTL_T(DE_OSX_Y), DE_OSX_X, DE_OSX_C, DE_OSX_V, DE_OSX_B, KC_LALT,  -                  LT(SYMB,DE_OSX_LESS), M(M_DE_OSX_CIRC_CTRLCMD), M(M_DE_OSX_PLUS_CTRLALT), KC_UP, KC_DOWN,  +    KC_ESC, DE_1, DE_2, DE_3, DE_4, DE_5, M(M_CTL_SFT_HASH),  +    KC_TAB, DE_Q, DE_W, DE_E, DE_R, DE_T, KC_LGUI,  +    KC_LALT, DE_A, DE_S, DE_D, DE_F, DE_G,  +    KC_LSFT, CTL_T(DE_Y), DE_X, DE_C, DE_V, DE_B, KC_LALT,  +                  LT(SYMB,DE_LABK), M(M_DE_CIRC_CTRLCMD), M(M_DE_PLUS_CTRLALT), KC_UP, KC_DOWN,                                                 M(M_MEH_SH_ACUT), TG(MDIA),                                                        KC_HOME,                                          KC_BSPC, KC_DEL, LT(SMLY,KC_END),       //right half -    M(M_CTL_SFT_HASH), DE_OSX_6, DE_OSX_7, DE_OSX_8, DE_OSX_9, DE_OSX_0, DE_OSX_SS,  -    KC_RGUI, DE_OSX_Z, DE_OSX_U, DE_OSX_I, DE_OSX_O, DE_OSX_P, DE_OSX_UE,  -           DE_OSX_H, DE_OSX_J, DE_OSX_K, DE_OSX_L, DE_OSX_OE, ALT_T(DE_OSX_AE),  -    KC_RALT, DE_OSX_N, DE_OSX_M, DE_OSX_COMM, DE_OSX_DOT, CTL_T(DE_OSX_MINS), KC_RSFT,  -                         KC_LEFT, KC_RIGHT, LGUI(KC_LSFT), LALT(KC_LSFT), LT(SYMB,DE_OSX_PLUS),  -    TG(NUMB), ALL_T(DE_OSX_ACUT),  +    M(M_CTL_SFT_HASH), DE_6, DE_7, DE_8, DE_9, DE_0, DE_SS,  +    KC_RGUI, DE_Z, DE_U, DE_I, DE_O, DE_P, DE_UDIA,  +           DE_H, DE_J, DE_K, DE_L, DE_ODIA, ALT_T(DE_ADIA),  +    KC_RALT, DE_N, DE_M, DE_COMM, DE_DOT, CTL_T(DE_MINS), KC_RSFT,  +                         KC_LEFT, KC_RIGHT, LGUI(KC_LSFT), LALT(KC_LSFT), LT(SYMB,DE_PLUS),  +    TG(NUMB), ALL_T(DE_ACUT),       KC_PGUP,       KC_PGDN, KC_ENT, KC_SPC),  [SYMB]=LAYOUT_ergodox(  //left half      KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,  -    KC_TRNS, DE_OSX_LESS, DE_OSX_MORE, DE_OSX_EXLM, DE_OSX_QST, KC_TRNS, KC_TRNS,  -    KC_TRNS, DE_OSX_HASH, DE_OSX_DLR, DE_OSX_BSLS, DE_OSX_SLSH, KC_DOT,  -    KC_TRNS, KC_TRNS, DE_OSX_LESS, DE_OSX_PERC, DE_OSX_PIPE, DE_OSX_TILD, KC_TRNS,  +    KC_TRNS, DE_LABK, DE_RABK, DE_EXLM, DE_QUES, KC_TRNS, KC_TRNS,  +    KC_TRNS, DE_HASH, DE_DLR, DE_BSLS, DE_SLSH, KC_DOT,  +    KC_TRNS, KC_TRNS, DE_LABK, DE_PERC, DE_PIPE, DE_TILD, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                 KC_TRNS, KC_TRNS,                                                        KC_TRNS,                                          KC_TRNS, KC_DEL, KC_TRNS,       //right half      M(M_TOGGLE_5), KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,  -    KC_TRNS, LALT(LSFT(KC_7)), LALT(KC_5), LALT(KC_6), DE_OSX_LESS, DE_OSX_MORE, DE_OSX_EXLM,  -           DE_OSX_SLSH, DE_OSX_LPRN, DE_OSX_RPRN, LALT(KC_8), LALT(KC_9), DE_OSX_HASH,  -    KC_TRNS, DE_OSX_PIPE, DE_OSX_TILD, DE_OSX_CIRC, KC_UP, DE_OSX_MINS, LSFT(KC_4),  -                         DE_OSX_QUOT, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS,  +    KC_TRNS, LALT(LSFT(KC_7)), LALT(KC_5), LALT(KC_6), DE_LABK, DE_RABK, DE_EXLM,  +           DE_SLSH, DE_LPRN, DE_RPRN, LALT(KC_8), LALT(KC_9), DE_HASH,  +    KC_TRNS, DE_PIPE, DE_TILD, DE_CIRC, KC_UP, DE_MINS, LSFT(KC_4),  +                         DE_QUOT, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS,       KC_F13, KC_F12,       KC_F14,       KC_F15, KC_TRNS, KC_TRNS), @@ -118,9 +118,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {      //right half      KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,       KC_TRNS, KC_UP, KC_7, KC_8, KC_9, LSFT(KC_RBRC), KC_F12,  -           KC_DOWN, KC_4, KC_5, KC_6, KC_RBRC, DE_OSX_MINS,  +           KC_DOWN, KC_4, KC_5, KC_6, KC_RBRC, DE_MINS,       KC_TRNS, LSFT(KC_6), KC_1, KC_2, KC_3, LSFT(KC_7), KC_TRNS,  -                         KC_0, KC_DOT, KC_COMM, DE_OSX_EQL, KC_TRNS,  +                         KC_0, KC_DOT, KC_COMM, DE_EQL, KC_TRNS,       KC_TRNS, KC_TRNS,       KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS), @@ -171,8 +171,8 @@ if (record->event.pressed) {  		}  break; -case M_DE_OSX_PLUS_CTRLALT: -//Macro: M_DE_OSX_PLUS_CTRLALT//----------------------- +case M_DE_PLUS_CTRLALT: +//Macro: M_DE_PLUS_CTRLALT//-----------------------  if (record->event.pressed) {  			start = timer_read();  			return MACRO(D(LCTRL),D(LALT),END); @@ -264,8 +264,8 @@ if (record->event.pressed) {  		}  break; -case M_DE_OSX_CIRC_CTRLCMD: -//Macro: M_DE_OSX_CIRC_CTRLCMD//----------------------- +case M_DE_CIRC_CTRLCMD: +//Macro: M_DE_CIRC_CTRLCMD//-----------------------  if (record->event.pressed) {  			start = timer_read();  			return MACRO(D(LCTRL),D(LGUI),END); diff --git a/layouts/community/ergodox/osx_de_adnw_koy/keymap.c b/layouts/community/ergodox/osx_de_adnw_koy/keymap.c index 08b11cccdf..18335652ff 100644 --- a/layouts/community/ergodox/osx_de_adnw_koy/keymap.c +++ b/layouts/community/ergodox/osx_de_adnw_koy/keymap.c @@ -30,13 +30,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {      KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LCTL,       KC_TAB, KC_K, KC_DOT, KC_O, KC_COMM, KC_Z, KC_LGUI,       TG(QWERTZ), KC_H, KC_A, KC_E, KC_I, KC_U,  -    KC_LSFT, CTL_T(KC_X), KC_Q, DE_AE, DE_UE, DE_OE, KC_LALT,  -                  LT(SYMB,KC_GRV), DE_LESS, LALT(KC_LSFT), KC_LEFT, KC_RGHT,  +    KC_LSFT, CTL_T(KC_X), KC_Q, DE_ADIA, DE_UDIA, DE_ODIA, KC_LALT,  +                  LT(SYMB,KC_GRV), DE_LABK, LALT(KC_LSFT), KC_LEFT, KC_RGHT,                                                 TG(MDIA), MEH_T(LSFT(DE_ACUT)),                                                        KC_HOME,                                          KC_BSPC, KC_DEL, KC_END,       //right half -    KC_RCTL, KC_6, KC_7, KC_8, KC_9, KC_0, DE_OSX_MINS,  +    KC_RCTL, KC_6, KC_7, KC_8, KC_9, KC_0, DE_MINS,       KC_RGUI, KC_V, KC_G, KC_C, KC_L, KC_MINS, KC_Y,              KC_D, KC_T, KC_R, KC_N, KC_S, LT(MDIA,KC_F),       KC_RALT, KC_B, KC_P, KC_W, KC_M, CTL_T(KC_J), KC_RSFT,  @@ -47,9 +47,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  [SYMB]=LAYOUT_ergodox(  //left half      KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS,  -    KC_TRNS, KC_GRV, LSFT(KC_GRV), DE_EXLM, DE_QST, KC_TRNS, KC_TRNS,  +    KC_TRNS, KC_GRV, LSFT(KC_GRV), DE_EXLM, DE_QUES, KC_TRNS, KC_TRNS,       KC_TRNS, DE_HASH, DE_DLR, LALT(LSFT(KC_7)), DE_SLSH, KC_DOT,  -    KC_TRNS, KC_TRNS, DE_LESS, DE_PERC, LALT(KC_7), LALT(KC_N), KC_TRNS,  +    KC_TRNS, KC_TRNS, DE_LABK, DE_PERC, LALT(KC_7), LALT(KC_N), KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                 KC_TRNS, KC_TRNS,                                                        KC_TRNS,  @@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {      KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,       KC_TRNS, LALT(LSFT(KC_7)), LALT(KC_5), LALT(KC_6), LALT(KC_7), DE_HASH, KC_F12,              DE_SLSH, DE_LPRN, DE_RPRN, LALT(KC_8), LALT(KC_9), KC_TRNS,  -    KC_TRNS, DE_AMPR, KC_GRV, LSFT(KC_GRV), DE_DQOT, DE_QUOT, DE_QST,  +    KC_TRNS, DE_AMPR, KC_GRV, LSFT(KC_GRV), DE_DQUO, DE_QUOT, DE_QUES,                            KC_TRNS, KC_DOT, KC_EXLM, KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS,       KC_TRNS,  @@ -88,14 +88,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {      KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LGUI,       KC_TRNS, KC_A, KC_S, KC_D, KC_F, KC_G,       KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_LALT,  -                  LT(SYMB,KC_GRV), DE_LESS, LALT(KC_LSFT), KC_LEFT, KC_RGHT,  +                  LT(SYMB,KC_GRV), DE_LABK, LALT(KC_LSFT), KC_LEFT, KC_RGHT,                                                 KC_TRNS, MEH_T(LSFT(DE_ACUT)),                                                        KC_HOME,                                          KC_BSPC, KC_DEL, KC_END,       //right half      LGUI(KC_C), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,  -    KC_RGUI, KC_Y, KC_U, KC_I, KC_O, KC_P, DE_UE,  -           KC_H, KC_J, KC_K, KC_L, KC_SCLN, LT(MDIA,DE_AE),  +    KC_RGUI, KC_Y, KC_U, KC_I, KC_O, KC_P, DE_UDIA,  +           KC_H, KC_J, KC_K, KC_L, KC_SCLN, LT(MDIA,DE_ADIA),       KC_RALT, KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLSH), KC_RSFT,                            KC_UP, KC_DOWN, LGUI(KC_LSFT), KC_RBRC, LT(SYMB,KC_BSLS),       ALL_T(DE_ACUT), KC_TRNS,  diff --git a/layouts/community/ergodox/osx_de_experimental/keymap.c b/layouts/community/ergodox/osx_de_experimental/keymap.c index cedecd45cb..17ca4362e6 100644 --- a/layouts/community/ergodox/osx_de_experimental/keymap.c +++ b/layouts/community/ergodox/osx_de_experimental/keymap.c @@ -35,7 +35,7 @@  #define TGH_NUM 2 -#define M_DE_OSX_PLUS_CTRLALT 3 +#define M_DE_PLUS_CTRLALT 3  #define SM_KISS 4 @@ -57,7 +57,7 @@  #define SM_SAD 13 -#define M_DE_OSX_CIRC_CTRLCMD 14 +#define M_DE_CIRC_CTRLCMD 14  #define M_MEH_SH_ACUT 15 @@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  *                                                                                                                                                                                                                                                                                                                                                        *                                           /-------------------//-------------------//-------------------//-------------------//-------------------/                                                                                       /-------------------//-------------------//-------------------//-------------------//-------------------/    *                                           | <                  | LongPress / Type   | LongPress / Type   | Shift+Ctrl         | Type               |                                                                                      | #                  | ACUT               | CMD+Shift          | ALT+Shift          | +                  |  -*                                           | SYMB               | DE_OSX_CIRC_CTRLCMD| DE_OSX_PLUS_CTRAlt |                    | Toggle SMLY        |                                                                                      | Meh                | Hyper              |                    |                    | SYMB               |  +*                                           | SYMB               | DE_CIRC_CTRLCMD    | DE_PLUS_CTRAlt     |                    | Toggle SMLY        |                                                                                      | Meh                | Hyper              |                    |                    | SYMB               |   *                                           \-------------------\\-------------------\\-------------------\\-------------------\/-------------------//-------------------/   /-------------------//-------------------/                     \-------------------\\-------------------\\-------------------\\-------------------\\-------------------\    *                                                                                                                               | HOME               | END                |  | LEFT               | RIGHT              |                                                                                                                                 *                                                                                                                               |                    |                    |  |                    |                    |                                                                                                                                @@ -99,20 +99,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  **/  [BASE]=LAYOUT_ergodox(  //left half -    KC_ESC, DE_OSX_1, DE_OSX_2, DE_OSX_3, DE_OSX_4, DE_OSX_5, M(TGH_NUM),  -    KC_TAB, DE_OSX_Q, DE_OSX_W, DE_OSX_E, DE_OSX_R, DE_OSX_T, KC_LGUI,  -    KC_LALT, DE_OSX_A, DE_OSX_S, DE_OSX_D, DE_OSX_F, DE_OSX_G,  -    KC_LSFT, CTL_T(DE_OSX_Y), DE_OSX_X, DE_OSX_C, DE_OSX_V, DE_OSX_B, KC_LALT,  -                  LT(SYMB,DE_OSX_LESS), M(M_DE_OSX_CIRC_CTRLCMD), M(M_DE_OSX_PLUS_CTRLALT), LSFT(KC_LCTRL), M(SMLY_TOG_QUOT),  +    KC_ESC, DE_1, DE_2, DE_3, DE_4, DE_5, M(TGH_NUM),  +    KC_TAB, DE_Q, DE_W, DE_E, DE_R, DE_T, KC_LGUI,  +    KC_LALT, DE_A, DE_S, DE_D, DE_F, DE_G,  +    KC_LSFT, CTL_T(DE_Y), DE_X, DE_C, DE_V, DE_B, KC_LALT,  +                  LT(SYMB,DE_LABK), M(M_DE_CIRC_CTRLCMD), M(M_DE_PLUS_CTRLALT), LSFT(KC_LCTRL), M(SMLY_TOG_QUOT),                                                 KC_HOME, KC_END,                                                        KC_PGUP,                                          KC_BSPC, KC_DEL, KC_PGDN,       //right half -    M(TOG_HLD_MDIA), DE_OSX_6, DE_OSX_7, DE_OSX_8, DE_OSX_9, DE_OSX_0, DE_OSX_SS,  -    KC_RGUI, DE_OSX_Z, DE_OSX_U, DE_OSX_I, DE_OSX_O, DE_OSX_P, DE_OSX_UE,  -           DE_OSX_H, DE_OSX_J, DE_OSX_K, DE_OSX_L, DE_OSX_OE, ALT_T(DE_OSX_AE),  -    KC_RALT, DE_OSX_N, DE_OSX_M, DE_OSX_COMM, DE_OSX_DOT, CTL_T(DE_OSX_MINS), KC_RSFT,  -                         MEH_T(DE_OSX_HASH), ALL_T(DE_OSX_ACUT), LGUI(KC_LSFT), LALT(KC_LSFT), LT(SYMB,DE_OSX_PLUS),  +    M(TOG_HLD_MDIA), DE_6, DE_7, DE_8, DE_9, DE_0, DE_SS,  +    KC_RGUI, DE_Z, DE_U, DE_I, DE_O, DE_P, DE_UDIA,  +           DE_H, DE_J, DE_K, DE_L, DE_ODIA, ALT_T(DE_ADIA),  +    KC_RALT, DE_N, DE_M, DE_COMM, DE_DOT, CTL_T(DE_MINS), KC_RSFT,  +                         MEH_T(DE_HASH), ALL_T(DE_ACUT), LGUI(KC_LSFT), LALT(KC_LSFT), LT(SYMB,DE_PLUS),       KC_LEFT, KC_RIGHT,       KC_UP,       KC_DOWN, KC_ENT, KC_SPC), @@ -152,19 +152,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  [SYMB]=LAYOUT_ergodox(  //left half      KC_APPLICATION, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F5,  -    KC_TRNS, DE_OSX_LESS, DE_OSX_MORE, DE_OSX_EXLM, DE_OSX_QST, KC_TRNS, KC_TRNS,  -    KC_TRNS, DE_OSX_HASH, DE_OSX_DLR, DE_OSX_BSLS, DE_OSX_SLSH, KC_DOT,  -    KC_TRNS, KC_TRNS, DE_OSX_LESS, DE_OSX_PERC, DE_OSX_PIPE, DE_OSX_TILD, KC_TRNS,  +    KC_TRNS, DE_LABK, DE_RABK, DE_EXLM, DE_QST, KC_TRNS, KC_TRNS,  +    KC_TRNS, DE_HASH, DE_DLR, DE_BSLS, DE_SLSH, KC_DOT,  +    KC_TRNS, KC_TRNS, DE_LABK, DE_PERC, DE_PIPE, DE_TILD, KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                 KC_TRNS, KC_TRNS,                                                        KC_TRNS,                                          KC_TRNS, KC_DEL, KC_TRNS,       //right half      KC_F6, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,  -    KC_TRNS, DE_OSX_BSLS, DE_OSX_LBRC, DE_OSX_RBRC, DE_OSX_LESS, DE_OSX_MORE, DE_OSX_EXLM,  -           DE_OSX_SLSH, DE_OSX_LPRN, DE_OSX_RPRN, DE_OSX_LCBR, DE_OSX_RCBR, DE_OSX_HASH,  -    KC_TRNS, DE_OSX_PIPE, DE_OSX_TILD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  -                         DE_OSX_QUOT, DE_OSX_DQOT, KC_TRNS, M(M_TOGGLE_5), KC_TRNS,  +    KC_TRNS, DE_BSLS, DE_LBRC, DE_RBRC, DE_LABK, DE_RABK, DE_EXLM,  +           DE_SLSH, DE_LPRN, DE_RPRN, DE_LCBR, DE_RCBR, DE_HASH,  +    KC_TRNS, DE_PIPE, DE_TILD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  +                         DE_QUOT, DE_DQUO, KC_TRNS, M(M_TOGGLE_5), KC_TRNS,       KC_F13, KC_F12,       KC_F14,       KC_F15, KC_TRNS, KC_TRNS), @@ -317,10 +317,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {                                         KC_TRNS, KC_TRNS, KC_TRNS,       //right half      KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,  -    KC_TRNS, DE_OSX_SLSH, KC_7, KC_8, KC_9, DE_OSX_ASTR, KC_F12,  -           DE_OSX_SLSH, KC_4, KC_5, KC_6, DE_OSX_PLUS, DE_OSX_MINS,  -    KC_TRNS, DE_OSX_PERC, KC_1, KC_2, KC_3, KC_TRNS, KC_TRNS,  -                         KC_0, KC_DOT, KC_COMM, DE_OSX_EQL, KC_TRNS,  +    KC_TRNS, DE_SLSH, KC_7, KC_8, KC_9, DE_ASTR, KC_F12,  +           DE_SLSH, KC_4, KC_5, KC_6, DE_PLUS, DE_MINS,  +    KC_TRNS, DE_PERC, KC_1, KC_2, KC_3, KC_TRNS, KC_TRNS,  +                         KC_0, KC_DOT, KC_COMM, DE_EQL, KC_TRNS,       KC_TRNS, KC_TRNS,       KC_TRNS,       KC_TRNS, KC_TRNS, KC_TRNS), @@ -394,7 +394,7 @@ if (record->event.pressed) {  			if (timer_elapsed(start) >150) {  				return MACRO_NONE;  			} else { -				return MACRO(DOWN(KC_LSFT),TYPE(DE_OSX_HASH),UP(KC_LSFT),END); +				return MACRO(DOWN(KC_LSFT),TYPE(DE_HASH),UP(KC_LSFT),END);  			}  		} @@ -422,8 +422,8 @@ if (record->event.pressed){  return MACRO_NONE;  break; -case M_DE_OSX_PLUS_CTRLALT: -//Macro: M_DE_OSX_PLUS_CTRLALT//----------------------- +case M_DE_PLUS_CTRLALT: +//Macro: M_DE_PLUS_CTRLALT//-----------------------  if (record->event.pressed) {  			start = timer_read();  			return MACRO(DOWN(KC_LCTRL),DOWN(KC_LALT),END); @@ -516,8 +516,8 @@ if (record->event.pressed) {  		}  break; -case M_DE_OSX_CIRC_CTRLCMD: -//Macro: M_DE_OSX_CIRC_CTRLCMD//----------------------- +case M_DE_CIRC_CTRLCMD: +//Macro: M_DE_CIRC_CTRLCMD//-----------------------  if (record->event.pressed) {  			start = timer_read();  			return MACRO(DOWN(KC_LCTRL),DOWN(KC_LGUI),END); @@ -539,7 +539,7 @@ if (record->event.pressed) {  			if (timer_elapsed(start) >150) {  				return MACRO(U(LCTRL),U(LSFT),U(LALT),END);  			} else { -				return MACRO(UP(KC_LCTRL),UP(KC_LALT),TYPE(DE_OSX_ACUT),UP(KC_LSFT),END); +				return MACRO(UP(KC_LCTRL),UP(KC_LALT),TYPE(DE_ACUT),UP(KC_LSFT),END);  			}  		} diff --git a/layouts/community/ergodox/osx_fr/keymap.c b/layouts/community/ergodox/osx_fr/keymap.c index 09ef0edb69..924e9ee8ae 100644 --- a/layouts/community/ergodox/osx_fr/keymap.c +++ b/layouts/community/ergodox/osx_fr/keymap.c @@ -34,17 +34,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  // Otherwise, it needs KC_*  [BASE] = LAYOUT_ergodox(  // layer 0 : default          // left hand -        FR_MINS,          FR_AMP,      FR_EACU,       FR_QUOT, FR_APOS, FR_LPRN, KC_LEFT, +        FR_MINS,          FR_AMPR,     FR_LEAC,       FR_DQUO, FR_QUOT, FR_LPRN, KC_LEFT,          KC_DEL,           FR_A,        FR_Z,          KC_E,    KC_R,    KC_T,    TG(1),          KC_BSPC,          FR_Q,        KC_S,          KC_D,    KC_F,    KC_G,          KC_LSFT,          CTL_T(FR_W), KC_X,          KC_C,    KC_V,    KC_B,    ALL_T(KC_NO), -        LT(SYMB,FR_UGRV), FR_LESS,     LALT(KC_LSFT), KC_LEFT, KC_RGHT, +        LT(SYMB,FR_LUGR), FR_LABK,     LALT(KC_LSFT), KC_LEFT, KC_RGHT,              ALT_T(KC_APP), KC_LGUI,              KC_HOME,              KC_SPC, KC_BSPC, KC_END,          // right hand -        KC_RGHT,      FR_SECT, FR_EGRV, FR_EXLM,           FR_CCED, FR_AGRV,         FR_RPRN, +        KC_RGHT,      FR_SECT, FR_LEGR, FR_EXLM,           FR_LCCE, FR_LAGR,         FR_RPRN,          TG(1),        KC_Y,    KC_U,    KC_I,              KC_O,    KC_P,            FR_GRV,          KC_H,         KC_J,    KC_K,    KC_L,              FR_M,    KC_LGUI,          MEH_T(KC_NO), KC_N,    FR_COMM, LT(MDIA, FR_SCLN), FR_COLN, CTL_T(FR_EQL),   KC_RSFT, @@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {         KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,         KC_TRNS, KC_UP,   FR_7,   FR_8,    FR_9,    FR_ASTR, KC_F12,                  KC_DOWN, FR_4,   FR_5,    FR_6,    FR_PLUS, KC_TRNS, -       KC_TRNS, FR_AMP,  FR_1,   FR_2,    FR_3,    FR_BSLS, KC_TRNS, +       KC_TRNS, FR_AMPR, FR_1,   FR_2,    FR_3,    FR_BSLS, KC_TRNS,                           KC_TRNS,FR_COMM, FR_0,    FR_EQL,  KC_TRNS,         KC_TRNS, KC_TRNS,         KC_TRNS, diff --git a/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/keymap.c b/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/keymap.c index 729810705b..6bf0285ab6 100644 --- a/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/keymap.c +++ b/layouts/community/ergodox/osx_whiskey_tango_foxtrot_capslock/keymap.c @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {          M(KC_CAPS), M(KC_A),  M(KC_S), M(KC_D), M(KC_F), M(KC_G),          KC_LSFT,    M(KC_Z),  M(KC_X), M(KC_C), M(KC_V), M(KC_B), MO(SYMB),          KC_LCTL,    KC_LALT,  KC_LGUI, KC_LEFT, KC_RGHT, -                                                         KC_TRNS, KC_FN1, +                                                         KC_TRNS, F(1),                                                                    KC_HOME,                                                  KC_BSPC, KC_DEL,  KC_END,          // right hand @@ -91,7 +91,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_FN3, KC_FN2, +                                               F(3),   F(2),                                                         KC_TRNS,                                         KC_TRNS,KC_TRNS,KC_TRNS,         // right hand @@ -132,7 +132,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {         KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,         KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,         KC_TRNS, KC_TRNS, KC_TRNS, KC_NO,   KC_NO, -                                                    KC_FN4,  KC_NO, +                                                    F(4),    KC_NO,                                                               KC_TRNS,                                             KC_TRNS, KC_TRNS, KC_TRNS,         // right hand diff --git a/layouts/community/ergodox/qwerty_code_friendly/keymap.c b/layouts/community/ergodox/qwerty_code_friendly/keymap.c index bf20e76a53..6e285d5613 100644 --- a/layouts/community/ergodox/qwerty_code_friendly/keymap.c +++ b/layouts/community/ergodox/qwerty_code_friendly/keymap.c @@ -490,7 +490,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  ),  }; -uint32_t layer_state_set_user(uint32_t state) { +layer_state_t layer_state_set_user(layer_state_t state) {    /* Use layer 3 when 1 & 2 are pressed. */    state = update_tri_layer_state(state, LAYER_KPAD, LAYER_FKEY, LAYER_WORD);    return state; diff --git a/layouts/community/ergodox/software_neo2/keymap.c b/layouts/community/ergodox/software_neo2/keymap.c index 8f73376010..5f600a5ab5 100644 --- a/layouts/community/ergodox/software_neo2/keymap.c +++ b/layouts/community/ergodox/software_neo2/keymap.c @@ -34,20 +34,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  // Otherwise, it needs KC_*  [BASE] = LAYOUT_ergodox(  // layer 0 : default          // left hand -        KC_DEL,          NEO_1,         NEO_2,         NEO_3,         NEO_4,   NEO_5,   KC_MPLY, -        KC_TAB,          NEO_X,         NEO_V,         NEO_L,         NEO_C,   NEO_W,   KC_ESC, -        NEO_L1_L,        NEO_U,         NEO_I,         NEO_A,         NEO_E,   NEO_O, -        KC_LSFT,         CTL_T(NEO_UE), GUI_T(NEO_OE), ALT_T(NEO_AE), NEO_P,   NEO_Z,   TG(1), -        NEO_L2_L,        KC_HOME,       KC_PGDN,       KC_PGUP,       KC_END, +        KC_DEL,          NE_1,         NE_2,         NE_3,         NE_4,   NE_5,   KC_MPLY, +        KC_TAB,          NE_X,         NE_V,         NE_L,         NE_C,   NE_W,   KC_ESC, +        NE_L3L,        NE_U,         NE_I,         NE_A,         NE_E,   NE_O, +        KC_LSFT,         CTL_T(NE_UDIA), GUI_T(NE_ODIA), ALT_T(NE_ADIA), NE_P,   NE_Z,   TG(1), +        NE_L4L,        KC_HOME,       KC_PGDN,       KC_PGUP,       KC_END,                                                  C_S_T(KC_ESC),KC_LGUI,                                                                KC_ENT,                                                 KC_SPC,KC_BSPC,KC_TAB,          // right hand -        KC_MNXT,     NEO_6,   NEO_7,   NEO_8,   NEO_9,   NEO_0,   NEO_SS, -        KC_ESC,      NEO_K,   NEO_H,   NEO_G,   NEO_F,   NEO_Q,   NEO_Y, -                     NEO_S,   NEO_N,   NEO_R,   NEO_T,   NEO_D,   NEO_L1_R, -        TG(1),       NEO_B,   NEO_M,   NEO_COMM, NEO_DOT, NEO_J,   KC_RSFT, -                              KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, NEO_L2_R, +        KC_MNXT,     NE_6,   NE_7,   NE_8,   NE_9,   NE_0,   NE_SS, +        KC_ESC,      NE_K,   NE_H,   NE_G,   NE_F,   NE_Q,   NE_Y, +                     NE_S,   NE_N,   NE_R,   NE_T,   NE_D,   NE_L3R, +        TG(1),       NE_B,   NE_M,   NE_COMM, NE_DOT, NE_J,   KC_RSFT, +                              KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, NE_L4R,          KC_LALT,KC_RGUI,          KC_DEL,          KC_ESC,KC_ENT, KC_SPC diff --git a/layouts/community/ergodox/swedish-lindhe/keymap.c b/layouts/community/ergodox/swedish-lindhe/keymap.c index 1b16c31d4d..368e216cdc 100644 --- a/layouts/community/ergodox/swedish-lindhe/keymap.c +++ b/layouts/community/ergodox/swedish-lindhe/keymap.c @@ -54,14 +54,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {      KC_TAB,          KC_Q,     KC_W,     KC_E,    KC_R,    KC_T,   MO(SYMB),      KC_CAPS,         KC_A,     KC_S,     KC_D,    KC_F,    KC_G,      KC_LSFT,         KC_Z,     KC_X,     KC_C,    KC_V,    KC_B,   SE_ACUT, -    CTL_T(SE_APOS),  SE_CIRC,  SE_ASTR,  KC_LALT, KC_LGUI, +    CTL_T(SE_QUOT),  SE_CIRC,  SE_ASTR,  KC_LALT, KC_LGUI,                                                 KC_LCTRL,  KC_LALT,                                                            SE_TILD,                                           KC_SPC, KC_BSPC, KC_ESC,      // right hand           KC_MS_BTN3,   KC_6,   KC_7,    KC_8,    KC_9,    KC_0,     SE_PLUS, -         TG(SYMB),  KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,     SE_AA, -                    KC_H,   KC_J,    KC_K,    KC_L,    SE_OSLH,  SE_AE, +         TG(SYMB),  KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,     SE_ARNG, +                    KC_H,   KC_J,    KC_K,    KC_L,    SE_ODIA,  SE_ADIA,           KC_DEL,    KC_N,   KC_M,    KC_COMM, KC_DOT,  SE_MINS,  KC_RSFT,                              KC_ALGR, KC_DOWN, KC_UP,   KC_LEFT,  KC_RGHT,           KC_HOME,        KC_END, diff --git a/layouts/community/ergodox/swedish/keymap.c b/layouts/community/ergodox/swedish/keymap.c index 8ef15d097d..90218aa886 100644 --- a/layouts/community/ergodox/swedish/keymap.c +++ b/layouts/community/ergodox/swedish/keymap.c @@ -66,14 +66,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {      KC_DEL,           KC_Q,           KC_W,          KC_E,    KC_R,    KC_T,   TG(SYMB),      KC_BSPC,          KC_A,           KC_S,          KC_D,    KC_F,    KC_G,      KC_LSFT,          CTL_T(KC_Z),    KC_X,          KC_C,    KC_V,    KC_B,   ALL_T(KC_NO), -    LT(SYMB,SE_APOS), SE_ACUT,        LALT(KC_LSFT), KC_LEFT, KC_RGHT, +    LT(SYMB,SE_QUOT), SE_ACUT,        LALT(KC_LSFT), KC_LEFT, KC_RGHT,                                            ALT_T(KC_APP),  KC_LGUI,                                                            KC_HOME,                                             KC_SPC,KC_BSPC,KC_END,      // right hand           KC_RGHT,      KC_6,   KC_7,   KC_8,    KC_9,    KC_0,              SE_PLUS, -         TG(SYMB),     KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,              SE_AA, -                       KC_H,   KC_J,   KC_K,    KC_L,    LT(MDIA, SE_OSLH), GUI_T(SE_AE), +         TG(SYMB),     KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,              SE_ARNG, +                       KC_H,   KC_J,   KC_K,    KC_L,    LT(MDIA, SE_ODIA), GUI_T(SE_ADIA),           MEH_T(KC_NO), KC_N,   KC_M,   KC_COMM, KC_DOT,  CTL_T(SE_MINS),    KC_RSFT,                                 KC_UP,  KC_DOWN, SE_CIRC, SE_ASTR,           TT(SYMB),           KC_ALGR,        CTL_T(KC_ESC), diff --git a/layouts/community/ergodox/workman_osx_mdw/keymap.c b/layouts/community/ergodox/workman_osx_mdw/keymap.c index 81fd3984b3..f14d9cf4cd 100644 --- a/layouts/community/ergodox/workman_osx_mdw/keymap.c +++ b/layouts/community/ergodox/workman_osx_mdw/keymap.c @@ -55,7 +55,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {               TG(1),       KC_J,   KC_F,   KC_U,   KC_P,   KC_SCLN,          KC_BSLS,                            KC_Y,   KC_N,   KC_E,   KC_O,   KC_I,             KC_QUOT,               MEH_T(KC_NO),KC_K,   KC_L,   KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSFT, -                                  KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,          KC_FN4, +                                  KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,          F(4),               KC_NO,        KC_NO,               KC_PGUP,               KC_PGDN,KC_SPC,KC_ENT diff --git a/layouts/community/ortho_4x12/bocaj/config.h b/layouts/community/ortho_4x12/bocaj/config.h index 9a65684f35..c9d297f927 100644 --- a/layouts/community/ortho_4x12/bocaj/config.h +++ b/layouts/community/ortho_4x12/bocaj/config.h @@ -24,7 +24,7 @@  #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS  // #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects  // #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 -#    define RGB_DISABLE_WHEN_USB_SUSPENDED true  // turn off effects when suspended +#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended  #    undef RGB_MATRIX_LED_PROCESS_LIMIT  #    undef RGB_MATRIX_LED_FLUSH_LIMIT  #endif diff --git a/layouts/community/ortho_4x12/brandonschlack/keymap.c b/layouts/community/ortho_4x12/brandonschlack/keymap.c index ea9d295064..4877a0b446 100644 --- a/layouts/community/ortho_4x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_4x12/brandonschlack/keymap.c @@ -154,7 +154,7 @@ bool encoder_update_keymap(uint8_t index, bool clockwise) {      return true;  } -void dip_switch_update_user(uint8_t index, bool active) { +bool dip_switch_update_user(uint8_t index, bool active) {      switch (index) {          case 0: {  #ifdef AUDIO_ENABLE @@ -183,6 +183,7 @@ void dip_switch_update_user(uint8_t index, bool active) {                  muse_mode = false;              }      } +    return true;  }  void matrix_scan_keymap(void) { diff --git a/layouts/community/ortho_4x12/drashna/config.h b/layouts/community/ortho_4x12/drashna/config.h index f4abd64f57..43143c3a3a 100644 --- a/layouts/community/ortho_4x12/drashna/config.h +++ b/layouts/community/ortho_4x12/drashna/config.h @@ -37,7 +37,7 @@  #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS  // #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects  // #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 -#    define RGB_DISABLE_WHEN_USB_SUSPENDED true  // turn off effects when suspended +#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended  #    undef RGB_MATRIX_LED_PROCESS_LIMIT  #    undef RGB_MATRIX_LED_FLUSH_LIMIT  #    ifdef KEYBOARD_planck_rev6 diff --git a/layouts/community/ortho_4x12/mguterl/keymap.c b/layouts/community/ortho_4x12/mguterl/keymap.c index 66039b61e6..f18ae14d4a 100644 --- a/layouts/community/ortho_4x12/mguterl/keymap.c +++ b/layouts/community/ortho_4x12/mguterl/keymap.c @@ -290,7 +290,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {      return true;  } -void dip_switch_update_user(uint8_t index, bool active) { +bool dip_switch_update_user(uint8_t index, bool active) {      switch (index) {          case 0: {  #ifdef AUDIO_ENABLE @@ -319,6 +319,7 @@ void dip_switch_update_user(uint8_t index, bool active) {                  muse_mode = false;              }      } +    return true;  }  void matrix_scan_user(void) { diff --git a/layouts/community/ortho_5x12/brandonschlack/keymap.c b/layouts/community/ortho_5x12/brandonschlack/keymap.c index c9c94fc967..1b423157bc 100644 --- a/layouts/community/ortho_5x12/brandonschlack/keymap.c +++ b/layouts/community/ortho_5x12/brandonschlack/keymap.c @@ -149,7 +149,7 @@ bool encoder_update_keymap(uint8_t index, bool clockwise) {      return true;  } -void dip_switch_update_user(uint8_t index, bool active) { +bool dip_switch_update_user(uint8_t index, bool active) {      switch (index) {          case 0: {  #ifdef AUDIO_ENABLE @@ -178,6 +178,7 @@ void dip_switch_update_user(uint8_t index, bool active) {                  muse_mode = false;              }      } +    return true;  } diff --git a/layouts/community/split_3x6_3/drashna/config.h b/layouts/community/split_3x6_3/drashna/config.h index dd950ce7bc..4a094e1954 100644 --- a/layouts/community/split_3x6_3/drashna/config.h +++ b/layouts/community/split_3x6_3/drashna/config.h @@ -31,11 +31,11 @@  #ifdef RGBLIGHT_ENABLE  #    undef RGBLED_NUM -#    define RGBLED_NUM 27 +#    define RGBLED_NUM         27 -#    define RGBLIGHT_HUE_STEP 8 -#    define RGBLIGHT_SAT_STEP 8 -#    define RGBLIGHT_VAL_STEP 5 +#    define RGBLIGHT_HUE_STEP  8 +#    define RGBLIGHT_SAT_STEP  8 +#    define RGBLIGHT_VAL_STEP  5  #    define RGBLIGHT_LIMIT_VAL 120  #endif @@ -44,37 +44,36 @@  #        undef RGB_DI_PIN  #        define RGB_DI_PIN A3  #    endif -#    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses +#    define RGB_MATRIX_KEYPRESSES // reacts to keypresses  // #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)  // #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects -#    define RGB_DISABLE_WHEN_USB_SUSPENDED true  // turn off effects when suspended +#    define RGB_DISABLE_WHEN_USB_SUSPENDED  // turn off effects when suspended  // #   define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)  // #   define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) -#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120  // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 -#    define RGB_MATRIX_HUE_STEP 8 -#    define RGB_MATRIX_SAT_STEP 8 -#    define RGB_MATRIX_VAL_STEP 5 -#    define RGB_MATRIX_SPD_STEP 10 +#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255 +#    define RGB_MATRIX_HUE_STEP           8 +#    define RGB_MATRIX_SAT_STEP           8 +#    define RGB_MATRIX_VAL_STEP           5 +#    define RGB_MATRIX_SPD_STEP           10  #endif  #ifdef CONVERT_TO_PROTON_C -#    define WS2812_PWM_DRIVER PWMD2                 // default: PWMD2 -#    define WS2812_PWM_CHANNEL 4                    // default: 2 -#    define WS2812_PWM_PAL_MODE 1                   // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 -#    define WS2812_DMA_STREAM STM32_DMA1_STREAM2    // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#    define WS2812_DMA_CHANNEL 2                    // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. -#    define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM2_UP  // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU. +#    define WS2812_PWM_DRIVER   PWMD2                 // default: PWMD2 +#    define WS2812_PWM_CHANNEL  4                     // default: 2 +#    define WS2812_PWM_PAL_MODE 1                     // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 +#    define WS2812_DMA_STREAM   STM32_DMA1_STREAM2    // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#    define WS2812_DMA_CHANNEL  2                     // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU. +#    define WS2812_DMAMUX_ID    STM32_DMAMUX1_TIM2_UP // DMAMUX configuration for TIMx_UP -- only required if your MCU has a DMAMUX peripheral, see the respective reference manual for the appropriate values for your MCU.  #    undef SOFT_SERIAL_PIN -#    define SOFT_SERIAL_PIN D3 -#    define SERIAL_USART_DRIVER SD1     // USART driver of TX pin. default: SD1 -#    define SERIAL_USART_TX_PAL_MODE 7  // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7 +#    define SOFT_SERIAL_PIN          D3 +#    define SERIAL_USART_DRIVER      SD1 // USART driver of TX pin. default: SD1 +#    define SERIAL_USART_TX_PAL_MODE 7   // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 7  // #define INIT_EE_HANDS_LEFT  // #define INIT_EE_HANDS_RIGHT  #endif -  #if defined(AUDIO_ENABLE) && !defined(CONVERT_TO_PROTON_C)  #    define AUDIO_PIN B6  #    define NO_MUSIC_MODE diff --git a/layouts/community/split_3x6_3/drashna/keymap.c b/layouts/community/split_3x6_3/drashna/keymap.c index 5a2d2f2e27..e46b626ef9 100644 --- a/layouts/community/split_3x6_3/drashna/keymap.c +++ b/layouts/community/split_3x6_3/drashna/keymap.c @@ -114,7 +114,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  // clang-format on  #ifdef OLED_DRIVER_ENABLE -oled_rotation_t oled_init_user(oled_rotation_t rotation) { +oled_rotation_t oled_init_keymap(oled_rotation_t rotation) {      return OLED_ROTATION_270;  }  #endif | 
