diff options
| author | Erez Zukerman <bulk@ezuk.org> | 2016-07-29 08:10:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-29 08:10:46 -0400 |
| commit | 64e76f6ed34699400fa856c5013bb16b2782992a (patch) | |
| tree | 8ce0048226854cc40094da3768373769eacc0405 | |
| parent | 3c235b4bf9cf1749959e529ac37698aaef6bee82 (diff) | |
| parent | 3ace37271baec300d7801b123376692a6b583312 (diff) | |
| download | qmk_firmware-64e76f6ed34699400fa856c5013bb16b2782992a.tar.gz qmk_firmware-64e76f6ed34699400fa856c5013bb16b2782992a.zip | |
Merge pull request #583 from coderkun/coderkun_neo2
Ergodox EZ: update keymap “coderkun_neo2”
| -rw-r--r-- | keyboards/ergodox_ez/keymaps/coderkun_neo2/Makefile | 3 | ||||
| -rw-r--r-- | keyboards/ergodox_ez/keymaps/coderkun_neo2/keymap.c | 19 |
2 files changed, 15 insertions, 7 deletions
diff --git a/keyboards/ergodox_ez/keymaps/coderkun_neo2/Makefile b/keyboards/ergodox_ez/keymaps/coderkun_neo2/Makefile index e7b2d0a65..6c0a79b11 100644 --- a/keyboards/ergodox_ez/keymaps/coderkun_neo2/Makefile +++ b/keyboards/ergodox_ez/keymaps/coderkun_neo2/Makefile | |||
| @@ -1 +1,2 @@ | |||
| 1 | UNICODE_ENABLE = yes \ No newline at end of file | 1 | SLEEP_LED_ENABLE = no |
| 2 | UNICODE_ENABLE = yes | ||
diff --git a/keyboards/ergodox_ez/keymaps/coderkun_neo2/keymap.c b/keyboards/ergodox_ez/keymaps/coderkun_neo2/keymap.c index d25e2b995..8a2ba26d2 100644 --- a/keyboards/ergodox_ez/keymaps/coderkun_neo2/keymap.c +++ b/keyboards/ergodox_ez/keymaps/coderkun_neo2/keymap.c | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | #include "ergodox_ez.h" | 1 | #include "ergodox_ez.h" |
| 2 | #include "debug.h" | 2 | #include "debug.h" |
| 3 | #include "action_layer.h" | 3 | #include "action_layer.h" |
| 4 | #include "keymap_neo2.h" | 4 | #include "led.h" |
| 5 | #include "keymap_extras/keymap_neo2.h" | ||
| 5 | 6 | ||
| 6 | // Layer names | 7 | // Layer names |
| 7 | #define BASE 0 // default layer | 8 | #define BASE 0 // default layer |
| @@ -33,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 33 | */ | 34 | */ |
| 34 | [BASE] = KEYMAP( | 35 | [BASE] = KEYMAP( |
| 35 | // left hand | 36 | // left hand |
| 36 | KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_EQL, | 37 | KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, NEO_GRV, |
| 37 | NEO_Y, NEO_X, NEO_V, NEO_L, NEO_C, NEO_W, KC_HOME, | 38 | NEO_Y, NEO_X, NEO_V, NEO_L, NEO_C, NEO_W, KC_HOME, |
| 38 | NEO_L1_L, NEO_U, NEO_I, NEO_A, NEO_E, NEO_O, | 39 | NEO_L1_L, NEO_U, NEO_I, NEO_A, NEO_E, NEO_O, |
| 39 | KC_LSFT, NEO_UE, NEO_OE, NEO_AE, NEO_P, NEO_Z, TG(PMQ), | 40 | KC_LSFT, NEO_UE, NEO_OE, NEO_AE, NEO_P, NEO_Z, TG(PMQ), |
| @@ -42,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 42 | KC_MINS, | 43 | KC_MINS, |
| 43 | KC_SPC, KC_ENT, ALL_T(KC_NO), | 44 | KC_SPC, KC_ENT, ALL_T(KC_NO), |
| 44 | // right hand | 45 | // right hand |
| 45 | DE_ACUT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, | 46 | NEO_ACUT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, |
| 46 | KC_END, NEO_K, NEO_H, NEO_G, NEO_F, NEO_Q, NEO_SS, | 47 | KC_END, NEO_K, NEO_H, NEO_G, NEO_F, NEO_Q, NEO_SS, |
| 47 | NEO_S, NEO_N, NEO_R, NEO_T, NEO_D, NEO_L1_R, | 48 | NEO_S, NEO_N, NEO_R, NEO_T, NEO_D, NEO_L1_R, |
| 48 | TG(PMN), NEO_B, NEO_M, KC_COMM,KC_DOT, NEO_J, KC_RSFT, | 49 | TG(PMN), NEO_B, NEO_M, KC_COMM,KC_DOT, NEO_J, KC_RSFT, |
| @@ -140,10 +141,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 140 | * │ │ │ │ │ ✕ │ │ │ │ │ │ F9 │ F10 │ F11 │ F12 │ │ | 141 | * │ │ │ │ │ ✕ │ │ │ │ │ │ F9 │ F10 │ F11 │ F12 │ │ |
| 141 | * ├───────┼─────┼─────┼─────╆─────╅─────┤ │ │ ├─────╆─────╅─────┼─────┼─────┼───────┤ | 142 | * ├───────┼─────┼─────┼─────╆─────╅─────┤ │ │ ├─────╆─────╅─────┼─────┼─────┼───────┤ |
| 142 | * │ │ │ │ │ ✓ │ ├─────┤ ├─────┤ │ F5 │ F6 │ F7 │ F8 │ │ | 143 | * │ │ │ │ │ ✓ │ ├─────┤ ├─────┤ │ F5 │ F6 │ F7 │ F8 │ │ |
| 143 | * ├───────┼─────┼─────┼─────╄─────╃─────┤ │ │ ├─────╄─────╃─────┼─────┼─────┼───────┤ | 144 | * ├───────┼─────┼─────┼─────╄─────╃─────┤(TL2)│ │(TL3)├─────╄─────╃─────┼─────┼─────┼───────┤ |
| 144 | * │ │ │ │ │ │ │ │ │ │ │ F1 │ F2 │ F3 │ F4 │ │ | 145 | * │ │ │ │ │ │ │ │ │ │ │ F1 │ F2 │ F3 │ F4 │ │ |
| 145 | * └─┬─────┼─────┼─────┼─────┼─────┼─────┴─────┘ └─────┴─────┼─────┼─────┼─────┼─────┼─────┬─┘ | 146 | * └─┬─────┼─────┼─────┼─────┼─────┼─────┴─────┘ └─────┴─────┼─────┼─────┼─────┼─────┼─────┬─┘ |
| 146 | * │ │ │(MO1)│ │ │ │ │ │(MO1)│ │ │ | 147 | * │ │ │(MO1)│ │(MO4)│ │(MO4)│ │(MO1)│ │ │ |
| 147 | * └─────┴─────┴─────┴─────┴─────┘ ┌─────┬─────┐ ┌─────┬─────┐ └─────┴─────┴─────┴─────┴─────┘ | 148 | * └─────┴─────┴─────┴─────┴─────┘ ┌─────┬─────┐ ┌─────┬─────┐ └─────┴─────┴─────┴─────┴─────┘ |
| 148 | * │ Ms← │ Ms↑ │ │ Ms↓ │ Ms→ │ | 149 | * │ Ms← │ Ms↑ │ │ Ms↓ │ Ms→ │ |
| 149 | * ┌─────┼─────┼─────┤ ├─────┼─────┼─────┐ | 150 | * ┌─────┼─────┼─────┤ ├─────┼─────┼─────┐ |
| @@ -267,7 +268,13 @@ void matrix_scan_user(void) | |||
| 267 | ergodox_right_led_3_on(); | 268 | ergodox_right_led_3_on(); |
| 268 | break; | 269 | break; |
| 269 | default: | 270 | default: |
| 270 | ergodox_board_led_off(); | 271 | if(host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) { |
| 272 | ergodox_led_all_set(LED_BRIGHTNESS_HI); | ||
| 273 | ergodox_right_led_1_on(); | ||
| 274 | } | ||
| 275 | else { | ||
| 276 | ergodox_board_led_off(); | ||
| 277 | } | ||
| 271 | break; | 278 | break; |
| 272 | } | 279 | } |
| 273 | 280 | ||
