summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-08-01Merge pull request #596 from fredizzimo/rid_of_quickJack Humbert
Fix the makefile dependencies and remove quick targets
2016-07-31added support for Infinity 1.1a (4th drop) matrix, no LED support yetDepariel
2016-07-31Thumb ⌫ into ⇥, numpad & into :, yank home/endNathan Sharfi
Also: add (back?) in the light-shine disabler
2016-07-31Remove /keyboard/* filesNathan Sharfi
2016-07-31Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi
# Conflicts: # keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c # keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
2016-07-31fixed typo in hasu/keymap.cDepariel
2016-07-31fixed compiling bugs in infinity_chibios.h, updated keymaps, added depariel ↵Depariel
keymap
2016-07-31feature: add basic doc about how a keyboard works on USBJiehong Ma
This comes from the discussion on #520
2016-07-31Travis calls the normal build target, instead of quickFred Sundvik
2016-07-31Fix the readme for the removed quick targetFred Sundvik
2016-07-31Remove the quick commands and add proper cleanFred Sundvik
2016-07-31Also depend on the gcc versionFred Sundvik
2016-07-31Generate version information to version.hFred Sundvik
So that only the files that really needs a version are recompiled.
2016-07-31Force compilation and linking when options changesFred Sundvik
2016-07-31More reliable .d file generationFred Sundvik
Also generated inside the obj dir instead of separate deps folder.
2016-07-31Put the build output inside the root/.build directoryFred Sundvik
2016-07-31Enable vpath seraching for source files onlyFred Sundvik
2016-07-31Better "include guards" for the makefilesFred Sundvik
Checking for ARCH is not good enough, since some subprojects define it. Ergodox Ez for example. The leads to running the make from keyboards/ergodox/ez failing. The keyboard makefile will not be included in that case, and therefore not the CUSTOM_MATRIX either. Furthermore the output files are read from many different .build directories, so it doesn't fail deterministically. For example on the Travis CI the compilation passes, since there's no outdated objects that needs recompilation.
2016-07-31Merge pull request #594 from jeebak/jeebakJack Humbert
Jeebak's keymap for planck
2016-07-31Merge pull request #590 from jeebak/in-like-flintJack Humbert
Add IN_LIKE_FLINT song
2016-07-30Update readme.mdJeeBak Kim
2016-07-30Add additional shortcut keymaps to TOUCHCURSOR layerJeeBak Kim
2016-07-30Add additional maps for [, and ], to LOWERJeeBak Kim
2016-07-30Make RAISE layer an all numbers/arithmatic layerJeeBak Kim
2016-07-30Move reset to a less accessible locationJeeBak Kim
2016-07-30Add -, +, and . to RAISEJeeBak Kim
2016-07-30Change calls from persistant_default_layer_set() to default_layer_set()JeeBak Kim
2016-07-30PrintScreen and RGUI replace BACKLIT and Ctrl. Move BACKLIT to LOWER/RAISE ↵JeeBak Kim
layers
2016-07-30Updated readme with recent changesJonathan Arnett
2016-07-30Updated my keymapJack Humbert
2016-07-30Media keys for all the "regular" layersJeeBak Kim
2016-07-30Add mouse layer, and remove default arrow keys (touchcursor only, now)JeeBak Kim
2016-07-30Add numbers to _RAISEJeeBak Kim
2016-07-30Move _RAISE symbols to _LOWERJeeBak Kim
2016-07-30Tap for Enter, hold for ShiftJeeBak Kim
2016-07-30Add personalized TouchCursor layerJeeBak Kim
2016-07-30Tap for Esc, hold for ControlJeeBak Kim
2016-07-30rebaseSeth Chandler
2016-07-30update makefileSeth Chandler
2016-07-30initial commit of sethbc keymapSeth Chandler
2016-07-30Add IN_LIKE_FLINT songJeeBak Kim
2016-07-30Add "jeebak" keymap folder as a copy of the "default" folderJeeBak Kim
2016-07-30Merge pull request #589 from algernon/h/ergodox_ez-vs-ergodoxJack Humbert
Update some obsolete references
2016-07-30Update some obsolete referencesGergely Nagy
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-29Merge pull request #587 from fredizzimo/documentation_quick_fixJack Humbert
Fix the quick aliases documentation section
2016-07-29Merge pull request #503 from fredizzimo/ergodox_subprojectJack Humbert
Add both Ergodox EZ and Infinity Ergodox as sub-projects of Ergodox
2016-07-29Fix the quick aliases documentation sectionFred Sundvik
Also move all keyboard customization documentation under the "Going Beyond the keycodes" heading.
2016-07-29Small fix for infinity include guardFred Sundvik
2016-07-29Fix typo in the readme.Fred Sundvik
2016-07-29A couple of more Ergodox readme fixesFred Sundvik