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

4262 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ole Anders 1968ec4c24 changed definitions on keymap.c in admiral strokers 
Made a few changes to my own keymaps. (organisation)
 2017-03-07 19:40:18 +01:00
Ole Anders 25a7c94174 Merge remote-tracking branch 'refs/remotes/qmk/master' 2017-03-07 19:39:00 +01: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
Jimmy Chan 56d2198b3d rename I2C_MASTER_RIGHT to MASTER_RIGHT since this works for serial as well 2017-02-07 12:36:52 -08:00
Jimmy Chan 048ef311dc udpate readme to reflect QMK and not having the Makefile from ahtn's repo 2017-02-07 12:33:35 -08:00
Jimmy Chan 9c02e2ab49 correctly put eeprom EE_HANDS at addr 0x0a (decimal 10). default to rev2 project. do not default EE_HANDS for the serial keymap 
if you compare split_util.h with the original project by ahtn, the
address we look for isLeftHand config went from addr 7 to addr 10
(decimal). The EEP files were not updated.

EE_HANDS should not be enabled by default since it's more confusing for
most users
 2017-02-07 12:30:24 -08: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
Nic Aitch 3dbdd15304 Check for a new serial port every second 2017-02-06 19:57:34 -06: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
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