From d2ff66a985b938e87fffe55c1d9f1dc55e356f91 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Wed, 23 Aug 2017 22:29:07 -0400 Subject: Creates a layouts/ folder for keymaps shared between keyboards (#1609) * include variables and .h files as pp directives * start layout compilation * split ergodoxes up * don't compile all layouts for everything * might seg fault * reset layouts variable * actually reset layouts * include rules.mk instead * remove includes from rules.mk * update variable setting * load visualizer from path * adds some more examples * adds more layouts * more boards added * more boards added * adds documentation for layouts * use lowercase names for LAYOUT_ * add layout.json files for each layout * add community folder, default keymaps for layouts * touch-up default layouts * touch-up layouts, some keyboard rules.mk * update documentation for layouts * fix up serial/i2c switches --- keyboards/ergodox/keymaps/dvorak_emacs/keymap.c | 165 ----------------------- keyboards/ergodox/keymaps/dvorak_emacs/readme.md | 70 ---------- 2 files changed, 235 deletions(-) delete mode 100755 keyboards/ergodox/keymaps/dvorak_emacs/keymap.c delete mode 100644 keyboards/ergodox/keymaps/dvorak_emacs/readme.md (limited to 'keyboards/ergodox/keymaps/dvorak_emacs') diff --git a/keyboards/ergodox/keymaps/dvorak_emacs/keymap.c b/keyboards/ergodox/keymaps/dvorak_emacs/keymap.c deleted file mode 100755 index d33c6e5271..0000000000 --- a/keyboards/ergodox/keymaps/dvorak_emacs/keymap.c +++ /dev/null @@ -1,165 +0,0 @@ -#include "ergodox.h" -#include "debug.h" -#include "action_layer.h" - -/****************************************************************************************** - * DVORAK LAYOUT (see http://djelibeibi.unex.es/dvorak/) - * Layer 1: auxiliary keys - * Layer 2: full qwerty layout - *****************************************************************************************/ - -// LAYERS -#define BASE 0 // dvorak layout (default) -#define AUX 1 // auxiliary keys - -// MACROS -/* #define OBRACE 0 // key { or shift */ -/* #define CBRACE 1 // key } or shift */ -/* #define OBRACK 2 // key [ or left alt */ -/* #define CBRACK 3 // key ] or left alt */ -/* #define CAPS 4 // caps lock */ - -// LEDS -#define USB_LED_NUM_LOCK 0 -#define USB_LED_CAPS_LOCK 1 -#define USB_LED_SCROLL_LOCK 2 -#define USB_LED_COMPOSE 3 -#define USB_LED_KANA 4 - -// TIMERS -#define KEY_TAP_FAST 85 -#define KEY_TAP_SLOW 95 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -/* Keymap 0: Base layer - * Keys with double values (like Esc/Ctrl) correspond to the 'tapped' key and the 'held' key, respectively - * - * ,--------------------------------------------------. ,--------------------------------------------------. - * | | 1 | 2 | 3 | 4 | 5 | Esc | | Esc | 6 | 7 | 8 | 9 | 0 | = / + | - * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | ~ |" / ' |, / < |. / > | P | Y | [ | | ] | F | G | C | H | L | / / ? | - * |--------+------+------+------+------+------| { | | } |------+------+------+------+------+--------| - * | Tab | A | O | E |U/LSft| I/L1 |------| |------| D/L1|R/RSft| T | N | S | - / _ | - * |--------+------+------+------+------+------| LGUI | | LGUI |------+------+------+------+------+--------| - * | {/LSft |; / : | Q | J | K | X | | | | B | M | W | V | Z | }/RSft | - * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * | | | | | ~L1 | | ~L1 | | | \ / || | - * `----------------------------------' `----------------------------------' - * ,-------------. ,-------------. - * | HOME | END | | LEFT | RIGHT| - * ,------|------|------| |------+--------+------. - * | BSPC | DEL | PGUP | | UP | SPACE |RETURN| - * | / | / |------| |------| / | / | - * | LCTL | LALT |PGDWN | | DOWN | LALT | LCTL | - * `--------------------' `----------------------' - * - */ -[BASE] = KEYMAP( - // left hand - KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_ESC, - KC_TILD, KC_QUOTE, KC_COMM,KC_DOT, KC_P, KC_Y, KC_LBRACKET, - KC_TAB, KC_A, KC_O, KC_E, SFT_T(KC_U), LT(AUX, KC_I), - SFT_T(KC_LBRC), KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_LGUI, - KC_NO, KC_NO, KC_NO, KC_NO, MO(AUX), - KC_HOME, KC_END, - KC_PGUP, - CTL_T(KC_BSPC), ALT_T(KC_DEL), KC_PGDN, - // right hand - KC_ESC, KC_6, KC_7, KC_8, KC_9, KC_0, KC_EQL, - KC_RBRACKET, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLASH, - LT(AUX, KC_D), SFT_T(KC_H), KC_T, KC_N, KC_S, KC_MINUS, - KC_LGUI, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_T(KC_RBRC), - MO(AUX), KC_NO, KC_NO, KC_BSLASH, KC_NO, - KC_LEFT, KC_RIGHT, - KC_UP, - KC_DOWN, ALT_T(KC_ENT), CTL_T(KC_SPC) - ), -/* Keymap 1: Aux layer - * - * ,--------------------------------------------------. ,--------------------------------------------------. - * | VolUp | | | | | | SLEEP | PWR | | | | | | | - * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | VolDn | F1 | F2 | F3 | F4 | | | | | | 7 | 8 | 9 | * | | - * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| - * | | F5 | F6 | F7 | F8 | TRANS|------| |------|TRANS | 4 | 5 | 6 | + | | - * |--------+------+------+------+------+------| | |PSCR |------+------+------+------+------+--------| - * | TRANS | F9 | F10 | F11 | F12 | | | | | | 1 | 2 | 3 | / | TRANS | - * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' - * |CTRL-S|CTRL-Z|CTRL-X|CTRL-C| TRANS| | TRANS| . | 0 | = | | - * `----------------------------------' `----------------------------------' - * ,-------------. ,-------------. - * | TRANS| TRANS| | TRANS| TRANS| - * ,------|------|------| |------+------+------. - * | | | TRANS| | TRANS| | | - * |TRANS |TRANS |------| |------| TRANS| TRANS| - * | | | TRANS| | TRANS| | | - * `--------------------' `--------------------' - */ -[AUX] = KEYMAP( - // left hand - KC_VOLU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLEP, - KC_VOLD, KC_F1, KC_F2, KC_F3, KC_F4, KC_NO, KC_NO, - KC_NO , KC_F5, KC_F6, KC_F7, KC_F8, KC_TRNS, - KC_TRNS, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, - LCTL(KC_S), LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), KC_TRNS, - KC_TRNS , KC_TRNS, - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - // right hand - KC_PWR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_7, KC_8, KC_9, KC_PAST, KC_NO, - KC_TRNS, KC_4, KC_5, KC_6, KC_PPLS, KC_NO, - KC_PSCR, KC_NO, KC_1, KC_2, KC_3, KC_PSLS, KC_TRNS, - KC_TRNS,KC_DOT, KC_0, KC_PEQL, KC_NO, - KC_TRNS , KC_TRNS, - KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS -), -}; - -const uint16_t PROGMEM fn_actions[] = { - [1] = ACTION_LAYER_TAP_TOGGLE(AUX) // FN1 - Momentary Layer 1 (Aux) -}; - - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - // MACRODOWN only works in this function - switch(id) { - case 0: - if (record->event.pressed) { - register_code(KC_RSFT); - } else { - unregister_code(KC_RSFT); - } - break; - } - return MACRO_NONE; -}; - -// Runs just one time when the keyboard initializes. -void matrix_init_user(void) { - -}; - -// Runs constantly in the background, in a loop. -void matrix_scan_user(void) { - - uint8_t layer = biton32(layer_state); - - ergodox_board_led_off(); - ergodox_right_led_1_off(); - ergodox_right_led_2_off(); - ergodox_right_led_3_off(); - switch (layer) { - case 1: - ergodox_right_led_1_on(); - break; - case 2: - ergodox_right_led_2_on(); - break; - default: - // none - break; - } -} diff --git a/keyboards/ergodox/keymaps/dvorak_emacs/readme.md b/keyboards/ergodox/keymaps/dvorak_emacs/readme.md deleted file mode 100644 index a3fc34afeb..0000000000 --- a/keyboards/ergodox/keymaps/dvorak_emacs/readme.md +++ /dev/null @@ -1,70 +0,0 @@ -# Ergodox Dvorak Layout with emacs binding in mind - * Control & Alt key on the thumbs (activated if pressed with another key). - * In the same way, "U" and "R" are the shift modifier if pressed with another key. - * "I" and "D" set the layer 1 for the auxiliary keys if pressed with another key. - * Software layout set to english. - -## Keymap Layers - - L0: dvorak with some customizations (see layout below) - - L1: auxiliary keys (includes function keys, numpad...) - - -### Keymap 0: Base layer -Keys with double values (like U/LSft) correspond to the 'tapped' key and the 'held' key, respectively - -

-
-,--------------------------------------------------.           ,--------------------------------------------------.
-|        |   1  |   2  |   3  |   4  |   5  |  Esc |           |  Esc |   6  |   7  |   8  |   9  |   0  |   =    |
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-|   ~    |  '   |   ,  |   .  |   P  |   Y  |   [  |           |   ]  |   F  |   G  |   C  |   H  |   L  |   /    |
-|--------+------+------+------+------+------|   {  |           |   }  |------+------+------+------+------+--------|
-|  Tab   |   A  |   O  |   E  |U/LSft| I/L1 |------|           |------|  D/L1|R/RSft|   T  |   N  |   S  |   -    |
-|--------+------+------+------+------+------| LGUI |           | LGUI |------+------+------+------+------+--------|
-| {/LSft |   ;  |   Q  |   J  |   K  |   X  |      |           |      |   B  |   M  |   W  |   V  |   Z  | }/RSft |
-`--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  |      |      |      |      | ~L1  |                                       | ~L1  |      |      |   \  |      |
-  `----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       | HOME |  END |       | LEFT | RIGHT|
-                                ,------|------|------|       |------+--------+------.
-                                | BSPC |  DEL | PGUP |       |  UP  | SPACE  |RETURN|
-                                |  /   |  /   |------|       |------|   /    |  /   |
-                                | LCTL | LALT |PGDWN |       | DOWN | LALT   | LCTL |
-                                `--------------------'       `----------------------'
-
-
- -### Keymap 1: Aux layer - -

-
-,--------------------------------------------------.           ,--------------------------------------------------.
-|  VolUp |      |      |      |      |      | SLEEP            | PWR  |      |      |      |      |      |        |
-|--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
-|  VolDn |  F1  |  F2  |  F3  |  F4  |      |      |           |      |      |   7  |   8  |   9  |   *  |        |
-|--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
-|        |  F5  |  F6  |  F7  |  F8  | TRANS|------|           |------|TRANS |   4  |   5  |   6  |   +  |        |
-|--------+------+------+------+------+------|      |           |PSCR  |------+------+------+------+------+--------|
-|  TRANS |  F9  |  F10 |  F11 |  F12 |      |      |           |      |      |   1  |   2  |   3  |   /  |  TRANS |
-`--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-  |CTRL-S|CTRL-Z|CTRL-X|CTRL-C| TRANS|                                       | TRANS|    . |   0  |   =  |      |
-  `----------------------------------'                                       `----------------------------------'
-                                       ,-------------.       ,-------------.
-                                       | TRANS| TRANS|       | TRANS| TRANS|
-                                ,------|------|------|       |------+------+------.
-                                |      |      | TRANS|       | TRANS|      |      |
-                                |TRANS |TRANS |------|       |------| TRANS| TRANS|
-                                |      |      | TRANS|       | TRANS|      |      |
-                                `--------------------'       `--------------------'
-
-
- - - -## Generation of .hex file -> In the "qmk_firmware/keyboards/ergodox" directory. - -> Execute "make dvorak_emacs". Then the hex file "ergodox_ez_dvorak_emacs.hex" is in the root directory : "qmk_firmware". - -> Flash with `teensy_loader` binary -- cgit v1.2.3