From 4047469afd42511139f2e554fa689af0f4137112 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Wed, 4 Feb 2015 11:30:17 -0800 Subject: [PATCH] move around functions; add workman-style keybindings to symbol layer --- keyboard/ergodox/keymap.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/keyboard/ergodox/keymap.c b/keyboard/ergodox/keymap.c index f083313..868d485 100644 --- a/keyboard/ergodox/keymap.c +++ b/keyboard/ergodox/keymap.c @@ -102,7 +102,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { FN4, 6, 7, 8, 9, 0, MINS, LBRC,Y, U, I, O, P, RBRC, H, J, K, L, SCLN,QUOT, - FN5, N, M, COMM,DOT, SLSH,RSFT, + FN6, N, M, COMM,DOT, SLSH,RSFT, UP,DOWN,LEFT, RGHT,RGUI, DEL,RGUI, PGUP, @@ -112,24 +112,23 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KEYMAP( // layer 1 : function and symbol keys // left hand TRNS,F1, F2, F3, F4, F5, F11, - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,FN4, - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, + TRNS,LBRC,RBRC,LBRC,RBRC,SCLN,FN4, + TRNS,BSLS,SLSH,9 ,0 ,SCLN, + TRNS,1 ,2 ,3 ,4 ,5 ,TRNS, TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS, TRNS, TRNS,TRNS,TRNS, // right hand - F12, F6, F7, F8, F9, F10, TRNS, - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, + F12, F6, F7, F8, F9, F10, PWR , + TRNS,TRNS,EQL ,EQL ,MINS,MINS,UP , + LEFT,DOWN,UP ,RGHT,TRNS,DOWN, + FN5 ,6 ,7 ,8 ,9 ,0 ,MUTE, TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS, TRNS, TRNS,TRNS,TRNS ), - KEYMAP( // layer 2 : Mouse // left hand TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, @@ -154,9 +153,9 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KEYMAP( // layer 3 : keyboard functions // left hand FN0, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, + TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,FN5, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, + TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,FN5, TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS, @@ -166,7 +165,7 @@ static const uint8_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { FN5, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, - TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, + FN5, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS,TRNS,TRNS,TRNS, TRNS,TRNS, TRNS, @@ -205,12 +204,13 @@ enum function_id { * Fn action definition */ static const uint16_t PROGMEM fn_actions[] = { - ACTION_FUNCTION(TEENSY_KEY), // FN0 - Teensy key - ACTION_LAYER_MOMENTARY(1), // FN1 - switch to Layer1 - ACTION_LAYER_SET(2, ON_PRESS), // FN2 - push Layer2 - ACTION_LAYER_SET(3, ON_PRESS), // FN3 - push Layer3 - ACTION_LAYER_SET(4, ON_PRESS), // FN4 - push Layer4 - ACTION_LAYER_SET(0, ON_PRESS), // FN5 - push Layer0 + [0] = ACTION_FUNCTION(TEENSY_KEY), // FN0 - Teensy key + [1] = ACTION_LAYER_MOMENTARY(1), // FN1 - switch to Layer1 + [2] = ACTION_LAYER_SET(2, ON_PRESS), // FN2 - push Layer2 + [3] = ACTION_LAYER_SET(3, ON_PRESS), // FN3 - push Layer3 + [4] = ACTION_LAYER_SET(4, ON_PRESS), // FN4 - push Layer4 + [5] = ACTION_LAYER_SET(0, ON_PRESS), // FN5 - push Layer0 + [6] = ACTION_LAYER_SET(1, ON_PRESS), // FN6 - push Layer1 }; void action_function(keyrecord_t *event, uint8_t id, uint8_t opt) -- 2.39.5