diff options
| -rw-r--r-- | keyboards/ergodox/config.h | 7 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/default/keymap.c | 84 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/erez_experimental/keymap.c | 2 | 
3 files changed, 63 insertions, 30 deletions
| diff --git a/keyboards/ergodox/config.h b/keyboards/ergodox/config.h index edc60caae1..994a8c6433 100644 --- a/keyboards/ergodox/config.h +++ b/keyboards/ergodox/config.h @@ -1,10 +1,11 @@  #ifndef KEYBOARDS_ERGODOX_CONFIG_H_  #define KEYBOARDS_ERGODOX_CONFIG_H_ -#define MOUSEKEY_DELAY          100  #define MOUSEKEY_INTERVAL       20 -#define MOUSEKEY_MAX_SPEED      3 -#define MOUSEKEY_TIME_TO_MAX    10 +#define MOUSEKEY_DELAY          0 +#define MOUSEKEY_TIME_TO_MAX    5 +#define MOUSEKEY_MAX_SPEED      2 +#define MOUSEKEY_WHEEL_DELAY 0  #define TAPPING_TOGGLE  1 diff --git a/keyboards/ergodox/keymaps/default/keymap.c b/keyboards/ergodox/keymaps/default/keymap.c index 2f399bd181..4eff280850 100644 --- a/keyboards/ergodox/keymaps/default/keymap.c +++ b/keyboards/ergodox/keymaps/default/keymap.c @@ -7,7 +7,12 @@  #define SYMB 1 // symbols  #define MDIA 2 // media keys -#define EPRM M(1) // Macro 1: Reset EEPROM +enum custom_keycodes { +  PLACEHOLDER = SAFE_RANGE, // can always be here +  EPRM, +  VRSN, +  RGB_SLD +};  const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {  /* Keymap 0: Basic layer @@ -17,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|   * | Del    |   Q  |   W  |   E  |   R  |   T  |  L1  |           |  L1  |   Y  |   U  |   I  |   O  |   P  |   \    |   * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------| - * | BkSp   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2|' / Cmd | + * | BkSp   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |J/Alt |   K  |   L  |; / L2|' / Cmd |   * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|   * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |//Ctrl| RShift |   * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------' @@ -44,56 +49,56 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {                                                                KC_HOME,                                                 KC_SPC,KC_BSPC,KC_END,          // right hand -             KC_RGHT,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS, -             TG(SYMB),    KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_BSLS, -                          KC_H,   KC_J,   KC_K,   KC_L,   LT(MDIA, KC_SCLN),GUI_T(KC_QUOT), -             MEH_T(KC_NO),KC_N,   KC_M,   KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSFT, -                                  KC_UP,  KC_DOWN,KC_LBRC,KC_RBRC,          KC_FN1, +             KC_RGHT,     KC_6,   KC_7,        KC_8,   KC_9,   KC_0,             KC_MINS, +             TG(SYMB),    KC_Y,   KC_U,        KC_I,   KC_O,   KC_P,             KC_BSLS, +                          KC_H,   ALT_T(KC_J), KC_K,   KC_L,   LT(MDIA, KC_SCLN),GUI_T(KC_QUOT), +             MEH_T(KC_NO),KC_N,   KC_M,        KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSFT, +                                  KC_UP,       KC_DOWN,KC_LBRC,KC_RBRC,          KC_FN1,               KC_LALT,        CTL_T(KC_ESC),               KC_PGUP,               KC_PGDN,KC_TAB, KC_ENT      ),  /* Keymap 1: Symbol Layer   * - * ,--------------------------------------------------.           ,--------------------------------------------------. - * |Version |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  | - * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------| - * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  | - * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------| - * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        | - * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------| - * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        | - * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------' - *   | EPRM |      |      |      |      |                                       |      |    . |   0  |   =  |      | - *   `----------------------------------'                                       `----------------------------------' + * ,---------------------------------------------------.           ,--------------------------------------------------. + * |Version  |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  | + * |---------+------+------+------+------+------+------|           |------+------+------+------+------+------+--------| + * |         |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  | + * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------| + * |         |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        | + * |---------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------| + * |         |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        | + * `---------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------' + *   | EPRM  |      |      |      |      |                                       |      |    . |   0  |   =  |      | + *   `-----------------------------------'                                       `----------------------------------'   *                                        ,-------------.       ,-------------. - *                                        |      |      |       |      |      | + *                                        |Animat|      |       |Toggle|Solid |   *                                 ,------|------|------|       |------+------+------. - *                                 |      |      |      |       |      |      |      | - *                                 |      |      |------|       |------|      |      | + *                                 |Bright|Bright|      |       |      |Hue-  |Hue+  | + *                                 |ness- |ness+ |------|       |------|      |      |   *                                 |      |      |      |       |      |      |      |   *                                 `--------------------'       `--------------------'   */  // SYMBOLS  [SYMB] = KEYMAP(         // left hand -       M(0),   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS, +       VRSN,   KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,         KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,         KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,         KC_TRNS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,KC_TRNS,            EPRM,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, -                                       KC_TRNS,KC_TRNS, +                                       RGB_MOD,KC_TRNS,                                                 KC_TRNS, -                               KC_TRNS,KC_TRNS,KC_TRNS, +                               RGB_VAD,RGB_VAI,KC_TRNS,         // right hand         KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,         KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,                  KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,         KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_TRNS,                           KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS, -       KC_TRNS, KC_TRNS, +       RGB_TOG, RGB_SLD,         KC_TRNS, -       KC_TRNS, KC_TRNS, KC_TRNS +       KC_TRNS, RGB_HUD, RGB_HUI  ),  /* Keymap 2: Media and mouse keys   * @@ -160,6 +165,33 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)      return MACRO_NONE;  }; +bool process_record_user(uint16_t keycode, keyrecord_t *record) { +  switch (keycode) { +    // dynamically generate these. +    case EPRM: +      if (record->event.pressed) { +        eeconfig_init(); +      } +      return false; +      break; +    case VRSN: +      if (record->event.pressed) { +        SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); +      } +      return false; +      break; +    case RGB_SLD: +      if (record->event.pressed) { +        #ifdef RGBLIGHT_ENABLE +          rgblight_mode(1); +        #endif +      } +      return false; +      break; +  } +  return true; +} +  // Runs just one time when the keyboard initializes.  void matrix_init_user(void) { diff --git a/keyboards/ergodox/keymaps/erez_experimental/keymap.c b/keyboards/ergodox/keymaps/erez_experimental/keymap.c index 2963c40e31..13b8240ce8 100644 --- a/keyboards/ergodox/keymaps/erez_experimental/keymap.c +++ b/keyboards/ergodox/keymaps/erez_experimental/keymap.c @@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {   *                                        ,-------------.       ,-------------.   *                                        |      |      |       |TOG   |   *                                 ,------|------|------|       |------+------+------. - *                                 |VAI   |VAD   |HUI   |       |SAI   |TOG   |MOD   | + *                                 |VAI   |VAD   |HUI   |       |SAI   |      |MOD   |   *                                 |      |      |------|       |------|      |      |   *                                 |      |      |HUD   |       |SAD   |      |      |   *                                 `--------------------'       `--------------------' | 
