gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-30 06:55:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,611 Commits 62 Branches 1,612 Tags 942 MiB
a75d4bd593
Commit Graph

1231 Commits

Author SHA1 Message Date
Erez Zukerman
1237025963 [Erez & Jack] Packages Space Cadet shifts into keycodes 2016-05-24 23:43:58 -04:00
Erez Zukerman
f4a426a0b1 [Erez & Jack] Documents new Leader key functionality 2016-05-24 22:37:38 -04:00
Jack Humbert
287eb7ad14 Converted audio play functions to *_user (#349) 
* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs

* Usability tweaks

* TWEAE

* nightly

added extra kcs to keymap common

* turned on Plank audio

* Added backlight breathing to atomic

* reverted accidental merge

* Added music and audio toggles to Quantum.c

* Redid the audio callbacks

* Adjusted default planck layout to use the user tone naming

* tabs to spaces

* Rewrote the ALL recipe to allow for faster parallel make

* tabs to spaces

* Renamed custom event functions to be 'startup_user' and 'shutdown_user'. Also moved the prototypes around.

* Tweaked pvc atomic layout to work with the pvc planck.

* updates midi scale calling
 2016-05-24 11:56:53 -04:00
Mazin Bokhari
8090fb82ff Initial commit of keymaps/maz with default config 2016-05-24 02:26:16 -05:00
Eric Tang
aaa758f1d3 Optimize matrix scanning (#343) 2016-05-23 23:42:21 -04:00
Peter
d66aa0abf9 adds petereichinger's planck keymap (#340) 
* Add custom keymap

* A little readme and remove old layout comments
 2016-05-20 11:14:08 -04:00
Erez Zukerman
ed349f0c3d Merge pull request #324 from Bubblepoint/master 
Add adnw/k_o_y layout
 2016-05-19 15:54:16 -04:00
Jack Humbert
b732b79b49 adapts unicode to quantum.c (#333) 
* Unicode

to have unicode input you need to:

- set your OS input method to UNICODE if needed
- enable unicode in your makefile
- copy the action_function from
keyboard/planck/keymaps/unicode/unicode.c to your keymap.c
set the target OS method in your keymap.c: void matrix_init_user() {
set_unicode_mode(UC_OSX); } you can then switch when you want with:
set_unicode_mode(UC_OSX); set_unicode_mode(UC_LNX);
set_unicode_mode(UC_WIN);
put some unicode codes in your keymap like so: UC(0x0061)
I did change the bit mask in quantum/keymap_common.c and .h
I’m afraid we will need uint32 to get a total support for all unicode
tables or relocate the handler as @mbarkhau did.

* rearranges keycode values, hooks-up unicode

* removes extra lalt ref

* adds unicode shortcuts and example
 2016-05-18 23:47:16 -04:00
Jack Humbert
0428214b90 adds music and audio toggles (#337) 
* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs

* Usability tweaks

* TWEAE

* nightly

added extra kcs to keymap common

* turned on Plank audio

* Added backlight breathing to atomic

* reverted accidental merge

* Added music and audio toggles to Quantum.c

* Redid the audio callbacks

* music/audio_on_user
 2016-05-18 23:14:00 -04:00
Jack Humbert
fe9b1482fd adds KC_NUBS, KC_NUHS and shifted versions to default keymaps 2016-05-17 22:17:23 -04:00
Jack Humbert
2425fd295a fixes default planck keymap 2016-05-16 23:08:16 -04:00
Jacob Bilger
b79400e0e9 Folders for each keymap.c file (#332) 
* Add folders to keymaps

* test

* test
 2016-05-15 01:22:51 -04:00
Jack Humbert
e2aa980ad5 cleans up default keymaps (olkb) 2016-05-15 01:07:48 -04:00
Jack Humbert
fde477a927 updates midi functionality (#331) 
* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* adds music sequencer functionality

* implements audio/music functions in quantum.c

* splits up process_action to allow independent processing of actions

* moves midi stuff to quantum.c

* adds additional scales for midi
 2016-05-15 00:51:06 -04:00
Jack Humbert
15719f3574 adds a sequencer to the music mode (#330) 
* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* adds music sequencer functionality

* implements audio/music functions in quantum.c

* Merge branch 'master' into process-record
 2016-05-15 00:40:59 -04:00
Erez Zukerman
1a8c0dd22d Leader key implementation (#326) 
* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* updates process_action functions to return bool
 2016-05-15 00:27:32 -04:00
Jacob Bilger
c7d2c79d34 adds Bilger321's planck keymap 2016-05-14 21:11:33 -04:00
Tobias Matt
26e315a6bb readme added 2016-05-14 10:04:14 +02:00
Erez Zukerman
6e72586b6b Merge pull request #320 from Townk/townkmap 
Townkmap
 2016-05-13 21:54:23 -04:00
Erez Zukerman
9746cd5323 Merge pull request #317 from Twey/master 
Updates to `keymaps/twey` to the media layer and for Plover 3.0
 2016-05-13 21:51:03 -04:00
Erez Zukerman
7b2cdca744 Merge pull request #307 from sboesebeck/master 
minor change to default layouts
 2016-05-13 21:50:28 -04:00
Tobias Matt
65645fb8ca Merge remote-tracking branch 'upstream/master' 2016-05-13 10:08:29 +02:00
cwhits
69f05e1afd [planck] adds button for toggling output in plover app (#323) 
* [planck] toggle plover output in app when toggling plover layer on keyboard

* [planck] moved plover toggle to separate key

* [planck] renamed toggle button
 2016-05-12 15:08:53 -04:00
Thiago Alves
f70dec3ee9 Remove unused variable on the keymap. 2016-05-11 14:01:15 -07:00
Stephan Bösebeck
d09d2da1c2 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-11 22:05:19 +02:00
Thiago Alves
c7d52fda9e Add an initial Readme to the keymap. 2016-05-11 13:04:53 -07:00
Thiago Alves
4a041f65e2 Tweak some key positions and changed macro location. 
After using the layout a while I learn that the - and = positions should be
swapped since I keep typing = when I intend to type -.

I also, removed the only macro from the top left on the right hand to put the
power button there and since I never use the arrow keys on the separated groups
of keys, I added 4 macros there to get a feel for it.
 2016-05-10 16:32:18 -07:00
Thiago Alves
75384689b2 Add custom config.h and revert the changes on the global one. 
Some options I defined on the config.h file don't make much sense to other
keymaps so I revert the global config.h and add those options on the keymap
custom one.
 2016-05-10 16:17:30 -07:00
James ‘Twey’ Kay
a46a0ed4f3 keymaps/twey: fix documentation 2016-05-10 22:33:06 +01:00
James ‘Twey’ Kay
373e441d86 keymaps/twey: Plover 3.0 has a standard TOGGLE keybinding; use that instead 2016-05-10 22:30:17 +01:00
James ‘Twey’ Kay
b5c5b71828 keymaps/twey: Add more history keys to media layer; stop using toggleable media layer 2016-05-10 22:23:36 +01:00
Thiago Alves
c2ffedd65c Update the .hex file on the keymap folder. 2016-05-09 15:27:57 -07:00
Thiago Alves
3e43298d79 Revert the Makefile to the original one. 
Make sure I customize things as much as possible inside the keymap itself.
 2016-05-09 15:27:57 -07:00
Thiago Alves
85f5eaec39 Change the access to the extra layer to be simetric. 
Instead of having a key on the left side for one layer and a key on the right
side for the other layer, I put two dedicated layers on each side to get to the
proper layers.
 2016-05-09 15:27:57 -07:00
Thiago Alves
6d343f3559 Add my personal keymap for OSX use. 
This keymap was created to have a feel keys on a different place and to have as
fewer layers as possible.

Currently I have only 2 extra layers and only one of them is really required to
have all possible keys available.

Check out the README.md file for more information.
 2016-05-09 15:27:57 -07:00
Jack Humbert
3f02637f4d Backlight Breathing for Planck and Atomic 
* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs

* Usability tweaks

* TWEAE

* nightly

added extra kcs to keymap common

* turned on Plank audio

* Added backlight breathing to atomic

* reverted accidental merge

* adds backlight pulse to planck
 2016-05-09 13:17:15 -04:00
Erez Zukerman
35a72ca5e1 Adds next tab/prev tab back to symb layer and updates legend 2016-05-08 13:55:30 -04:00
Erez Zukerman
2ac27dd574 A little more tweaking 2016-05-08 13:45:26 -04:00
Erez Zukerman
897396b58f Tweaks layers 1 & 2 in my experimental layout 2016-05-08 13:39:17 -04:00
Erez Zukerman
2ce9644caa Merge pull request #311 from adiabatic/ergodox-zweihander-osx 
Add KC_LABK and KC_RABK (< and >)
 2016-05-06 18:28:43 -04:00
Erez Zukerman
7566ac4241 Merge pull request #310 from nrrkeene/master 
Lock layers by pressing both shift keys
 2016-05-06 09:13:30 -04:00
Nathan Sharfi
c702a522b0 Rearrange code layer on Zweihander 
Makes it more like the iOS keyboard (and therefore easier to remember). Also adds angle brackets for HTML and comparisons.
 2016-05-06 05:47:55 -07:00
Nathan Sharfi
fc4f693cad zweihander: add ⌘X, ⌘C, ⌘V to media thumb keys 2016-05-06 05:19:17 -07:00
Nicholas Keene
481c74cc56 The Ordinary Layout is the layout you are looking for. Come and see. 2016-05-05 23:18:48 -05:00
Nicholas Keene
90a6534729 The Ordinary Layout is extraordinarily familiar and powerful 2016-05-05 23:10:51 -05:00
Erez Zukerman
78bd31f28e Uses @eltang's famous macro! Still not perfect though :( 2016-05-05 23:18:46 -04:00
Erez Zukerman
cd30f971ae [Jack & Erez] Creates a makefile.mk and a config file for the experimental layout 2016-05-05 22:24:09 -04:00
Erez Zukerman
3a9d1c4279 [Jack & Erez] Enables config_user.h per keymap 2016-05-05 22:23:32 -04:00
Jack Humbert
356dba7e61 updates atreus's column mapping 2016-05-05 12:05:09 -04:00
Stephan Bösebeck
2e02886a1e remove typo 2016-05-05 16:52:40 +02:00
Stephan Bösebeck
a096d205aa making default osx more ELG conform 2016-05-05 16:48:51 +02:00
Stephan Bösebeck
7060e10669 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-05 16:28:47 +02:00
Nicholas Keene
5daf24b1a5 The Ordinary Layout is the most natural and powerful layout for the Ergodox EZ. Come check it out. 2016-05-04 22:17:47 -05:00
Erez Zukerman
dbb1c2f281 Merge pull request #305 from nrrkeene/master 
Custom handling for shift keys, improved media layer
 2016-05-04 22:31:00 -04:00
Stephan Bösebeck
660511f050 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-04 08:03:25 +02:00
Erez Zukerman
31a697bc05 Merge pull request #304 from adiabatic/ergodox-zweihander-osx 
zweihander: comment out action_get_macro()
 2016-05-03 22:27:39 -04:00
Nathan Sharfi
6bafe44486 zweihander: comment out action_get_macro() 2016-05-03 19:19:47 -07:00
Nicholas Keene
4b74eca2a5 The Ordinary Layout is arranged as close as possible to a traditional keyboard, but with extra special features 2016-05-03 20:58:27 -05:00
Nicholas Keene
575ca2b96d The Ordinary Layout works the way you expect it to, with extra powerful features 2016-05-03 20:40:15 -05:00
IBNobody
83e1cc241e Clarified audio.c (#302) 
* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs
 2016-05-03 13:56:40 -04:00
Stephan Bösebeck
507db3ab13 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-03 08:29:55 +02:00
Nicholas Keene
8b0274f60a Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-02 21:35:58 -05:00
James ‘Twey’ Kay
1173dbd02f Swap steno/media layers to allow using media keys in the Plover layer; display all active layers, not just the top; use only momentary modifiers 2016-05-02 19:22:32 +01:00
Stephan Bösebeck
61b2b58bee Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-02 14:38:54 +02:00
Erez Zukerman
1ce6da2605 Merge pull request #298 from adiabatic/ergodox-zweihander-osx 
ergodox-zweihander-osx: initial commit
 2016-05-02 08:30:34 -04:00
Erez Zukerman
98ed12843e Merge pull request #294 from sneako/master 
Add my Ergodox EZ config
 2016-05-02 08:24:26 -04:00
Erez Zukerman
84b736dc7f Merge pull request #258 from romanzolotarev/master 
Add Roman's single layer layout based on Norman
 2016-05-02 08:24:11 -04:00
Stephan Bösebeck
0e7a3a25bb new version of the experimental layout. changed media keys in MDIA layer 2016-05-02 13:46:00 +02:00
Nicholas Keene
1076c2b122 The Ordinary Layout is the layout you are looking for. Come and see v3.14. 2016-05-01 23:16:41 -05:00
Nathan Sharfi
fe022a508f zweihander: move dim/brighten to 1/2, add ⌘Q 2016-05-01 15:12:38 -07:00
Nathan Sharfi
9b163d2feb zweihander: Add ⌘, ⌘⇧, ⌥⇥, ⌥⇧⇥ 2016-05-01 13:55:00 -07:00
Nathan Sharfi
8ec1d41a28 Ergodox EZ: add zweihander-osx.hex 2016-04-30 22:36:09 -07:00
Nathan Sharfi
262930c8d5 ergodox-zweihander: initial commit 2016-04-30 22:12:13 -07:00
Anand Babu (AB) Periasamy
ed0798de24 Beginner's keymap for Ergodox-EZ 2016-04-30 11:28:38 -07:00
Olivier
dc7b606ff1 Update firmware with latest QMK code. 2016-04-30 16:06:23 +02:00
Olivier
09ea12f9ca Merge https://github.com/jackhumbert/qmk_firmware 2016-04-30 16:03:52 +02:00
Olivier
9d48ba9713 Add a macro for Ctrl+Alt+Fx. 2016-04-30 16:01:37 +02:00
Erez Zukerman
e7d56215de Merge pull request #295 from techtomas/techtomas 
Add my layout to the list
 2016-04-30 07:42:20 -04:00
Jack Humbert
0656f2fa10 moves backlight functionality to keyboard files and updates template makefile 
previously there were two backlight.c files (bad)
 2016-04-29 22:19:40 -04:00
Jack Humbert
9ab7098c83 fixes plover start sound 2016-04-29 21:21:08 -04:00
Thomas Anderson
fb57b2e55d Added readme 2016-04-29 17:25:14 -07:00
Thomas Anderson
711809fdac Finalized my personal layout 2016-04-29 14:42:31 -07:00
Erez Zukerman
9edcfcdf6f Adds brackets to inner vertical keys in experimental layout 2016-04-29 22:39:05 +03:00
Jack Humbert
66e0323881 removes extra voices, updates .hex files 2016-04-29 12:42:55 -04:00
Jack Humbert
27d24faf39 adds condition to one last audio ref in planck default 2016-04-28 23:11:09 -04:00
skullY
ca9b85f702 Bring the clueboard firmware size down 2016-04-28 20:07:07 -07:00
sneako
b79124ac14 Adding .hex file 2016-04-28 22:20:25 -04:00
sneako
38858338f8 Add my Ergodox EZ config 2016-04-28 21:58:29 -04:00
Erez Zukerman
4f998657e9 Addresses #290 2016-04-29 04:47:06 +03:00
Tobias Matt
4122ad3f7b switch shift and enter thumb key 2016-04-28 15:09:34 +02:00
Tobias Matt
a101d9ebcd update hex file 2016-04-28 15:02:40 +02:00
Tobias Matt
d4710d8d7a shift to thumb key 2016-04-28 15:01:27 +02:00
IBNobody
ce75a7675e Updated personal layouts (#291) 2016-04-27 00:25:16 -04:00
a0-c
8fda26db7d gh60 Rev C with LED controls (#289) 
* gh60_rev_c

* gh60 Rev C

Support for WASD, Poker, Esc, FN LED clusters

* clean up spacing

* Update README.md

* Added image and pinout

* PCB image
 2016-04-26 20:05:05 -04:00
Jack Humbert
c37d52d213 resolves conflicts in rgblight.c 
# Conflicts:
#	quantum/rgblight.c
 2016-04-26 13:48:36 -04:00
Erez Zukerman
ea091e7f1b Honing in on an interval that works for me 2016-04-26 14:25:35 +03:00
Roman Zolotarev
bf925fb71c
Add Roman's layout with QWERTY 2016-04-26 16:46:43 +08:00
Roman Zolotarev
28f0b64e31
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-04-26 16:23:10 +08:00
Tobias Matt
d280a59c82 add hex file 2016-04-26 08:43:56 +02:00
Tobias Matt
0181663771 organize in subfolder 2016-04-26 08:41:17 +02:00
Bubblepoint
57789c64bd basic layout 2016-04-26 05:39:33 +02:00
Erez Zukerman
6274a216f8 [Erez & Jack] Examples for advanced macro stuff 2016-04-26 05:25:31 +03:00
Erez Zukerman
aabcfd5b4e Merge pull request #282 from jasontwong/master 
Add new keymap
 2016-04-25 06:57:00 -04:00
Jack Humbert
28352f4619 adds revisions of .hex files for planck/preonic 2016-04-25 01:01:41 -04:00
Jack Humbert
0889cc0d9a removes old .hex files 2016-04-25 01:00:34 -04:00
Jack Humbert
170d9b7d15 addresses memory limits concerns for atomic default makefile 2016-04-25 00:25:49 -04:00
Jack Humbert
9fb1e5441f updates preonic default keymap 2016-04-25 00:22:35 -04:00
Jack Humbert
130a485bf7 updates planck default keymap 2016-04-25 00:15:23 -04:00
Jason T. Wong
9f8f34119a Compiled Hex File 
The keymap file to use without compilation.
 2016-04-24 22:14:09 -04:00
IBNobody
f32f80cf32 updating personal atomic keymap (#285) 2016-04-24 22:06:59 -04:00
Erez Zukerman
68532ced24 Merge pull request #280 from Twey/master 
Add `quantum/keymap_extras/keymap_plover.h` and a keymap.
 2016-04-24 20:33:38 -04:00
James ‘Twey’ Kay
5713083e91 Add Twey's keymap 2016-04-25 01:08:36 +01:00
Jason T. Wong
93da70a43a Update keymap image 
Why:

* The transparency made it ugly.

This change addresses the need by:

* Make transparent parts white.
 2016-04-23 23:36:41 -04:00
Jack Humbert
def6853532 adds voice iteration to planck default 2016-04-23 23:30:09 -04:00
Jason T. Wong
762065578b Add new keymap 
Why:

* I want a custom keymap that suits my needs.

This change addresses the need by:

* Cloned default keymap.
* Customized layout.
* Updated README.
* Add an image created from keyboard layout editor.
 2016-04-23 23:21:13 -04:00
IBNobody
082a0f313d fixed compiler warnings (#273) 2016-04-22 01:01:38 -04:00
Eric Tang
620ac4b260 Update functions used to write to EEPROM 2016-04-21 20:07:03 -07:00
Jack Humbert
9828aba2a1 adds multiple voices and the ability to iterate/deiterate between them 2016-04-21 18:14:25 -04:00
Erez Zukerman
a8fd65d86f Merge pull request #265 from sboesebeck/master 
ErgodoxLayoutGenerator used
 2016-04-21 08:10:39 +03:00
Jack Humbert
7d1a683607 sounds for plover layout 2016-04-20 22:28:47 -04:00
Jack Humbert
157ddccc2c start-up sound working, removes tick with some devices 2016-04-20 20:11:05 -04:00
Jack Humbert
0fd093b400 there is no on 2016-04-20 18:41:10 -04:00
Jack Humbert
b0635e58eb delay isn't the problem here 2016-04-20 18:39:36 -04:00
Jack Humbert
b8c932f9aa makes the plover keymap correct 2016-04-20 18:39:17 -04:00
Stephan Bösebeck
e065ff8cba changed the macro generation of the ELG to use UP, DOWN, TYPE instead of U,D,T - makes it work with custom keycodes 2016-04-20 22:34:02 +02:00
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
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
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
e49712b559 note sliding - on right now 2016-04-18 21:01:48 -04:00
IBNobody
4b3358acc2 Fixed speaker being on during sleep. 2016-04-18 18:58:37 -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
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