~ruther/qmk_firmware

46023610950e464b21f4b89edb8fffd6c1241c31 — Sid Carter 6 years ago 28f5346
[Keymap] Switch Iris keymap from workman to colemak (#6385)

* via support and colemak layout

* figures tap and hold parts don't work vith via enabled - so those are commented out for now
M keyboards/keebio/iris/keymaps/osiris/keymap.c => keyboards/keebio/iris/keymaps/osiris/keymap.c +16 -16
@@ 4,7 4,7 @@ extern keymap_config_t keymap_config;

enum layer_names {
    _QWERTY,
    _WORKMAN,
    _COLEMAK,
    _LOWER,
    _RAISE,
    _ADJUST


@@ 12,7 12,7 @@ enum layer_names {

enum custom_keycodes {
  QWERTY = SAFE_RANGE,
  WORKMAN,
  COLEMAK,
  LOWER,
  RAISE
};


@@ 24,8 24,8 @@ enum custom_keycodes {
#define KC_RST  RESET
#define KC_BL_S BL_STEP

// left control as a left key too - makes perfect sense
#define KC_LECL LCTL_T(KC_LEFT)
// left shift as a left key too - makes perfect sense
#define KC_LESF LSFT_T(KC_LEFT)


const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {


@@ 36,23 36,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
     TAB , Q  , W  , E  , R  , T  ,                Y  , U  , I  , O  , P  ,BSLS,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
     LSFT, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
     LCTL, A  , S  , D  , F  , G  ,                H  , J  , K  , L  ,SCLN,QUOT,
  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
     LECL, Z  , X  , C  , V  , B  ,LBRC,     RBRC, N  , M  ,COMM,DOT ,SLSH,RGHT,
     LESF, Z  , X  , C  , V  , B  ,LBRC,     RBRC, N  , M  ,COMM,DOT ,SLSH,RGHT,
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
                       LGUI,LOWR,ENT ,         SPC ,RASE,RALT
  //                  `----+----+----'        `----+----+----'
  ),

    [_WORKMAN] = LAYOUT_kc(
    [_COLEMAK] = LAYOUT_kc(
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
     GESC, 1  , 2  , 3  , 4  , 5  ,                6  , 7  , 8  , 9  , 0  ,BSPC,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
     TAB , Q  , D  , R  , W  , B  ,                J  , F  , U  , P  ,SCLN,BSLS,
     TAB , Q  , W  , F  , P  , G  ,                J  , L  , U  , Y  ,SCLN,BSLS,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
     LSFT, A  , S  , H  , T  , G  ,                Y  , N  , E  , O  ,I   ,QUOT,
     LCTL, A  , R  , S  , T  , D  ,                H  , N  , E  , I  , O  ,QUOT,
  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
     LECL, Z  , X  , M  , C  , V  ,LBRC,     RBRC, K  , L  ,COMM,DOT ,SLSH,RGHT,
     LESF, Z  , X  , C  , V  , B  ,LBRC,     RBRC, K  , M  ,COMM,DOT ,SLSH,RGHT,
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
                       LGUI,LOWR,ENT ,         SPC ,RASE,RALT
  //                  `----+----+----'        `----+----+----'


@@ 60,13 60,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_LOWER] = LAYOUT_kc(
  //,----+----+----+----+----+----.              ,----+----+----+----+----+----.
     TILD,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,DEL ,
     GRV ,EXLM, AT ,HASH,DLR ,PERC,               CIRC,AMPR,ASTR,LPRN,RPRN,DEL ,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
         ,    ,    ,    ,    ,    ,                   ,    ,BTN1,    ,    ,    ,
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
         ,    ,    ,    ,    ,    ,               MS_L,MS_D,MS_U,MS_R,    ,    ,
  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
         ,    ,    ,    ,    , UP ,    ,         ,    ,    ,    ,    ,    ,    ,
         ,    ,    ,    ,    , UP ,    ,         ,DOWN,    ,    ,    ,    ,    ,
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
                           ,    ,    ,             ,    ,   
  //                  `----+----+----'        `----+----+----'


@@ 80,7 80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  //|----+----+----+----+----+----|              |----+----+----+----+----+----|
         ,MPLY,VOLD,MNXT,    ,LPRN,               RPRN,MINS,EQL ,    ,    ,    ,
  //|----+----+----+----+----+----+----.    ,----|----+----+----+----+----+----|
         ,    ,    ,    ,    ,    ,    ,         ,DOWN,    ,    ,    ,    ,    ,
         ,    ,    ,    ,    ,    ,    ,         ,    ,    ,    ,    ,    ,    ,
  //`----+----+----+--+-+----+----+----/    \----+----+----+----+----+----+----'
                           ,    ,    ,             ,    ,
  //                  `----+----+----'        `----+----+----'


@@ 88,7 88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_ADJUST] = LAYOUT(
  //,--------+--------+--------+--------+--------+--------.                          ,--------+--------+--------+--------+--------+--------.
      _______, _______, _______, _______, _______,  QWERTY,                            WORKMAN, _______, _______, _______, _______, _______,
      _______, _______, _______, _______, _______,  QWERTY,                            COLEMAK, _______, _______, _______, _______, _______,
  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|
      RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______,                            _______, _______, _______, _______, _______, _______,
  //|--------+--------+--------+--------+--------+--------|                          |--------+--------+--------+--------+--------+--------|


@@ 113,9 113,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
        set_single_persistent_default_layer(_QWERTY);
      }
      return false;
    case WORKMAN:
    case COLEMAK:
      if (record->event.pressed) {
        set_single_persistent_default_layer(_WORKMAN);
        set_single_persistent_default_layer(_COLEMAK);
      }
      return false;
    case LOWER:

M keyboards/keebio/iris/keymaps/osiris/readme.md => keyboards/keebio/iris/keymaps/osiris/readme.md +2 -1
@@ 3,9 3,10 @@
![My Iris Rev3](https://i.imgur.com/7oXacel.jpg)

- mouse keys enabled
- includes a QWERTY and a WORKMAN layout now
- includes a QWERTY and a COLEMAK layout now
- keys that I need, while removing keys that I don't
- more updates with the layout coming soon
  - the enter needs to move elsewhere, not yet sure where
- support for VIA Configurator

See keymap.c for layouts

M keyboards/keebio/iris/keymaps/osiris/rules.mk => keyboards/keebio/iris/keymaps/osiris/rules.mk +5 -0
@@ 1,3 1,8 @@
RGBLIGHT_ENABLE = yes
BACKLIGHT_ENABLE = yes
MOUSEKEY_ENABLE = yes

# VIA Support - Comment these 3 lines out to disable
# RAW_ENABLE = yes
# DYNAMIC_KEYMAP_ENABLE = yes
# SRC += keyboards/wilba_tech/wt_main.c
\ No newline at end of file