Commit Graph
100 Commits
Author SHA1 Message Date
Jack Humbert 199458378b Merge pull request #1088 from Mauin/gon_nerd
add GON NerD
2017-02-11 11:48:11 -05:00
Jack Humbert bfc33a56d7 don't try to build the readme 2017-02-11 11:39:57 -05:00
Jack Humbert 835556da91 Merge pull request #1083 from VoodaGod/bone2planck
fixed readme (i swear)
2017-02-10 11:03:43 -05:00
Jack Humbert 6c462e0c01 Merge pull request #1073 from qmk/backlight_changes
Open backlight functionality to all ports
2017-02-09 20:14:35 -05:00
Jack Humbert d537120eab Merge pull request #1078 from VoodaGod/bone2planck
updated Bone2Planck Keymap, Readme & fixed Makefile
2017-02-09 10:38:46 -05:00
Jack Humbert 93ee3bea37 Merge pull request #1079 from r2d2rogers/patch-1
[Typo] correct link to default keymap in readme.
2017-02-09 10:38:09 -05:00
Jack Humbert 0a9fda968d Merge pull request #1074 from dungdung/kc60_led
Moved KC60 capslock LED code to standard led_set_kb…
2017-02-07 21:25:00 -05:00
Jack Humbert ad1327cd00 accept numbers in travis build 2017-02-07 20:51:50 -05:00
Jack Humbert f5c8c5d4c8 Merge pull request #1070 from jimmyhchan/fixSplit
Lets split readme eeprom master hand fixes
2017-02-07 15:46:29 -05:00
Jack Humbert b4e30d3929 added functionality for just a port 2017-02-07 15:23:56 -05:00
Jack Humbert d639bd2021 Merge pull request #1072 from nicinabox/improve-ls-avrdude-target
Check for Pro Micro serial port automatically
2017-02-07 13:52:03 -05:00
Jack Humbert 42ea912fde Merge pull request #1062 from luizribeiro/fix-win
Fix V-USB bug on Windows 10
2017-02-07 13:49:10 -05:00
Jack Humbert 13c394fba4 Merge pull request #1071 from dungdung/rgb_tweaks
RGB tweaks
2017-02-07 13:32:31 -05:00
Jack Humbert c0c69a1a7c Merge pull request #1068 from adzenith/master
Minor cleanup
2017-02-07 13:27:41 -05:00
Jack Humbert 3c7fa0acc1 Merge pull request #1046 from LukeSilva/master
Add Tapping Macros to QMK
2017-02-07 13:18:47 -05:00
Jack Humbert 0c2b6951a6 Merge pull request #1057 from priyadi/selectable_output
Implement runtime selectable output (USB or BT)
2017-02-07 13:12:29 -05:00
Jack Humbert de659486f5 pass through travis errors 2017-02-07 12:36:25 -05:00
Jack Humbert c256ad51bd Merge pull request #1056 from upils/master
Add reddot handwired keyboard.
2017-02-07 12:20:29 -05:00
Jack Humbert 790dab27b6 Merge pull request #1053 from TerryMathews/master
Let's Split: establish rev2fliphalf subproject
2017-02-07 12:19:45 -05:00
Jack Humbert 616b8604b0 variable scope fix for travis 2017-02-07 11:53:43 -05:00
Jack Humbert 6a92cc2897 correctly assign bash variable 2017-02-07 02:00:07 -05:00
Jack Humbert c8d5376f11 fix typo 2017-02-07 01:54:58 -05:00
Jack Humbert f79f38d726 add comma 2017-02-07 01:53:46 -05:00
Jack Humbert 2179a548f4 Merge pull request #1069 from hot-leaf-juice/master
change cmd-l and cmd-r for actual home and end
2017-02-07 01:42:30 -05:00
Jack Humbert 19d63ad72c try building only keyboards needed 2017-02-07 01:35:10 -05:00
Jack Humbert e5a2306804 Merge pull request #1041 from folkert4/master
Added Espynn's keymap
2017-02-07 00:37:23 -05:00
Jack Humbert ab07d71b22 Merge pull request #1047 from lordchair/keymap_yale
yale planck layout
2017-02-07 00:30:56 -05:00
Jack Humbert d4c88626bd Merge pull request #1048 from smt/smt/planck
Add smt's keymap for Planck
2017-02-06 20:21:42 -05:00
Jack Humbert 198a2929ed Merge pull request #1059 from qmk/hf/algr_t
Introduces ALGR_T for dual-function AltGr
2017-02-06 19:33:33 -05:00
Jack Humbert b5159c964a Merge pull request #1036 from nicinabox/lets-split-improvements
Lets Split flashing improvements
2017-02-06 19:33:07 -05:00
Jack Humbert 4348fb54d6 Merge pull request #960 from ofples/feature/combos
Keyboard combination triggers
2017-02-06 19:31:45 -05:00
Jack Humbert b6ffda4849 Merge pull request #1010 from SjB/oneshot_timeout_fix
oneshot timeout would only timeout after an event.
2017-02-06 18:57:23 -05:00
Jack Humbert 449ab9109a Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2017-02-06 18:28:50 -05:00
Jack Humbert 35edb382ee [skip build] testing travis script 2017-02-06 18:28:37 -05:00
Jack Humbert 0a3c5c06fe Merge pull request #981 from jonasoberschweiber/osx-surrogate-pairs
Add support for Unicode supplementary planes on OS X
2017-02-06 18:00:47 -05:00
Jack Humbert 5c8cdfd2b5 [skip build] testing travis script 2017-02-06 17:51:20 -05:00
Jack Humbert 246d2583ff Merge pull request #1030 from SjB/refactor_register_code16
speeding up (un)register_code16
2017-02-06 17:06:53 -05:00
Jack Humbert ee386a29d1 [skip build] testing travis script 2017-02-06 17:00:30 -05:00
Jack Humbert cf8dac3538 [skip build] testing travis script 2017-02-06 16:56:39 -05:00
Jack Humbert 98adda34c9 [skip build] testing travis script 2017-02-06 16:54:54 -05:00
Jack Humbert 470c8436c2 [skip build] testing travis script 2017-02-06 16:46:44 -05:00
Jack Humbert 3a76f24cbd [skip build] testing travis script 2017-02-06 16:42:18 -05:00
Jack Humbert 835cacb031 fixes qmk.fm linking, tests out auto version incrementing 2017-02-06 16:04:28 -05:00
Jack Humbert a28f689387 Merge pull request #869 from dylanjgscott/master
Use `type cmp` to test for cmp in Makefile
2017-01-27 11:23:02 -05:00
Jack Humbert 712f3de16f Merge pull request #1035 from qmk/qmk_org_changes
Updated urls due to transfer to qmk org
2017-01-27 00:28:46 -05:00
Jack Humbert c9ca368008 replace jackhumbert with qmk 2017-01-26 01:52:43 -05:00
Jack Humbert aac7c0aa4d Merge pull request #1029 from SjB/qmk_infinity60
fix: infinity60 keyboard was not using quantum features.
2017-01-26 01:28:44 -05:00
Jack Humbert 0212a30aa6 Merge pull request #1033 from smt/smt/preonic
Add smt's keymap for Preonic
2017-01-26 01:27:51 -05:00
Jack Humbert 1b20243092 Add gitter image, start update to qmk org 2017-01-26 01:26:17 -05:00
Jack Humbert 7e3962f36a Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2017-01-25 10:02:06 -05:00
Jack Humbert 938422ce99 layer defines to enum 2017-01-25 10:02:01 -05:00
Jack Humbert 71137deba2 Merge pull request #1014 from SjB/lcd_mods_status
added mods status bit to visualizer.
2017-01-24 00:34:55 -05:00
Jack Humbert 841d7e6a1d turn off rgb_midi in ez 2017-01-23 13:55:24 -05:00
Jack Humbert 6d377bcc9c Merge pull request #1026 from TerryMathews/master
Let's Split: More code cleanup
2017-01-23 00:33:29 -05:00
Jack Humbert 0026f4ec09 Merge pull request #1018 from hot-leaf-juice/master
simplified my keymap
2017-01-22 19:01:34 -05:00
Jack Humbert 79a823d802 Merge pull request #1020 from remigius42/master
Swiss German layout for Ergodox EZ & Infinity
2017-01-22 18:59:57 -05:00
Jack Humbert a8a1fbbac8 Merge pull request #1022 from lucwastiaux/master
Improvements to Dvorak Programmer Ergodox keymap
2017-01-22 18:59:12 -05:00
Jack Humbert a54944ac33 Merge pull request #1021 from luizribeiro/ps2avrGB
Support for ps2avrGB / winkeyless.kr boards
2017-01-22 18:58:46 -05:00
Jack Humbert 405b2ae267 Merge pull request #1023 from TerryMathews/master
Corrects Let's Split code
2017-01-22 18:57:44 -05:00
Jack Humbert 10ff962321 Merge pull request #1016 from arthurnn/patch-1
this is the atreus doc
2017-01-18 21:28:43 -05:00
Jack Humbert 3d264adfc5 Merge pull request #1013 from mitchlloyd/mitch-keymap-update
Update mitch layout for new keymaps
2017-01-17 16:38:31 -05:00
Jack Humbert 6f44885615 Merge pull request #987 from belak/belak/whitefox-initial-support
Initial whitefox support
2017-01-15 01:14:02 -05:00
Jack Humbert 81b89f8b2b Merge pull request #996 from milestogo/master
kinesis keyboard with subdirectories for different hardware - matches pull #911
2017-01-15 01:13:15 -05:00
Jack Humbert 99d0b54e5e Merge pull request #999 from deadcyclo/master
Adds layer images to the deadcyclo layout readme
2017-01-15 01:12:21 -05:00
Jack Humbert b2dcac9655 Merge pull request #1003 from mneme/master
Layout "Mneme" for Atreus62
2017-01-15 01:12:04 -05:00
Jack Humbert ff76ee8377 Merge pull request #1005 from kd0kkv/patch-1
Update keymap.c
2017-01-15 01:11:38 -05:00
Jack Humbert 5036112d39 Merge pull request #1006 from Vifon/master
Update the vifon keymap
2017-01-15 01:11:04 -05:00
Jack Humbert a896b300ec Merge pull request #1007 from bryan4887/bryan
Added Bryan's keymap
2017-01-15 01:10:39 -05:00
Jack Humbert 5521d854d0 Merge pull request #1009 from getclacking/master
Typo fix
2017-01-15 01:09:50 -05:00
Jack Humbert 7288e5ab9c Update quantum_keycodes.h 2017-01-13 14:04:51 -05:00
Jack Humbert 176b93d08e Merge pull request #994 from priyadi/unicode_mods_fix
Unregister all mods before inputting Unicode, and reregister afterwards
2017-01-08 21:12:02 -05:00
Jack Humbert 18d013b25b Merge pull request #993 from priyadi/greek_layer
Greek alphabet layer
2017-01-08 21:11:32 -05:00
Jack Humbert d8b445b03b Merge pull request #990 from replicaJunction/master
Update replicaJunction keymap
2017-01-08 21:10:42 -05:00
Jack Humbert e7df488a92 Merge pull request #989 from ishigoya/master
Keymap
2017-01-06 17:28:45 -05:00
Jack Humbert e5c7b5d8fc Merge pull request #983 from common-nighthawk/master
adds personal keymap for ergodox optimized for macOS with Vim
2017-01-04 23:41:56 -05:00
Jack Humbert 6a59dfb4c6 Merge pull request #984 from deadcyclo/master
Added the deadcyclo layout
2017-01-04 23:41:29 -05:00
Jack Humbert ad290946f2 Merge pull request #988 from jcowgar/master
Added Jeremy’s developers keymap for the Planck
2017-01-04 23:39:52 -05:00
Jack Humbert ffc1d97672 Update config.h 2017-01-02 09:57:39 -05:00
Jack Humbert 847377fb43 Merge pull request #980 from TerryMathews/master
Establish support for AMJPAD
2016-12-31 13:38:10 -05:00
Jack Humbert 6dbcc50f56 Merge pull request #975 from fredizzimo/remove_temp_files
Remove extra file that has been commited by mistake
2016-12-30 11:12:47 -05:00
Jack Humbert f98062081b Merge pull request #976 from fredizzimo/fix_makefile_on_cygwin
Fix makefile on cygwin
2016-12-30 11:08:02 -05:00
Jack Humbert 460bf008f5 Merge pull request #973 from Wilba6582/keycode_refactor
Keycode refactor
2016-12-30 11:07:17 -05:00
Jack Humbert 07e266bbc6 Merge pull request #971 from algernon/ergodox-ez/algernon
ergodox: Update algernon's keymap to v1.10
2016-12-30 11:06:21 -05:00
Jack Humbert 2eced29675 Merge pull request #974 from fredizzimo/remove_malloc_from_sysex
API Sysex fixes
2016-12-30 11:05:50 -05:00
Jack Humbert 8a76075ca7 Merge pull request #972 from mechkeys/rgb_compat
Add extern for 'led' global, set 'weak' attribute for rgblight_set()
2016-12-29 21:42:16 -05:00
Jack Humbert 223cffd92f Merge pull request #968 from ofples/bugfix/right-modifiers
Fixed bug in do_code16
2016-12-28 13:07:16 -05:00
Jack Humbert d3ec88cd07 Merge pull request #966 from Dbroqua/master
Some updates for GH60 and Satan keyboard
2016-12-28 13:04:08 -05:00
Jack Humbert 273faa4d9c add different scales for music mode 2016-12-23 20:59:00 -05:00
Jack Humbert cae269b08b Christmas RGB light mode 2016-12-23 10:29:19 -05:00
Jack Humbert 2fa36e38cf initial subatomic keymap (text) 2016-12-21 00:22:32 -05:00
Jack Humbert 438a5d685b limit voices by default, add some drums 2016-12-20 19:38:22 -05:00
Jack Humbert 53ea854462 Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2016-12-19 21:01:27 -05:00
Jack Humbert dd114e648e planck preonic update 2016-12-19 21:01:23 -05:00
Jack Humbert 29c527f0f0 Merge pull request #964 from climbalima/master
added case stl
2016-12-19 14:06:39 -05:00
Jack Humbert 101416eb82 Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2016-12-19 11:18:22 -05:00
Jack Humbert 06c64bbff3 rgb clean-up, api clean-up 2016-12-19 11:18:18 -05:00
Jack Humbert ea926369b8 Merge pull request #963 from Wilba6582/fix_900
Fixes issue #900 KC_PWR not working
2016-12-19 11:07:39 -05:00
Jack Humbert 8e28bf39d8 Merge pull request #958 from pvinis/master
make a sysctl MO button so i can quickly use the arrows
2016-12-18 20:56:20 -05:00
Jack Humbert 96cc053799 Merge pull request #961 from Dbroqua/master
Updated kc60 layout for dbroqua_hhkb
2016-12-18 20:55:52 -05:00
Jack Humbert e05fd4fc66 Merge pull request #962 from stanleylai/master
Added XD60 Support
2016-12-18 20:55:38 -05:00