summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1185 from exiva/rn42_bluetoothJack Humbert2017-03-304-2/+43
|\ | | | | Add RN42 Bluetooth module support
| * Add RN42 Bluetooth module supportTravis La Marr2017-03-294-2/+43
| | | | | | | | Added support for sending HID keycodes over the RN42/reflashed HC05 module. Tested on OS X and iOS.
* | Merge pull request #1184 from osamuaoki/masterJack Humbert2017-03-302-90/+144
|\ \ | |/ |/| Update keymap.md to QMK
| * Update to match QMK keymapOsamu Aoki2017-03-301-89/+143
| |
| * Typo fixOsamu Aoki2017-03-301-1/+1
| |
* | Merge pull request #1183 from Rovanion/real-masterJack Humbert2017-03-291-4/+17
|\ \ | | | | | | Added instructions for how to build and flash the firmware with teensy_cli
| * | Added link to the teensy linux page.Rovanion Luckey2017-03-291-2/+5
| | |
| * | Added instructions for how to build and flash the firmware with teensy_cli.Rovanion Luckey2017-01-241-4/+14
| | |
* | | Clarify the quantum license (#1042)skullydazed2017-03-2889-1293/+2172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 #1182 from henxing/default_atreus_layoutJack Humbert2017-03-281-6/+6
|\ \ \ | | | | | | | | Default atreus layout
| * \ \ Merge branch 'master' into default_atreus_layoutHugh Enxing2017-03-28101-782/+4925
| |\ \ \
| * | | | Swapped placement of `Ctrl` and `Alt` keys to match Technomancy'sHugh Enxing2017-03-241-6/+6
| | | | | | | | | | | | | | | | | | | | default layout
* | | | | Merge pull request #1139 from Swoy/masterJack Humbert2017-03-284-0/+328
|\ \ \ \ \ | |_|/ / / |/| | | | Satan Board "Admiral Strokers" keymap and config
| * | | | typo removed {3 ...Ole Anders2017-03-281-3/+2
| | | | |
| * | | | fixed capitalization issue (checkTime => checktime)Ole Anders2017-03-281-2/+4
| | | | |
| * | | | moved checktime out of functionOle Anders2017-03-281-6/+3
| | | | |
| * | | | declaring checktime before the function it is used in.Ole Anders2017-03-281-0/+1
| | | | |
| * | | | fixed function to not accept any arguments.Ole Anders2017-03-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per Pramod's comment on stack overflow: In C int foo() and int foo(void) are different functions. int foo() accepts an arbitrary number of arguments, while int foo(void) accepts 0 arguments. In C++ they mean the same thing. I suggest that you use void consistently when you mean no arguments.
| * | | | removed varable trace option from makefileOle Anders2017-03-281-1/+0
| | | | |
| * | | | slight cleanup as per recommendationOle Anders2017-03-281-1/+2
| | | | |
| * | | | Moved key_timer out of function.Ole Anders2017-03-281-3/+4
| | | | |
| * | | | removed a carriage returnOle Anders2017-03-281-19/+18
| | | | |
| * | | | Merge remote-tracking branch 'refs/remotes/qmk/master'Ole Anders2017-03-28324-3360/+16019
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1174 from nooges/atreus50Jack Humbert2017-03-288-0/+565
|\ \ \ \ \ | | | | | | | | | | | | Add Atreus50 keyboard
| * | | | | Move Atreus50 to hardwired directory and update READMEDanny Nguyen2017-03-289-25/+16
| | | | | |
| * | | | | Add RGB supportDanny Nguyen2017-03-233-4/+4
| | | | | |
| * | | | | Cleanup keymapDanny Nguyen2017-03-233-115/+94
| | | | | |
| * | | | | Initial commit for Atreus50 with working audioDanny Nguyen2017-03-239-0/+595
| | |/ / / | |/| | |
* | | | | Merge pull request #1112 from newsboytko/newsboytko/midi-keycodesJack Humbert2017-03-2836-506/+1445
|\ \ \ \ \ | | | | | | | | | | | | 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-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Fix redundant process_music.c in sourcesGabriel Young2017-02-251-16/+22
| | | | | |
| * | | | | Update existing keymapsGabriel Young2017-02-2523-19/+472
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-253-3/+25
| | | | | |
| * | | | | Factor basic note processing into respective processorsGabriel Young2017-02-259-83/+184
| | | | | |
| * | | | | Split MIDI functionality into MIDI_BASIC and MIDI_ADVANCEDGabriel Young2017-02-259-11/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | fix typos in keymapGabriel Young2017-02-191-8/+2
| | | | | |
| * | | | | Document size added by MIDI_ENABLE (~3800 bytes according to my experiments)Gabriel Young2017-02-196-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-196-0/+180
| | | | | |
| * | | | | expose midi_configGabriel Young2017-02-192-17/+24
| | | | | |
| * | | | | add keycodes for transpose rangeGabriel Young2017-02-192-7/+48
| | | | | |
| * | | | | implement modulationGabriel Young2017-02-194-206/+61
| | | | | |
| * | | | | 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 a