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

4661 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
TerryMathews 2a2be010d9 Reverse rev2 and rev2fliphalf 
Flipped definitions on what constitutes "fliphalf" by popular demand.
 2017-02-06 19:23:10 -05:00
TerryMathews 5d55a44afa Revert "Reverse rev2 and rev2fliphalf" 
This reverts commit 0537977ba1.
 2017-02-06 19:21:21 -05:00
TerryMathews 0537977ba1 Reverse rev2 and rev2fliphalf 
Flipped definitions on what constitutes "fliphalf" by popular demand.
 2017-02-06 19:14:57 -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
dungdung a7882b1ffc Added non-animated gradient mode 2017-02-06 14:18:20 -08:00
dungdung 5a1b68d562 Added mode reverse step function 2017-02-06 14:18:20 -08:00
dungdung 0e548f8b5d Christmas mode now works with even RGBED_NUM 
Added Christmas mode steps to reduce red and green colors blending into each other
Added Christmas mode interval
Increased green hue to 120
 2017-02-06 14:18:20 -08: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
Callum Oakley 21015918b4 change cmd-l and cmd-r for actual home and end 2017-02-06 12:40:32 +00:00
Ole Anders d1fb51976a Added new keymap to the Satan GH60 keyboard. 
Added new keymap `Admiral Strokers` to the Satan keyboard. This is an
ISO based layout with tap for brackets/ curly on shft and ctl keys.
Furthermore, there is added arrows and media/volume/special/f-keys layer
on the TAB button when you hold.
 2017-02-06 11:53:48 +01:00
Nikolaus Wittenstein 06d21009b2 Minor cleanup 2017-02-05 19:55:27 -05:00
Nikolaus Wittenstein 8cbf61c919 Add new DIODE_DIRECTION option 
The previous two options were COL2ROW, ROW2COL; this adds CUSTOM_MATRIX
to disable the built-in matrix scanning code.

Most notably, this obviates the need to set MATRIX_ROW_PINS or
MATRIX_COL_PINS.
 2017-02-05 19:47:33 -05:00
Nikolaus Wittenstein d961c80df2 Remove unused matrix_raw variable in matrix.c 2017-02-05 19:41:08 -05:00
milestogo b0dfb037dc Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2017-02-04 20:08:07 -08:00
Nikolaus Wittenstein 101465b6ed Add missing header to ergodox ordinary keymap 2017-02-03 21:09:50 -05:00
Nikolaus Wittenstein 3faf06c880 Fix compile warnings in egodox robot_test_layout 
Fixes the warning "right shift count >= width of type" by adding UL to
the end of constants.
 2017-02-03 21:07:24 -05:00
Nikolaus Wittenstein e667e9f6da Fix compile warnings in light_ws2812.c 
Fixes the warning "function declaration isn't a prototype" by explicitly
making the parameter list void.
 2017-02-03 21:00:13 -05:00
Erez Zukerman f0633f2540 Merge pull request #1063 from osamuaoki/master 
Typo fixes
 2017-02-02 18:33:04 -05:00
Erez Zukerman 404f79ef14 Merge pull request #1058 from edasque/master 
Reverted Dockerfile to put the CMD back
 2017-02-02 18:31:25 -05:00
Osamu Aoki f787f4291a Typo fixes 2017-02-02 23:15:08 +09:00
Luiz Ribeiro a3da586505 Fix V-USB bug on Windows 10 2017-02-01 21:57:44 -05:00
Erez Zukerman 45e5b32781 Merge pull request #1049 from SjB/tap_dance_save_oneshot_mods 
race condition between oneshot_mods and tap_dance
 2017-02-01 20:12:44 -05:00
Erez Zukerman a5d10e8c2e Merge pull request #1054 from deadcyclo/master 
Adds support for ergodox shine and unicode and emoji support to the deadcyclo layout
 2017-02-01 20:11:37 -05:00
Priyadi Iman Nurcahyo e7c4f621f1 Restrict outputselect to LUFA only for now 2017-02-01 22:30:06 +07:00
Priyadi Iman Nurcahyo 98f9a2e6df Fix wrong include 2017-02-01 20:18:52 +07:00
Priyadi Iman Nurcahyo 2bef8b5b88 Limit outputselect to AVR only for now 2017-02-01 19:37:52 +07:00
Priyadi Iman Nurcahyo 72e95809a1 Move outputselect to parent dir to satisfy non LUFA keyboards 2017-02-01 17:55:13 +07:00
Priyadi Iman Nurcahyo c17070eca5 Add layer switcher keycodes: OUT_AUTO, OUT_USB, OUT_BT, OUT_BLE 2017-02-01 15:35:21 +07:00
Brendan Johan Lee 02a95ee08c Merge remote-tracking branch 'upstream/master' 2017-02-01 08:56:35 +01:00
lucwastiaux 467e284178 increase timeout for dual mode caps key 2017-02-01 13:46:00 +08:00
Erez Zukerman f46c2b3ca0 Introduces ALGR_T for dual-function AltGr 2017-01-31 21:31:05 -05:00
Erik Dasque 407f949e4b Reverted Dockerfile to put the CMD back 2017-01-31 19:59:59 -05:00
Erez Zukerman 748316fc43 Merge pull request #1039 from zabereer/albert_ergodox_keymap 
albert ergodox keymap
 2017-01-31 19:29:19 -05:00
Erez Zukerman 0081101c30 Merge pull request #1055 from matzebond/master 
update my neo2 keymap
 2017-01-31 19:25:46 -05:00
Priyadi Iman Nurcahyo d8a9c63c26 Implement runtime selectable output (USB or BT) 2017-02-01 05:07:05 +07:00
upils f36fc1d2e5 Add reddot handwired keyboard. 2017-01-31 22:37:03 +01:00
milestogo e8ba4838d3 fixing kinesis reboot 2017-01-30 19:39:23 -08:00