| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge remote-tracking branch 'upstream/master' into makefile_overhaul | Fred Sundvik | 2016-08-24 | 3 | -0/+419 | |
| |\| | | ||||||
| | * | | Merge pull request #677 from SmackleFunky/master | Jack Humbert | 2016-08-23 | 3 | -0/+419 | |
| | |\ \ | | | | | | | | | Virtual Serial Port - and a Layout that uses that virtual serial port for Plover | |||||
| | | * | | move to ergodox-ez only | Jason Green | 2016-08-23 | 3 | -0/+0 | |
| | | | | | ||||||
| | | * | | Remove unneeded include | Jason Green | 2016-08-23 | 1 | -1/+0 | |
| | | | | | ||||||
| | | * | | add missing #include | Jason Green | 2016-08-23 | 1 | -0/+1 | |
| | | | | | ||||||
| | | * | | TxBolt (Steno) Serial protocol for Ergodox Ez | Jason Green | 2016-08-23 | 3 | -0/+419 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into makefile_overhaul | Fred Sundvik | 2016-08-23 | 18 | -484/+685 | |
| |\| | | | ||||||
| | * | | | Add default swap configs for a couple of boards. | Joe Wasson | 2016-08-20 | 1 | -0/+24 | |
| | |/ / | ||||||
| | * | | Merge pull request #665 from linsomniac/keymap_jafo | Jack Humbert | 2016-08-20 | 5 | -0/+213 | |
| | |\ \ | | | | | | | | | Adding jafo layout. | |||||
| | | * | | Bringing over changes from default map. | Sean Reifschneider | 2016-08-19 | 1 | -4/+3 | |
| | | | | | ||||||
| | | * | | Adding jafo layout. | Sean Reifschneider | 2016-08-19 | 5 | -0/+214 | |
| | | |/ | ||||||
| | * | | Merge pull request #658 from Xyverz/master | Jack Humbert | 2016-08-20 | 2 | -209/+211 | |
| | |\ \ | | | | | | | | | Got rid of all the kludge in my ErgoDox keymap. | |||||
| | | * | | Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md. | Xyverz | 2016-08-19 | 2 | -17/+10 | |
| | | | | | ||||||
| | | * | | Changed my keymap to match normal keymaps. | Xyverz | 2016-08-19 | 1 | -314/+198 | |
| | | | | | ||||||
| | | * | | Added compatibility for the Infinity ErgoDox to my Ergodox keymap. | Xyverz | 2016-08-18 | 2 | -53/+178 | |
| | | |/ | | | | | | | | | | Updated readme.md to reflect this change. | |||||
| | * | | Merge pull request #630 from nrrkeene/master | Jack Humbert | 2016-08-20 | 10 | -275/+237 | |
| | |\ \ | | |/ | |/| | The Ordinary Layout is the unsurprising layout | |||||
| | | * | The Ordinary Layout is boring because all the keys are where you expect them ↵ | Nicholas Keene | 2016-08-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | to be | |||||
| | | * | The Ordinary Layout is boring because all the keys are where you expect them ↵ | Nicholas Keene | 2016-08-19 | 8 | -111/+98 | |
| | | | | | | | | | | | | | to be | |||||
| | | * | The Ordinary Layout is the unsurprising layout | Nicholas Keene | 2016-08-13 | 10 | -183/+158 | |
| | | | | ||||||
| * | | | Update keyboard readme files with new makefile instructions | Fred Sundvik | 2016-08-20 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Split subproject make files into Makefile and rules.mk | Fred Sundvik | 2016-08-20 | 4 | -151/+157 | |
| | | | | ||||||
| * | | | Split keyboard makefiles into rules and Makefile | Fred Sundvik | 2016-08-20 | 2 | -31/+30 | |
| |/ / | ||||||
| * | | One last change to the readme. | Xyverz | 2016-08-18 | 1 | -3/+1 | |
| | | | ||||||
| * | | One last formatting change | Xyverz | 2016-08-18 | 1 | -1/+1 | |
| | | | ||||||
| * | | more formatting changes | Xyverz | 2016-08-18 | 1 | -90/+90 | |
| | | | ||||||
| * | | Hopefully this fixes the layout diagrams. | Xyverz | 2016-08-18 | 1 | -91/+91 | |
| | | | ||||||
| * | | Added a readme, tidied up comments in the keymap. | Xyverz | 2016-08-18 | 2 | -29/+147 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/Xyverz/qmk_firmware | Xyverz | 2016-08-17 | 1 | -0/+5 | |
| |\ \ | ||||||
| | * | | Update readme.md | Xyverz | 2016-08-17 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Create readme.md | Xyverz | 2016-08-17 | 1 | -0/+5 | |
| | | | | ||||||
| * | | | tap-dance: Major rework, to make it more reliable | Gergely Nagy | 2016-08-17 | 1 | -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' | Xyverz | 2016-08-13 | 6 | -1237/+1244 | |
| |\ \ | ||||||
| | * | | ergodox: Update my keymap to v1.5 | Gergely Nagy | 2016-08-12 | 6 | -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 Sterling | 2016-08-09 | 1 | -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.c | Xyverz | 2016-08-08 | 1 | -184/+0 | |
| | | | | | | | file cleanup | |||||
| * | | Delete old_keymap.c | Xyverz | 2016-08-08 | 1 | -311/+0 | |
| | | | | | | | file cleanup | |||||
| * | | Delete readme.md | Xyverz | 2016-08-08 | 1 | -10/+0 | |
| | | | | | | | file cleanup, removing file that doesn't apply to my layout. | |||||
| * | | Delete dvorak.png | Xyverz | 2016-08-08 | 1 | -0/+0 | |
| | | | | | | | Not reflective of my layout. | |||||
| * | | Adding my own keymaps to the following keyboards: | Ian Sterling | 2016-08-08 | 4 | -0/+505 | |
| |/ | | | | Planck, Preonic, Atreus, Ergodox | |||||
| * | Merge pull request #592 from sethbc/ez-sethbc | Erez Zukerman | 2016-08-02 | 3 | -0/+119 | |
| |\ | | | | | Ez sethbc | |||||
| | * | rebase | Seth Chandler | 2016-07-30 | 3 | -0/+119 | |
| | | | ||||||
| * | | Merge pull request #593 from J3RN/master | Erez Zukerman | 2016-08-02 | 2 | -22/+26 | |
| |\ \ | | | | | | | Updated the J3RN ErgoDox keymap | |||||
| | * | | Updated readme with recent changes | Jonathan Arnett | 2016-07-30 | 1 | -3/+6 | |
| | | | | ||||||
| | * | | Updated my keymap | Jack Humbert | 2016-07-30 | 2 | -20/+21 | |
| | |\| | ||||||
| * | | | Merge pull request #600 from adiabatic/master | Erez Zukerman | 2016-08-02 | 4 | -14/+1167 | |
| |\ \ \ | | | | | | | | | zweihander-osx: add left-hand-thumb tab key | |||||
| | * | | | Thumb ⌫ into ⇥, numpad & into :, yank home/end | Nathan Sharfi | 2016-07-31 | 3 | -13/+1166 | |
| | | | | | | | | | | | | | | | | | Also: add (back?) in the light-shine disabler | |||||
| | * | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware | Nathan Sharfi | 2016-07-31 | 1 | -1/+1 | |
| | | |/ | |/| | | | | | | | | | | | | | # Conflicts: # keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c # keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex | |||||
| * | | | Updates ErgoDox readme | Erez Zukerman | 2016-08-01 | 1 | -9/+6 | |
| | | | | ||||||
| * | | | Generate version information to version.h | Fred Sundvik | 2016-07-31 | 3 | -0/+3 | |
| |/ / | | | | | | | So that only the files that really needs a version are recompiled. | |||||
| * / | Update some obsolete references | Gergely Nagy | 2016-07-30 | 1 | -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> | |||||
 |
index : qmk_firmware | |
| [no description] |
| summaryrefslogtreecommitdiffstats |