3920 Commits

Author SHA1 Message Date
c3469b8d21 Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware 2016-12-17 22:28:56 +01:00
c9803f78b2 Merge pull request #14 from jackhumbert/master
Merged from jackhumbert/qmk_firmware
2016-12-17 22:28:45 +01:00
df50bee5a8 Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware 2016-12-17 22:25:21 +01:00
46b93f02d5 - Added capslock key 2016-12-17 22:25:08 +01:00
8a65c640ec Adds a troubleshooting layout for resetting the EEPROM 2016-12-16 20:53:42 -05:00
df32d5b769 Removes alt/j dual function 2016-12-16 20:13:40 -05:00
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
c641e46567 QWERTZ style dot & comma, move QUOT to SCLN position 2016-12-16 01:16:55 +07:00
61ab3018c7 Merge pull request #956 from sgoodwin/master
Make keymap compile again.
2016-12-15 10:02:31 -05:00
826c929c49 Make keymap compile again. 2016-12-15 09:52:57 +01:00
36dddd45fb Merge pull request #949 from priyadi/promethium
Promethium firmware update
2016-12-15 00:03:18 -05:00
803040d4ee Merge pull request #952 from pvinis/master
update my keymap a bit
2016-12-15 00:03:02 -05:00
97f9b05efb Merge pull request #953 from priyadi/ibm_terminal
IBM Terminal M-122 converter support
2016-12-15 00:02:45 -05:00
2ba7f38bf4 Merge pull request #955 from askreet/powerDrawPerKeyboard
Allow power consumption to be set per-keyboard.
2016-12-15 00:02:19 -05:00
83e613ad23 Allow power consumption to be set per-keyboard. 2016-12-14 23:29:33 -05:00
e58304c094 My layout for M-122 terminal keyboard 2016-12-14 22:34:23 +07:00
dc49231391 Update KEYMAP macro to be consistent with the rest of QMK 2016-12-14 22:33:56 +07:00
bd5f323bec IBM Terminal M-122 converter support
Code ported from TMK to QMK.
2016-12-14 16:21:01 +07:00
e5b165c255 fine tune trackpoint initialization 2016-12-14 07:10:28 +07:00
32e952bda9 disable remote mode 2016-12-14 06:03:27 +07:00
0b54b32361 Enable Adafruit BLE support 2016-12-14 06:03:27 +07:00
9838ddcead Pretend to be Thinkpad USB Keyboard 2016-12-14 06:03:27 +07:00
a747343b61 Enable PS2 remote mode 2016-12-14 06:03:27 +07:00
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
5dce74d0ff svg bug fix and added pilcrow to hand wire 2016-12-12 22:36:16 -05:00
ae95834f5a specialise music variables 2016-12-12 16:06:41 -05:00
0edfe55bfe re-enable audio and extrakeys 2016-12-12 15:39:07 -05:00
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
6cd55d89e6 Merge pull request #945 from priyadi/planck_priyadi
Remove unneeded options to reduce firmware size
2016-12-12 00:47:29 -05:00
f2e5ca25db Merge pull request #944 from priyadi/negmousefix
Allow negative values for mouse movements
2016-12-12 00:46:59 -05:00
a30591cd53 Merge pull request #943 from lucwastiaux/master
Update dvorak_programmer layout
2016-12-12 00:46:32 -05:00
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
7bc1caa21c changed svg after merge 2016-12-10 23:18:46 -05:00
73d6018296 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-12-10 23:15:47 -05:00
56515ba503 changed svg to support proto pcb 2016-12-10 23:13:36 -05:00
a6db20e518 Remove unneeded options to reduce firmware size 2016-12-10 21:08:22 +07:00
434b286032 Allow negative values for mouse movements 2016-12-10 19:40:44 +07:00
75d7eb9cb5 put home/end on thumb cluster 2016-12-10 13:20:05 +08:00
a3c8949627 readme updates 2016-12-10 12:52:59 +08:00
9240f27ba9 Merge remote-tracking branch 'upstream/master' 2016-12-10 12:49:47 +08:00
dc4c8875ba use thumb cluster key to toggle brackets layer 2016-12-10 12:37:32 +08:00
901f29e3aa The adafruit BLE C++ code requires -std=c++11 2016-12-10 04:08:08 +07:00
13c4080a1d Merge pull request #13 from jackhumbert/master
Merged from qmk
2016-12-09 19:44:03 +01:00
9a59fee667 tap dance for some layers. one tap sysctl, two taps mouse. 2016-12-09 16:01:11 +01:00
063ade6bb5 add light for some layers 2016-12-09 16:00:46 +01:00
be2863e56d separate sysctl and mouse layers 2016-12-09 16:00:10 +01:00
d5914a4dfe add alt key 2016-12-09 14:37:22 +01:00
5d241479f5 media keys 2016-12-09 14:37:07 +01:00
985a091a73 Update readme.md 2016-12-06 09:49:05 -05:00
cd41355069 Merge pull request #936 from jackhumbert/f/shine_default
Official default factory firmware for ErgoDox EZ Shine
ergodox_ez-161205
2016-12-06 07:57:02 -05:00