diff options
| -rw-r--r-- | keyboards/phantom/keymaps/xyverz/keymap.c | 6 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/xyverz/keymap.c | 66 | ||||
| -rw-r--r-- | keyboards/planck/keymaps/xyverz/makefile.mk | 4 | 
3 files changed, 12 insertions, 64 deletions
| diff --git a/keyboards/phantom/keymaps/xyverz/keymap.c b/keyboards/phantom/keymaps/xyverz/keymap.c index aa6af18b1d..4a15226386 100644 --- a/keyboards/phantom/keymaps/xyverz/keymap.c +++ b/keyboards/phantom/keymaps/xyverz/keymap.c @@ -34,7 +34,7 @@ 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_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN},      {KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, XXXXXXX, KC_ENT,  XXXXXXX, XXXXXXX, XXXXXXX},      {KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, XXXXXXX, KC_RSFT, XXXXXXX, KC_UP,   XXXXXXX}, -    {KC_LCTL, KC_LGUI, KC_LALT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, KC_RALT, KC_RGUI, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT} +    {KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, KC_RGUI, KC_RALT, KC_RCTL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT}    },  [_DV] = { /* Layer 1: Dvorak */ @@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {      {KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH, KC_EQL,  KC_BSLS, KC_DEL,  KC_END,  KC_PGDN},      {KC_CAPS, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS, XXXXXXX, KC_ENT,  XXXXXXX, XXXXXXX, XXXXXXX},      {KC_LSFT, XXXXXXX, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    XXXXXXX, KC_RSFT, XXXXXXX, KC_UP,   XXXXXXX}, -    {KC_LCTL, KC_LGUI, KC_LALT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, KC_RALT, KC_RGUI, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT} +    {KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, KC_RGUI, KC_RALT, KC_RCTL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT}    },  [_CM] = { /* Layer 2: Colemak */ @@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {      {KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN},      {KC_BSPC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, XXXXXXX, KC_ENT,  XXXXXXX, XXXXXXX, XXXXXXX},      {KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, XXXXXXX, KC_RSFT, XXXXXXX, KC_UP,   XXXXXXX}, -    {KC_LCTL, KC_LGUI, KC_LALT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, KC_RALT, KC_RGUI, MO(_FL), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT} +    {KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SPC,  XXXXXXX, XXXXXXX, KC_RGUI, KC_RALT, KC_RCTL, MO(_FL), KC_LEFT, KC_DOWN, KC_RGHT}    },  [_FL] = { /* Layer 3: Functions */ diff --git a/keyboards/planck/keymaps/xyverz/keymap.c b/keyboards/planck/keymaps/xyverz/keymap.c index 90529428da..e57746e6ac 100644 --- a/keyboards/planck/keymaps/xyverz/keymap.c +++ b/keyboards/planck/keymaps/xyverz/keymap.c @@ -19,18 +19,15 @@ extern keymap_config_t keymap_config;  #define _DVORAK 2  #define _LOWER 3  #define _RAISE 4 -#define _PLOVER 5  #define _ADJUST 16  enum planck_keycodes {    QWERTY = SAFE_RANGE,    COLEMAK,    DVORAK, -  PLOVER,    LOWER, -  RAISE, -  BACKLIT, -  EXT_PLV +  RAISE = LT(_RAISE, KC_ENT), +  BACKLIT  };  // Fillers to make layering more clear @@ -89,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  [_DVORAK] = {    {KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH},    {KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS}, -  {KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SFT_T(KC_ENT)}, +  {KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT},    {KC_LCTL, KC_LALT, KC_LEFT, KC_RGHT, LOWER,   KC_BSPC, KC_SPC,  RAISE,   KC_UP,   KC_DOWN, KC_RGUI, KC_ENT }  }, @@ -129,30 +126,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {    {BACKLIT, _______, KC_HOME, KC_END,  _______, KC_DEL,  KC_INS,  _______, KC_PGUP, KC_PGDN, _______, _______}  }, -/* Plover layer (http://opensteno.org) - * ,-----------------------------------------------------------------------------------. - * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * |TogOut|   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      | - * `-----------------------------------------------------------------------------------' - */ - -[_PLOVER] = { -  {KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   }, -  {XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC}, -  {XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT}, -  {EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX} -}, -  /* Adjust (Lower + Raise)   * ,-----------------------------------------------------------------------------------.   * |      | Reset|      |      |      |      |      |      |      |      |      |  Del |   * |------+------+------+------+------+-------------+------+------+------+------+------| - * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      | + * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|      |      |   * |------+------+------+------+------+------|------+------+------+------+------+------|   * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |   * |------+------+------+------+------+------+------+------+------+------+------+------| @@ -161,7 +139,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   */  [_ADJUST] = {    {_______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL}, -  {_______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______}, +  {_______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  _______, _______},    {_______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______},    {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}  } @@ -175,8 +153,6 @@ float tone_startup[][2]    = SONG(STARTUP_SOUND);  float tone_qwerty[][2]     = SONG(QWERTY_SOUND);  float tone_dvorak[][2]     = SONG(DVORAK_SOUND);  float tone_colemak[][2]    = SONG(COLEMAK_SOUND); -float tone_plover[][2]     = SONG(PLOVER_SOUND); -float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);  float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);  float tone_goodbye[][2] = SONG(GOODBYE_SOUND); @@ -235,7 +211,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {          layer_off(_RAISE);          update_tri_layer(_LOWER, _RAISE, _ADJUST);        } -      return false; +      //return false;        break;      case BACKLIT:        if (record->event.pressed) { @@ -248,34 +224,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {        }        return false;        break; -    case PLOVER: -      if (record->event.pressed) { -        #ifdef AUDIO_ENABLE -          stop_all_notes(); -          PLAY_NOTE_ARRAY(tone_plover, false, 0); -        #endif -        layer_off(_RAISE); -        layer_off(_LOWER); -        layer_off(_ADJUST); -        layer_on(_PLOVER); -        if (!eeconfig_is_enabled()) { -            eeconfig_init(); -        } -        keymap_config.raw = eeconfig_read_keymap(); -        keymap_config.nkro = 1; -        eeconfig_update_keymap(keymap_config.raw); -      } -      return false; -      break; -    case EXT_PLV: -      if (record->event.pressed) { -        #ifdef AUDIO_ENABLE -          PLAY_NOTE_ARRAY(tone_plover_gb, false, 0); -        #endif -        layer_off(_PLOVER); -      } -      return false; -      break;    }    return true;  } @@ -311,4 +259,4 @@ void music_scale_user(void)      PLAY_NOTE_ARRAY(music_scale, false, 0);  } -#endif
\ No newline at end of file +#endif diff --git a/keyboards/planck/keymaps/xyverz/makefile.mk b/keyboards/planck/keymaps/xyverz/makefile.mk index 0f4953888d..93a89bb4ab 100644 --- a/keyboards/planck/keymaps/xyverz/makefile.mk +++ b/keyboards/planck/keymaps/xyverz/makefile.mk @@ -9,10 +9,10 @@ MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)  EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)  CONSOLE_ENABLE = no         # Console for debug(+400)  COMMAND_ENABLE = yes        # Commands for debug and configuration -NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work  BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality  MIDI_ENABLE = no            # MIDI controls -AUDIO_ENABLE = yes           # Audio output on port C6 +AUDIO_ENABLE = yes          # Audio output on port C6  UNICODE_ENABLE = no         # Unicode  BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID  RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time. | 
