masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,961 Commits 2 Branches 0 Tags 274 MiB
Commit Graph

2961 Commits

Author SHA1 Message Date
Jason Green 86656690f1 TxBolt (Steno) Serial protocol for Ergodox Ez 2016-08-23 04:17:34 +00:00
Jason Green 80d10bef07 Added USB Virtual Serial support 2016-08-23 04:16:35 +00:00
Jack Humbert d8c5041f0a Merge pull request #669 from fredizzimo/windows10_build_instructions 
Add instructions for Windows 10 subsystem for Linux
 2016-08-21 19:13:19 -04:00
Jack Humbert fa18e62d37 Merge pull request #668 from fredizzimo/line_endings 
Enforce correct line endings
 2016-08-21 19:13:06 -04:00
Jack Humbert 7c140538c7 Merge pull request #674 from kyleberry/master 
Fixing Dvorak
 2016-08-21 19:09:26 -04:00
Kyle Berry 30de8663a9 Fixing Dvorak 
Updating with proper Dvorak layout.
 2016-08-21 14:01:43 -07:00
Fred Sundvik 2a5bdd81d4 Add warning about line endings 2016-08-20 19:11:22 +03:00
Fred Sundvik 704cbd1d2b Add instructions for Windows 10 subsystem for Linux 
Also simplify the linux instructions
 2016-08-20 19:02:19 +03:00
Jack Humbert a3f726174c Merge pull request #665 from linsomniac/keymap_jafo 
Adding jafo layout.
 2016-08-20 11:04:54 -04:00
Jack Humbert a592c9dcf4 Merge pull request #658 from Xyverz/master 
Got rid of all the kludge in my ErgoDox keymap.
 2016-08-20 11:04:02 -04:00
Jack Humbert 7cef0f56e9 Merge pull request #630 from nrrkeene/master 
The Ordinary Layout is the unsurprising layout
 2016-08-20 11:01:22 -04:00
Fred Sundvik fd2f957a1a Normalize line endings 2016-08-20 17:59:18 +03:00
Fred Sundvik f0fd840a57 Add .gitattributes to ensure correct line endings 
It also ensures that make files and shell script are checked out
with lf endings, for compability with the Windows 10 bash
 2016-08-20 17:27:51 +03:00
Xyverz 70d4ea7904 Merge remote-tracking branch 'upstream/master' 2016-08-19 22:50:55 -07:00
Xyverz e4984f65de Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md. 2016-08-19 22:45:20 -07:00
Xyverz aff792545d Changed my keymap to match normal keymaps. 2016-08-19 22:30:34 -07:00
Nicholas Keene 6a9a6b9477 The Ordinary Layout is boring because all the keys are where you expect them to be 2016-08-19 23:44:08 -05:00
Nicholas Keene 8f78ba1f73 The Ordinary Layout is boring because all the keys are where you expect them to be 2016-08-19 23:38:13 -05:00
Sean Reifschneider a25480b3b5 Bringing over changes from default map. 2016-08-19 20:55:50 -06: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
Sean Reifschneider 50531068b3 Adding jafo layout. 2016-08-19 14:42:41 -06: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
Xyverz ed1291bfbd Added compatibility for the Infinity ErgoDox to my Ergodox keymap. 
Updated readme.md to reflect this change.
 2016-08-18 22:43:31 -07: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