66adbfcab5
Add default swap configs for a couple of boards.
2016-08-20 17:46:53 -07:00
b5172e3afa
Rename file following upstream folder rename.
2016-08-20 18:19:03 +02:00
009ab77d3e
Merge https://github.com/jackhumbert/qmk_firmware
2016-08-20 18:07:02 +02:00
a3f726174c
Merge pull request #665 from linsomniac/keymap_jafo
...
Adding jafo layout.
2016-08-20 11:04:54 -04:00
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
7cef0f56e9
Merge pull request #630 from nrrkeene/master
...
The Ordinary Layout is the unsurprising layout
2016-08-20 11:01:22 -04:00
e4984f65de
Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.
2016-08-19 22:45:20 -07:00
aff792545d
Changed my keymap to match normal keymaps.
2016-08-19 22:30:34 -07:00
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
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
d98e5ddf30
Tweaks after review.
2016-08-19 21:50:04 -06:00
9e03517ae5
Restructuring of the ergodox README.
2016-08-19 21:47:00 -06:00
a25480b3b5
Bringing over changes from default map.
2016-08-19 20:55:50 -06:00
da226e6126
Update keyboard readme files with new makefile instructions
2016-08-20 03:56:48 +03:00
051017c312
Split subproject make files into Makefile and rules.mk
2016-08-20 03:56:23 +03:00
44441de8ca
Split keyboard makefiles into rules and Makefile
2016-08-20 03:56:08 +03:00
30c63b1495
Noting the change directory.
2016-08-19 14:52:05 -06:00
b918aa6bab
Adding submodule note.
2016-08-19 14:49:29 -06:00
50531068b3
Adding jafo layout.
2016-08-19 14:42:41 -06:00
32216066e7
Adding nicer Infinity build instructions.
2016-08-19 14:36:41 -06:00
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
aa37a57e0f
One last change to the readme.
2016-08-18 00:38:25 -07:00
eb81978ecb
One last formatting change
2016-08-18 00:35:32 -07:00
118ad691c4
more formatting changes
2016-08-18 00:34:22 -07:00
4dd641a128
Hopefully this fixes the layout diagrams.
2016-08-18 00:27:54 -07:00
035290b7d8
Added a readme, tidied up comments in the keymap.
2016-08-18 00:22:56 -07:00
67227e4c71
Merge branch 'master' of https://github.com/Xyverz/qmk_firmware
2016-08-17 23:55:58 -07:00
ef95c10c66
Update readme.md
2016-08-17 14:55:01 -07:00
e3486caf87
Create readme.md
2016-08-17 14:54:05 -07:00
29f64d7a93
tap-dance: Major rework, to make it more reliable
...
This reworks how the tap-dance feature works: instead of one global
state, we have a state for each tap-dance key, so we can cancel them
when another tap-dance key is in flight. This fixes #527 .
Since we have a state for each key, we can avoid situation where a keyup
would mess with our global state. This fixes #563 .
And while here, we also make sure to fire events only once, and this
fixes #574 .
There is one breaking change, though: tap-dance debugging support was
removed, because dumping the whole state would increase the firmware
size too much. Any keymap that made use of this, will have to be
updated (but there's no such keymap in the repo).
Also, there's a nice trick used in this rework: we need to iterate
through tap_dance_actions in a few places, to check for timeouts, and so
on. For this, we'd need to know the size of the array. We can't discover
that at compile-time, because tap-dance gets compiled separately. We'd
like to avoid having to terminate the list with a sentinel value,
because that would require updates to all keymaps that use the feature.
So, we keep track of the highest tap-dance code seen so far, and iterate
until that index.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-17 15:05:58 +02:00
8019a074cf
minor tweaks to numpad and media layer
2016-08-14 20:43:05 -05:00
1920c290a4
Merge remote-tracking branch 'upstream/master'
2016-08-13 19:51:49 -07:00
ba7f2b1d3f
The Ordinary Layout is the unsurprising layout
2016-08-13 15:53:03 -05:00
558bf2ed07
completes first-pass at media layer
2016-08-12 19:27:44 -05:00
916d12f9fa
completes first-pass at symbol layer
2016-08-12 14:37:13 -05:00
b98d47abe5
ergodox: Update my keymap to v1.5
...
Major changes include:
* The **1HAND** layer has been removed.
* A `Delete` key is now available on the right thumb cluster.
* The **ADORE** layer received a major update, see the updated layout
image.
* It is now possible to enable automatic logging for the **ADORE**
layer, by setting the `ADORE_AUTOLOG` makefile variable to `yes` when
compiling the keymap. It is off by default.
* The `~` key and the `Media Next/Prev` key have been swapped on
the **base** layer.
* On the **ARROW** layer, `Backspace` has been replaced by `Enter`.
* There is some experimental support for entering Unicode symbols.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-12 16:36:07 +02:00
fe7b46579c
completes first-pass at base layer
2016-08-10 19:37:59 -05:00
6f700f1eb0
Adding my own layouts for the Phantom and Ergodox. My Ergodox layout adds persistent layers
...
based on the Planck and Preonic setup. The layout arrays are pulled directly from the
ergodox/ez/ez.h keymap definition starting at line 81.
2016-08-09 23:49:27 -07:00
ea8638b944
Changed left thumb back to Ctrl/Alt
...
Removed Shift from left thumb
2016-08-09 21:29:22 -05:00
fdb8a4cd65
Created keymap-specific config.h
2016-08-09 21:28:31 -05:00
5d78311612
Reverted Ergodox config.h
...
I will create a separate config.h for my keymap
2016-08-09 21:27:38 -05:00
c062b6a13d
Delete keymap.c
...
file cleanup
2016-08-08 18:52:48 -07:00
c060afe68e
Delete old_keymap.c
...
file cleanup
2016-08-08 18:47:13 -07:00
bf93fa510b
Delete readme.md
...
file cleanup, removing file that doesn't apply to my layout.
2016-08-08 18:46:34 -07:00
de1db144d0
Delete dvorak.png
...
Not reflective of my layout.
2016-08-08 18:44:09 -07:00
552399df4c
Adding my own keymaps to the following keyboards:
...
Planck, Preonic, Atreus, Ergodox
2016-08-08 18:34:08 -07:00
6df31120a1
Merge remote-tracking branch 'upstream/master'
2016-08-07 23:28:59 -05:00
79a9e04706
Merge pull request #592 from sethbc/ez-sethbc
...
Ez sethbc
2016-08-02 08:03:09 -04:00
8c52327aa6
Merge pull request #593 from J3RN/master
...
Updated the J3RN ErgoDox keymap
2016-08-02 08:02:27 -04:00
6eab4ecd7e
Merge pull request #600 from adiabatic/master
...
zweihander-osx: add left-hand-thumb tab key
2016-08-02 08:01:56 -04:00
56aa51664e
Updates ErgoDox readme
2016-08-01 21:15:01 -04:00
07a631bd5a
Thumb ⌫ into ⇥, numpad & into :, yank home/end
...
Also: add (back?) in the light-shine disabler
2016-07-31 14:21:08 -07:00
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
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
1876e100be
Updated readme with recent changes
2016-07-30 14:37:54 -04:00
17bd4ac062
Updated my keymap
2016-07-30 14:07:27 -04:00
a6ec5fa74a
rebase
2016-07-30 10:46:13 -04:00
0064f1f84c
Moved my Ergodox keymap to match upstream changes
2016-07-30 08:46:01 -05:00
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
566c79554e
Small fix for infinity include guard
2016-07-29 21:09:42 +03:00
6e8a5aca9d
Fix typo in the readme.
2016-07-29 21:09:41 +03:00
401dd09077
A couple of more Ergodox readme fixes
2016-07-29 21:09:40 +03:00
c65da1f208
Unify the ErgoDox EZ and Infinity documentation
2016-07-29 21:09:39 +03:00
44cefcb40a
Refer to the right path in the readme
2016-07-29 21:09:38 +03:00
349f189e83
Move Ergodox readme from ez subfolder to parent
2016-07-29 21:09:37 +03:00
ad416fb1a3
Include the main Makefile before including Ergodox infinity drivers
2016-07-29 21:09:37 +03:00
592ef7c6f0
Move Infinity Ergodox drivers to subproject, and fix makefile
2016-07-29 21:09:36 +03:00
37052a53f1
Remove the Infinity Ergodox default keymap
2016-07-29 21:09:35 +03:00
650298cec3
Cleanup the townk_osx config.h and make files
2016-07-29 21:09:34 +03:00
fd7f20b029
Rename supercoder config_user to config.h
...
Also fixup the include path of parent config
2016-07-29 21:09:33 +03:00
426e9ecc6f
Fix config.h include guards
2016-07-29 21:09:32 +03:00
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
1641743b9d
Change _delay_ms to wait_ms in algernon keymap
2016-07-29 21:09:21 +03:00
e7670f6d19
Move some of the Ergodox config settings to shared
2016-07-29 20:48:22 +03:00
e0f28c2b10
Add empty led control functions to Infinity Ergodox
...
So that most keymaps compiles and links
2016-07-29 20:48:21 +03:00
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
b0376687f4
All Ez keymaps compiles
2016-07-29 20:48:19 +03:00
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
Joe Wasson
Olivier
Jack Humbert
Xyverz
Nicholas Keene
Sean Reifschneider
Fred Sundvik
Gergely Nagy
Daniel
Joshua T
Erez Zukerman
Erez Zukerman
Nathan Sharfi
Jonathan Arnett
Seth Chandler