IBNobody
6bd9235fe3
Merge
2016-08-20 08:16:06 -05:00
IBNobody
dd553d460e
fixed color detection routine in makefile
2016-08-19 23:53:22 -05:00
IBNobody
23617779b4
Merge https://github.com/IBNobody/qmk_firmware
2016-08-19 23:39:35 -05:00
IBNobody
fdaae7ec88
fixed color detection routine in makefile
2016-08-19 23:37:54 -05:00
Jack Humbert
a3a312f8f4
Merge pull request #662 from toneman77/iso_satan
...
Satan Cleanup
2016-08-19 17:55:54 -04:00
Jack Humbert
47b670bced
Merge pull request #663 from tomb0y/kc60_workman_dead
...
Add the workman-dead layout for kc60
2016-08-19 17:54:12 -04:00
zs
a1da23d827
Add the workman-dead layout for kc60
2016-08-19 21:59:08 +02:00
Jack Humbert
7bb9d7f0f9
Merge pull request #660 from toneman77/amj60
...
new keyboard: AMJ60
2016-08-19 11:19:52 -04:00
Toni
bc0bd11430
forgot media keys
2016-08-19 10:24:48 +02:00
Toni
225c73ed30
Merge remote-tracking branch 'origin/master' into amj60
...
merge with upstream
2016-08-19 09:49:56 +02:00
Jack Humbert
2c59f71090
Merge pull request #655 from Dbroqua/patch-1
...
Added dbroqua layout for planck keyboard
2016-08-18 19:25:36 -04:00
Jack Humbert
05728cad68
Merge pull request #656 from Vifon/dynamic_macros
...
Improve the dynamic macro documentation
2016-08-18 19:23:53 -04:00
Wojciech Siewierski
ea7115534a
Improve the dynamic macro documentation
2016-08-19 00:18:45 +02:00
Damien
a5e6da7aa8
Added dbroqua layout for planck keyboard
2016-08-18 22:25:13 +02:00
Jack Humbert
6c359cabbf
Merge pull request #652 from iFreilicht/master
...
Added S60-X keyboard
2016-08-18 10:34:22 -04:00
Jack Humbert
ca7fa07bc1
Merge pull request #651 from algernon/f/register16
...
Add a register/unregister_code16 pair of functions
2016-08-18 10:32:16 -04:00
Jack Humbert
8f32595820
Merge pull request #650 from Xyverz/master
...
Minor changes to keymaps and other files
2016-08-18 10:31:17 -04:00
Jack Humbert
6e1b89fdc8
Merge pull request #654 from algernon/h/planck-circuit-tap-dance-fix
...
planck/circuit: Update after the latest tap-dance change
2016-08-18 10:04:02 -04:00
Toni
21dc8381d1
made a correct default KEYMAP. moved the old one to KEYMAP_ANSI
...
fixed all layouts that were referencing KEYMAP to KEYMAP_ANSI
whitespace prettyfying
2016-08-18 15:57:17 +02:00
Toni
fe90653886
smyll typo fixed
2016-08-18 15:32:06 +02:00
Toni
0e86c85241
amj60 variant of the readme
2016-08-18 15:30:52 +02:00
Toni
0edf7c7cad
first attempt at documentation for the amj60 board
2016-08-18 15:22:34 +02:00
Gergely Nagy
0d9d4b8658
planck/circuit: Update after the latest tap-dance change
...
Fixes #653 .
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-18 13:22:16 +02:00
Toni
068e76bbf0
uniform whitespace
2016-08-18 13:10:02 +02:00
Toni
387bd772e1
initial commit for the AMJ60 PCB
2016-08-18 13:06:16 +02:00
Felix Uhl
dbfb27326b
Added info to docs
2016-08-18 12:15:10 +02:00
Felix Uhl
ed6ecff292
Merge pull request #1 from jackhumbert/master
...
Merging from base Repo
2016-08-18 12:02:31 +02:00
Felix Uhl
73f13c8f26
Bugfixes
2016-08-18 11:56:44 +02:00
Felix Uhl
a72dc6da70
Final link fix
2016-08-18 11:45:56 +02:00
Felix Uhl
406ae1a2eb
More link fixing
2016-08-18 11:43:32 +02:00
Felix Uhl
aa71ebfbba
Fixed links again
...
Note to self: check before commiting.
2016-08-18 11:41:52 +02:00
Felix Uhl
d34c0a2fc1
Fixed dead link
2016-08-18 11:40:05 +02:00
Felix Uhl
738151d12a
Minor documentation changes
2016-08-18 11:38:04 +02:00
Gergely Nagy
0d28787c5c
Add a register/unregister_code16 pair of functions
...
These functions register not only the 8bit keycode, but the modifiers
too. It doesn't handle the full range of the upper 8bits, just the mods,
but that's a good start.
Changed the tap-dance pair functions to use these, so one can do:
`ACTION_TAP_DANCE_DOUBLE (KC_COLN, KC_SCLN)`
...and that will do the right thing.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-18 11:29:53 +02:00
Felix Uhl
c5f13e5836
Fixed links again
2016-08-18 11:16:10 +02:00
Felix Uhl
a865995595
Fixed pictures and links
2016-08-18 11:11:42 +02:00
Felix Uhl
2618260b34
Documentation overhaul.
2016-08-18 10:37:32 +02:00
Toni
864e26f439
cleanup, readability , shift swap in ISO_SPLIT_RSHIFT
2016-08-18 10:06:13 +02:00
Felix Uhl
07924511f3
Small changes, renamed keymap
...
Added MicMute
Revived all dead keys
Removed OS Shift
2016-08-18 10:01:46 +02:00
Toni
64ecb15310
corrected the split rshift key to reality
...
fixed my keymap in the process to adjust to that
2016-08-18 09:56:11 +02:00
Xyverz
aa37a57e0f
One last change to the readme.
2016-08-18 00:38:25 -07:00
Xyverz
eb81978ecb
One last formatting change
2016-08-18 00:35:32 -07:00
Xyverz
118ad691c4
more formatting changes
2016-08-18 00:34:22 -07:00
Xyverz
4dd641a128
Hopefully this fixes the layout diagrams.
2016-08-18 00:27:54 -07:00
Xyverz
035290b7d8
Added a readme, tidied up comments in the keymap.
2016-08-18 00:22:56 -07:00
Xyverz
47beb763e8
Returned RAISE and LOWER buttons to their original functions - too many inopportune ENTER inputs. :-(
2016-08-18 00:05:24 -07:00
Xyverz
67227e4c71
Merge branch 'master' of https://github.com/Xyverz/qmk_firmware
2016-08-17 23:55:58 -07:00
Xyverz
385b827c85
Merge remote-tracking branch 'upstream/master'
...
this merge is necessary,
2016-08-17 23:53:56 -07:00
Jack Humbert
8144ce8852
Merge pull request #648 from Vifon/dynamic_macros
...
Implement the dynamic macros that are recorded in runtime
2016-08-17 21:17:30 -04:00
Jack Humbert
39a95897bc
Merge pull request #647 from Vifon/process_record_nocache-fix
...
Fix the process_record_nocache function
2016-08-17 21:16:49 -04:00