diff options
| -rw-r--r-- | keyboards/iris/keymaps/omgvee/config.h | 9 | ||||
| -rw-r--r-- | keyboards/iris/keymaps/omgvee/keymap.c | 77 | ||||
| -rw-r--r-- | keyboards/iris/keymaps/omgvee/readme.md | 2 | ||||
| -rw-r--r-- | keyboards/iris/keymaps/omgvee/rules.mk | 4 | 
4 files changed, 67 insertions, 25 deletions
| diff --git a/keyboards/iris/keymaps/omgvee/config.h b/keyboards/iris/keymaps/omgvee/config.h index c29201fe1f..c5899f45f0 100644 --- a/keyboards/iris/keymaps/omgvee/config.h +++ b/keyboards/iris/keymaps/omgvee/config.h @@ -46,4 +46,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #define MOUSEKEY_DELAY 0  #define MOUSEKEY_TIME_TO_MAX 60  #define MOUSEKEY_MAX_SPEED 7 -#define MOUSEKEY_WHEEL_DELAY 0
\ No newline at end of file +#define MOUSEKEY_WHEEL_DELAY 0 + +////Leader key timeout +//#define LEADER_TIMEOUT 500 +//#define LEADER_PER_KEY_TIMING 200 + +#undef PRODUCT +#define PRODUCT         "Vee's Home IRIS choc keeb" diff --git a/keyboards/iris/keymaps/omgvee/keymap.c b/keyboards/iris/keymaps/omgvee/keymap.c index da76b593b6..6f29ccecd3 100644 --- a/keyboards/iris/keymaps/omgvee/keymap.c +++ b/keyboards/iris/keymaps/omgvee/keymap.c @@ -8,6 +8,7 @@ extern keymap_config_t keymap_config;  #define _RAISE 2  #define _MOUSE 3  #define _ADJUST 4 +#define _HWCT 5  enum custom_keycodes {    QWERTY = SAFE_RANGE, @@ -15,9 +16,11 @@ enum custom_keycodes {    RAISE,    MOUSE,    ADJUST, +  HWCT,  };  #define KC_MOUS TT(_MOUSE) // double tab toggle mouse layer +#define KC_HWCT TT(_HWCT) // double tab toggle hardware control layer  #define MS_L KC_MS_LEFT  #define MS_R KC_MS_RIGHT  #define MS_U KC_MS_UP  @@ -27,7 +30,10 @@ enum custom_keycodes {  #define MW_U KC_MS_WH_UP   #define MW_D KC_MS_WH_DOWN   #define MW_L KC_MS_WH_LEFT  -#define MW_R KC_MS_WH_RIGHT  +#define MW_R KC_MS_WH_RIGHT + +//// only uncomment the below line when you enable leader key in rules.mk +//LEADER_EXTERNS();  //Tap Dance Declarations  enum { @@ -36,13 +42,12 @@ enum {  //Tap Dance Definitions  qk_tap_dance_action_t tap_dance_actions[] = {    //Tap once for Shift, twice for Caps Lock -  [TD_SCL]  = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS) +  [TD_SCL]  = ACTION_TAP_DANCE_DOUBLE(KC_LSFT, KC_CAPS),  };  enum {    TD_EBT = 0  }; -  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    [_QWERTY] = LAYOUT( @@ -51,37 +56,37 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                               KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,    //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤ -  TD(TD_SCL), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, +     KC_LSFT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                               KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ -     KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_MOUS,          KC_MOUS, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, +     KC_LCTL, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_MOUS,          KC_HWCT, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,TD(TD_SCL),    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ -                                    KC_LALT, LOWER,   KC_ENT,                    KC_SPC,  RAISE,   KC_LGUI +                                    KC_LGUI,  LOWER,   KC_ENT,                    KC_SPC,  RAISE,   KC_LALT                                  // └────────┴────────┴────────┘                 └────────┴────────┴────────┘    ),    [_LOWER] = LAYOUT(    //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐ -     KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                            KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,  KC_BSPC, +     KC_GRV,  _______, _______, _______, _______, _______,                            _______, _______, _______, KC_MINS, KC_EQL,  _______,    //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤ -     _______, _______, KC_UP,   _______, _______, _______,                            _______, _______, _______, KC_LBRC, KC_RBRC, KC_PIPE, +     _______, KC_HOME, KC_UP,   KC_END,  KC_PGUP, _______,                            _______, KC_HOME, KC_END,  KC_LBRC, KC_RBRC, _______,    //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤ -     _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,                            KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,_______, KC_ENT, +     _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, _______,                            KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,_______, _______,    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ -     KC_LCTL, _______, _______, _______, KC_LCBR, KC_LBRC, KC_LPRN,          KC_RPRN, KC_RBRC, KC_RCBR, _______, _______, _______, _______, +     KC_LCTL, _______, _______, KC_LT,   KC_LCBR, KC_LBRC, KC_LPRN,          KC_RPRN, KC_RBRC, KC_RCBR, KC_GT,   _______, _______, _______,    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ -                                    _______, _______, KC_DEL,                    KC_DEL,  _______, _______ +                                    _______, _______, _______,                    KC_DEL, _______, _______                                  // └────────┴────────┴────────┘                 └────────┴────────┴────────┘    ),    [_RAISE] = LAYOUT(    //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐ -     KC_TILD,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11, +     KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                              KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,    //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤ -     RGB_TOG, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______, +     _______, _______, _______, _______, KC_PGUP, _______,                            _______, _______, _______, _______, _______, KC_INS,    //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤ -     RGB_MOD, KC_MPRV, KC_MNXT, _______, KC_PGUP, KC_UNDS,                            KC_EQL,  KC_HOME, RGB_HUI, RGB_SAI, RGB_VAI, KC_ENT, +     _______, _______, _______, _______, KC_PGDN, _______,                            KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_MENU, KC_PENT,    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ -     _______, KC_MSTP, KC_MPLY, _______, KC_PGDN, KC_MINS, KC_LPRN,          KC_RPRN, KC_PLUS, KC_END,  RGB_HUD, RGB_SAD, RGB_VAD, _______, +     _______, _______, _______, _______, _______, KC_MINS, KC_F11,           KC_F12,  KC_MINS, KC_EQL,  KC_VOLD, KC_VOLU, KC_PSCR, KC_EJCT,    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘                                      _______, _______, _______,                   _______, _______, _______                                  // └────────┴────────┴────────┘                 └────────┴────────┴────────┘ @@ -89,13 +94,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    [_MOUSE] = LAYOUT(    //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐ -     BL_BRTG, _______, _______, _______, _______, RESET,                              _______, _______, _______, _______, _______, RESET, +     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______,    //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤ -     BL_TOGG, MS_B1,   MS_U,    MS_B2,   MW_U,    _______,                            _______, MS_B1,   MS_B2,   _______, _______, _______, +     _______, MS_B1,   MS_U,    MS_B2,   MW_U,    _______,                            _______, MS_B1,   MS_B2,   _______, _______, _______,    //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤       _______, MS_L,    MS_D,    MS_R,    MW_D,    _______,                            MS_L,    MS_D   , MS_U,    MS_R    ,_______, _______,    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ -     BL_STEP, _______, _______, MW_L,    MW_R,    _______, _______,          _______, KC_BRID, KC_BRIU, KC_VOLD, KC_VOLU, KC_MUTE, _______, +     _______, _______, _______, MW_L,    MW_R,    _______, _______,          _______, KC_BRID, KC_BRIU, KC_VOLD, KC_VOLU, KC_MUTE, _______,    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘                                      _______, _______, _______,                   _______, _______, _______                                  // └────────┴────────┴────────┘                 └────────┴────────┴────────┘ @@ -103,17 +108,32 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    [_ADJUST] = LAYOUT(    //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐ -     _______, _______, _______, _______, _______, RESET,                              _______, _______, _______, _______, _______, RESET, +     BL_BRTG, _______, _______, _______, DEBUG,   RESET,                              RESET,   DEBUG,   _______, RGB_HUI, RGB_SAI, RGB_VAI,    //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤ -     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______, +      BL_INC, _______, _______, _______, _______, EEP_RST,                            EEP_RST, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD,    //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤ -     _______, _______, _______, _______, _______, _______,                            _______, _______, _______, _______, _______, _______, +      BL_DEC, KC_MPRV, KC_MNXT, KC_MFFD, KC_MRWD, KC_MPLY,                            KC_MPRV, KC_MNXT, KC_MFFD, KC_MRWD, KC_MPLY, RGB_MOD,    //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ -     _______, _______, _______, _______, _______, _______, _______,          _______, KC_BRID, KC_BRIU, KC_VOLD, KC_VOLU, KC_MUTE, _______, +     BL_TOGG, _______, _______, _______, _______, _______, _______,          _______, KC_BRID, KC_BRIU, KC_VOLD, KC_VOLU, KC_MUTE, RGB_TOG, +  //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘ +                                    _______, _______, _______,                   _______, _______, _______ +                                // └────────┴────────┴────────┘                 └────────┴────────┴────────┘ +  ), + +  [_HWCT] = LAYOUT( +  //┌────────┬────────┬────────┬────────┬────────┬────────┐                          ┌────────┬────────┬────────┬────────┬────────┬────────┐ +     BL_BRTG, _______, _______, _______, _______,   RESET,                              RESET, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, +  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤ +      BL_INC, _______, _______, _______, _______, _______,                            _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, +  //├────────┼────────┼────────┼────────┼────────┼────────┤                          ├────────┼────────┼────────┼────────┼────────┼────────┤ +      BL_DEC, KC_MPRV, KC_MNXT, KC_MFFD, KC_MRWD, KC_MPLY,                            KC_MPRV, KC_MNXT, KC_MFFD, KC_MRWD, KC_MPLY, RGB_MOD, +  //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐        ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ +     BL_TOGG, _______, _______, _______, _______, _______, KC_EJCT,          _______, KC_BRID, KC_BRIU, KC_VOLD, KC_VOLU, KC_MUTE, RGB_TOG,    //└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘        └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘                                      _______, _______, _______,                   _______, _______, _______                                  // └────────┴────────┴────────┘                 └────────┴────────┴────────┘    ) +  };  bool process_record_user(uint16_t keycode, keyrecord_t *record) { @@ -160,6 +180,19 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {        }        return false;        break; +    case HWCT: +      if (record->event.pressed) { +        layer_on(_HWCT); +        dprintf("Got on layer %s ", HWCT); +        update_tri_layer(_LOWER, _RAISE, _MOUSE); +      } else { +        layer_off(_HWCT); +        dprintf("Got off layer %s ", HWCT); +        update_tri_layer(_LOWER, _RAISE, _MOUSE); +      } +      return false; +      break; +      case ADJUST:        if (record->event.pressed) {          layer_on(_ADJUST); diff --git a/keyboards/iris/keymaps/omgvee/readme.md b/keyboards/iris/keymaps/omgvee/readme.md index 82a6cd2cf5..275d270fa3 100644 --- a/keyboards/iris/keymaps/omgvee/readme.md +++ b/keyboards/iris/keymaps/omgvee/readme.md @@ -4,7 +4,7 @@   - +  ======= diff --git a/keyboards/iris/keymaps/omgvee/rules.mk b/keyboards/iris/keymaps/omgvee/rules.mk index 281f64c7eb..897c6069c5 100644 --- a/keyboards/iris/keymaps/omgvee/rules.mk +++ b/keyboards/iris/keymaps/omgvee/rules.mk @@ -2,6 +2,8 @@ RGBLIGHT_ENABLE = yes  BACKLIGHT_ENABLE = yes  MOUSEKEY_ENABLE = yes  CONSOLE_ENABLE = no -COMMAND_ENABLE = yes +COMMAND_ENABLE = no  TAP_DANCE_ENABLE = yes  NKRO_ENABLE = yes +LEADER_ENABLE = no +UNICODE_ENABLE = no | 
