diff options
author | Damien <Dbroqua@users.noreply.github.com> | 2016-12-09 19:44:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-09 19:44:03 +0100 |
commit | 13c4080a1d77cb1dfdf48df8a42e78b9dc483912 (patch) | |
tree | 66fd988d98a32e1437fbc6cb80bee03c056722a7 /keyboards/ergodox/keymaps/jack/keymap.c | |
parent | a849bdc5811b2bb69df8e3b0948c8e81c0dfa9d4 (diff) | |
parent | 985a091a739c99736d5b17de5161831488dbc219 (diff) | |
download | firmware-13c4080a1d77cb1dfdf48df8a42e78b9dc483912.tar.gz firmware-13c4080a1d77cb1dfdf48df8a42e78b9dc483912.tar.bz2 firmware-13c4080a1d77cb1dfdf48df8a42e78b9dc483912.zip |
Merge pull request #13 from jackhumbert/master
Merged from qmk
Diffstat (limited to 'keyboards/ergodox/keymaps/jack/keymap.c')
-rw-r--r-- | keyboards/ergodox/keymaps/jack/keymap.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/keyboards/ergodox/keymaps/jack/keymap.c b/keyboards/ergodox/keymaps/jack/keymap.c index dda253fa4..9cb80c59d 100644 --- a/keyboards/ergodox/keymaps/jack/keymap.c +++ b/keyboards/ergodox/keymaps/jack/keymap.c @@ -19,14 +19,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_HOME, KC_SPC,KC_SPC,KC_END, // right hand - KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, - KC_NO, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + KC_NO, M(1), KC_7, KC_8, KC_9, KC_0, KC_NO, + KC_NO, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, KC_P, KC_BSPC, + RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_SCLN, KC_QUOT, KC_NO, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_ENT, MO(1), KC_LEFT,KC_DOWN,KC_UP, KC_RGHT, - KC_NO, KC_NO, - KC_PGUP, - KC_PGDN, KC_SPC,KC_SPC + RGB_TOG, RGB_HUI, + RGB_MOD, + M(2), KC_SPC,KC_SPC ), [SYMB] = KEYMAP( // left hand @@ -84,6 +84,16 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) unregister_code(KC_RSFT); } break; + case 1: + if (record->event.pressed) { // For resetting EEPROM + eeconfig_init(); + } + break; + case 2: + if (record->event.pressed) { // For resetting EEPROM + api_send_unicode(0x0CA0); + } + break; } return MACRO_NONE; }; |