jowj/jlj-qmk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,087 Commits 1 Branch 0 Tags 122 MiB
523dff3005
Commit Graph

3087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Sundvik
523dff3005 Merge branch 'master' into makefile_overhaul 2016-08-25 23:26:02 +03:00
Jack Humbert
4321f0af7d Merge pull request #659 from Dbroqua/master 
- Updated dbroqua layout for planck keyboard
 2016-08-25 15:49:50 -04:00
dbroqua
8d0aed39d1 - Added capslock led for KC60 keyboard (based on gitbug.com/jpec/kc60 works) 2016-08-25 20:39:55 +02:00
Jack Humbert
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
Jack Humbert
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
Jack Humbert
6f6f745385 Merge pull request #682 from jeebak/jd45-jeebak 
Port jeebak's Planck keymap to JD45
 2016-08-25 11:33:14 -04:00
Jack Humbert
5728d1c9f2 Merge pull request #680 from replicaJunction/layout-atreus-replicaJunction 
Added replicaJunction keymap
 2016-08-25 11:27:55 -04:00
IBNobody
34eeea787c Fixed naming of Analog pins to differentiate them from DIO pins used by Quantum Matrix 2016-08-25 08:16:18 -05:00
René Werner
22ef0bbac5 Merge remote-tracking branch 'upstream/master' into kitten_paw 2016-08-25 12:27:29 +02:00
René Werner
1bbd3c1eea fixed defaulf keymap, added my own keymap 
now the LEDs are working like they should
 2016-08-25 12:25:57 +02:00
JeeBak Kim
94597a27c5 Make the "extra" key in the top row another backspace 2016-08-25 03:06:42 -07:00
Damien
c51862b237 Merge pull request #1 from jackhumbert/master 
Merge from jackhumbert
 2016-08-25 08:58:04 +02:00
dbroqua
c34399c592 - Updated kc60/readme 
- Added layout examples for kc60
 2016-08-25 08:29:30 +02:00
JeeBak Kim
9c0c8c307d [jd45] Port jeebak's planck keymap to jd45 2016-08-24 22:34:03 -07:00
JeeBak Kim
601feed87e [jd45] Add "jeebak" keymap folder as a copy of the "default" folder 2016-08-24 22:23:24 -07:00
IBNobody
8423601ea1 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into vision_division_dev 2016-08-25 00:16:15 -05:00
IBNobody
936a26d04f Added pin support for A0-A7 
Vision Division - It works!
 2016-08-25 00:15:41 -05:00
Joshua T
a72d46d1ec Added replicaJunction keymap 2016-08-24 23:58:59 -05:00
dbroqua
e6dcb8de8c - Fixed layout for kc60 2016-08-24 22:22:14 +02:00
dbroqua
5979051de3 - Updated kc60.h for 2x 1u backspace (K49) 
- Added dbroqua layout
 2016-08-24 21:53:49 +02:00
Jack Humbert
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
Jack Humbert
d2990645ca Merge pull request #646 from nclundsten/master 
fix ergodox ez link
 2016-08-24 11:14:21 -04:00
Gergely Nagy
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
dbroqua
235d47e747 - Updated readme by adding link on kle for each layer 2016-08-24 12:57:32 +02:00
Fred Sundvik
2e3834edea Merge remote-tracking branch 'upstream/master' into makefile_overhaul 2016-08-24 10:37:02 +03:00
Fred Sundvik
7c9fff59d0 Fix slight inconsistency 
When running make from either a keyboard folder or a subproject
it runs all keymaps for all subprojects and the selected subproject
respectively. Without this fix, the same doesn't happen if your
run make clean for example. As it would just provide you with an
error message. Now this will work as expected.
 2016-08-24 10:29:01 +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
IBNobody
9263ade0fb Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-08-23 20:52:19 -05:00
IBNobody
6c2b7f359c Fixed line ending 2016-08-23 20:47:35 -05:00
IBNobody
3f8672287f Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-08-23 20:45:06 -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
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
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
Jason Green
80d10bef07 Added USB Virtual Serial support 2016-08-23 04:16:35 +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