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