summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi2016-07-316362-2418080/+66593
|\ | | | | | | | | | | # Conflicts: # keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c # keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
| * Merge pull request #594 from jeebak/jeebakJack Humbert2016-07-313-0/+496
| |\ | | | | | | Jeebak's keymap for planck
| | * Update readme.mdJeeBak Kim2016-07-301-1/+106
| | |
| | * Add additional shortcut keymaps to TOUCHCURSOR layerJeeBak Kim2016-07-301-4/+7
| | |
| | * Add additional maps for [, and ], to LOWERJeeBak Kim2016-07-301-4/+4
| | |
| | * Make RAISE layer an all numbers/arithmatic layerJeeBak Kim2016-07-301-6/+6
| | |
| | * Move reset to a less accessible locationJeeBak Kim2016-07-301-4/+4
| | |
| | * Add -, +, and . to RAISEJeeBak Kim2016-07-301-4/+4
| | |
| | * Change calls from persistant_default_layer_set() to default_layer_set()JeeBak Kim2016-07-301-3/+3
| | |
| | * PrintScreen and RGUI replace BACKLIT and Ctrl. Move BACKLIT to LOWER/RAISE ↵JeeBak Kim2016-07-301-10/+10
| | | | | | | | | | | | layers
| | * Media keys for all the "regular" layersJeeBak Kim2016-07-301-10/+10
| | |
| | * Add mouse layer, and remove default arrow keys (touchcursor only, now)JeeBak Kim2016-07-301-15/+36
| | |
| | * Add numbers to _RAISEJeeBak Kim2016-07-301-4/+4
| | |
| | * Move _RAISE symbols to _LOWERJeeBak Kim2016-07-301-6/+6
| | |
| | * Tap for Enter, hold for ShiftJeeBak Kim2016-07-301-30/+31
| | |
| | * Add personalized TouchCursor layerJeeBak Kim2016-07-301-6/+28
| | |
| | * Tap for Esc, hold for ControlJeeBak Kim2016-07-301-30/+33
| | |
| | * Add "jeebak" keymap folder as a copy of the "default" folderJeeBak Kim2016-07-303-0/+341
| | |
| * | Merge pull request #590 from jeebak/in-like-flintJack Humbert2016-07-311-0/+8
| |\ \ | | |/ | |/| Add IN_LIKE_FLINT song
| | * Add IN_LIKE_FLINT songJeeBak Kim2016-07-301-0/+8
| |/
| * Merge pull request #589 from algernon/h/ergodox_ez-vs-ergodoxJack Humbert2016-07-307-9/+9
| |\ | | | | | | Update some obsolete references
| | * Update some obsolete referencesGergely Nagy2016-07-307-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>
| * Merge pull request #587 from fredizzimo/documentation_quick_fixJack Humbert2016-07-291-13/+15
| |\ | | | | | | Fix the quick aliases documentation section
| | * Fix the quick aliases documentation sectionFred Sundvik2016-07-291-13/+15
| | | | | | | | | | | | | | | Also move all keyboard customization documentation under the "Going Beyond the keycodes" heading.
| * | Merge pull request #503 from fredizzimo/ergodox_subprojectJack Humbert2016-07-29225-1795/+1651
| |\ \ | | |/ | |/| Add both Ergodox EZ and Infinity Ergodox as sub-projects of Ergodox
| | * Small fix for infinity include guardFred Sundvik2016-07-291-3/+3
| | |
| | * Fix typo in the readme.Fred Sundvik2016-07-291-1/+1
| | |
| | * A couple of more Ergodox readme fixesFred Sundvik2016-07-291-2/+2
| | |
| | * Unify the ErgoDox EZ and Infinity documentationFred Sundvik2016-07-291-8/+13
| | |
| | * Refer to the right path in the readmeFred Sundvik2016-07-291-1/+1
| | |
| | * Move Ergodox readme from ez subfolder to parentFred Sundvik2016-07-291-0/+0
| | |
| | * Include the main Makefile before including Ergodox infinity driversFred Sundvik2016-07-291-4/+4
| | |
| | * Move Infinity Ergodox drivers to subproject, and fix makefileFred Sundvik2016-07-2914-2/+2
| | |
| | * Remove the Infinity Ergodox default keymapFred Sundvik2016-07-292-282/+0
| | |
| | * Cleanup the townk_osx config.h and make filesFred Sundvik2016-07-292-52/+2
| | |
| | * Rename supercoder config_user to config.hFred Sundvik2016-07-291-1/+1
| | | | | | | | | | | | Also fixup the include path of parent config
| | * Fix config.h include guardsFred Sundvik2016-07-292-4/+4
| | |
| | * Define weak matrix user function for Infinity ErgodoxFred Sundvik2016-07-291-0/+9
| | | | | | | | | | | | So that a few keyboards, which don't use them, links properly.
| | * Speed up ChibiOS keymap compilationFred Sundvik2016-07-291-17/+33
| | | | | | | | | | | | | | | By sharing the external library object files between the whole keyboard, instead of re-compiling them for each keymap.
| | * Change _delay_ms to wait_ms in algernon keymapFred Sundvik2016-07-291-1216/+1217
| | |
| | * Move some of the Ergodox config settings to sharedFred Sundvik2016-07-293-37/+37
| | |
| | * Add empty led control functions to Infinity ErgodoxFred Sundvik2016-07-292-0/+96
| | | | | | | | | | | | So that most keymaps compiles and links
| | * Most ergodox keymaps compiles on InfinityFred Sundvik2016-07-2921-32/+46
| | | | | | | | | | | | There are linker errors due to missing led funcitonality though
| | * All Ez keymaps compilesFred Sundvik2016-07-2958-58/+70
| | |
| | * Initial structure for Ergodox as subprojectsFred Sundvik2016-07-29219-23/+58
| |/ | | | | | | Only the EZ default keymaps compiles at the moment though.
| * Merge pull request #584 from algernon/ergodox-ez/algernonErez Zukerman2016-07-294-28/+687
| |\ | | | | | | ergodox_ez: Upgrade my keymap to v1.4
| | * ergodox_ez: Upgrade my keymap to v1.4Gergely Nagy2016-07-294-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>
| * | Merge pull request #583 from coderkun/coderkun_neo2Erez Zukerman2016-07-292-7/+15
| |\ \ | | | | | | | | Ergodox EZ: update keymap “coderkun_neo2”
| | * | disable sleep LEDcoderkun2016-07-291-1/+2
| | | |
| | * | complete labels for modifiers in keymap schemacoderkun2016-07-291-2/+2
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 11:17:57 +0000