summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Reverted Ergodox config.hJoshua T2016-08-091-1/+1
| | | I will create a separate config.h for my keymap
* Created keymap local config.h fileJoshua T2016-08-092-4/+95
| | | Reverted the Atreus config.h to default and added one specific to this keymap.
* Merge remote-tracking branch 'upstream/master'Joshua T2016-08-0735-612/+2743
|\
| * Merge pull request #605 from kuel/masterJack Humbert2016-08-031-0/+161
| |\ | | | | | | Add keymap_cyrillic.h, lots of cyrillic characters
| | * Add keymap_cyrillic.h, lots of cyrillic characterskuel2016-08-021-0/+161
| | |
| * | Merge pull request #599 from Depariel/masterJack Humbert2016-08-036-154/+196
| |\ \ | | | | | | | | Fixed compiling errors and updated keymaps for infinity_chibios
| | * | added support for Infinity 1.1a (4th drop) matrix, no LED support yetDepariel2016-07-312-5/+50
| | | |
| | * | fixed typo in hasu/keymap.cDepariel2016-07-311-1/+1
| | | |
| | * | fixed compiling bugs in infinity_chibios.h, updated keymaps, added depariel ↵Depariel2016-07-315-149/+146
| | | | | | | | | | | | | | | | keymap
| * | | Merge pull request #561 from 0xdec/patch-1Jack Humbert2016-08-031-357/+378
| |\ \ \ | | |_|/ | |/| | Clean up formatting & tiny refactor in rgblight.c
| | * | Simplify HSV->RGB calculationJordi Orlando2016-07-261-14/+12
| | | | | | | | | | | | De-dupe repeated code
| | * | Increament -> incrementJordi Orlando2016-07-261-9/+9
| | | |
| | * | Clean up rgblight.cJordi Orlando2016-07-261-354/+377
| | | | | | | | | | | | Fix formatting issues, clarify comments
| * | | Merge pull request #592 from sethbc/ez-sethbcErez Zukerman2016-08-023-0/+119
| |\ \ \ | | | | | | | | | | Ez sethbc
| | * | | rebaseSeth Chandler2016-07-303-1/+1
| | | | |
| | * | | update makefileSeth Chandler2016-07-301-1/+1
| | | | |
| | * | | initial commit of sethbc keymapSeth Chandler2016-07-303-0/+119
| | | | |
| * | | | Merge pull request #593 from J3RN/masterErez Zukerman2016-08-022-22/+26
| |\ \ \ \ | | | | | | | | | | | | Updated the J3RN ErgoDox keymap
| | * | | | Updated readme with recent changesJonathan Arnett2016-07-301-3/+6
| | | | | |
| | * | | | Updated my keymapJack Humbert2016-07-308-28/+29
| | |\ \ \ \
| * | \ \ \ \ Merge pull request #600 from adiabatic/masterErez Zukerman2016-08-024-14/+1167
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | zweihander-osx: add left-hand-thumb tab key
| | * | | | | | Thumb ⌫ into ⇥, numpad & into :, yank home/endNathan Sharfi2016-07-313-13/+1166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: add (back?) in the light-shine disabler
| | * | | | | | Remove /keyboard/* filesNathan Sharfi2016-07-313-1394/+0
| | | | | | | |
| | * | | | | | 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
| | * | | | | | zweihander-osx: Use power instead of ejectNathan Sharfi2016-05-312-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | KC_EJCT isn't the OS X Eject key and won't restart your computer.
| | * | | | | | zweihander-osx: use eject instead of powerNathan Sharfi2016-05-312-1110/+1097
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://support.apple.com/en-us/HT201236 says that ⌃⌘⏏ will quit all apps and then restart your Mac; ⌃⌘-power will shut things down in an…ungraceful fashion. I reboot into Windows fairly frequently; I'd rather have the nice behavior at my fingertips, not the rude one.
| | * | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi2016-05-312-4/+9
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi2016-05-3036-96/+3634
| | |\ \ \ \ \ \ \
| | * | | | | | | | zweihander: Add :, disable sleep LED wavesNathan Sharfi2016-05-302-1/+3
| | | | | | | | | |
| | * | | | | | | | zweihander-osx: Add =, :, juggle Home/EndNathan Sharfi2016-05-271-8/+8
| | | | | | | | | |
| | * | | | | | | | zweihander-osx: Bump ALFRED_LEAD_TIME to 250msNathan Sharfi2016-05-262-5/+5
| | | | | | | | | |
| * | | | | | | | | correct file nameJack Humbert2016-08-011-1/+1
| | | | | | | | | |
| * | | | | | | | | fix mkdir cmdJack Humbert2016-08-011-1/+1
| | | | | | | | | |
| * | | | | | | | | Updates ErgoDox readmeErez Zukerman2016-08-011-9/+6
| | | | | | | | | |
| * | | | | | | | | automatically forward ergodox ezJack Humbert2016-08-012-0/+3
| | | | | | | | | |
| * | | | | | | | | Merge pull request #597 from Jiehong/feature/basic_keyboard_docJack Humbert2016-08-011-0/+96
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | feature: add basic doc about how a keyboard works on USB
| | * | | | | | | | | feature: add basic doc about how a keyboard works on USBJiehong Ma2016-07-311-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This comes from the discussion on #520
| * | | | | | | | | | Merge pull request #596 from fredizzimo/rid_of_quickJack Humbert2016-08-0110-56/+87
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | Fix the makefile dependencies and remove quick targets
| | * | | | | | | | | Travis calls the normal build target, instead of quickFred Sundvik2016-07-311-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Fix the readme for the removed quick targetFred Sundvik2016-07-311-4/+3
| | | | | | | | | | |
| | * | | | | | | | | Remove the quick commands and add proper cleanFred Sundvik2016-07-311-26/+5
| | | | | | | | | | |
| | * | | | | | | | | Also depend on the gcc versionFred Sundvik2016-07-311-3/+5
| | | | | | | | | | |
| | * | | | | | | | | Generate version information to version.hFred Sundvik2016-07-317-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that only the files that really needs a version are recompiled.
| | * | | | | | | | | Force compilation and linking when options changesFred Sundvik2016-07-311-9/+28
| | | | | | | | | | |
| | * | | | | | | | | More reliable .d file generationFred Sundvik2016-07-311-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also generated inside the obj dir instead of separate deps folder.
| | * | | | | | | | | Put the build output inside the root/.build directoryFred Sundvik2016-07-311-1/+2
| | | | | | | | | | |
| | * | | | | | | | | Enable vpath seraching for source files onlyFred Sundvik2016-07-311-1/+11
| | | | | | | | | | |
| | * | | | | | | | | Better "include guards" for the makefilesFred Sundvik2016-07-311-9/+14
| | | |_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | Merge pull request #594 from jeebak/jeebakJack Humbert2016-07-313-0/+496
| |\ \ \ \ \ \ \ \ \