yohan/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,680 Commits 1 Branch 0 Tags 99 MiB
e9a501d447
Commit Graph

191 Commits

Author SHA1 Message Date
Joshua T
e9a501d447 Merge remote-tracking branch 'upstream/master' 2016-07-30 08:41:22 -05:00
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>
 2016-07-30 08:37:30 +02:00
Fred Sundvik
566c79554e Small fix for infinity include guard 2016-07-29 21:09:42 +03:00
Fred Sundvik
6e8a5aca9d Fix typo in the readme. 2016-07-29 21:09:41 +03:00
Fred Sundvik
401dd09077 A couple of more Ergodox readme fixes 2016-07-29 21:09:40 +03:00
Fred Sundvik
c65da1f208 Unify the ErgoDox EZ and Infinity documentation 2016-07-29 21:09:39 +03:00
Fred Sundvik
44cefcb40a Refer to the right path in the readme 2016-07-29 21:09:38 +03:00
Fred Sundvik
349f189e83 Move Ergodox readme from ez subfolder to parent 2016-07-29 21:09:37 +03:00
Fred Sundvik
ad416fb1a3 Include the main Makefile before including Ergodox infinity drivers 2016-07-29 21:09:37 +03:00
Fred Sundvik
592ef7c6f0 Move Infinity Ergodox drivers to subproject, and fix makefile 2016-07-29 21:09:36 +03:00
Fred Sundvik
37052a53f1 Remove the Infinity Ergodox default keymap 2016-07-29 21:09:35 +03:00
Fred Sundvik
650298cec3 Cleanup the townk_osx config.h and make files 2016-07-29 21:09:34 +03:00
Fred Sundvik
fd7f20b029 Rename supercoder config_user to config.h 
Also fixup the include path of parent config
 2016-07-29 21:09:33 +03:00
Fred Sundvik
426e9ecc6f Fix config.h include guards 2016-07-29 21:09:32 +03:00
Fred Sundvik
a6577b272e Define weak matrix user function for Infinity Ergodox 
So that a few keyboards, which don't use them, links properly.
 2016-07-29 21:09:31 +03:00
Fred Sundvik
1641743b9d Change _delay_ms to wait_ms in algernon keymap 2016-07-29 21:09:21 +03:00
Fred Sundvik
e7670f6d19 Move some of the Ergodox config settings to shared 2016-07-29 20:48:22 +03:00
Fred Sundvik
e0f28c2b10 Add empty led control functions to Infinity Ergodox 
So that most keymaps compiles and links
 2016-07-29 20:48:21 +03:00
Fred Sundvik
e01b4c3fd9 Most ergodox keymaps compiles on Infinity 
There are linker errors due to missing led funcitonality though
 2016-07-29 20:48:20 +03:00
Fred Sundvik
b0376687f4 All Ez keymaps compiles 2016-07-29 20:48:19 +03:00
Fred Sundvik
9af995c59b Initial structure for Ergodox as subprojects 
Only the EZ default keymaps compiles at the moment though.
 2016-07-29 20:48:04 +03:00
Erez Zukerman
30003d48f9 Merge pull request #584 from algernon/ergodox-ez/algernon 
ergodox_ez: Upgrade my keymap to v1.4
 2016-07-29 08:11:37 -04:00
Gergely Nagy
f82437f08e ergodox_ez: Upgrade my keymap to v1.4 
* When toggling the key logging on or off, the LEDs will do a little dance.
* The keylogger is now optional, but enabled by default. Use `KEYLOGGER_ENABLE=no` on the `make` command line to disable it.
* The `TAB`/`ARRW` key was turned into a tap-dance key, allowing one to toggle the **ARROW** layer on by double-tapping, and as such, avoid the need to hold the key.
* The `-`/`_` key was turned into a tap-dance key too.
* There is now a way to travel time with the keyboard, toggle the feature on by hitting `LEAD t`.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
 2016-07-29 12:24:33 +02:00
coderkun
3ace37271b disable sleep LED 2016-07-29 11:28:37 +02:00
coderkun
70755d6614 complete labels for modifiers in keymap schema 2016-07-29 11:07:50 +02:00
coderkun
08239aadea use Ergodox EZ’s third LED for “scroll lock” 2016-07-29 11:07:50 +02:00
coderkun
61fbb47eb6 fix grave (GRV) and acute (ACUT) accents 2016-07-29 11:06:18 +02:00
Jack Humbert
7559edc6e6 Merge pull request #578 from 0xdec/master 
0xdec Preonic keymap
 2016-07-28 16:34:34 -04:00
Jack Humbert
9b5edbdce9 Merge pull request #577 from hot-leaf-juice/master 
Pull request to include my keymap if you want it!
 2016-07-28 16:34:16 -04:00
Jordi Orlando
3b39910cb9 Create 0xdec Preonic keymap 
An ergonomically optimized Colemak keymap for the grid-layout Preonic
 2016-07-28 14:36:20 -05:00
Jack Humbert
e5ac0e8369 Merge pull request #570 from sethbc/fix_bone2planck_build 
Fix bone2planck build
 2016-07-28 12:27:46 -04:00
Jack Humbert
a6d279a343 Merge pull request #569 from sethbc/fix_stanleylai_warnings 
kill warnings filling up travis buildlog
 2016-07-28 12:27:11 -04:00
Jack Humbert
36df9fd3fd Merge pull request #568 from sethbc/fix-colemak-osx-pc-no 
update NO_AMP to NO_AMPR
 2016-07-28 12:26:43 -04:00
Jack Humbert
f96a2a74ea Merge pull request #566 from SmackleFunky/master 
Allow toggling out of plover layer
 2016-07-28 12:26:11 -04:00
Callum Oakley
1eeceee355 Added readme.md for custom layout. 2016-07-28 12:15:55 +01:00
Callum Oakley
9822b9f743 Added custom keymap. 
Added custom keymap.
 2016-07-27 21:18:19 +01:00
Seth Chandler
180a3da44d remove unnecessary includes 2016-07-27 02:32:15 -04:00
Seth Chandler
95ef3f864e fix numerous errors in bone2planck keymap 2016-07-27 02:30:17 -04:00
Seth Chandler
368d0bdf68 kill warnings filling up travis buildlog 2016-07-27 02:21:09 -04:00
Seth Chandler
13bb3a7379 update NO_AMP to NO_AMPR 2016-07-27 02:06:19 -04:00
SmackleFunky
fdd07991de Allow toggling out of plover layer 2016-07-27 04:44:24 +00:00
Mazin Bokhari
3fd1c9d72b Move to keyboards 2016-07-26 22:43:04 -05:00
Jack Humbert
b66131eeb5 disable midi by default 2016-07-26 15:59:26 -04:00
Joshua T
5607b716ba Merge remote-tracking branch 'upstream/master' 2016-07-26 01:49:24 -05:00
Joshua T
876a6bdd4c Modified Atreus extend and Ergodox. 
Atreus: Removed home row Shift. It's under the thumb anyway. Also replaced dual modifier keys with macro keys (cut, copy, paste, undo).

Ergodox: Made Colemak the default layer instead of Dvorak. Also began the process of bringing it in line with the Atreus layout I've been working on.
 2016-07-26 01:44:57 -05:00
Jack Humbert
8b94e26d7c Fixes midi functionality 2016-07-24 22:07:43 -04:00
Jack Humbert
670327f1d0 Merge pull request #548 from CommandLineDesign/CMD-Preonic 
CMD keymap for Preonic
 2016-07-24 21:56:50 -04:00
Jack Humbert
384d9cd6bb Merge pull request #546 from sethbc/satan-cleanup 
Satan cleanup
 2016-07-24 21:56:23 -04:00
Erez Zukerman
4885225159 Merge pull request #534 from willwm/teckinesis 
Teckinesis for ErgoDox EZ
 2016-07-24 18:04:59 -07:00
Will Wolff-Myren
f4cb84c940 Remove images, per @ezuk request. =) 2016-07-24 14:33:17 -07:00