summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | Delete readme.mdXyverz2016-08-081-10/+0
| | | | | | file cleanup, removing file that doesn't apply to my layout.
* | Delete dvorak.pngXyverz2016-08-081-0/+0
| | | | | | Not reflective of my layout.
* | Adding my own keymaps to the following keyboards:Ian Sterling2016-08-084-0/+505
|/ | | | Planck, Preonic, Atreus, Ergodox
* Merge pull request #592 from sethbc/ez-sethbcErez Zukerman2016-08-023-0/+119
|\ | | | | Ez sethbc
| * rebaseSeth Chandler2016-07-303-0/+119
| |
* | Merge pull request #593 from J3RN/masterErez Zukerman2016-08-022-22/+26
|\ \ | | | | | | Updated the J3RN ErgoDox keymap
| * | Updated readme with recent changesJonathan Arnett2016-07-301-3/+6
| | |
| * | Updated my keymapJack Humbert2016-07-302-20/+21
| |\|
* | | Merge pull request #600 from adiabatic/masterErez Zukerman2016-08-024-14/+1167
|\ \ \ | | | | | | | | zweihander-osx: add left-hand-thumb tab key
| * | | Thumb ⌫ into ⇥, numpad & into :, yank home/endNathan Sharfi2016-07-313-13/+1166
| | | | | | | | | | | | | | | | Also: add (back?) in the light-shine disabler
| * | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi2016-07-311-1/+1
| | |/ | |/| | | | | | | | | | | | | # Conflicts: # keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c # keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
* | | Updates ErgoDox readmeErez Zukerman2016-08-011-9/+6
| | |
* | | Generate version information to version.hFred Sundvik2016-07-313-0/+3
|/ / | | | | | | So that only the files that really needs a version are recompiled.
* / Update some obsolete referencesGergely Nagy2016-07-301-1/+1
|/ | | | | | | | | | | Some links were still pointing to `/keyboards/ergodox_ez`, while the directory is `/keyboards/erdogox` now. Not all references have been updated, and some of the text here and there may need updating to mention the ErgoDox Infinity too, but that's out of the scope for this quick fix. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* Small fix for infinity include guardFred Sundvik2016-07-291-3/+3
|
* Fix typo in the readme.Fred Sundvik2016-07-291-1/+1
|
* A couple of more Ergodox readme fixesFred Sundvik2016-07-291-2/+2
|
* Unify the ErgoDox EZ and Infinity documentationFred Sundvik2016-07-291-8/+13
|
* Refer to the right path in the readmeFred Sundvik2016-07-291-1/+1
|
* Move Ergodox readme from ez subfolder to parentFred Sundvik2016-07-291-0/+0
|
* Include the main Makefile before including Ergodox infinity driversFred Sundvik2016-07-291-4/+4
|
* Move Infinity Ergodox drivers to subproject, and fix makefileFred Sundvik2016-07-2914-2/+2
|
* Remove the Infinity Ergodox default keymapFred Sundvik2016-07-292-282/+0
|
* Cleanup the townk_osx config.h and make filesFred Sundvik2016-07-292-52/+2
|
* Rename supercoder config_user to config.hFred Sundvik2016-07-291-1/+1
| | | | Also fixup the include path of parent config
* Fix config.h include guardsFred Sundvik2016-07-292-4/+4
|
* Define weak matrix user function for Infinity ErgodoxFred Sundvik2016-07-291-0/+9
| | | | So that a few keyboards, which don't use them, links properly.
* Change _delay_ms to wait_ms in algernon keymapFred Sundvik2016-07-291-1216/+1217
|
* Move some of the Ergodox config settings to sharedFred Sundvik2016-07-293-37/+37
|
* Add empty led control functions to Infinity ErgodoxFred Sundvik2016-07-292-0/+96
| | | | So that most keymaps compiles and links
* Most ergodox keymaps compiles on InfinityFred Sundvik2016-07-2919-31/+42
| | | | There are linker errors due to missing led funcitonality though
* All Ez keymaps compilesFred Sundvik2016-07-2958-58/+70
|
* Initial structure for Ergodox as subprojectsFred Sundvik2016-07-29219-0/+27312
Only the EZ default keymaps compiles at the moment though.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 06:03:35 +0000