Commit Graph

6910 Commits (5fd400faa999bdb15240966f6246c4788c438568)

Author SHA1 Message Date
Jack Humbert e719f5b0b5 Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-08-22 10:08:44 -04:00
Jack Humbert 9da308a0cd move to compiled [skip ci] 2017-08-22 10:07:32 -04:00
keisuke333 47cd5b5622 Fix avoid certificate errors that occur during '2-setup-environment-win.bat' 2017-08-22 09:09:51 -04:00
Jack Humbert 0e39f1faf4 Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-08-22 08:57:13 -04:00
Jack Humbert dd8cedc361 update travis script 2017-08-22 08:56:39 -04:00
Jack Humbert 51a2ce6145 convert to unix line-endings [skip ci] 2017-08-22 08:56:22 -04:00
Jack Humbert 11d27cec1e attempt to fix line-ending travis stuff 2017-08-21 23:39:06 -04:00
jpetermans 7a445d9167 Add back original copyrights 2017-08-21 23:22:36 -04:00
jpetermans ff32643641 Readme correction #2 2017-08-21 23:22:36 -04:00
jpetermans dbd4ce19e9 Correct jpetermans keymap readme and update copyright info 2017-08-21 23:22:36 -04:00
Jack Humbert 9ff064ae50 triggering travis 2017-08-21 23:11:08 -04:00
Jack Humbert c3c07eff51 update building for .hex, secrets moving 2017-08-21 21:57:46 -04:00
Daniel Shields 69c4cfb238 Fix gherkin README to use correct build command. 2017-08-21 17:04:31 -04:00
Mark Spanbroek 36709d6a30 Use cmd-left and cmd-right instead of ctrl-a and ctrl-e for home and end
The ctrl commands only seem to work well in terminal, not in other apps.
2017-08-21 17:01:27 -04:00
Mark Spanbroek 1ab9e5d1c9 Remove COMPACT_KEYMAP, use full KC_ keycodes instead. 2017-08-21 17:01:27 -04:00
Mark Spanbroek f4b3b576a0 Revert "Add COMPACT_KEYMAP macro to Satan GH60"
9a1826598a1a06d87459c5bbef9db9be277bdae9
2017-08-21 17:01:27 -04:00
Mark Spanbroek dc1d24a4fe Add screen lock key 2017-08-21 17:01:27 -04:00
Mark Spanbroek 0be483c762 Fix power; use keyboard shortcut for Mac 2017-08-21 17:01:27 -04:00
Mark Spanbroek cb719757c2 Reverse the split shift/fn
Turns out that 3c and 3d are not reversed when splitting the right
shift in the way that the Mark I layout does. Reversing it here, rather
than in the generic satan.h to avoid breaking the other layouts.
2017-08-21 17:01:27 -04:00
Mark Spanbroek d172d6bec6 Add Mark I layout 2017-08-21 17:01:27 -04:00
Mark Spanbroek 90b07a5be4 Add COMPACT_KEYMAP macro to Satan GH60 2017-08-21 17:01:27 -04:00
Mark Spanbroek af21fa63e5 Fix: add missing keys to Satan GH60 KEYMAP macro 2017-08-21 17:01:27 -04:00
Stephen Tudor dde035b963 Add smt keymap for Sentraq S65-X 2017-08-21 16:59:52 -04:00
Jack Humbert e7b3991b97 fix readmes 2017-08-21 16:51:16 -04:00
Jack Humbert 1ce3971c90 adds sweet16 and four banger keyboards 2017-08-21 16:51:16 -04:00
Ben James 48e79cbe29 Create readme.md 2017-08-20 20:57:22 -04:00
Ben James 68dafc8382 Create Makefile 2017-08-20 20:57:22 -04:00
Ben James e0d9cc945f Create config.h 2017-08-20 20:57:22 -04:00
Ben James 7aa839915e Create keymap.c 2017-08-20 20:57:22 -04:00
Jack Humbert 78dc7bacfa travis files in gitignore for good measure 2017-08-20 15:20:32 -04:00
Jack Humbert fa6bcfd10c make travis convert line-endings and push a skippable commit 2017-08-20 14:22:18 -04:00
Jack Humbert 1254e76e29 stop compiling ez after build, rework ssh ids 2017-08-20 14:04:35 -04:00
Jack Humbert 166706a32c adds subatomic files (non-working) 2017-08-20 13:52:28 -04:00
Joe Wasson 948d6efcfb Fix stray keystroke in readme file. 2017-08-20 13:28:39 -04:00
Joe Wasson fe60cbd928 Remove PLAY_NOTE_ARRAY usages to get rid of warning. 2017-08-20 12:32:20 -04:00
Jack Humbert f94963e6b7 Merge pull request #1608 from hot-leaf-juice/master
keymap update
2017-08-20 11:52:57 -04:00
Joe Wasson 4b74c9056b Fix Planck Steno layout with new error message (remove MIDI). 2017-08-20 11:51:57 -04:00
Joe Wasson e74a95bf26 Keymap tweaks. 2017-08-20 11:51:57 -04:00
Joe Wasson bae1144a9f Fix compilation error when NO_ACTION_LAYER is defined. 2017-08-20 11:51:57 -04:00
Joe Wasson eb5748e8bf Gherkin keymaps for Steno and Talljoe 2017-08-20 11:51:57 -04:00
Joe Wasson bdc0880ca5 Add compile error if too many endpoints are defined for the ATmega32U4. 2017-08-20 11:51:57 -04:00
Joe Wasson fc70c9ac9e Allow steno to build when NKRO is not defined.
Was missing eeprom.h, MAX(), and memset.
2017-08-20 11:51:57 -04:00
That-Canadian 937b86d030 Added default ECO keymap 2017-08-20 11:47:46 -04:00
That-Canadian cc9b0eb109 Line ending stuff again 2017-08-20 11:47:46 -04:00
Daniel Khodabakhsh 046595f521 Update s60_x/default/rule.mk for original Sentraq S60-X
Fix and issue with the original Sentraq S60-X not being compatible with 'default'. If 'default' shouldn't be changed, perhaps I can create an 'original' revision.
2017-08-20 11:45:18 -04:00
ThreeFx 8341068299 Correct if-statement 2017-08-20 11:17:19 -04:00
ThreeFx a553dcba5a Added gentoo support for dependency script 2017-08-20 11:17:19 -04:00
Jack Humbert 5cab5e4a4e validates json 2017-08-19 08:35:14 -04:00
Jack Humbert d8145c8464 adds redirects for docs 2017-08-19 08:31:54 -04:00
Jack Humbert 81d7e7d4c8 Merge pull request #1601 from dlaroe/master
My keymaps only
2017-08-19 08:19:50 -04:00