Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Clarify the quantum license (#1042) | skullydazed | 2017-03-28 | 89 | -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_layout | Jack Humbert | 2017-03-28 | 1 | -6/+6 |
|\ | | | | | Default atreus layout | ||||
| * | Merge branch 'master' into default_atreus_layout | Hugh Enxing | 2017-03-28 | 101 | -782/+4925 |
| |\ | |||||
| * | | Swapped placement of `Ctrl` and `Alt` keys to match Technomancy's | Hugh Enxing | 2017-03-24 | 1 | -6/+6 |
| | | | | | | | | | | | | default layout | ||||
* | | | Merge pull request #1139 from Swoy/master | Jack Humbert | 2017-03-28 | 4 | -0/+328 |
|\ \ \ | |_|/ |/| | | Satan Board "Admiral Strokers" keymap and config | ||||
| * | | typo removed {3 ... | Ole Anders | 2017-03-28 | 1 | -3/+2 |
| | | | |||||
| * | | fixed capitalization issue (checkTime => checktime) | Ole Anders | 2017-03-28 | 1 | -2/+4 |
| | | | |||||
| * | | moved checktime out of function | Ole Anders | 2017-03-28 | 1 | -6/+3 |
| | | | |||||
| * | | declaring checktime before the function it is used in. | Ole Anders | 2017-03-28 | 1 | -0/+1 |
| | | | |||||
| * | | fixed function to not accept any arguments. | Ole Anders | 2017-03-28 | 1 | -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 makefile | Ole Anders | 2017-03-28 | 1 | -1/+0 |
| | | | |||||
| * | | slight cleanup as per recommendation | Ole Anders | 2017-03-28 | 1 | -1/+2 |
| | | | |||||
| * | | Moved key_timer out of function. | Ole Anders | 2017-03-28 | 1 | -3/+4 |
| | | | |||||
| * | | removed a carriage return | Ole Anders | 2017-03-28 | 1 | -19/+18 |
| | | | |||||
| * | | Merge remote-tracking branch 'refs/remotes/qmk/master' | Ole Anders | 2017-03-28 | 324 | -3360/+16019 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #1174 from nooges/atreus50 | Jack Humbert | 2017-03-28 | 8 | -0/+565 |
|\ \ \ | | | | | | | | | Add Atreus50 keyboard | ||||
| * | | | Move Atreus50 to hardwired directory and update README | Danny Nguyen | 2017-03-28 | 9 | -25/+16 |
| | | | | |||||
| * | | | Add RGB support | Danny Nguyen | 2017-03-23 | 3 | -4/+4 |
| | | | | |||||
| * | | | Cleanup keymap | Danny Nguyen | 2017-03-23 | 3 | -115/+94 |
| | | | | |||||
| * | | | Initial commit for Atreus50 with working audio | Danny Nguyen | 2017-03-23 | 9 | -0/+595 |
| | |/ | |/| | |||||
* | | | Merge pull request #1112 from newsboytko/newsboytko/midi-keycodes | Jack Humbert | 2017-03-28 | 36 | -506/+1445 |
|\ \ \ | | | | | | | | | Flesh out MIDI support | ||||
| * | | | add debug messages to audio | Gabriel Young | 2017-03-02 | 1 | -158/+164 |
| | | | | |||||
| * | | | fix 'stop_all_notes' naming to be more consistent | Gabriel Young | 2017-03-02 | 6 | -7/+7 |
| | | | | |||||
| * | | | Update size estimates in the Makefile | Gabriel Young | 2017-02-25 | 2 | -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 sources | Gabriel Young | 2017-02-25 | 1 | -16/+22 |
| | | | | |||||
| * | | | Update existing keymaps | Gabriel Young | 2017-02-25 | 23 | -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 keycap | Gabriel Young | 2017-02-25 | 3 | -3/+25 |
| | | | | |||||
| * | | | Factor basic note processing into respective processors | Gabriel Young | 2017-02-25 | 9 | -83/+184 |
| | | | | |||||
| * | | | Split MIDI functionality into MIDI_BASIC and MIDI_ADVANCED | Gabriel Young | 2017-02-25 | 9 | -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 keymap | Gabriel Young | 2017-02-19 | 1 | -8/+2 |
| | | | | |||||
| * | | | Document size added by MIDI_ENABLE (~3800 bytes according to my experiments) | Gabriel Young | 2017-02-19 | 6 | -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 keymap | Gabriel Young | 2017-02-19 | 6 | -0/+180 |
| | | | | |||||
| * | | | expose midi_config | Gabriel Young | 2017-02-19 | 2 | -17/+24 |
| | | | | |||||
| * | | | add keycodes for transpose range | Gabriel Young | 2017-02-19 | 2 | -7/+48 |
| | | | | |||||
| * | | | implement modulation | Gabriel Young | 2017-02-19 | 4 | -206/+61 |
| | | | | |||||
| * | | | add support for pedal cc messages | Gabriel Young | 2017-02-19 | 2 | -15/+57 |
| | | | | |||||
| * | | | remove disabled code | Gabriel Young | 2017-02-19 | 1 | -129/+0 |
| | | | | |||||
| * | | | Alternative version with a tone array | Gabriel Young | 2017-02-19 | 1 | -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 code | Gabriel Young | 2017-02-19 | 1 | -137/+0 |
| | | | | |||||
| * | | | initial implementation of polyphony using variable length array of notes on | Gabriel Young | 2017-02-19 | 5 | -7/+211 |
| | | | | |||||
| * | | | Expand MIDI key codes | Gabriel Young | 2017-02-19 | 1 | -1/+113 |
| | | | | |||||
* | | | | Merge pull request #1098 from lambdalisue/tapping-force-hold | Jack Humbert | 2017-03-28 | 2 | -4/+8 |
|\ \ \ \ | | | | | | | | | | | Add TAPPING_FORCE_HOLD to regulate behaviour | ||||
| * | | | | Add TAPPING_FORCE_HOLD to regulate behaviour | lambdalisue | 2017-02-14 | 2 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | See #889 for the detail. | ||||
* | | | | | Merge pull request #1167 from smt/smt/satan | Jack Humbert | 2017-03-28 | 3 | -0/+163 |
|\ \ \ \ \ | | | | | | | | | | | | | Add smt keymap for Satan 'GH60' | ||||
| * | | | | | Use single _FUNC layer. Move RESET and base layout-changing keys to _FUNC. | Stephen Tudor | 2017-03-20 | 1 | -43/+12 |
| | | | | | | |||||
| * | | | | | Remove tap-dance. Raise will be accessed via holding shift while lower is active | Stephen Tudor | 2017-03-20 | 2 | -22/+11 |
| | | | | | | |||||
| * | | | | | Use normal backtick in ESC spot - I've mapped ESC to caps lock | Stephen Tudor | 2017-03-20 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Fix shift tap-dance (can't use one-shot layer) | Stephen Tudor | 2017-03-20 | 2 | -34/+12 |
| | | | | | | |||||
| * | | | | | Forsake spacefn in favor of left shift tapdance. Move media controls. | Stephen Tudor | 2017-03-10 | 1 | -24/+25 |
| | | | | | | |||||
| * | | | | | Add smt keymap for Satan 'GH60' | Stephen Tudor | 2017-03-09 | 3 | -0/+226 |
| | | | | | |