summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Collapse)AuthorAgeFilesLines
* merge upstreamLior Haim2016-10-2312-21/+698
|\
| * Merge pull request #833 from h-parks/masterErez Zukerman2016-10-208-0/+482
| |\ | | | | | | Win10 Writer's Block - An ErgoDox Keymap
| | * Win10 Writer's Block - An ErgoDox Keymaph-parks2016-10-192-9/+12
| | | | | | | | | | | | | | | | | | fix for compiling on infinity: replaced `_delay_ms()' with `wait_ms()' included "wait.h"
| | * Win10 Writer's Block - An ErgoDox Keymaph-parks2016-10-188-0/+479
| | | | | | | | | This is a QWERTY layout for ErgoDox on QMK. It's designed to work well in MS Office-like environments. It's tested on Windows 7 and 10.
| * | update header fileRyan Ascheman2016-10-181-1/+1
| | |
| * | didn't read PR comment close enough, correcting folderRyan Ascheman2016-10-182-0/+0
| | |
| * | moving keymap to new locationRyan Ascheman2016-10-182-0/+194
| |/
| * Merge pull request #829 from r2d2rogers/masterJack Humbert2016-10-182-21/+22
| |\ | | | | | | Move hand_swap_config to ez.c, removes error for infinity
| | * Update ez.cRob Rogers2016-10-181-1/+0
| | |
| | * Move hand_swap_config to ez.c, removes error for infinityRob Rogers2016-10-172-20/+22
| | |
* | | fixed copy-cut-paste buttonstwentylives2016-10-211-5/+5
| | |
* | | Merge branch 'master' of https://github.com/20lives/qmk_firmwaretwentylives2016-10-201-2/+2
|\ \ \
| * | | fix readme20lives2016-10-191-2/+2
| | | |
* | | | fixed base layer = keytwentylives2016-10-201-1/+1
|/ / /
* | | update pics and readmetwentylives2016-10-195-133/+122
| | |
* | | Update readme.md20lives2016-10-181-3/+5
| | |
* | | Update readme.md20lives2016-10-181-1/+3
| | |
* | | adding dvorak hebrew layouttwentylives2016-10-183-0/+230
|/ /
* / ergodox: Update algernon's keymap to v1.9Gergely Nagy2016-10-169-103/+189
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overall changes =============== * `F12` was replaced by an `Fx` key, that activate the **Media** layer as a one-shot layer, and also `Alt` as a one-shot modifier. Base layer changes ================== * The `Media Stop` key is now a tap-dance key, and resets the device for programming on the fourth tap. Miscellaneous ============= * `π` can now be entered with UCIS. * `🐁` can now be entered with UCIS. Tools ===== * The `tools/layer-notify` tool was removed, it was an example, which I don't use. `tools/hid-commands` -------------------- * Now looks at the `DISABLE_APPSEL_START` environment value, and does not display an AppSel notification if it is non-empty. * Will attempt to re-program the keyboard when receiving a `reflash` command. * No longer tries to select Emacs 24 on `APPSEL_EMACS`, rather, it goes for any Emacs. * The `APPSEL_MUSIC` command now includes Kodi in the list too, as the last choice. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* Merge pull request #818 from pvinis/pvinis-keymapErez Zukerman2016-10-134-0/+511
|\ | | | | pvinis keymap
| * add readmePavlos Vinieratos2016-10-112-0/+72
| |
| * use wait_ms instead of _delay_msPavlos Vinieratos2016-10-111-7/+7
| |
| * add messengerPavlos Vinieratos2016-10-111-2/+3
| |
| * init keymapPavlos Vinieratos2016-10-112-0/+438
| |
* | [Jack & Erez] Simplifies and documents TOJack & Erez2016-10-121-6/+6
|/
* Merge pull request #803 from coderkun/coderkun_neo2Erez Zukerman2016-10-101-2/+27
|\ | | | | Merge Unicode fixes for keymap “coderkun_neo2”
| * Overwrite method hex_to_unicode() for make it compatible with Neocoderkun2016-10-031-0/+25
| |
| * Merge branch 'master' into coderkun_neo2coderkun2016-10-0253-1125/+3453
| |\
| * | Add double arrow Unicode characters to FMU layercoderkun2016-10-021-2/+2
| | |
* | | Adding whiskey_tango_foxtrot_capslock ergodox keymapNathan Johnson2016-10-093-0/+269
| | |
* | | ergodox: Update algernon's keymap to v1.8Gergely Nagy2016-10-039-175/+212
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ADORE ----- * Major rearrangements were made, to reduce pinky use, and to balance out the hand usage. Tools ----- * The `hid-commands` tool will now display a notification when the **AppSel** layer is triggered. * The `log-to-heatmap.py` tool now treats the innermost keys on the bottom row as thumb keys, as far as statistics are concerned. Miscellaneous ------------- * Fixed the **Steno** toggle key. * My wife is now present on the keyboard too. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* | Merge pull request #788 from chwilk/kastyle-refreshErez Zukerman2016-09-304-36/+80
|\ \ | | | | | | Kastyle refresh
| * | Added description of kastyle keymapchwilk2016-09-271-0/+14
| | |
| * | Moved hand_swap_config array so all keyboards get it definedchwilk2016-09-262-21/+24
| | |
| * | Updated kastyle keymap, including swap hands featurechwilk2016-09-261-36/+62
| | |
| * | Added ONEHAND_ENABLE to allow SWAP HANDS actionschwilk2016-09-261-0/+1
| | |
* | | Remove config.hChris McLennon2016-09-281-93/+0
| | |
* | | Contributing new keymap to ErgodoxChris McLennon2016-09-283-0/+242
|/ /
* | Disables sleep LED by defaultErez Zukerman2016-09-231-0/+2
| |
* | 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
| | | |