summaryrefslogtreecommitdiffstats
path: root/keyboards
<
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into to_pushZay9502017-03-29596-2652/+55289
|\
| * 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
| | |
| * | 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-2876-209/+3960
| | |\ \
| | * | | Swapped placement of `Ctrl` and `Alt` keys to match Technomancy'sHugh Enxing2017-03-241-6/+6
| | | | | | | | | | | | | | | | | | | | default layout
| * | | | 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-28276-2293/+14170
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 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-2820-0/+574
| | |\ \ \ | | | | | | | | | | | | Flesh out MIDI support
| | | * | | 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-2517-0/+449
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-1/+22
| | | | | |
| | | * | | Split MIDI functionality into MIDI_BASIC and MIDI_ADVANCEDGabriel Young2017-02-252-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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-194-0/+93
| | | | | |
| | * | | | Merge pull request #1167 from smt/smt/satanJack Humbert2017-03-283-0/+163
| | |\ \ \ \ | | | | | | | | | | | | | | Add smt keymap for Satan 'GH60'
| | | * | | | Use single _FUNC layer. Move RESET and base layout-changing keys to _FUNC.Stephen Tudor2017-03-201-43/+12
| | | | | | |
| | | * | | | Remove tap-dance. Raise will be accessed via holding shift while lower is activeStephen Tudor2017-03-202-22/+11
| | | | | | |
| | | * | | | Use normal backtick in ESC spot - I've mapped ESC to caps lockStephen Tudor2017-03-201-4/+4
| | | | | | |
| | | * | | | Fix shift tap-dance (can't use one-shot layer)Stephen Tudor2017-03-202-34/+12
| | | | | | |
| | | * | | | Forsake spacefn in favor of left shift tapdance. Move media controls.Stephen Tudor2017-03-101-24/+25
| | | | | | |
| | | * | | | Add smt keymap for Satan 'GH60'Stephen Tudor2017-03-093-0/+226
| | | | | | |
| | * | | | | Merge pull request #1162 from Khord/masterJack Humbert2017-03-283-0/+433
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | My customized keymap + some tunes for the song list
| | | * \ \ \ \ Merge branch 'master' of https://github.com/Khord/qmk_firmwareDylan Khor2017-03-201-4/+4
| | | |\ \ \ \ \
| | | | * | | | | Missing commaDylan Khor2017-03-191-1/+1
| | | | | | | | |
| | | | * | | | | Don't feel like tap dancing arrows anymoreDylan Khor2017-03-191-4/+4
| | | | | | | | |
| | | * | | | | | add pgup, pgdn, home, endDylan Khor2017-03-201-4/+4
| | | |/ / / / /
| | | * | | | | tap dance working for esc and arrowsDylan Khor2017-03-161-7/+15
| | | | | | | |
| | | * | | | | remove constDylan Khor2017-03-161-1/+1
| | | | | | | |
| | | * | | | | test td changesDylan Khor2017-03-162-7/+6
| | | | | | | |