mindfulminun/qmk
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity
4,153 Commits 2 Branches 1,455 Tags
011811af68baa6d0103ab289ed4737991c24f9c4
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jack Humbert b8e13167c8 Merge pull request #957 from priyadi/qwertz-dot-comma 
Update my layouts using QWERTZ style dot & comma, move QUOT to SCLN position
 2016-12-15 22:52:12 -05:00
Jack Humbert 61ab3018c7 Merge pull request #956 from sgoodwin/master 
Make keymap compile again.
 2016-12-15 10:02:31 -05:00
Jack Humbert 36dddd45fb Merge pull request #949 from priyadi/promethium 
Promethium firmware update
 2016-12-15 00:03:18 -05:00
Jack Humbert 803040d4ee Merge pull request #952 from pvinis/master 
update my keymap a bit
 2016-12-15 00:03:02 -05:00
Jack Humbert 97f9b05efb Merge pull request #953 from priyadi/ibm_terminal 
IBM Terminal M-122 converter support
 2016-12-15 00:02:45 -05:00
Jack Humbert 2ba7f38bf4 Merge pull request #955 from askreet/powerDrawPerKeyboard 
Allow power consumption to be set per-keyboard.
 2016-12-15 00:02:19 -05:00
Jack Humbert 20892bf706 Merge pull request #948 from climbalima/master 
svg bug fix and added pilcrow to hand wire
 2016-12-12 23:32:14 -05:00
Jack Humbert ae95834f5a specialise music variables 2016-12-12 16:06:41 -05:00
Jack Humbert 0edfe55bfe re-enable audio and extrakeys 2016-12-12 15:39:07 -05:00
Jack Humbert 0213acbdbe Merge pull request #946 from climbalima/master 
Changed lets split svg to support boston meetup pcb
 2016-12-12 00:47:48 -05:00
Jack Humbert 6cd55d89e6 Merge pull request #945 from priyadi/planck_priyadi 
Remove unneeded options to reduce firmware size
 2016-12-12 00:47:29 -05:00
Jack Humbert f2e5ca25db Merge pull request #944 from priyadi/negmousefix 
Allow negative values for mouse movements
 2016-12-12 00:46:59 -05:00
Jack Humbert a30591cd53 Merge pull request #943 from lucwastiaux/master 
Update dvorak_programmer layout
 2016-12-12 00:46:32 -05:00
Jack Humbert 02fa4e3ce2 Merge pull request #942 from priyadi/cpp11 
The adafruit BLE C++ code requires -std=c++11
 2016-12-12 00:46:12 -05:00
Jack Humbert 985a091a73 Update readme.md 2016-12-06 09:49:05 -05:00
Jack Humbert c87d039839 Merge pull request #921 from Wilba6582/raw_hid 
Initial version of Raw HID interface
 2016-12-05 00:13:37 -05:00
Jack Humbert 1eec2b7277 Update planck.c 2016-12-04 23:11:22 -05:00
Jack Humbert b66845ca7f Update rules.mk 2016-12-04 23:10:44 -05:00
Jack Humbert 7e4341e437 Update rules.mk 2016-12-04 23:01:07 -05:00
Jack Humbert d15d1d3833 Merge pull request #935 from priyadi/promethium 
Promethium handwired keyboard firmware update
 2016-12-04 21:07:26 -05:00
Jack Humbert dd2911151b Merge pull request #932 from climbalima/master 
Added ponoko svg for lets split
 2016-12-04 13:53:25 -05:00
Jack Humbert 082f7ed3d3 Merge pull request #933 from priyadi/ps2_mouse_init_user2 
Implemented weak ps2_mouse_init_user()
 2016-12-04 13:52:17 -05:00
Jack Humbert f39e1b5dfe cleans-up formatting of readme 2016-12-03 14:36:39 -05:00
Jack Humbert d0c667c790 Merge pull request #931 from OferPlesser/feature/improve-ps2-mouse 
Improving ps/2 mouse
 2016-12-03 10:13:11 -05:00
Jack Humbert 464f7d9687 Merge pull request #916 from wez/ble_4 
Connect the adafruit ble code to the lufa main loop
 2016-12-03 10:12:38 -05:00
Jack Humbert 7f88c9506c Merge pull request #930 from cbbrowne/master 
Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929
 2016-12-02 15:21:04 -05:00
Jack Humbert 11d263118a Merge pull request #929 from jackhumbert/hf/size-warnings 
Adds warnings to Planck keymaps that exceed 0x7000 bytes in size
 2016-12-02 15:20:44 -05:00
Jack Humbert 245c9508bd adds warnings to 4 keymaps 2016-12-02 13:32:50 -05:00
Jack Humbert e14b0e8e7e Merge pull request #881 from NoahAndrews/patch-1 
Recommend WSL on Windows 10 [Discussion]
 2016-12-02 13:22:03 -05:00
Jack Humbert 78f8fe361f Merge pull request #915 from wez/ble_3 
Add support for Adafruit BLE modules
 2016-12-02 13:14:04 -05:00
Jack Humbert 8f0a8cb7a6 Merge pull request #914 from wez/ble_2 
Add arduino-alike GPIO pin control helpers
 2016-12-02 13:12:56 -05:00
Jack Humbert ead68248c5 Merge pull request #913 from wez/ble_1 
Tidy up atomicity in timer.c and ring_buffer.h
 2016-12-02 13:12:19 -05:00
Jack Humbert 4bcec04c01 Merge pull request #924 from cbbrowne/master 
Keymapping revs, revisions to documentation on API_SYSEX_ENABLE
 2016-12-02 13:06:31 -05:00
Jack Humbert 81ea909467 Merge pull request #919 from jackhumbert/hf/robot_test_layout 
Test layout for ErgoDox EZ manufacturing robot
 2016-11-29 11:22:31 -05:00
Jack Humbert f946d830f9 guess i didnt pull 2016-11-29 00:11:11 -05:00
Jack Humbert efbc205efd Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7 2016-11-29 00:10:06 -05:00
Jack Humbert d0cefef946 enable rgblight by default for ez 2016-11-29 00:09:56 -05:00
Jack Humbert 06f18e95d4 enable api sysex for ez 2016-11-29 00:06:12 -05:00
Jack Humbert 6e0f994950 Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7 2016-11-28 23:51:07 -05:00
Jack Humbert 7edac212c8 separated into api files/folder 2016-11-26 15:38:44 -05:00
Jack Humbert 1585fc4b61 Merge pull request #908 from priyadi/promethium 
My handwired keyboard firmware
 2016-11-26 13:40:42 -05:00
Jack Humbert b5c811bde5 Merge pull request #907 from priyadi/unicode_docs 
Update Unicode documentation
 2016-11-26 12:38:48 -05:00
Jack Humbert 637170d560 Merge pull request #906 from priyadi/unicode_map_fix_warning 
fix strict-prototypes warning
 2016-11-26 12:38:10 -05:00