dax/qmk
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Update ergodox

Browse Source
This commit is contained in:
Jens Kadenbach
2016-03-17 17:57:33 +01:00
parent 6b4d8d1bf2
commit 24796ee545
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
keyboard/ergodox_ez/keymaps/keymap_audax_softneo2.c
View File

@@ -11,7 +11,7 @@
#define BASE 0 // default layer #define BASE 0 // default layer
#define MDIA 1 // media keys #define MDIA 1 // media keys
#define NEO_L1_Y 1 #define NEO_L1_SS 1
#define NEO_L2_ENT 2 #define NEO_L2_ENT 2
// Max duration that counts as a tap (ms) // Max duration that counts as a tap (ms)
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* ,--------------------------------------------------. ,--------------------------------------------------. * ,--------------------------------------------------. ,--------------------------------------------------.
* | ^ | 1 | 2 | 3 | 4 | 5 | Play | | Next | 6 | 7 | 8 | 9 | 0 |BackSpce| * | ^ | 1 | 2 | 3 | 4 | 5 | Play | | Next | 6 | 7 | 8 | 9 | 0 |BackSpce|
* |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------|
* | Del | X | V | L | C | W | L1 | | L1 | K | H | G | F | Q | ß | * | Del | X | V | L | C | W | L1 | | L1 | K | H | G | F | Q | Y |
* |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------|
* | Caps | U | I | A | E | O |------| |------| S | N | R | T | D |Y/NeoL1 | * | Caps | U | I | A | E | O |------| |------| S | N | R | T | D |Y/NeoL1 |
* |--------+------+------+------+------+------| Esc | | Meh |------+------+------+------+------+--------| * |--------+------+------+------+------+------| Esc | | Meh |------+------+------+------+------+--------|
@@ -48,17 +48,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// left hand // left hand
KC_CIRC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MPLY, KC_CIRC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MPLY,
KC_DELT, NEO_X, NEO_V, NEO_L, NEO_C, NEO_W, TG(1), KC_DELT, NEO_X, NEO_V, NEO_L, NEO_C, NEO_W, TG(1),
KC_CAPS, NEO_U, NEO_I, NEO_A, NEO_E, NEO_O, KC_CAPS, GUI_T(NEO_U), MT(MOD_LGUI|MOD_LSFT, NEO_I), NEO_A, NEO_E, NEO_O,
KC_LSFT, CTL_T(NEO_UE), C_S_T(NEO_OE), ALT_T(NEO_AE), NEO_P, NEO_Z, KC_ESC, KC_LSFT, CTL_T(NEO_UE), C_S_T(NEO_OE), ALT_T(NEO_AE), NEO_P, NEO_Z, KC_LGUI|KC_LSFT,
ALL_T(KC_NO), KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_LGUI, KC_HOME, KC_PGDN, KC_PGUP, KC_END,
ALT_T(KC_APP),KC_LGUI, ALT_T(KC_APP),KC_LGUI,
NEO_L2_L, NEO_L2_L,
KC_SPC,KC_BSPC,NEO_L1_L, KC_SPC,KC_BSPC,NEO_L1_L,
// right hand // right hand
KC_MNXT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_MNXT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
TG(1), NEO_K, NEO_H, NEO_G, NEO_F, NEO_Q, NEO_SS, TG(1), NEO_K, NEO_H, NEO_G, NEO_F, NEO_Q, F(NEO_L1_SS),
NEO_S, NEO_N, NEO_R, NEO_T, NEO_D, F(NEO_L1_Y), NEO_S, NEO_N, NEO_R, NEO_T, NEO_D, NEO_Y,
MEH_T(KC_NO),NEO_B, NEO_M, KC_COMM, KC_DOT, NEO_J, KC_RSFT, MEH_T(KC_NO),NEO_B, NEO_M, KC_COMM, KC_DOT, MT(MOD_LGUI|MOD_LSFT, NEO_J), SFT_T(KC_ESC),
KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_ESC, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_ESC,
KC_LALT,CTL_T(KC_ESC), KC_LALT,CTL_T(KC_ESC),
NEO_L2_R, NEO_L2_R,
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_BTN4, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5, KC_TRNS, KC_BTN4, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5,
KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_BTN3, KC_TRNS, KC_TRNS, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_BTN3, KC_TRNS,
KC_TRNS, KC_TRNS, KC_ACL0, KC_ACL1, KC_ACL2, KC_TRNS, KC_TRNS, KC_ACL0, KC_ACL1, KC_ACL2,
KC_TRNS, KC_TRNS, KC_TRNS, RESET,
KC_TRNS, KC_TRNS,
KC_BTN1, KC_BTN2, KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS,
// right hand // right hand
@@ -109,22 +109,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
const uint16_t PROGMEM fn_actions[] = { const uint16_t PROGMEM fn_actions[] = {
/* [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols) */ /* [1] = ACTION_LAYER_TAP_TOGGLE(SYMB) // FN1 - Momentary Layer 1 (Symbols) */
[1] = ACTION_FUNCTION_TAP(NEO_L1_Y), [1] = ACTION_FUNCTION_TAP(NEO_L1_SS),
[2] = ACTION_FUNCTION_TAP(NEO_L2_ENT) [2] = ACTION_FUNCTION_TAP(NEO_L2_ENT)
}; };
void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
{ {
switch (id) { switch (id) {
case NEO_L1_Y: case NEO_L1_SS:
if (record->event.pressed) { if (record->event.pressed) {
register_code(NEO_L1_R); register_code(NEO_L1_R);
} else { } else {
unregister_code(NEO_L1_R); unregister_code(NEO_L1_R);
if (record->tap.count != 0) { if (record->tap.count != 0) {
register_code(NEO_Y); add_key(NEO_SS);
add_key(NEO_Y);
send_keyboard_report(); send_keyboard_report();
del_key(NEO_Y); del_key(NEO_SS);
send_keyboard_report(); send_keyboard_report();
} }
} }