diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-11-12 20:54:37 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-11-12 20:54:37 -0500 |
| commit | 33e62c080c9161a0fc921c90ed299a67fc2e1799 (patch) | |
| tree | 253ea910d8f2ba464ab28709f5f93d09b27c05fd /keyboards/ergodox/keymaps/jack | |
| parent | a889b899e2cf52b3b7807d8a7ad39f12e0761a10 (diff) | |
| parent | 631b8999a737ec73610f8b569b1f775cadf08172 (diff) | |
merging
Diffstat (limited to 'keyboards/ergodox/keymaps/jack')
| -rw-r--r-- | keyboards/ergodox/keymaps/jack/config.h | 6 | ||||
| -rw-r--r-- | keyboards/ergodox/keymaps/jack/keymap.c | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/keyboards/ergodox/keymaps/jack/config.h b/keyboards/ergodox/keymaps/jack/config.h index f0932084a0..1781563b84 100644 --- a/keyboards/ergodox/keymaps/jack/config.h +++ b/keyboards/ergodox/keymaps/jack/config.h @@ -7,8 +7,8 @@ #define RGB_DI_PIN D7 // #define RGBLIGHT_TIMER #define RGBLED_NUM 15 // Number of LEDs -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 +#define RGBLIGHT_HUE_STEP 12 +#define RGBLIGHT_SAT_STEP 255 +#define RGBLIGHT_VAL_STEP 12 #endif
\ No newline at end of file diff --git a/keyboards/ergodox/keymaps/jack/keymap.c b/keyboards/ergodox/keymaps/jack/keymap.c index fabd27a618..8721b9644a 100644 --- a/keyboards/ergodox/keymaps/jack/keymap.c +++ b/keyboards/ergodox/keymaps/jack/keymap.c @@ -19,9 +19,9 @@ 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, RGB_TOG, RGB_HUI, @@ -84,6 +84,11 @@ 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; } return MACRO_NONE; }; |