summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-07-31Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi6334-2415530/+64043
# Conflicts: # keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c # keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
2016-07-31Merge pull request #594 from jeebak/jeebakJack Humbert3-0/+496
Jeebak's keymap for planck
2016-07-31Merge pull request #590 from jeebak/in-like-flintJack Humbert1-0/+8
Add IN_LIKE_FLINT song
2016-07-31Update readme.mdJeeBak Kim1-1/+106
2016-07-30Add additional shortcut keymaps to TOUCHCURSOR layerJeeBak Kim1-4/+7
2016-07-30Add additional maps for [, and ], to LOWERJeeBak Kim1-4/+4
2016-07-30Make RAISE layer an all numbers/arithmatic layerJeeBak Kim1-6/+6
2016-07-30Move reset to a less accessible locationJeeBak Kim1-4/+4
2016-07-30Add -, +, and . to RAISEJeeBak Kim1-4/+4
2016-07-30Change calls from persistant_default_layer_set() to default_layer_set()JeeBak Kim1-3/+3
2016-07-30PrintScreen and RGUI replace BACKLIT and Ctrl. Move BACKLIT to LOWER/RAISE ↵JeeBak Kim1-10/+10
layers
2016-07-30Media keys for all the "regular" layersJeeBak Kim1-10/+10
2016-07-30Add mouse layer, and remove default arrow keys (touchcursor only, now)JeeBak Kim1-15/+36
2016-07-30Add numbers to _RAISEJeeBak Kim1-4/+4
2016-07-30Move _RAISE symbols to _LOWERJeeBak Kim1-6/+6
2016-07-30Tap for Enter, hold for ShiftJeeBak Kim1-30/+31
2016-07-30Add personalized TouchCursor layerJeeBak Kim1-6/+28
2016-07-30Tap for Esc, hold for ControlJeeBak Kim1-30/+33
2016-07-30Add IN_LIKE_FLINT songJeeBak Kim1-0/+8
2016-07-30Add "jeebak" keymap folder as a copy of the "default" folderJeeBak Kim3-0/+341
2016-07-30Merge pull request #589 from algernon/h/ergodox_ez-vs-ergodoxJack Humbert7-9/+9
Update some obsolete references
2016-07-30Update some obsolete referencesGergely Nagy7-9/+9
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>
2016-07-30Merge pull request #587 from fredizzimo/documentation_quick_fixJack Humbert1-13/+15
Fix the quick aliases documentation section
2016-07-30Merge pull request #503 from fredizzimo/ergodox_subprojectJack Humbert225-1795/+1651
Add both Ergodox EZ and Infinity Ergodox as sub-projects of Ergodox
2016-07-29Fix the quick aliases documentation sectionFred Sundvik1-13/+15
Also move all keyboard customization documentation under the "Going Beyond the keycodes" heading.
2016-07-29Small fix for infinity include guardFred Sundvik1-3/+3
2016-07-29Fix typo in the readme.Fred Sundvik1-1/+1
2016-07-29A couple of more Ergodox readme fixesFred Sundvik1-2/+2
2016-07-29Unify the ErgoDox EZ and Infinity documentationFred Sundvik1-8/+13
2016-07-29Refer to the right path in the readmeFred Sundvik1-1/+1
2016-07-29Move Ergodox readme from ez subfolder to parentFred Sundvik1-0/+0
2016-07-29Include the main Makefile before including Ergodox infinity driversFred Sundvik1-4/+4
2016-07-29Move Infinity Ergodox drivers to subproject, and fix makefileFred Sundvik14-2/+2
2016-07-29Remove the Infinity Ergodox default keymapFred Sundvik2-282/+0
2016-07-29Cleanup the townk_osx config.h and make filesFred Sundvik2-52/+2
2016-07-29Rename supercoder config_user to config.hFred Sundvik1-1/+1
Also fixup the include path of parent config
2016-07-29Fix config.h include guardsFred Sundvik2-4/+4
2016-07-29Define weak matrix user function for Infinity ErgodoxFred Sundvik1-0/+9
So that a few keyboards, which don't use them, links properly.
2016-07-29Speed up ChibiOS keymap compilationFred Sundvik1-17/+33
By sharing the external library object files between the whole keyboard, instead of re-compiling them for each keymap.
2016-07-29Change _delay_ms to wait_ms in algernon keymapFred Sundvik1-1216/+1217
2016-07-29Move some of the Ergodox config settings to sharedFred Sundvik3-37/+37
2016-07-29Add empty led control functions to Infinity ErgodoxFred Sundvik2-0/+96
So that most keymaps compiles and links
2016-07-29Most ergodox keymaps compiles on InfinityFred Sundvik21-32/+46
There are linker errors due to missing led funcitonality though
2016-07-29All Ez keymaps compilesFred Sundvik58-58/+70
2016-07-29Initial structure for Ergodox as subprojectsFred Sundvik219-23/+58
Only the EZ default keymaps compiles at the moment though.
2016-07-29Merge pull request #584 from algernon/ergodox-ez/algernonErez Zukerman4-28/+687
ergodox_ez: Upgrade my keymap to v1.4
2016-07-29Merge pull request #583 from coderkun/coderkun_neo2Erez Zukerman2-7/+15
Ergodox EZ: update keymap “coderkun_neo2”
2016-07-29Merge pull request #580 from MatsLanGoH/patch-1Erez Zukerman1-1/+1
Fixed a typo
2016-07-29ergodox_ez: Upgrade my keymap to v1.4Gergely Nagy4-28/+687
* When toggling the key logging on or off, the LEDs will do a little dance. * The keylogger is now optional, but enabled by default. Use `KEYLOGGER_ENABLE=no` on the `make` command line to disable it. * The `TAB`/`ARRW` key was turned into a tap-dance key, allowing one to toggle the **ARROW** layer on by double-tapping, and as such, avoid the need to hold the key. * The `-`/`_` key was turned into a tap-dance key too. * There is now a way to travel time with the keyboard, toggle the feature on by hitting `LEAD t`. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-29disable sleep LEDcoderkun1-1/+2
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-07-11 21:08:39 +0200