summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox/keymaps
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:jackhumbert/qmk_firmwareErez Zukerman2016-09-2213-475/+616
|\
| * Update the ergodox/algernon keymap to v1.7Gergely Nagy2016-09-1813-475/+616
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overall changes =============== * The number row has been completely rearranged on both the **Base** and the **ADORE** layers. * The number/function key behavior was changed: function keys are now on the **Media**. * The `:`/`;` and `-`/`_` keys were put back to their thumb position on the bottom row, on both the **Base** and **ADORE** layers. * The bottom large keys on the inner side of each half now function as [tmux](http://tmux.github.io/) keys: the left to send the prefix, the right to send the `display-panes` key. The left also doubles as a GNU screen prefix key, and sends `C-a` when double tapped. * A number of functions, such as the **AppSel** layer, now require the `hid-commands` tool to be running, with the output of `hid_listen` being piped to it. ADORE ===== * `Y` and `X` have been swapped again. Media/Navigation layer ====================== * The function keys are now on this layer. * Mouse keys have been removed. * Media start/stop/prev/next have been removed. * `Print screen` has been removed. * There is only one screen lock key now. Heatmap ======= * Fixed a few issues in the finger-stats calculation. * The tool now also timestamps and saves all input lines to a logfile, which it loads on start, allowing one to continue the collection after upgrading the tool. * The heatmap tool will now colorize the stats by default. * The periodic stats are now printed in a more compact format. Tools ===== * Added a new tool, `tools/layer-notify` that listens to layer change events on the HID console, and pops up a notification on layer changes. * Another new tool, `tools/text-to-log.py` has been added that converts arbitrary text to a keylogger output, which can be fed to the heatmap generator. * A number of features have been moved to the `tools/hid-commands` utility. These generally are OS dependent, and are easier to implement on the software side. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* | Adds EPRM reset keyErez Zukerman2016-09-222-2/+12
|/
* Merge pull request #758 from absenth/developmentErez Zukerman2016-09-143-6/+9
|\ | | | | Absenth Ergodox Keymap Improvements
| * Adding Space Cadet, And Correcting Ascii KeymapLars R. Noldan2016-09-143-6/+9
| |
* | Merge pull request #734 from adiabatic/masterErez Zukerman2016-09-113-10/+12
|\ \ | | | | | | Ergodox EZ: Zweihander keyboard layout updates
| * | - Make thumb-accessible ⌥ and ⌃ into right-⌥ and right-⌃Nathan Sharfi2016-09-072-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove media-space and media-shift-space; put a play/pause key at media-m instead - add print screen, scroll lock, and pause/break to the media layer And in the readme: - don't say we don't have any Windows-specific keys - add mnemonics for thumb-alt and thumb-ctrl positioning
| * | zweihander: rename to MakefileNathan Sharfi2016-09-071-0/+0
| | |
* | | Merge pull request #740 from absenth/developmentErez Zukerman2016-09-113-0/+191
|\ \ \ | | |/ | |/| Absenth's Layout- QWERTY with additional Media Layer Functions.
| * | Updated Image HeaderLars2016-09-081-0/+0
| | |
| * | first commit of Absenth's Ergodox FirmwareLars2016-09-083-0/+191
| | |
* | | Added readme.md for bepo_csaDidier Loiseau2016-09-111-0/+162
| | |
* | | Fixed compilation issues after the mergeDidier Loiseau2016-09-111-0/+527
|/ /
* / Fix typoRoman Zolotarev2016-09-081-1/+1
|/
* Merge pull request #732 from romanzolotarev/masterErez Zukerman2016-09-062-27/+40
|\ | | | | Change CTL_T(KC_ESC) to KC_LCTRL and update readme
| * Change CTL_T(KC_ESC) to KC_LCTRL and update readmeRoman Zolotarev2016-09-072-27/+40
| |
* | norwegian programmer-friendly layoutjoar2016-09-066-0/+420
|/
* Merge pull request #728 from fitzsim/yoruianErez Zukerman2016-09-066-0/+277
|\ | | | | Add new ErgoDox EZ keymap, YORUIAN
| * Fix ergodox_yoruian XKB namingThomas Fitzsimmons2016-09-062-2/+2
| |
| * Add new ErgoDox EZ keymap, YORUIANThomas Fitzsimmons2016-09-056-0/+277
| |
* | Merge pull request #686 from coderkun/coderkun_neo2Erez Zukerman2016-09-052-7/+19
|\ \ | | | | | | Merge Ergodox keymap “coderkun_neo2”
| * | Add box-drawing Unicode characters to keymap “coderkun_neo2”coderkun2016-08-261-6/+6
| | |
| * | Set Unicode input mode and override unicode_input_start() method to keymap ↵coderkun2016-08-261-2/+14
| | | | | | | | | | | | “coderkun_neo2”
| * | Disable debugging for Ergodox keymap “coderkun_neo2”coderkun2016-08-262-1/+1
| |/
* / ergodox: Update algernon's keymap to v1.6Gergely Nagy2016-08-248-523/+552
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Major changes include: Base layer changes ------------------ * The parentheses & bracket keys have been merged: tapping them results in `[` or `{` (if it was shifted), double tapping leads to `(`. * The `:;` and `-_` keys are now available on the base layer, on their **ADORE** location, too, just below `[{(`/`]})`. * The `Apps` key has been replaced by `F12`. * The `-`/`_` is no longer a tap-dance key. ADORE layer changes ------------------- * Adjustments were made to the **ADORE** layer, to separate some inconvenient combinations. Miscellaneous changes --------------------- * `LEAD u` now starts the symbolic unicode input system, instead of the OS-one. * The mouse acceleration keys on the **Navigation and Media* layer have been turned into toggles: tap them once to turn them on, until tapped again. Tapping an accelerator button will turn all the others off. * When the **ARROW** layer is on, the *red* and *blue* LEDs light up now. Heatmap ------- * The built-in keylogger has been greatly enhanced, it now outputs the pressed state, and the layer (Dvorak or ADORE). As such, the `ADORE_AUTOLOG` option has been removed, instead there is `AUTOLOG_ENABLE` now, which when enabled, makes the keylogger start when the keyboard boots. It defaults to off. * The heatmap generator received a lot of updates. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* Merge pull request #665 from linsomniac/keymap_jafoJack Humbert2016-08-205-0/+213
|\ | | | | Adding jafo layout.
| * Bringing over changes from default map.Sean Reifschneider2016-08-191-4/+3
| |
| * Adding jafo layout.Sean Reifschneider2016-08-195-0/+214
| |
* | Merge pull request #658 from Xyverz/masterJack Humbert2016-08-202-209/+211
|\ \ | | | | | | Got rid of all the kludge in my ErgoDox keymap.
| * | Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.Xyverz2016-08-192-17/+10
| | |
| * | Changed my keymap to match normal keymaps.Xyverz2016-08-191-314/+198
| | |
| * | Added compatibility for the Infinity ErgoDox to my Ergodox keymap.Xyverz2016-08-182-53/+178
| |/ | | | | | | Updated readme.md to reflect this change.
* | Merge pull request #630 from nrrkeene/masterJack Humbert2016-08-2010-275/+237
|\ \ | |/ |/| The Ordinary Layout is the unsurprising layout
| * The Ordinary Layout is boring because all the keys are where you expect them ↵Nicholas Keene2016-08-191-1/+1
| | | | | | | | to be
| * The Ordinary Layout is boring because all the keys are where you expect them ↵Nicholas Keene2016-08-198-111/+98
| | | | | | | | to be
| * The Ordinary Layout is the unsurprising layoutNicholas Keene2016-08-1310-183/+158
| |
* | One last change to the readme.Xyverz2016-08-181-3/+1
| |
* | One last formatting changeXyverz2016-08-181-1/+1
| |
* | more formatting changesXyverz2016-08-181-90/+90
| |
* | Hopefully this fixes the layout diagrams.Xyverz2016-08-181-91/+91
| |
* | Added a readme, tidied up comments in the keymap.Xyverz2016-08-182-29/+147
| |
* | Merge branch 'master' of https://github.com/Xyverz/qmk_firmwareXyverz2016-08-171-0/+5
|\ \
| * | Update readme.mdXyverz2016-08-171-1/+1
| | |
| * | Create readme.mdXyverz2016-08-171-0/+5
| | |
* | | tap-dance: Major rework, to make it more reliableGergely Nagy2016-08-171-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reworks how the tap-dance feature works: instead of one global state, we have a state for each tap-dance key, so we can cancel them when another tap-dance key is in flight. This fixes #527. Since we have a state for each key, we can avoid situation where a keyup would mess with our global state. This fixes #563. And while here, we also make sure to fire events only once, and this fixes #574. There is one breaking change, though: tap-dance debugging support was removed, because dumping the whole state would increase the firmware size too much. Any keymap that made use of this, will have to be updated (but there's no such keymap in the repo). Also, there's a nice trick used in this rework: we need to iterate through tap_dance_actions in a few places, to check for timeouts, and so on. For this, we'd need to know the size of the array. We can't discover that at compile-time, because tap-dance gets compiled separately. We'd like to avoid having to terminate the list with a sentinel value, because that would require updates to all keymaps that use the feature. So, we keep track of the highest tap-dance code seen so far, and iterate until that index. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* | Merge remote-tracking branch 'upstream/master'Xyverz2016-08-136-1237/+1244
|\ \
| * | ergodox: Update my keymap to v1.5Gergely Nagy2016-08-126-1237/+1244
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Major changes include: * The **1HAND** layer has been removed. * A `Delete` key is now available on the right thumb cluster. * The **ADORE** layer received a major update, see the updated layout image. * It is now possible to enable automatic logging for the **ADORE** layer, by setting the `ADORE_AUTOLOG` makefile variable to `yes` when compiling the keymap. It is off by default. * The `~` key and the `Media Next/Prev` key have been swapped on the **base** layer. * On the **ARROW** layer, `Backspace` has been replaced by `Enter`. * There is some experimental support for entering Unicode symbols. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* | Adding my own layouts for the Phantom and Ergodox. My Ergodox layout adds ↵Ian Sterling2016-08-091-0/+311
| | | | | | | | | | | | | | persistent layers based on the Planck and Preonic setup. The layout arrays are pulled directly from the ergodox/ez/ez.h keymap definition starting at line 81.
* | Delete keymap.cXyverz2016-08-081-184/+0
| | | | | | file cleanup
* | Delete old_keymap.cXyverz2016-08-081-311/+0
| | | | | | file cleanup