megamanmalte/qmk_firmware
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
6556 commits 1 branch 0 tags 275 MiB
Commit graph

6556 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Stanley Lai 5834d4b262 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-12-18 15:35:59 -08:00
Stanley Lai 91913146db Added XD60 support 2016-12-18 15:35:03 -08:00
Stanley Lai b49d7800ae Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-12-17 13:49:13 -08:00
dbroqua e9f69ff46e - Revert local fail o_O 2016-12-17 22:33:45 +01:00
dbroqua c3469b8d21 Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware 2016-12-17 22:28:56 +01:00
Damien c9803f78b2 Merge pull request #14 from jackhumbert/master 
Merged from jackhumbert/qmk_firmware
 2016-12-17 22:28:45 +01:00
dbroqua df50bee5a8 Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware 2016-12-17 22:25:21 +01:00
dbroqua 46b93f02d5 - Added capslock key 2016-12-17 22:25:08 +01:00
Erez Zukerman 8a65c640ec Adds a troubleshooting layout for resetting the EEPROM 2016-12-16 20:53:42 -05:00
Erez Zukerman df32d5b769 Removes alt/j dual function 2016-12-16 20:13:40 -05:00
Ofer Plesser 40abf8bc9c Moved combo processing lower down in process logic 2016-12-16 22:00:29 +02:00
Ofer Plesser 6a462c818c Merge branch 'master' into feature/combos 2016-12-16 21:52:51 +02:00
Ofer Plesser 6e7cfa83b9 Refactored as well as added support for action keys in combos 2016-12-16 21:50:28 +02:00
Pavlos Vinieratos 34d6f07d2c make a sysctl MO button so i can quickly use the arrows 2016-12-16 09:46:03 +01: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
Priyadi Iman Nurcahyo c641e46567 QWERTZ style dot & comma, move QUOT to SCLN position 2016-12-16 01:16:55 +07:00
Jack Humbert 61ab3018c7 Merge pull request #956 from sgoodwin/master 
Make keymap compile again.
 2016-12-15 10:02:31 -05:00
Samuel Ryan Goodwin 826c929c49
Make keymap compile again. 2016-12-15 09:52:57 +01: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
Kyle Smith 83e613ad23 Allow power consumption to be set per-keyboard. 2016-12-14 23:29:33 -05:00
climbalima 16483409cf better switch spacing in svg 2016-12-14 23:11:04 -05:00
lucwastiaux ebe351a690 enable brackets using the - key on the right, and cleanups 2016-12-15 07:22:31 +08:00
Priyadi Iman Nurcahyo e58304c094 My layout for M-122 terminal keyboard 2016-12-14 22:34:23 +07:00
Priyadi Iman Nurcahyo dc49231391 Update KEYMAP macro to be consistent with the rest of QMK 2016-12-14 22:33:56 +07:00
Priyadi Iman Nurcahyo bd5f323bec IBM Terminal M-122 converter support 
Code ported from TMK to QMK.
 2016-12-14 16:21:01 +07:00
xyverz 0523657923 Merge remote-tracking branch 'upstream/master' 2016-12-13 18:06:49 -08:00
xyverz 592b90dd22 Changes 2016-12-13 18:05:45 -08:00
Priyadi Iman Nurcahyo e5b165c255 fine tune trackpoint initialization 2016-12-14 07:10:28 +07:00
Priyadi Iman Nurcahyo 32e952bda9 disable remote mode 2016-12-14 06:03:27 +07:00
Priyadi Iman Nurcahyo 0b54b32361 Enable Adafruit BLE support 2016-12-14 06:03:27 +07:00
Priyadi Iman Nurcahyo 9838ddcead Pretend to be Thinkpad USB Keyboard 2016-12-14 06:03:27 +07:00
Priyadi Iman Nurcahyo a747343b61 Enable PS2 remote mode 2016-12-14 06:03:27 +07: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
climbalima 5dce74d0ff svg bug fix and added pilcrow to hand wire 2016-12-12 22:36:16 -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
climbalima 7bc1caa21c changed svg after merge 2016-12-10 23:18:46 -05:00
climbalima 73d6018296 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-12-10 23:15:47 -05:00
climbalima 56515ba503 changed svg to support proto pcb 2016-12-10 23:13:36 -05:00