summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Collapse)AuthorAgeFilesLines
* merging lets_splitJack Humbert2016-11-2111-13/+925
|\
| * dvorak/plover keyboard layoutSeebs2016-11-162-0/+244
| | | | | | | | | | | | | | Plover's steno support likes quasi-qwerty, and gaming likes qwerty, and I like dvorak, so... what if I could have it all? Signed-off-by: seebs <seebs@seebs.net>
| * Merge pull request #880 from psyill/masterJack Humbert2016-11-166-0/+678
| |\ | | | | | | Added keymap "videck", an ErgoDox keymap for Vi(m) users.
| | * Added keymap "videck", an ErgoDox keymap for Vi(m) users.Hans Ellegård2016-11-136-0/+678
| | |
| * | update sethbc ergodox keymapSeth Chandler2016-11-133-13/+3
| |/
* | wqMerge branch 'wu5y7' of https://github.com/jackhumbert/qmk_firmware into wu5y7Jack Humbert2016-11-183-7/+42
|\ \
| * | Groundwork for dedicated color keycodesErez Zukerman2016-11-171-1/+23
| | |
| * | Initial Erez Experimental keymap tweaksErez Zukerman2016-11-173-6/+19
| | |
* | | midi back and forthJack Humbert2016-11-181-1/+6
|/ /
* | rgb light through midiJack Humbert2016-11-171-1/+2
| |
* | mostly workingJack Humbert2016-11-134-4/+13
| |
* | mergingJack Humbert2016-11-1245-149/+2511
|\|
| * Removed the control action when holding z or /Jonathan Arnett2016-11-061-3/+3
| |
| * Implements dedicated text zoom keysErez Zukerman2016-11-012-3/+7
| |
| * Merge pull request #851 from J3RN/momentaryErez Zukerman2016-10-311-5/+5
| |\ | | | | | | Switched to momentary
| | * Switched to momentaryJonathan Arnett2016-10-091-5/+5
| | | | | | | | | | | | | | | Also updated the style of these lines slightly to match the style of the default keymap
| * | Merge pull request #843 from lucwastiaux/masterErez Zukerman2016-10-313-0/+426
| |\ \ | | | | | | | | Adding Ergodox Dvorak Programmer layout
| | * | re-introduce brackets layerlucwastiaux2016-10-261-2/+24
| | | |
| | * | adding readmelucwastiaux2016-10-231-0/+15
| | | |
| | * | add up/down keys on thumb clusterslucwastiaux2016-10-231-2/+2
| | | |
| | * | remove brackets layer, replace a few shortcuts on thumb clusterlucwastiaux2016-10-231-30/+13
| | | |
| | * | type brackets in symbol layer, using bottom rowlucwastiaux2016-10-232-8/+18
| | | |
| | * | add tap-dance support, make right shift double-tap=caplocklucwastiaux2016-10-222-1/+16
| | | |
| | * | change include fileslucwastiaux2016-10-221-1/+2
| | | |
| | * | added dvorak programmer layoutlucwastiaux2016-10-221-0/+380
| | | |
| * | | Merge pull request #836 from 20lives/masterErez Zukerman2016-10-317-472/+695
| |\ \ \ | | | | | | | | | | added new layout
| | * | | merge upstreamLior Haim2016-10-2312-21/+698
| | |\| |
| | * | | 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
| | | | |
| * | | | [alphadox] remove tmk reset codeAlpha Chen2016-10-251-5/+0
| | | | |
| * | | | [ergodox][alphadox] undefine tapping_term, ignore_mod_tap_interruptAlpha Chen2016-10-251-0/+3
| | | | |
| * | | | add alphadox layouts to atreus and ergodoxAlpha Chen2016-10-253-0/+138
| | |/ / | |/| |
| * | | 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
| | | |
| * | | 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
| | | |