Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merging in #262 | Jack Humbert | 2016-04-18 | 3 | -254/+377 |
|\ | |||||
| * | Merge pull request #262 from IBNobody/master | Jack Humbert | 2016-04-18 | 13 | -324/+599 |
| |\ | |||||
| | * | Merge pull request #2 from IBNobody/personal_atomic_planck | IBNobody | 2016-04-18 | 2 | -226/+248 |
| | |\ | |||||
| | | * | Fixed speaker being on during sleep. | IBNobody | 2016-04-18 | 2 | -226/+248 |
| | |/ | |||||
| | * | Merge remote-tracking branch 'refs/remotes/origin/personal_atomic_planck' | IBNobody | 2016-04-18 | 46 | -575/+2373 |
| | |\ | |||||
| | | * | Added CM/DK | IBNobody | 2016-04-18 | 1 | -96/+202 |
| | | * | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into personal_... | IBNobody | 2016-04-17 | 3 | -5/+9 |
| | | |\ | | |_|/ | |/| | | |||||
| | | * | Notes Bugfix | IBNobody | 2016-04-17 | 2 | -38/+33 |
* | | | | note sliding - on right now | Jack Humbert | 2016-04-18 | 3 | -45/+63 |
* | | | | audio fixes | Jack Humbert | 2016-04-17 | 1 | -2/+2 |
* | | | | Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware | Jack Humbert | 2016-04-17 | 12 | -194/+346 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| * | | Added extra songs, LED indicator notes | IBNobody | 2016-04-17 | 12 | -194/+346 |
* | | | Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard | Jack Humbert | 2016-04-17 | 1 | -0/+1 |
|\ \ \ | |||||
| * \ \ | Merge pull request #261 from a0-c/master | Jack Humbert | 2016-04-17 | 1 | -0/+1 |
| |\ \ \ | |||||
| | * | | | __attribute__ ((weak)) added to led_set | a0-c | 2016-04-17 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | merging | Jack Humbert | 2016-04-17 | 11 | -56/+64 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Converted goodbye to notes, fixed eighth dotted note macro | IBNobody | 2016-04-17 | 5 | -11/+15 |
| * | | | Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomi... | IBNobody | 2016-04-17 | 8 | -87/+150 |
| |\| | | |||||
| * | | | Fixed many compiler warnings related to print being disabled | IBNobody | 2016-04-17 | 8 | -45/+50 |
| * | | | fixed single note play copy/paste bug | IBNobody | 2016-04-17 | 1 | -1/+1 |
* | | | | audio fixes | Jack Humbert | 2016-04-17 | 3 | -5/+9 |
* | | | | Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware | Jack Humbert | 2016-04-17 | 6 | -210/+293 |
|\| | | | |/ / |/| | | |||||
| * | | Added trimble and tempo adjustments! | IBNobody | 2016-04-17 | 6 | -110/+189 |
| * | | Adding folding to #if, etc | IBNobody | 2016-04-17 | 4 | -170/+174 |
* | | | planck default layout updates | Jack Humbert | 2016-04-17 | 4 | -70/+130 |
* | | | no need for length of play_notes array with macro | Jack Humbert | 2016-04-16 | 7 | -61/+54 |
|\| | | |||||
| * | | Fixed how note arrays are used. | IBNobody | 2016-04-16 | 5 | -47/+39 |
| * | | Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomi... | IBNobody | 2016-04-16 | 5 | -23/+37 |
| |\ \ | |||||
* | | | | Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmware | Jack Humbert | 2016-04-16 | 1 | -30/+139 |
|\| | | | |||||
| * | | | Merging with QMK main to fix rest issues | IBNobody | 2016-04-16 | 1 | -30/+139 |
| * | | | Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomi... | IBNobody | 2016-04-16 | 3 | -34/+36 |
| |\ \ \ | |||||
* | | | | | changes to play_notes, goodbye | Jack Humbert | 2016-04-16 | 6 | -22/+24 |
| |_|/ / |/| | | | |||||
* | | | | rests between notes as an argument | Jack Humbert | 2016-04-16 | 5 | -23/+37 |
* | | | | Merge pull request #260 from IBNobody/personal_atomic_planck | Jack Humbert | 2016-04-16 | 9 | -55/+645 |
|\| | | | |/ / |/| | | |||||
| * | | Adding Musical Notes | IBNobody | 2016-04-16 | 23 | -333/+1069 |
| |\ \ | |||||
| * | | | Merging with QMK main to fix audio issues | IBNobody | 2016-04-16 | 1 | -5/+17 |
| * | | | Corrected layer macros | IBNobody | 2016-04-15 | 1 | -9/+12 |
| * | | | Tweaking PVC atomic layout | IBNobody | 2016-04-15 | 3 | -31/+39 |
| * | | | Added Audio to my Atomic | IBNobody | 2016-04-15 | 6 | -175/+297 |
| * | | | Prepping for merge with new_defaults | IBNobody | 2016-04-15 | 8 | -76/+93 |
| |\ \ \ | |||||
| * \ \ \ | fixed merging | IBNobody | 2016-04-14 | 6 | -39/+205 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'remotes/jackhumbert/new_defaults' | IBNobody | 2016-04-14 | 6 | -60/+202 |
| | |\ \ \ \ | |||||
| | * | | | | | Rename pc.c to pvc_planck.c | IBNobody | 2016-04-14 | 1 | -0/+0 |
| | * | | | | | Update and rename pc_atomic.c to pvc_atomic.c | IBNobody | 2016-04-14 | 1 | -6/+0 |
| * | | | | | | adding new per-keymap makefile | IBNobody | 2016-04-14 | 3 | -28/+73 |
| * | | | | | | Checkin | IBNobody | 2016-04-14 | 3 | -9/+169 |
| * | | | | | | Adding personal build file settings | IBNobody | 2016-04-14 | 3 | -6/+6 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into pc_atomic... | IBNobody | 2016-04-14 | 0 | -0/+0 |
| |\ \ \ \ \ | |||||
| * | | | | | | Rename pc.c to pvc_planck.c | IBNobody | 2016-04-14 | 1 | -0/+0 |
| * | | | | | | Update and rename pc_atomic.c to pvc_atomic.c | IBNobody | 2016-04-14 | 1 | -6/+0 |