Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #975 from fredizzimo/remove_temp_files | Jack Humbert | 2016-12-30 | 1 | -66/+0 |
|\ | | | | | Remove extra file that has been commited by mistake | ||||
| * | Remove extra file that has been commited by mistake | Fred Sundvik | 2016-12-29 | 1 | -66/+0 |
| | | |||||
* | | Merge pull request #976 from fredizzimo/fix_makefile_on_cygwin | Jack Humbert | 2016-12-30 | 1 | -18/+3 |
|\ \ | | | | | | | Fix makefile on cygwin | ||||
| * | | Clean up the SKIP_GIT code | Fred Sundvik | 2016-12-29 | 1 | -17/+2 |
| | | | |||||
| * | | Remove extra parenthesis from Makefile | Fred Sundvik | 2016-12-29 | 1 | -1/+1 |
| |/ | | | | | | | Cygwin had trouble running the tests | ||||
* | | Merge pull request #973 from Wilba6582/keycode_refactor | Jack Humbert | 2016-12-30 | 4 | -314/+331 |
|\ \ | | | | | | | Keycode refactor | ||||
| * | | Keycode refactor | Wilba6582 | 2016-12-29 | 4 | -314/+331 |
| | | | |||||
* | | | Merge pull request #971 from algernon/ergodox-ez/algernon | Jack Humbert | 2016-12-30 | 3 | -6/+21 |
|\ \ \ | | | | | | | | | ergodox: Update algernon's keymap to v1.10 | ||||
| * | | | ergodox: Update algernon's keymap to v1.10 | Gergely Nagy | 2016-12-28 | 3 | -6/+21 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Miscellaneous ============= * `µ` can now be entered with UCIS. * `™` can now be entered with UCIS. Tools ===== * `tools/hid-commands` can now find Banshee, and prefers it over Kodi. * `tools/hid-commands` can now find Chrome too, not juts Chromium. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> | ||||
* | | | Merge pull request #974 from fredizzimo/remove_malloc_from_sysex | Jack Humbert | 2016-12-30 | 4 | -27/+71 |
|\ \ \ | | | | | | | | | API Sysex fixes | ||||
| * | | | API Sysex fixes | Fred Sundvik | 2016-12-29 | 4 | -27/+71 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | Fix memory leaks by using stack instead of malloc Reduce memory usage by having less temporary bufffers Remove warnings by adding includes Decrease code size by 608 bytes (mostly due to not linking malloc) More robust handling of buffer overflows | ||||
* | | | Merge pull request #972 from mechkeys/rgb_compat | Jack Humbert | 2016-12-29 | 2 | -0/+3 |
|\ \ \ | |_|/ |/| | | Add extern for 'led' global, set 'weak' attribute for rgblight_set() | ||||
| * | | Removed errant + | Scott Wilson | 2016-12-29 | 1 | -1/+1 |
| | | | |||||
| * | | Add extern for 'led' global, set 'weak' attribute for rgblight_set() | Scott Wilson | 2016-12-28 | 2 | -0/+3 |
| |/ | |||||
* | | Merge pull request #968 from ofples/bugfix/right-modifiers | Jack Humbert | 2016-12-28 | 2 | -0/+3 |
|\ \ | | | | | | | Fixed bug in do_code16 | ||||
| * | | Added check that makes sure a code is a right modifier before considering it ↵ | Ofer Plesser | 2016-12-23 | 2 | -0/+3 |
| | | | | | | | | | | | | as one | ||||
* | | | Merge pull request #966 from Dbroqua/master | Jack Humbert | 2016-12-28 | 7 | -111/+650 |
|\ \ \ | |_|/ |/| | | Some updates for GH60 and Satan keyboard | ||||
| * | | - Updated dbroqua layout for Satan keyboard | dbroqua | 2016-12-24 | 1 | -19/+17 |
| | | | |||||
| * | | - Added RGB layer on dbroqua GH60 layout | dbroqua | 2016-12-24 | 3 | -10/+288 |
| | | | |||||
| * | | - Fixed bug in dbroqua layout for Satan keyboard | dbroqua | 2016-12-22 | 2 | -40/+24 |
| | | | |||||
| * | | - Fixed bad typo in dbroqua layout for gh60 | dbroqua | 2016-12-22 | 1 | -19/+2 |
| | | | | | | | | | | | | - Removed unused function in dbroqua layout for gh60 | ||||
| * | | - Renamed dbroqua_hhkb as dbroqua for gh60 layout | dbroqua | 2016-12-21 | 2 | -0/+0 |
| | | | |||||
| * | | - Rewrote dbroqua layout for Satan keyboard and adding RGB light | dbroqua | 2016-12-21 | 4 | -110/+170 |
| | | | |||||
| * | | - Updated gh60 files | dbroqua | 2016-12-20 | 3 | -1/+237 |
| | | | |||||
* | | | add different scales for music mode | Jack Humbert | 2016-12-23 | 1 | -0/+9 |
| |/ |/| | |||||
* | | Christmas RGB light mode | Jack Humbert | 2016-12-23 | 2 | -1/+23 |
| | | |||||
* | | Update readme.md | Erez Zukerman | 2016-12-21 | 1 | -1/+1 |
| | | |||||
* | | Update readme.md | Erez Zukerman | 2016-12-21 | 1 | -5/+4 |
| | | |||||
* | | updates readme | Erez Zukerman | 2016-12-21 | 1 | -1/+4 |
| | | |||||
* | | New default firmware graphic | Erez Zukerman | 2016-12-21 | 1 | -0/+0 |
| | | |||||
* | | initial subatomic keymap (text) | Jack Humbert | 2016-12-21 | 2 | -2/+280 |
| | | |||||
* | | limit voices by default, add some drums | Jack Humbert | 2016-12-20 | 4 | -25/+86 |
| | | |||||
* | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware | Jack Humbert | 2016-12-19 | 5 | -1859/+18050 |
|\ \ | |||||
| * \ | Merge pull request #964 from climbalima/master | Jack Humbert | 2016-12-19 | 5 | -1859/+18050 |
| |\ \ | | | | | | | | | added case stl | ||||
| | * | | added case stl from se7en9057 | climbalima | 2016-12-19 | 4 | -0/+17931 |
| | | | | |||||
| | * | | better switch spacing in svg | climbalima | 2016-12-14 | 1 | -1859/+119 |
| | | | | |||||
* | | | | planck preonic update | Jack Humbert | 2016-12-19 | 3 | -30/+8 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmware | Jack Humbert | 2016-12-19 | 54 | -215/+2262 |
|\| | | | |||||
| * | | | Merge pull request #963 from Wilba6582/fix_900 | Jack Humbert | 2016-12-19 | 2 | -4/+4 |
| |\ \ \ | | | | | | | | | | | Fixes issue #900 KC_PWR not working | ||||
| | * | | | Fixes issue #900 | Wilba6582 | 2016-12-20 | 2 | -4/+4 |
| | | | | | |||||
| * | | | | Flips off MIDI and API_SYSEX | Erez Zukerman | 2016-12-19 | 2 | -2/+2 |
| |/ / / | |||||
| * | | | Merge pull request #958 from pvinis/master | Jack Humbert | 2016-12-18 | 1 | -12/+12 |
| |\ \ \ | | | | | | | | | | | make a sysctl MO button so i can quickly use the arrows | ||||
| | * | | | make a sysctl MO button so i can quickly use the arrows | Pavlos Vinieratos | 2016-12-16 | 1 | -12/+12 |
| | | | | | |||||
| * | | | | Merge pull request #961 from Dbroqua/master | Jack Humbert | 2016-12-18 | 1 | -2/+2 |
| |\ \ \ \ | | | |_|/ | | |/| | | Updated kc60 layout for dbroqua_hhkb | ||||
| | * | | | - Revert local fail o_O | dbroqua | 2016-12-17 | 5 | -0/+9 |
| | | | | | |||||
| | * | | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware | dbroqua | 2016-12-17 | 50 | -245/+2003 |
| | |\ \ \ | |||||
| | | * \ \ | Merge pull request #14 from jackhumbert/master | Damien | 2016-12-17 | 50 | -245/+2003 |
| | | |\ \ \ | | | | | | | | | | | | | | | Merged from jackhumbert/qmk_firmware | ||||
| | * | | | | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware | dbroqua | 2016-12-17 | 191 | -2405/+14432 |
| | |\| | | | | |||||
| | | * | | | | Merge pull request #13 from jackhumbert/master | Damien | 2016-12-09 | 191 | -2405/+14432 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | Merged from qmk | ||||
| | * | | | | | | - Added capslock key | dbroqua | 2016-12-17 | 1 | -2/+2 |
| | |/ / / / / |