Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Adding nicer Infinity build instructions. | Sean Reifschneider | 2016-08-19 | 1 | -0/+11 |
| | |||||
* | forgot media keys | Toni | 2016-08-19 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into amj60 | Toni | 2016-08-19 | 47 | -89/+5699 |
|\ | | | | | | | merge with upstream | ||||
| * | Added dbroqua layout for planck keyboard | Damien | 2016-08-18 | 1 | -0/+314 |
| | | |||||
| * | Merge pull request #652 from iFreilicht/master | Jack Humbert | 2016-08-18 | 40 | -0/+5227 |
| |\ | | | | | | | Added S60-X keyboard | ||||
| | * | Added info to docs | Felix Uhl | 2016-08-18 | 1 | -1/+1 |
| | | | |||||
| | * | Merge pull request #1 from jackhumbert/master | Felix Uhl | 2016-08-18 | 100 | -1407/+6306 |
| | |\ | | | | | | | | | Merging from base Repo | ||||
| | * | | Bugfixes | Felix Uhl | 2016-08-18 | 1 | -6/+7 |
| | | | | |||||
| | * | | Final link fix | Felix Uhl | 2016-08-18 | 1 | -2/+2 |
| | | | | |||||
| | * | | More link fixing | Felix Uhl | 2016-08-18 | 1 | -6/+6 |
| | | | | |||||
| | * | | Fixed links again | Felix Uhl | 2016-08-18 | 1 | -2/+2 |
| | | | | | | | | | | | | Note to self: check before commiting. | ||||
| | * | | Fixed dead link | Felix Uhl | 2016-08-18 | 1 | -1/+1 |
| | | | | |||||
| | * | | Minor documentation changes | Felix Uhl | 2016-08-18 | 2 | -28/+21 |
| | | | | |||||
| | * | | Fixed links again | Felix Uhl | 2016-08-18 | 1 | -3/+5 |
| | | | | |||||
| | * | | Fixed pictures and links | Felix Uhl | 2016-08-18 | 1 | -15/+13 |
| | | | | |||||
| | * | | Documentation overhaul. | Felix Uhl | 2016-08-18 | 10 | -9/+3138 |
| | | | | |||||
| | * | | Small changes, renamed keymap | Felix Uhl | 2016-08-18 | 4 | -213/+236 |
| | | | | | | | | | | | | | | | | | | | | | | | | Added MicMute Revived all dead keys Removed OS Shift | ||||
| | * | | Minor changes to felix keymap | Felix Uhl | 2016-08-15 | 3 | -17/+54 |
| | | | | |||||
| | * | | Ported all keymaps | Felix Uhl | 2016-08-14 | 14 | -92/+115 |
| | | | | | | | | | | | | | | | | | | | | | | | | Old TMK keymaps were ported and confirmed to compile All keymaps compiled and added to zip-archive. Documentation was updated. | ||||
| | * | | Update readme.md | Felix Uhl | 2016-08-14 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fixed links to keymap sources | Felix Uhl | 2016-08-14 | 1 | -14/+13 |
| | | | | |||||
| | * | | Added all original S60-X keymaps | Felix Uhl | 2016-08-14 | 28 | -150/+1579 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | All keymaps that were included in VinnyCordeiro's repository were ported to QMK. Main Readme was copied over from VC's repo, slightly altered. Main Makefile was updated to reflect VC's original configuration. Small changes in felix keymap. | ||||
| | * | | Small changes | Felix Uhl | 2016-08-11 | 2 | -9/+10 |
| | | | | | | | | | | | | | | | | | | | | Enabled Bootmagic and ISO layouts on felix keymap Added unused pins | ||||
| | * | | Minor changes to keymaps | Felix Uhl | 2016-08-11 | 3 | -9/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | Clarified extra keys Made ISO-keys non-dead in default layout Added non-US backslash on felix layout | ||||
| | * | | Added S60-X to keyboards with two layouts. | Felix Uhl | 2016-08-11 | 11 | -0/+589 |
| | | | | |||||
| * | | | Merge pull request #650 from Xyverz/master | Jack Humbert | 2016-08-18 | 5 | -88/+157 |
| |\ \ \ | | | | | | | | | | | Minor changes to keymaps and other files | ||||
| | * | | | 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 |
| | | | | | |||||
| | * | | | Returned RAISE and LOWER buttons to their original functions - too many ↵ | Xyverz | 2016-08-18 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | inopportune ENTER inputs. :-( | ||||
| | * | | | 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 |
| | | | | | | |||||
| | * | | | | Merge remote-tracking branch 'upstream/master' | Xyverz | 2016-08-17 | 19 | -2/+1044 |
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/| | this merge is necessary, | ||||
| | * | | | Adding KC_BSPC to the LT() macro for LOWER resulted in a backspace stroke ↵ | Xyverz | 2016-08-15 | 2 | -59/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being sent if the LOWER key was used too quickly. Switching back to original LOWER macro, but keeping the new RAISE macro. | ||||
| | * | | | Adding u/treasuredfrog's hack to use LT() with the RAISE and LOWER macros. | Xyverz | 2016-08-15 | 1 | -6/+6 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'upstream/master' | Xyverz | 2016-08-14 | 21 | -0/+686 |
| | |\ \ \ | |||||
| | * | | | | Setup the bottom-row modifiers to be mac-like in their arrangement. | Xyverz | 2016-08-14 | 1 | -3/+3 |
| | | | | | | |||||
| * | | | | | planck/circuit: Update after the latest tap-dance change | Gergely Nagy | 2016-08-18 | 1 | -1/+1 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | Fixes #653. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> | ||||
* | | | | | smyll typo fixed | Toni | 2016-08-18 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | amj60 variant of the readme | Toni | 2016-08-18 | 1 | -0/+30 |
| | | | | | |||||
* | | | | | first attempt at documentation for the amj60 board | Toni | 2016-08-18 | 1 | -0/+57 |
| | | | | | |||||
* | | | | | uniform whitespace | Toni | 2016-08-18 | 1 | -45/+45 |
| | | | | | |||||
* | | | | | initial commit for the AMJ60 PCB | Toni | 2016-08-18 | 8 | -0/+563 |
|/ / / / | |||||
* | | | | Merge pull request #645 from algernon/f/tap-dance/buffering | Jack Humbert | 2016-08-17 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | tap-dance rework | ||||
| * | | | | tap-dance: Major rework, to make it more reliable | Gergely Nagy | 2016-08-17 | 2 | -2/+2 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 pull request #640 from toneman77/iso_satan | Jack Humbert | 2016-08-17 | 9 | -0/+364 |
|\ \ \ \ | | | | | | | | | | | heavily modified spacefn layout for iso boards using the satan PCB | ||||
| * | | | | wring keypress for german iso fixed. prettified | Toni | 2016-08-17 | 1 | -6/+6 |
| | | | | |