summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-261-23/+142
|\
| * Merge pull request #664 from linsomniac/infinity_readmeErez Zukerman2016-08-261-23/+144
| |\ | | | | | | Adding nicer Infinity build instructions.
| | * Making the existing firmware link betterSean Reifschneider2016-08-241-1/+2
| | |
| | * Changes based on @fredizzimo review, flashing Infinity detailsSean Reifschneider2016-08-241-0/+34
| | |
| | * Changes from review by @fredizzimo and @XyverzSean Reifschneider2016-08-221-19/+16
| | |
| | * Tweaks after review.Sean Reifschneider2016-08-191-3/+3
| | |
| | * Restructuring of the ergodox README.Sean Reifschneider2016-08-191-29/+105
| | |
| | * Noting the change directory.Sean Reifschneider2016-08-191-0/+1
| | |
| | * Adding submodule note.Sean Reifschneider2016-08-191-0/+1
| | |
| | * Adding nicer Infinity build instructions.Sean Reifschneider2016-08-191-0/+11
| | |
* | | Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-243-0/+419
|\| |
| * | Merge pull request #677 from SmackleFunky/masterJack Humbert2016-08-233-0/+419
| |\ \ | | | | | | | | Virtual Serial Port - and a Layout that uses that virtual serial port for Plover
| | * | move to ergodox-ez onlyJason Green2016-08-233-0/+0
| | | |
| | * | Remove unneeded includeJason Green2016-08-231-1/+0
| | | |
| | * | add missing #includeJason Green2016-08-231-0/+1
| | | |
| | * | TxBolt (Steno) Serial protocol for Ergodox EzJason Green2016-08-233-0/+419
| | | |
* | | | Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-2318-484/+685
|\| | |
| * | | Add default swap configs for a couple of boards.Joe Wasson2016-08-201-0/+24
| |/ /
| * | 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
| | |
* | | Update keyboard readme files with new makefile instructionsFred Sundvik2016-08-201-3/+3
| | |
* | | Split subproject make files into Makefile and rules.mkFred Sundvik2016-08-204-151/+157
| | |
* | | Split keyboard makefiles into rules and MakefileFred Sundvik2016-08-202-31/+30
|/ /
* | 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
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 14:06:21 +0000