summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
AgeCommit message (Collapse)AuthorFilesLines
2016-10-23merge upstreamLior Haim12-21/+698
2016-10-21fixed copy-cut-paste buttonstwentylives1-5/+5
2016-10-20Merge pull request #833 from h-parks/masterErez Zukerman8-0/+482
Win10 Writer's Block - An ErgoDox Keymap
2016-10-20Merge branch 'master' of https://github.com/20lives/qmk_firmwaretwentylives1-2/+2
2016-10-20fixed base layer = keytwentylives1-1/+1
2016-10-19fix readme20lives1-2/+2
2016-10-19update pics and readmetwentylives5-133/+122
2016-10-19Win10 Writer's Block - An ErgoDox Keymaph-parks2-9/+12
fix for compiling on infinity: replaced `_delay_ms()' with `wait_ms()' included "wait.h"
2016-10-19Win10 Writer's Block - An ErgoDox Keymaph-parks8-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.
2016-10-18update header fileRyan Ascheman1-1/+1
2016-10-18didn't read PR comment close enough, correcting folderRyan Ascheman2-0/+0
2016-10-18moving keymap to new locationRyan Ascheman2-0/+194
2016-10-18Update readme.md20lives1-3/+5
2016-10-18Update readme.md20lives1-1/+3
2016-10-18adding dvorak hebrew layouttwentylives3-0/+230
2016-10-18Merge pull request #829 from r2d2rogers/masterJack Humbert2-21/+22
Move hand_swap_config to ez.c, removes error for infinity
2016-10-18Update ez.cRob Rogers1-1/+0
2016-10-17Move hand_swap_config to ez.c, removes error for infinityRob Rogers2-20/+22
2016-10-16ergodox: Update algernon's keymap to v1.9Gergely Nagy9-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>
2016-10-13Merge pull request #818 from pvinis/pvinis-keymapErez Zukerman4-0/+511
pvinis keymap
2016-10-13[Jack & Erez] Simplifies and documents TOJack & Erez1-6/+6
2016-10-11add readmePavlos Vinieratos2-0/+72
2016-10-11use wait_ms instead of _delay_msPavlos Vinieratos1-7/+7
2016-10-11add messengerPavlos Vinieratos1-2/+3
2016-10-11init keymapPavlos Vinieratos2-0/+438
2016-10-11Merge pull request #803 from coderkun/coderkun_neo2Erez Zukerman1-2/+27
Merge Unicode fixes for keymap “coderkun_neo2”
2016-10-09Adding whiskey_tango_foxtrot_capslock ergodox keymapNathan Johnson3-0/+269
2016-10-03ergodox: Update algernon's keymap to v1.8Gergely Nagy9-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>
2016-10-03Overwrite method hex_to_unicode() for make it compatible with Neocoderkun1-0/+25
2016-10-02Merge branch 'master' into coderkun_neo2coderkun53-1125/+3453
2016-10-02Add double arrow Unicode characters to FMU layercoderkun1-2/+2
2016-09-30Merge pull request #788 from chwilk/kastyle-refreshErez Zukerman4-36/+80
Kastyle refresh
2016-09-28Remove config.hChris McLennon1-93/+0
2016-09-28Contributing new keymap to ErgodoxChris McLennon3-0/+242
2016-09-27Added description of kastyle keymapchwilk1-0/+14
2016-09-26Moved hand_swap_config array so all keyboards get it definedchwilk2-21/+24
2016-09-26Updated kastyle keymap, including swap hands featurechwilk1-36/+62
2016-09-26Added ONEHAND_ENABLE to allow SWAP HANDS actionschwilk1-0/+1
2016-09-24Disables sleep LED by defaultErez Zukerman1-0/+2
2016-09-23Merge branch 'master' of github.com:jackhumbert/qmk_firmwareErez Zukerman13-475/+616
2016-09-23Adds EPRM reset keyErez Zukerman2-2/+12
2016-09-18Update the ergodox/algernon keymap to v1.7Gergely Nagy13-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>
2016-09-15Merge pull request #758 from absenth/developmentErez Zukerman3-6/+9
Absenth Ergodox Keymap Improvements
2016-09-14Adding Space Cadet, And Correcting Ascii KeymapLars R. Noldan3-6/+9
2016-09-12Merge pull request #734 from adiabatic/masterErez Zukerman3-10/+12
Ergodox EZ: Zweihander keyboard layout updates
2016-09-12Merge pull request #740 from absenth/developmentErez Zukerman3-0/+191
Absenth's Layout- QWERTY with additional Media Layer Functions.
2016-09-11Added readme.md for bepo_csaDidier Loiseau1-0/+162
2016-09-11Fixed compilation issues after the mergeDidier Loiseau1-0/+527
2016-09-09Merge pull request #715 from profet23/masterJack Humbert4-0/+234
Support for Ergodoxes with 80 keys.
2016-09-09Updated Image HeaderLars1-0/+0