1
0
Fork 0

Merge pull request #583 from coderkun/coderkun_neo2

Ergodox EZ: update keymap “coderkun_neo2”
This commit is contained in:
Erez Zukerman 2016-07-29 08:10:46 -04:00 committed by GitHub
commit 64e76f6ed3
2 changed files with 15 additions and 7 deletions

View File

@ -1 +1,2 @@
SLEEP_LED_ENABLE = no
UNICODE_ENABLE = yes UNICODE_ENABLE = yes

View File

@ -1,7 +1,8 @@
#include "ergodox_ez.h" #include "ergodox_ez.h"
#include "debug.h" #include "debug.h"
#include "action_layer.h" #include "action_layer.h"
#include "keymap_neo2.h" #include "led.h"
#include "keymap_extras/keymap_neo2.h"
// Layer names // Layer names
#define BASE 0 // default layer #define BASE 0 // default layer
@ -33,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/ */
[BASE] = KEYMAP( [BASE] = KEYMAP(
// left hand // left hand
KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_EQL, KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, NEO_GRV,
NEO_Y, NEO_X, NEO_V, NEO_L, NEO_C, NEO_W, KC_HOME, NEO_Y, NEO_X, NEO_V, NEO_L, NEO_C, NEO_W, KC_HOME,
NEO_L1_L, NEO_U, NEO_I, NEO_A, NEO_E, NEO_O, NEO_L1_L, NEO_U, NEO_I, NEO_A, NEO_E, NEO_O,
KC_LSFT, NEO_UE, NEO_OE, NEO_AE, NEO_P, NEO_Z, TG(PMQ), 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] = {
KC_MINS, KC_MINS,
KC_SPC, KC_ENT, ALL_T(KC_NO), KC_SPC, KC_ENT, ALL_T(KC_NO),
// right hand // right hand
DE_ACUT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, NEO_ACUT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
KC_END, NEO_K, NEO_H, NEO_G, NEO_F, NEO_Q, NEO_SS, KC_END, NEO_K, NEO_H, NEO_G, NEO_F, NEO_Q, NEO_SS,
NEO_S, NEO_N, NEO_R, NEO_T, NEO_D, NEO_L1_R, NEO_S, NEO_N, NEO_R, NEO_T, NEO_D, NEO_L1_R,
TG(PMN), NEO_B, NEO_M, KC_COMM,KC_DOT, NEO_J, KC_RSFT, 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] = {
* F9 F10 F11 F12 * F9 F10 F11 F12
* *
* F5 F6 F7 F8 * F5 F6 F7 F8
* * (TL2) (TL3)
* F1 F2 F3 F4 * F1 F2 F3 F4
* *
* (MO1) (MO1) * (MO1) (MO4) (MO4) (MO1)
* *
* Ms Ms Ms Ms * Ms Ms Ms Ms
* *
@ -267,7 +268,13 @@ void matrix_scan_user(void)
ergodox_right_led_3_on(); ergodox_right_led_3_on();
break; break;
default: default:
ergodox_board_led_off(); if(host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) {
ergodox_led_all_set(LED_BRIGHTNESS_HI);
ergodox_right_led_1_on();
}
else {
ergodox_board_led_off();
}
break; break;
} }