Commit Graph

3313 Commits (1aeb59335f2fe67613df25308a630ca453975ac0)
 

Author SHA1 Message Date
Nathan Sharfi d889648d53 Merge branch 'master' of github.com:jackhumbert/qmk_firmware
# Conflicts:
#	keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
#	keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
9 years ago
Depariel 0c4177e077 fixed typo in hasu/keymap.c 9 years ago
Depariel ceecb7c819 fixed compiling bugs in infinity_chibios.h, updated keymaps, added depariel keymap 9 years ago
Jiehong Ma d9bef1658e feature: add basic doc about how a keyboard works on USB
This comes from the discussion on #520
9 years ago
Fred Sundvik fda29be3e7 Travis calls the normal build target, instead of quick 9 years ago
Fred Sundvik 87a1a095d0 Fix the readme for the removed quick target 9 years ago
Fred Sundvik a0dc622199 Remove the quick commands and add proper clean 9 years ago
Fred Sundvik d5a947b324 Also depend on the gcc version 9 years ago
Fred Sundvik 97817a773e Generate version information to version.h
So that only the files that really needs a version are recompiled.
9 years ago
Fred Sundvik 84bfb19554 Force compilation and linking when options changes 9 years ago
Fred Sundvik e58e9af2ab More reliable .d file generation
Also generated inside the obj dir instead of separate deps folder.
9 years ago
Fred Sundvik abdf42573a Put the build output inside the root/.build directory 9 years ago
Fred Sundvik f11a0275a8 Enable vpath seraching for source files only 9 years ago
Fred Sundvik 79067662c8 Better "include guards" for the makefiles
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.
9 years ago
Jack Humbert b25dbc484d Merge pull request #594 from jeebak/jeebak
Jeebak's keymap for planck
9 years ago
Jack Humbert 7e000ff476 Merge pull request #590 from jeebak/in-like-flint
Add IN_LIKE_FLINT song
9 years ago
JeeBak Kim 230d313dbd Update readme.md 9 years ago
JeeBak Kim a2ed7ce795 Add additional shortcut keymaps to TOUCHCURSOR layer 9 years ago
JeeBak Kim db8ad8204e Add additional maps for [, and ], to LOWER 9 years ago
JeeBak Kim b54a58859f Make RAISE layer an all numbers/arithmatic layer 9 years ago
JeeBak Kim 216efe6c99 Move reset to a less accessible location 9 years ago
JeeBak Kim e0dd9d6af0 Add -, +, and . to RAISE 9 years ago
JeeBak Kim 6a2c681ae9 Change calls from persistant_default_layer_set() to default_layer_set() 9 years ago
JeeBak Kim eb9416a67d PrintScreen and RGUI replace BACKLIT and Ctrl. Move BACKLIT to LOWER/RAISE layers 9 years ago
Jonathan Arnett 1876e100be
Updated readme with recent changes 9 years ago
Jack Humbert 17bd4ac062
Updated my keymap 9 years ago
JeeBak Kim 984fc2b630 Media keys for all the "regular" layers 9 years ago
JeeBak Kim 7209310d1b Add mouse layer, and remove default arrow keys (touchcursor only, now) 9 years ago
JeeBak Kim a6bae9fb07 Add numbers to _RAISE 9 years ago
JeeBak Kim 6baf77d8fb Move _RAISE symbols to _LOWER 9 years ago
JeeBak Kim ad7e4af45c Tap for Enter, hold for Shift 9 years ago
JeeBak Kim b5d77440b6 Add personalized TouchCursor layer 9 years ago
JeeBak Kim eb1a06d3ae Tap for Esc, hold for Control 9 years ago
Seth Chandler a6ec5fa74a rebase 9 years ago
Seth Chandler 694567f799 update makefile 9 years ago
Seth Chandler a01d703a58 initial commit of sethbc keymap 9 years ago
JeeBak Kim 7d0345ef25 Add IN_LIKE_FLINT song 9 years ago
JeeBak Kim f78a994355 Add "jeebak" keymap folder as a copy of the "default" folder 9 years ago
Jack Humbert 7775f3e4b3 Merge pull request #589 from algernon/h/ergodox_ez-vs-ergodox
Update some obsolete references
9 years ago
Gergely Nagy 8a9bf1f165 Update some obsolete references
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>
9 years ago
Jack Humbert 0b7557b60f Merge pull request #587 from fredizzimo/documentation_quick_fix
Fix the quick aliases documentation section
9 years ago
Jack Humbert 063983639d Merge pull request #503 from fredizzimo/ergodox_subproject
Add both Ergodox EZ and Infinity Ergodox as sub-projects of Ergodox
9 years ago
Fred Sundvik 7d55951050 Fix the quick aliases documentation section
Also move all keyboard customization documentation under the
"Going Beyond the keycodes" heading.
9 years ago
Fred Sundvik 566c79554e Small fix for infinity include guard 9 years ago
Fred Sundvik 6e8a5aca9d Fix typo in the readme. 9 years ago
Fred Sundvik 401dd09077 A couple of more Ergodox readme fixes 9 years ago
Fred Sundvik c65da1f208 Unify the ErgoDox EZ and Infinity documentation 9 years ago
Fred Sundvik 44cefcb40a Refer to the right path in the readme 9 years ago
Fred Sundvik 349f189e83 Move Ergodox readme from ez subfolder to parent 9 years ago
Fred Sundvik ad416fb1a3 Include the main Makefile before including Ergodox infinity drivers 9 years ago