varl/qmk_firmware
1
0
Fork 0
forked from forks/qmk_firmware
Code Pull requests Activity
5585 commits 2 branches 1545 tags 870 MiB
Commit graph

5585 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jack Humbert cecf783e14 Merge pull request #1337 from fredizzimo/wsl_setup 
Add script for setting up Windows Subsystem for Linux
 2017-05-29 11:56:53 -04:00
Jack Humbert 988941cc0a Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-05-29 11:37:33 -04:00
Jack Humbert ee0135fb81 get rid of folders in tar 2017-05-29 11:37:20 -04:00
Jack Humbert e179dbd9e6 Merge pull request #1341 from Dbroqua/patch-3 
Update Differences-from-TMK.md
 2017-05-29 10:55:32 -04:00
Jack Humbert 7041055ace Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-05-29 10:54:56 -04:00
Jack Humbert ae6b803ad6 more than one en-file, and actually ignore docs 2017-05-29 10:54:46 -04:00
Damien 51e44fd6c5 Update Differences-from-TMK.md 
Removed fn_actions.

According this [comment](https://github.com/qmk/qmk_firmware/pull/1336#issuecomment-304634633)
 2017-05-29 13:17:23 +02: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
Fred Sundvik 78aebe0631 Update windows 10 instructions 2017-05-28 22:35:45 +03: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
Fred Sundvik 999b35c7f8 Create a symlink to qmk if requested 2017-05-28 21:38:14 +03:00
Fred Sundvik ec720ac1ea Add activate_wsl to .bashrc 2017-05-28 21:30:55 +03:00
Fred Sundvik fa4a492677 Fix symlink creation 2017-05-28 21:30:55 +03:00
Fred Sundvik 3e4f2f5590 Use unzip instead of 7zip 2017-05-28 21:30:55 +03:00
Fred Sundvik 3d3999d863 Actually install flip instead of just extracting 2017-05-28 21:30:55 +03:00
Fred Sundvik b8899b48b4 Make symlink to utils and export programmer variables 2017-05-28 21:30:55 +03:00
Fred Sundvik 9c582fc797 Add install dependencies 2017-05-28 21:30:55 +03:00
Fred Sundvik 477bd4b948 Add prompt for re-downloading the utils 2017-05-28 21:30:55 +03:00
Fred Sundvik c2096bb515 Add driver installation 2017-05-28 21:30:55 +03:00
Fred Sundvik aa26464480 Add checks for cloning to the right dir 2017-05-28 21:30:55 +03:00
Fred Sundvik 28a4e90565 Download windows flashing utils and driver_installer 2017-05-28 21:30:55 +03: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