Fred Sundvik
2e3834edea
Merge remote-tracking branch 'upstream/master' into makefile_overhaul
2016-08-24 10:37:02 +03:00
IBNobody
a902206735
Nightly
...
Prep for Vision build
2016-08-23 23:05:35 -05:00
IBNobody
5d685efa49
Merge remote-tracking branch 'refs/remotes/origin/master' into vision_division_dev
2016-08-23 20:53:21 -05:00
dbroqua
d19c0d46d9
Merge remote-tracking branch 'upstream/master'
2016-08-23 20:39:01 +02:00
Jack Humbert
a920548471
Merge pull request #677 from SmackleFunky/master
...
Virtual Serial Port - and a Layout that uses that virtual serial port for Plover
2016-08-23 11:05:26 -04:00
dbroqua
e65252d591
Merge remote-tracking branch 'upstream/master'
...
# Conflicts:
# keyboards/planck/keymaps/dbroqua/keymap.c
2016-08-23 13:39:49 +02:00
René Werner
6a61c89477
added my personal keymap
...
I ported my keymap from tmk to QMK.
2016-08-23 13:20:59 +02:00
René Werner
d28942f5d7
Merge branch 'kitten_paw'
2016-08-23 12:17:39 +02:00
René Werner
06c82a063b
Fixed wrong keycode in default keymap
...
Where I used KC_MENU I should have used KC_APP instead.
2016-08-23 12:15:29 +02:00
Jason Green
7009112752
move to ergodox-ez only
2016-08-23 07:04:55 +00:00
Fred Sundvik
feebc58d32
Split kitten_paw into Makefile/rules.mk
2016-08-23 09:42:11 +03:00
Fred Sundvik
8f2af3c6bc
Merge branch 'master' into makefile_overhaul
2016-08-23 09:38:05 +03:00
Jason Green
104ca8a5e1
Remove unneeded include
2016-08-23 04:49:05 +00:00
Jason Green
ec62cbe384
add missing #include
2016-08-23 04:32:40 +00:00
Jack Humbert
fb4452c2f5
Merge pull request #671 from Talljoe/one-hand
...
Add native one-handed support
2016-08-23 00:29:46 -04:00
Jack Humbert
3824fa0014
Merge pull request #675 from Xyverz/master
...
Added missing item K3A to KEYMAP() variable in tv44.h
2016-08-23 00:27:23 -04:00
Jack Humbert
9ca4c9f57f
Merge pull request #676 from ickerwx/kitten_paw
...
Added support for the Kitten Paw controller
2016-08-23 00:26:59 -04:00
Jason Green
86656690f1
TxBolt (Steno) Serial protocol for Ergodox Ez
2016-08-23 04:17:34 +00:00
dbroqua
92fe78a5ea
- Added PrintScreen key on multimedia layer
2016-08-22 21:19:03 +02:00
René Werner
a26ee57eb8
Added support for the Kitten Paw controller
...
This adds support for the 2016 revision of the Kitten Paw [1] replacement
controller by Bathroom Epiphanies.
[1] http://bathroomepiphanies.com/controllers/
2016-08-22 20:34:29 +02:00
Sean Reifschneider
0418ecc073
Changes from review by @fredizzimo and @Xyverz
2016-08-22 10:26:18 -06:00
IBNobody
705c775a4a
Nightly
...
Only major change to qmk was the addition of A0-A7 pins for the AT90USB
2016-08-21 22:05:55 -05:00
Xyverz
02f4e5b064
Merge remote-tracking branch 'upstream/master'
2016-08-21 19:02:32 -07:00
Xyverz
364b77563c
Added missing key K3A to KEYMAP() macro in tv44.h
2016-08-21 18:59:10 -07:00
dbroqua
d7b6d74842
- Inverted key Tab and Esc
...
- Reorganised bottom row
2016-08-21 23:20:24 +02:00
Kyle Berry
30de8663a9
Fixing Dvorak
...
Updating with proper Dvorak layout.
2016-08-21 14:01:43 -07:00
Joe Wasson
c20bf83afd
Add one-hand key to planck/experimental keymap.
2016-08-20 18:47:06 -07:00
Joe Wasson
66adbfcab5
Add default swap configs for a couple of boards.
2016-08-20 17:46:53 -07:00
IBNobody
4807feec8a
In Progress Merge
2016-08-20 14:49:16 -05:00
IBNobody
5febdb0a3c
Initial Commmit
2016-08-20 10:26:36 -05: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
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
d98e5ddf30
Tweaks after review.
2016-08-19 21:50:04 -06:00
Sean Reifschneider
9e03517ae5
Restructuring of the ergodox README.
2016-08-19 21:47:00 -06:00
Sean Reifschneider
a25480b3b5
Bringing over changes from default map.
2016-08-19 20:55:50 -06:00
Fred Sundvik
da226e6126
Update keyboard readme files with new makefile instructions
2016-08-20 03:56:48 +03:00
Fred Sundvik
051017c312
Split subproject make files into Makefile and rules.mk
2016-08-20 03:56:23 +03:00
Fred Sundvik
44441de8ca
Split keyboard makefiles into rules and Makefile
2016-08-20 03:56:08 +03: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
30c63b1495
Noting the change directory.
2016-08-19 14:52:05 -06:00
Sean Reifschneider
b918aa6bab
Adding submodule note.
2016-08-19 14:49:29 -06:00
Sean Reifschneider
50531068b3
Adding jafo layout.
2016-08-19 14:42:41 -06:00
Sean Reifschneider
32216066e7
Adding nicer Infinity build instructions.
2016-08-19 14:36:41 -06:00
zs
a1da23d827
Add the workman-dead layout for kc60
2016-08-19 21:59:08 +02:00
dbroqua
b9a284352e
- Moved Insert/Del in Esc layer
2016-08-19 21:10:07 +02:00
dbroqua
11aa19a626
- Updated lower and raise layer
2016-08-19 21:00:24 +02:00
dbroqua
c6e733afce
- Added readme file and layout preview
2016-08-19 14:17:07 +02:00
dbroqua
b4f23b146f
- Moved Home/End/PgUp/PgDn on arrow keys
2016-08-19 14:01:37 +02: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
dbroqua
31120ed166
- Moved Brite function on esc to avoid conflict with ctrl key.
2016-08-19 09:39:25 +02:00
dbroqua
578b7e969e
- Updated dbroqua layout for planck keyboard
2016-08-19 09:19:55 +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
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
8f32595820
Merge pull request #650 from Xyverz/master
...
Minor changes to keymaps and other files
2016-08-18 10:31:17 -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
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
f4f80a0e3a
Merge pull request #645 from algernon/f/tap-dance/buffering
...
tap-dance rework
2016-08-17 21:15:29 -04:00
Jack Humbert
1442a882d4
Merge pull request #640 from toneman77/iso_satan
...
heavily modified spacefn layout for iso boards using the satan PCB
2016-08-17 21:11:59 -04:00
Jack Humbert
f59b61332f
Merge pull request #638 from premek/master
...
Split layout for planck
2016-08-17 21:11:02 -04:00
Xyverz
ef95c10c66
Update readme.md
2016-08-17 14:55:01 -07:00
Xyverz
e3486caf87
Create readme.md
2016-08-17 14:54:05 -07:00
Toni
c024de4a87
wring keypress for german iso fixed. prettified
2016-08-17 15:33:14 +02:00
Gergely Nagy
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
Toni
8e142d8cbe
no more warning thanks to iFreilicht's tip with undef
2016-08-16 17:35:03 +02:00