Commit graph

2419 commits

Author SHA1 Message Date
Stephan Bösebeck 17140ec082 added some words about the ELG in the readme 2016-04-20 11:16:29 +02:00
Stephan Bösebeck 13244a259c Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-20 11:15:59 +02:00
Jack Humbert f489ae1ac0 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-04-20 01:08:27 -04:00
Jack Humbert de4690593c fixed startup audio with a 500ms delay 2016-04-20 01:08:17 -04:00
Erez Zukerman a9ef1c0a03 Merge pull request #267 from nrrkeene/master
Improved modifier keys, code
2016-04-20 07:48:54 +03:00
Nicholas Keene 5319c2cd6e The Ordinary Layout is the layout you are looking for. Come and see. 2016-04-19 21:56:50 -05:00
Jack Humbert 462601f5e8 breaking changes - restructuring audio.c a little 2016-04-19 21:25:48 -04:00
Stephan Bösebeck f645f9946c re-created all layouts using ErgodoxLayoutGenerator 2016-04-19 23:27:10 +02:00
Stephan Bösebeck 6ff5e10592 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-19 23:07:11 +02:00
Jack Humbert a2ee277158 updated comments about plover 2016-04-19 17:03:43 -04:00
Jack Humbert 6ae34f20aa added plover to default layout 2016-04-19 17:01:04 -04:00
Jack Humbert fd49dfe5cb vibrato and polyphony paratmeters 2016-04-19 17:00:45 -04:00
Jack Humbert d3fc077fa3 Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-04-19 12:58:16 -04:00
Jack Humbert a2f31c886f getting ready for getters and setters 2016-04-19 12:58:13 -04:00
Stephan Bösebeck 04f36b3681 new overview pic 2016-04-19 15:59:43 +02:00
Jack Humbert 4e0e2504ad Merge pull request #264 from ericlathrop/patch-1
Fix typo
2016-04-19 09:54:46 -04:00
Eric Lathrop 2b38d74795 Fix typo 2016-04-19 08:49:42 -04:00
Stephan Bösebeck a16a9b30b6 added new macro for toggling and holiding layer 2016-04-19 10:37:37 +02:00
Stephan Bösebeck 0fbc52809e new experimental layout 2016-04-19 07:50:29 +02:00
Jack Humbert 78b3a88154 merging in #262 2016-04-18 21:04:29 -04:00
Jack Humbert f2c1e9ddd4 Merge pull request #262 from IBNobody/master
Fixed keyboard snoring while asleep
2016-04-18 21:03:21 -04:00
Jack Humbert e49712b559 note sliding - on right now 2016-04-18 21:01:48 -04:00
IBNobody 499e3096e9 Merge pull request #2 from IBNobody/personal_atomic_planck
Fixed speaker being on during sleep.
2016-04-18 19:48:52 -05:00
IBNobody 4b3358acc2 Fixed speaker being on during sleep. 2016-04-18 18:58:37 -05:00
IBNobody cbcf0abe62 Merge remote-tracking branch 'refs/remotes/origin/personal_atomic_planck' 2016-04-18 15:47:10 -05:00
IBNobody 4f4b5b8c18 Added CM/DK 2016-04-18 01:58:25 -05:00
Stephan Bösebeck 42fad96be5 added smly layer again 2016-04-18 08:27:58 +02:00
Stephan Bösebeck 9cc39156f7 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-18 08:03:22 +02:00
IBNobody 82ec81660e Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into personal_atomic_planck 2016-04-17 23:16:36 -05:00
IBNobody ef73ab6628 Notes Bugfix 2016-04-17 22:08:05 -05:00
Jack Humbert 89a78f4a11 audio fixes 2016-04-17 21:26:06 -04:00
Jack Humbert 5a15c113d7 Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware 2016-04-17 21:15:50 -04:00
IBNobody 5c98ad5960 Added extra songs, LED indicator notes 2016-04-17 20:14:37 -05:00
Jack Humbert d94960be5b Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard 2016-04-17 18:19:46 -04:00
Jack Humbert e0ab1dcf4c merging 2016-04-17 18:15:35 -04:00
Jack Humbert ce463ef424 audio fixes 2016-04-17 18:14:42 -04:00
Jack Humbert f1fdeddad3 Merge pull request #261 from a0-c/master
__attribute__ ((weak)) added to led_set
2016-04-17 17:47:26 -04:00
Stephan Bösebeck 6732d6cf1a new png 2016-04-17 23:04:43 +02:00
Stephan Bösebeck a9d8c61dbd new iteration, change of lower row 2016-04-17 23:02:29 +02:00
Stephan Bösebeck 6d40f7c506 added new experimental layout - works with ErgodoxLayoutGenerator 2016-04-17 22:19:47 +02:00
Stephan Bösebeck 7c3345f9b9 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-17 22:17:40 +02:00
IBNobody 23231fa577 Converted goodbye to notes, fixed eighth dotted note macro 2016-04-17 14:16:03 -05:00
Olivier edb2996299 Use aliases where available. No firmware change. 2016-04-17 20:22:07 +02:00
Olivier 920e0865b6 Commit firmware up-to-date with latest upstream qmk_firmware changes. 2016-04-17 20:00:09 +02:00
IBNobody 3103ea542f Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomic_planck 2016-04-17 12:55:19 -05:00
IBNobody d5b72e7bde Fixed many compiler warnings related to print being disabled 2016-04-17 12:54:32 -05:00
Olivier b03a9f7252 Merge https://github.com/jackhumbert/qmk_firmware 2016-04-17 19:54:06 +02:00
a0-c 90289aa53f __attribute__ ((weak)) added to led_set
__attribute__ ((weak)) added to led_set
2016-04-17 06:51:39 -10:00
IBNobody c940e87235 fixed single note play copy/paste bug 2016-04-17 10:41:07 -05:00
Jack Humbert 319fbe344b Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware 2016-04-17 10:56:12 -04:00