a732003bfd
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-08-26 12:13:50 -04:00
2c8f6557e6
Merge pull request #664 from linsomniac/infinity_readme
...
Adding nicer Infinity build instructions.
2016-08-26 07:32:24 -04:00
17511870bc
Merge pull request #685 from fredizzimo/windows10_instructions_typo
...
Fix minor typo in the readme
2016-08-26 07:29:12 -04:00
86ece64176
Fix minor typo in the readme
2016-08-25 23:54:05 +03:00
4321f0af7d
Merge pull request #659 from Dbroqua/master
...
- Updated dbroqua layout for planck keyboard
2016-08-25 15:49:50 -04:00
8d0aed39d1
- Added capslock led for KC60 keyboard (based on gitbug.com/jpec/kc60 works)
2016-08-25 20:39:55 +02:00
f0cb5e9e50
Merge pull request #683 from ickerwx/master
...
LEDs work now, fixed Kitten Paw default keymap, added my own keymap as a better example
2016-08-25 12:22:28 -04:00
8ebe9c446c
Merge pull request #681 from IBNobody/vision_division_dev
...
Added Port A Pin Mapping / Added Vision Division (WIP)
2016-08-25 11:40:51 -04:00
6f6f745385
Merge pull request #682 from jeebak/jd45-jeebak
...
Port jeebak's Planck keymap to JD45
2016-08-25 11:33:14 -04:00
5728d1c9f2
Merge pull request #680 from replicaJunction/layout-atreus-replicaJunction
...
Added replicaJunction keymap
2016-08-25 11:27:55 -04:00
34eeea787c
Fixed naming of Analog pins to differentiate them from DIO pins used by Quantum Matrix
2016-08-25 08:16:18 -05:00
22ef0bbac5
Merge remote-tracking branch 'upstream/master' into kitten_paw
2016-08-25 12:27:29 +02:00
1bbd3c1eea
fixed defaulf keymap, added my own keymap
...
now the LEDs are working like they should
2016-08-25 12:25:57 +02:00
94597a27c5
Make the "extra" key in the top row another backspace
2016-08-25 03:06:42 -07:00
c51862b237
Merge pull request #1 from jackhumbert/master
...
Merge from jackhumbert
2016-08-25 08:58:04 +02:00
c34399c592
- Updated kc60/readme
...
- Added layout examples for kc60
2016-08-25 08:29:30 +02:00
9c0c8c307d
[jd45] Port jeebak's planck keymap to jd45
2016-08-24 22:34:03 -07:00
601feed87e
[jd45] Add "jeebak" keymap folder as a copy of the "default" folder
2016-08-24 22:23:24 -07:00
8423601ea1
Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into vision_division_dev
2016-08-25 00:16:15 -05:00
936a26d04f
Added pin support for A0-A7
...
Vision Division - It works!
2016-08-25 00:15:41 -05:00
a72d46d1ec
Added replicaJunction keymap
2016-08-24 23:58:59 -05:00
7c2a24b315
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
2016-08-24 17:47:09 -04:00
9778349c4b
More notes
2016-08-24 17:47:01 -04:00
e6dcb8de8c
- Fixed layout for kc60
2016-08-24 22:22:14 +02:00
5979051de3
- Updated kc60.h for 2x 1u backspace (K49)
...
- Added dbroqua layout
2016-08-24 21:53:49 +02:00
0dfd1712bb
Making the existing firmware link better
2016-08-24 09:30:29 -06:00
7debe7cd77
Changes based on @fredizzimo review, flashing Infinity details
2016-08-24 09:26:41 -06:00
ad206155aa
Merge pull request #679 from algernon/h/ucis/subproject-fix
...
quantum: Move qk_ucis_state to process_unicode.c
2016-08-24 11:21:17 -04:00
d2990645ca
Merge pull request #646 from nclundsten/master
...
fix ergodox ez link
2016-08-24 11:14:21 -04:00
a058ae40e2
quantum: Move qk_ucis_state to process_unicode.c
...
In order to not declare the same variable in multiple objects (which
happens when building UCIS-enabled keymap for both the ErgoDox EZ and
the ErgoDox Infinity), move the declaration to the .c file, and keep
only an extern reference in the header.
Many thanks to @fredizzimo for spotting the error in Travis, and
suggesting the fix.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-24 15:39:23 +02:00
235d47e747
- Updated readme by adding link on kle for each layer
2016-08-24 12:57:32 +02:00
a902206735
Nightly
...
Prep for Vision build
2016-08-23 23:05:35 -05:00
5d685efa49
Merge remote-tracking branch 'refs/remotes/origin/master' into vision_division_dev
2016-08-23 20:53:21 -05:00
9263ade0fb
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
2016-08-23 20:52:19 -05:00
6c2b7f359c
Fixed line ending
2016-08-23 20:47:35 -05:00
3f8672287f
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
2016-08-23 20:45:06 -05:00
d19c0d46d9
Merge remote-tracking branch 'upstream/master'
2016-08-23 20:39:01 +02:00
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
e65252d591
Merge remote-tracking branch 'upstream/master'
...
# Conflicts:
# keyboards/planck/keymaps/dbroqua/keymap.c
2016-08-23 13:39:49 +02:00
6a61c89477
added my personal keymap
...
I ported my keymap from tmk to QMK.
2016-08-23 13:20:59 +02:00
d28942f5d7
Merge branch 'kitten_paw'
2016-08-23 12:17:39 +02:00
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
7009112752
move to ergodox-ez only
2016-08-23 07:04:55 +00:00
104ca8a5e1
Remove unneeded include
2016-08-23 04:49:05 +00:00
ec62cbe384
add missing #include
2016-08-23 04:32:40 +00:00
fb4452c2f5
Merge pull request #671 from Talljoe/one-hand
...
Add native one-handed support
2016-08-23 00:29:46 -04:00
57125ce790
Merge pull request #673 from coderkun/master
...
Add method to set Unicode input key for ISO 14755
2016-08-23 00:28:01 -04:00
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
9ca4c9f57f
Merge pull request #676 from ickerwx/kitten_paw
...
Added support for the Kitten Paw controller
2016-08-23 00:26:59 -04:00
86656690f1
TxBolt (Steno) Serial protocol for Ergodox Ez
2016-08-23 04:17:34 +00:00
cbbrowne
Erez Zukerman
Fred Sundvik
Jack Humbert
dbroqua
IBNobody
René Werner
JeeBak Kim
Damien
Joshua T
Sean Reifschneider
Gergely Nagy
Jason Green