summaryrefslogtreecommitdiffstats
path: root/quantum
Commit message (Collapse)AuthorAgeFilesLines
* Worked around some new Makefile issues.nielsenz2017-03-303-1/+3
|
* Pulling and pushing troublesnielsenz2017-03-302-75/+15
|
* Typo fixOsamu Aoki2017-03-301-1/+1
|
* Merge branch 'master' into to_pushZay9502017-03-2992-1705/+5330
|\
| * Clarify the quantum license (#1042)skullydazed2017-03-2884-280/+1220
| | | | | | | | | | | | | | | | | | | | * Clarify the license for files we have signoff on * Update against the currently signed off files * Remove unused and not clearly licensed headers * Replace an #endif I accidentally removed while resolving merge conflicts
| * Merge pull request #1112 from newsboytko/newsboytko/midi-keycodesJack Humbert2017-03-2813-486/+834
| |\ | | | | | | Flesh out MIDI support
| | * add debug messages to audioGabriel Young2017-03-021-158/+164
| | |
| | * fix 'stop_all_notes' naming to be more consistentGabriel Young2017-03-026-7/+7
| | |
| | * Update size estimates in the MakefileGabriel Young2017-02-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MIDI_ENABLE = no text data bss dec hex filename 0 17080 0 17080 42b8 satan_midi.hex MIDI_ENABLE = yes MIDI_BASIC undefined MIDI_ADVANCED undefined text data bss dec hex filename 0 19494 0 19494 4c26 satan_midi.hex +2414 bytes (vs. MIDI_ENABLE = no) MIDI_ENABLE = yes 0 20846 0 20846 516e satan_midi.hex +1352 bytes (vs. MIDI_ENABLE = yes, MIDI_BASIC off, MIDI_ADVANCED off) MIDI_ENABLE = yes #define MIDI_BASIC #define MIDI_ADVANCED text data bss dec hex filename 0 21292 0 21292 532c satan_midi.hex +1798 bytes (vs. MIDI_ENABLE = yes, MIDI_BASIC off, MIDI_ADVANCED off) Conclusion: +2400 to 4200, depending on config
| | * Update existing keymapsGabriel Young2017-02-256-19/+23
| | | | | | | | | | | | | | | | | | Update existing keymaps to enable MIDI_BASIC functionality. Also added an option MIDI_ENABLE_STRICT to be strict about keycode use (which also reduces memory footprint at runtime)
| | * Add basic layer to sample MIDI keycapGabriel Young2017-02-252-2/+3
| | |
| | * Factor basic note processing into respective processorsGabriel Young2017-02-258-83/+183
| | |
| | * Split MIDI functionality into MIDI_BASIC and MIDI_ADVANCEDGabriel Young2017-02-255-8/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MIDI_ENABLE = no text data bss dec hex filename 0 17080 0 17080 42b8 satan_midi.hex MIDI_ENABLE = yes MIDI_BASIC undefined MIDI_ADVANCED undefined text data bss dec hex filename 0 19494 0 19494 4c26 satan_midi.hex MIDI_ENABLE = yes #define MIDI_BASIC MIDI_ADVANCED undefined text data bss dec hex filename 0 19788 0 19788 4d4c satan_midi.hex MIDI_ENABLE = yes MIDI_BASIC undefined #define MIDI_ADVANCED text data bss dec hex filename 0 20846 0 20846 516e satan_midi.hex MIDI_ENABLE = yes #define MIDI_BASIC #define MIDI_ADVANCED text data bss dec hex filename 0 21140 0 21140 5294 satan_midi.hex
| | * Document size added by MIDI_ENABLE (~3800 bytes according to my experiments)Gabriel Young2017-02-193-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | satan/keymaps/midi MIDI_ENABLE = no text data bss dec hex filename 0 17080 0 17080 42b8 satan_midi.hex MIDI_ENABLE = yes #define MIDI_TONE_KEYCODE_OCTAVES 3 // default text data bss dec hex filename 0 20846 0 20846 516e satan_midi.hex MIDI_ENABLE = yes #define MIDI_TONE_KEYCODE_OCTAVES 2 // fewer octaves text data bss dec hex filename 0 20846 0 20846 516e satan_midi.hex
| | * Allow customization of the number of tone keycodes and add example keymapGabriel Young2017-02-192-0/+87
| | |
| | * expose midi_configGabriel Young2017-02-192-17/+24
| | |
| | * add keycodes for transpose rangeGabriel Young2017-02-192-7/+48
| | |
| | * implement modulationGabriel Young2017-02-193-205/+60
| | |
| | * add support for pedal cc messagesGabriel Young2017-02-192-15/+57
| | |
| | * remove disabled codeGabriel Young2017-02-191-129/+0
| | |
| | * Alternative version with a tone arrayGabriel Young2017-02-191-0/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tone array: text data bss dec hex filename 0 25698 0 25698 6462 satan_newsboytko.hex 0x6480 bytes written into 0x7000 bytes memory (89.73%). note on array: text data bss dec hex filename 0 25802 0 25802 64ca satan_newsboytko.hex 0x6500 bytes written into 0x7000 bytes memory (90.18%).
| | * clean up commented codeGabriel Young2017-02-191-137/+0
| | |
| | * initial implementation of polyphony using variable length array of notes onGabriel Young2017-02-193-2/+201
| | |
| | * Expand MIDI key codesGabriel Young2017-02-191-1/+113
| | |
| * | Merge pull request #1162 from Khord/masterJack Humbert2017-03-281-0/+27
| |\ \ | | | | | | | | My customized keymap + some tunes for the song list
| | * | added custom tonesDylan Khor2017-03-161-0/+27
| | | |
| * | | Refactor Bluetooth HandlingTravis La Marr2017-03-242-11/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored Bluetooth support to make adding new Bluetooth modules easier in the future. * Remove `OUT_BLE` key from QMK's keymap. `OUT_BT` is all we need now as there's no difference anymore. * Made BLUETOOTH_ENABLE build option legacy as not to break existing keymaps (Falls back to existing EZ Key support if on) * Removed `ADAFRUIT_BLE_ENABLE` build option * Created new build option `BLUETOOTH` with module option (Currently `AdafruitEZKey` & `AdafruitBLE`) * Moved all LUFA bluetooth key/mouse events under `BLUETOOTH_ENABLE` ifdef with selected modules output.
| * | Merge pull request #1090 from qmk/backlight_softpwmJack Humbert2017-03-152-14/+46
| |\ \ | | | | | | | | Adds soft PWM backlight for non-timed ports
| | * | helps to save before committingJack Humbert2017-02-191-3/+1
| | | |
| | * | mergingJack Humbert2017-02-1917-450/+691
| | |\|
| | * | adds soft pwm for non-timed portsJack Humbert2017-02-122-14/+46
| | | |
| * | | Left control and altLukas Stiebig2017-03-081-0/+2
| | | | | | | | | | | | | | | | Use the left control and the left alt key.
| * | | Merge pull request #1117 from priyadi/fix_unicode_mapJack Humbert2017-02-231-4/+6
| |\ \ \ | | |_|/ | |/| | Fix UNICODE_MAP input_mode problem
| | * | Fix UNICODE_MAP input_mode problemPriyadi Iman Nurcahyo2017-02-231-4/+6
| | | |
| * | | remove more warningsJack Humbert2017-02-161-1/+3
| |/ /
| * | fix travis and reduce warningsJack Humbert2017-02-162-0/+2
| | |
| * | fix weirdness with arm and modsJack Humbert2017-02-152-19/+20
| | |
| * | unique variable nameJack Humbert2017-02-152-19/+19
| | |
| * | publicise variablesJack Humbert2017-02-152-4/+3
| | |
| * | add unicode common file, get names rightJack Humbert2017-02-151-0/+86
| | |
| * | add unicode common file, get names rightJack Humbert2017-02-156-209/+134
| | |
| * | split up unicode systems into different filesJack Humbert2017-02-158-237/+251
| | |
| * | give error if both unicode/map are enabledJack Humbert2017-02-151-0/+3
| | |
| * | adds layer tap toggleJack Humbert2017-02-152-4/+12
| | |
| * | Add keycodes to turn on, turn off and toggle faux clickyPriyadi Iman Nurcahyo2017-02-133-0/+43
| | |
| * | Implement faux-clicky featurePriyadi Iman Nurcahyo2017-02-133-0/+156
| |/
| * Merge pull request #1082 from priyadi/right-side-dual-functionJack Humbert2017-02-113-10/+24
| |\ | | | | | | Implement tap mod dual role for right side mods.
| | * Make room for 'loose keycodes' by halving UNICODE_MAP rangePriyadi Iman Nurcahyo2017-02-111-2/+2
| | |
| | * Implement tap mod dual role for right side mods.Priyadi Iman Nurcahyo2017-02-103-9/+23
| | |
| * | added functionality for just a portJack Humbert2017-02-071-32/+62
| |/