aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #975 from fredizzimo/remove_temp_filesJack Humbert2016-12-301-66/+0
|\ | | | | Remove extra file that has been commited by mistake
| * Remove extra file that has been commited by mistakeFred Sundvik2016-12-291-66/+0
| |
* | Merge pull request #976 from fredizzimo/fix_makefile_on_cygwinJack Humbert2016-12-301-18/+3
|\ \ | | | | | | Fix makefile on cygwin
| * | Clean up the SKIP_GIT codeFred Sundvik2016-12-291-17/+2
| | |
| * | Remove extra parenthesis from MakefileFred Sundvik2016-12-291-1/+1
| |/ | | | | | | Cygwin had trouble running the tests
* | Merge pull request #973 from Wilba6582/keycode_refactorJack Humbert2016-12-304-314/+331
|\ \ | | | | | | Keycode refactor
| * | Keycode refactorWilba65822016-12-294-314/+331
| | |
* | | Merge pull request #971 from algernon/ergodox-ez/algernonJack Humbert2016-12-303-6/+21
|\ \ \ | | | | | | | | ergodox: Update algernon's keymap to v1.10
| * | | ergodox: Update algernon's keymap to v1.10Gergely Nagy2016-12-283-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_sysexJack Humbert2016-12-304-27/+71
|\ \ \ | | | | | | | | API Sysex fixes
| * | | API Sysex fixesFred Sundvik2016-12-294-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_compatJack Humbert2016-12-292-0/+3
|\ \ \ | |_|/ |/| | Add extern for 'led' global, set 'weak' attribute for rgblight_set()
| * | Removed errant +Scott Wilson2016-12-291-1/+1
| | |
| * | Add extern for 'led' global, set 'weak' attribute for rgblight_set()Scott Wilson2016-12-282-0/+3
| |/
* | Merge pull request #968 from ofples/bugfix/right-modifiersJack Humbert2016-12-282-0/+3
|\ \ | | | | | | Fixed bug in do_code16
| * | Added check that makes sure a code is a right modifier before considering it ↵Ofer Plesser2016-12-232-0/+3
| | | | | | | | | | | | as one
* | | Merge pull request #966 from Dbroqua/masterJack Humbert2016-12-287-111/+650
|\ \ \ | |_|/ |/| | Some updates for GH60 and Satan keyboard
| * | - Updated dbroqua layout for Satan keyboarddbroqua2016-12-241-19/+17
| | |
| * | - Added RGB layer on dbroqua GH60 layoutdbroqua2016-12-243-10/+288
| | |
| * | - Fixed bug in dbroqua layout for Satan keyboarddbroqua2016-12-222-40/+24
| | |
| * | - Fixed bad typo in dbroqua layout for gh60dbroqua2016-12-221-19/+2
| | | | | | | | | | | | - Removed unused function in dbroqua layout for gh60
| * | - Renamed dbroqua_hhkb as dbroqua for gh60 layoutdbroqua2016-12-212-0/+0
| | |
| * | - Rewrote dbroqua layout for Satan keyboard and adding RGB lightdbroqua2016-12-214-110/+170
| | |
| * | - Updated gh60 filesdbroqua2016-12-203-1/+237
| | |
* | | add different scales for music modeJack Humbert2016-12-231-0/+9
| |/ |/|
* | Christmas RGB light modeJack Humbert2016-12-232-1/+23
| |
* | Update readme.mdErez Zukerman2016-12-211-1/+1
| |
* | Update readme.mdErez Zukerman2016-12-211-5/+4
| |
* | updates readmeErez Zukerman2016-12-211-1/+4
| |
* | New default firmware graphicErez Zukerman2016-12-211-0/+0
| |
* | initial subatomic keymap (text)Jack Humbert2016-12-212-2/+280
| |
* | limit voices by default, add some drumsJack Humbert2016-12-204-25/+86
| |
* | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert2016-12-195-1859/+18050
|\ \
| * \ Merge pull request #964 from climbalima/masterJack Humbert2016-12-195-1859/+18050
| |\ \ | | | | | | | | added case stl
| | * | added case stl from se7en9057climbalima2016-12-194-0/+17931
| | | |
| | * | better switch spacing in svgclimbalima2016-12-141-1859/+119
| | | |
* | | | planck preonic updateJack Humbert2016-12-193-30/+8
| | | |
* | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareJack Humbert2016-12-1954-215/+2262
|\| | |
| * | | Merge pull request #963 from Wilba6582/fix_900Jack Humbert2016-12-192-4/+4
| |\ \ \ | | | | | | | | | | Fixes issue #900 KC_PWR not working
| | * | | Fixes issue #900Wilba65822016-12-202-4/+4
| | | | |
| * | | | Flips off MIDI and API_SYSEXErez Zukerman2016-12-192-2/+2
| |/ / /
| * | | Merge pull request #958 from pvinis/masterJack Humbert2016-12-181-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 arrowsPavlos Vinieratos2016-12-161-12/+12
| | | | |
| * | | | Merge pull request #961 from Dbroqua/masterJack Humbert2016-12-181-2/+2
| |\ \ \ \ | | | |_|/ | | |/| | Updated kc60 layout for dbroqua_hhkb
| | * | | - Revert local fail o_Odbroqua2016-12-175-0/+9
| | | | |
| | * | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua2016-12-1750-245/+2003
| | |\ \ \
| | | * \ \ Merge pull request #14 from jackhumbert/masterDamien2016-12-1750-245/+2003
| | | |\ \ \ | | | | | | | | | | | | | | Merged from jackhumbert/qmk_firmware
| | * | | | | Merge branch 'master' of https://github.com/Dbroqua/qmk_firmwaredbroqua2016-12-17191-2405/+14432
| | |\| | | |
| | | * | | | Merge pull request #13 from jackhumbert/masterDamien2016-12-09191-2405/+14432
| | | |\ \ \ \ | | | | | | | | | | | | | | | | Merged from qmk
| | * | | | | | - Added capslock keydbroqua2016-12-171-2/+2
| | |/ / / / /