summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Merge pull request #20 from qmk/masterDamien2017-04-13114-1679/+5047
| | |\ | |_|/ |/| | Merge from QMK
* | | Merge pull request #1220 from joedevivo/masterJack Humbert2017-04-121-2/+2
|\ \ \ | | | | | | | | mimic atreus firmware defaults
| * | | mimic atreus firmware defaultsJoe DeVivo2017-04-101-2/+2
| | | |
* | | | Merge pull request #1212 from Xyverz/masterJack Humbert2017-04-122-44/+286
|\ \ \ \ | | | | | | | | | | atreus keymap overhaul
| * | | | Cleaned up the keymap:Xyverz2017-04-082-11/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added MOD_TAP aliases for keymap.c readability. Updated README to document said changes. Added additional Dvorak layer to make using the CMD key easier on Macs.
| * | | | More missed keycodes; added PSCR, SLCK, and PAUS to ADJUST layer.Xyverz2017-04-072-3/+3
| | | | |
| * | | | Corrected a missed typo in the readme.Xyverz2017-04-071-1/+1
| | | | |
| * | | | More tweaks to keymap and readme.Xyverz2017-04-062-9/+14
| | | | |
| * | | | Merge remote-tracking branch 'upstream/master'Xyverz2017-04-0644-127/+1463
| |\| | |
| * | | | Added readmeXyverz2017-04-061-0/+89
| | | | |
| * | | | Reworked Atreus keymap, added READMEXyverz2017-04-061-44/+146
| | | | |
* | | | | Merge pull request #1213 from nstickney/masterJack Humbert2017-04-124-1/+337
|\ \ \ \ \ | | | | | | | | | | | | ErgoDox Familiar layout
| * | | | | ErgoDox Familiar layout v1Stick2017-04-079-23478/+69
| | | | | |
| * | | | | Merge remote-tracking branch 'upstream/master'Stick2017-04-0613-1/+466
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge remote-tracking branch 'upstream/master'Stick2017-04-03239-2412/+11157
| |\ \ \ \ \
| * | | | | | unsatisfied with ESC/GRV/TAB positioningStick2017-03-271-16/+16
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master'Stick2017-03-2764-218/+3620
| |\ \ \ \ \ \
| * | | | | | | fixed unicode input issueStick2017-03-272-18/+18
| | | | | | | |
| * | | | | | | added README.mdnstickney2017-03-121-0/+3
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/master'nstickney2017-03-122-0/+602
| |\ \ \ \ \ \ \
| * | | | | | | | added US-International supportnstickney2017-03-122-53/+104
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master'nstickney2017-03-0816-2/+944
| |\ \ \ \ \ \ \ \
| * | | | | | | | | found LT(layer, kc) so I could take out TapDance codenstickney2017-03-082-112/+20
| | | | | | | | | |
| * | | | | | | | | corralled image filesnstickney2017-03-088-13/+13
| | | | | | | | | |
| * | | | | | | | | SLASH and WHACK functions added (based on algernon's CT_TA)nstickney2017-03-071-37/+0
| | | | | | | | | |
| * | | | | | | | | SLASH and WHACK functions added (based on algernon's CT_TA)nstickney2017-03-074-33/+157
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'upstream/master'nstickney2017-03-0766-349/+2369
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | making numbers more familiarnstickney2017-02-251-93/+131
| | | | | | | | | | |
| * | | | | | | | | | first two layers of ErgoDox Familiar completeCnstickney2017-02-241-13/+55
| | | | | | | | | | |
| * | | | | | | | | | initial layer of familiar layout)nstickney2017-02-231-37/+67
| | | | | | | | | | |
| * | | | | | | | | | Merge https://github.com/qmk/qmk_firmwarenstickney2017-02-2315-117/+360
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | familiar layout graphics, etcnstickney2017-02-237-0/+23475
| | | | | | | | | | | |
| * | | | | | | | | | | familiar layout v0.1 from ErgoDox-EZ configuratornstickney2017-02-191-0/+111
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1216 from Khord/masterJack Humbert2017-04-122-4/+39
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Added breathing macros/mappings and removed mappings to unused layouts
| * | | | | | | | | | | | Added breathing macros and removed mappings to unused layoutsDylan Khor2017-04-092-4/+39
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #1222 from kamisamamizu/patch-1Jack Humbert2017-04-121-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed position of BSLS and BSPC on the xd60
| * | | | | | | | | | | | Fixed position of BSLS and BSPCkamisamamizu2017-04-121-2/+2
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | They were in the incorrect positions before.
* | | | | | | | | | | | Merge pull request #1217 from fredizzimo/ergodox_default_visualizerJack Humbert2017-04-1243-1302/+1787
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Enable Ergodox Infinity LCD visualization
| * | | | | | | | | | | Fix code formatting in build_keyboard.mkFred Sundvik2017-04-121-82/+83
| | | | | | | | | | | |
| * | | | | | | | | | | Extract Ergodox default visualizer into simple_visualizerFred Sundvik2017-04-092-96/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's good enough if you only want to change the lcd text and color.
| * | | | | | | | | | | Rename led test to led_keyframes and move animation to ErgodoxFred Sundvik2017-04-095-61/+78
| | | | | | | | | | | |
| * | | | | | | | | | | Create a file for shared Ergodox Infinity animationsFred Sundvik2017-04-095-77/+90
| | | | | | | | | | | |
| * | | | | | | | | | | Combine startup and resume animationsFred Sundvik2017-04-093-21/+10
| | | | | | | | | | | |
| * | | | | | | | | | | Fix suspend not disabling backlightFred Sundvik2017-04-092-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Move the logo drawing keyframe to lcd_keyframesFred Sundvik2017-04-094-40/+25
| | | | | | | | | | | |
| * | | | | | | | | | | Move LCD logo to visualizer resourcesFred Sundvik2017-04-096-84/+94
| | | | | | | | | | | |
| * | | | | | | | | | | Add automatic flush for the LCD screenFred Sundvik2017-04-095-9/+5
| | | | | | | | | | | |
| * | | | | | | | | | | LCD initialization sequence according to the docsFred Sundvik2017-04-092-29/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LCD initialization show now be much better and faster with no flickering at the startup. Also fix the contrast control.
| * | | | | | | | | | | Yet another try to fix the LCD corruptionFred Sundvik2017-04-091-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |