darkkirb/qmk_firmware
1
0
Fork 0
forked from mirrors/qmk_firmware
Code Issues Pull requests Projects Releases Packages Wiki Activity
5567 commits 52 branches 1475 tags 279 MiB
Commit graph

5567 commits

This branch
This branch
All branches
Author SHA1 Message Date
Priyadi Iman Nurcahyo
f0fc2db4e2 Adafruit Feather BLE / BLE Friend mouse buttons support 2017-05-29 18:17:21 +07:00
Erez Zukerman
80707d529c Merge pull request #1338 from qmk/hf/prevent_stuck_mods 
Adds prevent stuck modifiers to EZ default
 2017-05-28 20:14:36 -04:00
Erez Zukerman
41fa638aa8 Adds prevent stuck modifiers to EZ default 2017-05-28 20:05:37 -04:00
Jack Humbert
71feac5717 ignore docs, fix tag/hex pushing 2017-05-28 16:16:56 -04:00
Jack Humbert
de0a058da7 Merge pull request #1336 from Dbroqua/patch-2 
Update Differences-from-TMK.md
 2017-05-28 14:47:57 -04:00
Damien
b2010cd478 Update Differences-from-TMK.md 
Hello,

I'm not sure but it seems to be uint8_t for TMK/fn_actions (cf. https://github.com/tmk/tmk_keyboard/blob/master/README.md ).

Regards,
Damien
 2017-05-28 19:17:22 +02:00
Jack Humbert
d0d81eecef Merge pull request #1334 from fredizzimo/fix_faq_lineending 
Fix line endings in FAQ.md
 2017-05-28 12:12:47 -04:00
Fred Sundvik
623b1cd866 Fix line endings in FAQ.md 2017-05-28 12:28:02 +03:00
Jack Humbert
b8c1f25072 Updates book.json 
Auto commit by GitBook Editor
 2017-05-27 22:24:53 +00:00
Jack Humbert
931ad66ffa Updates book.json 
Auto commit by GitBook Editor
 2017-05-27 22:23:09 +00:00
Jack Humbert
2003cee609 Updates book.json 
Auto commit by GitBook Editor
 2017-05-27 22:21:58 +00:00
Jack Humbert
c3bdddb637 move book for gitbook 2017-05-27 18:20:46 -04:00
Jack Humbert
c95f08c439 Updates docs/book.json 
Auto commit by GitBook Editor
 2017-05-27 22:19:38 +00:00
Jack Humbert
7e84b0e3b3 move old doc to docs 2017-05-27 18:14:21 -04:00
Jack Humbert
704794bae3 subtree docs 2017-05-27 18:09:52 -04:00
Jack Humbert
e229dcadb5 Merge pull request #5 from Maartenwut/patch-1 
Mention that TT needs 5 taps by default.
 2017-05-27 11:03:34 -04:00
Jack Humbert
bb2a8c3611 Updates book.json 
Auto commit by GitBook Editor
 2017-05-27 14:56:13 +00:00
Maarten Dekkers
e7fccabb1c Mention that TT needs 5 taps by default. 
Also gave an example of defining the amount of taps needed.
 2017-05-27 12:34:16 +02:00
Jack Humbert
d24da945d1 Merge pull request #1319 from Johannes-Larsson/master 
Add planck/johannes layout
 2017-05-26 18:33:25 -04:00
Jack Humbert
453877422b Merge pull request #1327 from Dbroqua/master 
Added Integration of IBM Trackpoint
 2017-05-26 18:32:43 -04:00
Jack Humbert
9851e6f3b1 Merge pull request #1328 from yiancar/qmk_usb_startup_disable 
Use variable to disable usb check at startup
 2017-05-26 18:31:23 -04:00
Jack Humbert
492115a611 Merge pull request #4 from Dbroqua/master 
Update Modding-your-keyboard.md
 2017-05-26 18:30:41 -04:00
yiancar
fa1b92fbb1 Use variable to disable usb check at startup 
Adds a define variable which when defined disables the usb startup
check. Modified the makefile to separate above define from bluetooth
dependancy
 2017-05-26 21:58:43 +01:00
Damien
6d12588cdf Merge pull request #1 from Dbroqua/patch-1 
Update Modding-your-keyboard.md
 2017-05-26 22:16:09 +02:00
dbroqua
6b994ecd82 - Added schematic for Trackpoint demonstration 2017-05-26 21:27:11 +02:00
dbroqua
81e85a1a4e - Added integration of IBM Trackpoint 2017-05-26 20:35:31 +02:00
Damien
6a0b13191b Update Modding-your-keyboard.md 
Updated `USART version` chapter.

I think there were 2 `#endif` too .
 2017-05-26 16:00:48 +02:00
Damien
0a4a966c66 Merge pull request #22 from qmk/master 
Merge from QMK
 2017-05-26 15:57:08 +02:00
Jack Humbert
b003669934 Merge pull request #3 from fieldju/patch-1 
Fix typo in Macro.md in dynamic macro section.
 2017-05-24 23:43:34 -04:00
Justin Field
a9ef02105d Fix typo in Macro.md in dynamic macro section. 2017-05-24 20:13:03 -07:00
Johannes Larsson
6d08de5c67 readme, media keys fix 2017-05-24 21:35:31 +02:00
Johannes Larsson
e4f1b238b3 revert changes to config.h 2017-05-24 21:24:13 +02:00
Jack Humbert
7a4ec3bd92 Merge pull request #1316 from nikchi/master 
FrostyFlake Keymap
 2017-05-24 13:59:30 -04:00
Johannes Larsson
690957cdbd media keys and stuff 2017-05-24 19:00:56 +02:00
Nick Choi
006ba4bf36 moved unicodemap rules to localer make 2017-05-24 12:36:36 -04:00
Johannes Larsson
b9cf386b21 Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-05-24 17:58:11 +02:00
Erez Zukerman
ad420e7205 Merge pull request #1317 from qmk/hf/faster_mouse 
tweaks default mouse speed constants
 2017-05-24 05:09:29 -07:00
Erez Zukerman
a965e5b735 tweaks default mouse speed constants 2017-05-24 07:56:41 -04:00
Nick Choi
ef1714f443 more emoji function comments 2017-05-24 00:35:04 -04:00
Nick Choi
6536b1ce2a Tap dancing emoji support 😩😩 2017-05-23 23:52:48 -04:00
Erez Zukerman
e90a00c88c then some code blocks 2017-05-23 23:09:19 -04:00
Erez Zukerman
870aaa0a7e pipes without backtics 2017-05-23 23:06:35 -04:00
Erez Zukerman
be4ece0f3e grrr 2017-05-23 23:05:19 -04:00
Erez Zukerman
9359abf33e surrounds stuff with backticks 2017-05-23 23:03:30 -04:00
Erez Zukerman
260ddd3290 quick table tweak 2017-05-23 22:58:35 -04:00
Nick Choi
b3eeb9d84a removed s 2017-05-23 18:47:06 -04:00
Nick Choi
0e174fcb48 Merge branch 'master' of https://github.com/nikchi/qmk_firmware 2017-05-23 13:13:23 -04:00
Nick Choi
3ed2147a88 preonic map 2017-05-23 13:13:20 -04:00
Nick Choi
ec86fac6ee Merge pull request #1 from qmk/master 
pull new to mine
 2017-05-23 13:08:44 -04:00
Johannes Larsson
4f1007952b merge 2017-05-22 15:27:57 +02:00