Commit Graph

3560 Commits

Author SHA1 Message Date
Jack Humbert
301e46c529 Merge pull request #599 from Depariel/master
Fixed compiling errors and updated keymaps for infinity_chibios
2016-08-03 00:10:41 -04:00
Jack Humbert
e62c588921 Merge pull request #561 from 0xdec/patch-1
Clean up formatting & tiny refactor in rgblight.c
2016-08-03 00:08:02 -04:00
Stephen Christie
bf2b260429 Merge branch 'master' of http://github.com/jackhumbert/qmk_firmware 2016-08-02 22:51:30 -04:00
Stephen Christie
0acb394ac4 Moved Insert, PrtSc, Pause to Adjust; Corner enter 2016-08-02 22:32:27 -04:00
kuel
c70b276b1b Add keymap_cyrillic.h, lots of cyrillic characters 2016-08-02 14:09:01 -05:00
Erez Zukerman
79a9e04706 Merge pull request #592 from sethbc/ez-sethbc
Ez sethbc
2016-08-02 08:03:09 -04:00
Erez Zukerman
8c52327aa6 Merge pull request #593 from J3RN/master
Updated the J3RN ErgoDox keymap
2016-08-02 08:02:27 -04:00
Erez Zukerman
6eab4ecd7e Merge pull request #600 from adiabatic/master
zweihander-osx: add left-hand-thumb tab key
2016-08-02 08:01:56 -04:00
Jack Humbert
461f973c2b correct file name 2016-08-01 23:46:50 -04:00
Jack Humbert
25f138c0d3 fix mkdir cmd 2016-08-01 22:59:25 -04:00
Erez Zukerman
56aa51664e Updates ErgoDox readme 2016-08-01 21:15:01 -04:00
Stephen Christie
76ef37e72d Corrected Qwerty/Fn Mismatch. 2016-08-01 18:54:25 -04:00
Jack Humbert
f422f442cf automatically forward ergodox ez 2016-08-01 14:51:26 -04:00
Jack Humbert
bb249fb239 Merge pull request #597 from Jiehong/feature/basic_keyboard_doc
feature: add basic doc about how a keyboard works on USB
2016-08-01 02:25:20 -04:00
Jack Humbert
d5baa4773d Merge pull request #596 from fredizzimo/rid_of_quick
Fix the makefile dependencies and remove quick targets
2016-08-01 02:24:53 -04:00
Depariel
a675c1aee0 added support for Infinity 1.1a (4th drop) matrix, no LED support yet 2016-07-31 23:12:16 -04:00
Stephen Christie
4b74c90cdb Added quote key. 2016-07-31 22:39:25 -04:00
Nathan Sharfi
07a631bd5a Thumb ⌫ into ⇥, numpad & into :, yank home/end
Also: add (back?) in the light-shine disabler
2016-07-31 14:21:08 -07:00
Nathan Sharfi
c2419ffecc Remove /keyboard/* files 2016-07-31 14:10:03 -07:00
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
2016-07-31 14:02:25 -07:00
Depariel
0c4177e077 fixed typo in hasu/keymap.c 2016-07-31 15:16:55 -04:00
Depariel
ceecb7c819 fixed compiling bugs in infinity_chibios.h, updated keymaps, added depariel keymap 2016-07-31 14:25:25 -04:00
Jiehong Ma
d9bef1658e feature: add basic doc about how a keyboard works on USB
This comes from the discussion on #520
2016-07-31 16:49:31 +02:00
Fred Sundvik
fda29be3e7 Travis calls the normal build target, instead of quick 2016-07-31 14:18:51 +03:00
Fred Sundvik
87a1a095d0 Fix the readme for the removed quick target 2016-07-31 14:18:00 +03:00
Fred Sundvik
a0dc622199 Remove the quick commands and add proper clean 2016-07-31 14:17:32 +03:00
Fred Sundvik
d5a947b324 Also depend on the gcc version 2016-07-31 13:49:04 +03:00
Fred Sundvik
97817a773e Generate version information to version.h
So that only the files that really needs a version are recompiled.
2016-07-31 13:42:05 +03:00
Fred Sundvik
84bfb19554 Force compilation and linking when options changes 2016-07-31 13:42:04 +03:00
Fred Sundvik
e58e9af2ab More reliable .d file generation
Also generated inside the obj dir instead of separate deps folder.
2016-07-31 13:36:30 +03:00
Fred Sundvik
abdf42573a Put the build output inside the root/.build directory 2016-07-31 13:25:49 +03:00
Fred Sundvik
f11a0275a8 Enable vpath seraching for source files only 2016-07-31 13:24:25 +03:00
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.
2016-07-31 13:22:18 +03:00
Jack Humbert
b25dbc484d Merge pull request #594 from jeebak/jeebak
Jeebak's keymap for planck
2016-07-31 01:30:31 -04:00
Jack Humbert
7e000ff476 Merge pull request #590 from jeebak/in-like-flint
Add IN_LIKE_FLINT song
2016-07-31 01:30:09 -04:00
JeeBak Kim
230d313dbd Update readme.md 2016-07-30 17:30:10 -07:00
JeeBak Kim
a2ed7ce795 Add additional shortcut keymaps to TOUCHCURSOR layer 2016-07-30 12:52:51 -07:00
JeeBak Kim
db8ad8204e Add additional maps for [, and ], to LOWER 2016-07-30 12:52:51 -07:00
JeeBak Kim
b54a58859f Make RAISE layer an all numbers/arithmatic layer 2016-07-30 12:52:51 -07:00
JeeBak Kim
216efe6c99 Move reset to a less accessible location 2016-07-30 12:52:51 -07:00
JeeBak Kim
e0dd9d6af0 Add -, +, and . to RAISE 2016-07-30 12:52:51 -07:00
JeeBak Kim
6a2c681ae9 Change calls from persistant_default_layer_set() to default_layer_set() 2016-07-30 12:52:51 -07:00
JeeBak Kim
eb9416a67d PrintScreen and RGUI replace BACKLIT and Ctrl. Move BACKLIT to LOWER/RAISE layers 2016-07-30 12:52:46 -07:00
Jonathan Arnett
1876e100be
Updated readme with recent changes 2016-07-30 14:37:54 -04:00
Jack Humbert
17bd4ac062
Updated my keymap 2016-07-30 14:07:27 -04:00
JeeBak Kim
984fc2b630 Media keys for all the "regular" layers 2016-07-30 10:13:50 -07:00
JeeBak Kim
7209310d1b Add mouse layer, and remove default arrow keys (touchcursor only, now) 2016-07-30 10:13:50 -07:00
JeeBak Kim
a6bae9fb07 Add numbers to _RAISE 2016-07-30 10:13:49 -07:00
JeeBak Kim
6baf77d8fb Move _RAISE symbols to _LOWER 2016-07-30 10:13:49 -07:00
JeeBak Kim
ad7e4af45c Tap for Enter, hold for Shift 2016-07-30 10:13:49 -07:00