Commit Graph

5653 Commits

Author SHA1 Message Date
Stick
4cf17210b6 moved alt out from under space 2017-06-02 19:51:29 -05:00
Stick
4ba9917f82 Merge remote-tracking branch 'upstream/master' 2017-06-02 19:50:54 -05:00
Jack Humbert
aaa67f6930 Merge pull request #1357 from shieldsd/gherkin
Initial commit for gherkin keyboard support. Compiles but untested.
2017-06-02 10:23:54 -04:00
Daniel Shields
7cbd16c902 Initial commit for gherkin keyboard support. Compiles but untested. 2017-06-02 14:45:42 +01:00
Jack Humbert
eefec19ad9 Update Keycodes.md 2017-06-02 09:44:08 -04:00
Jack Humbert
af931368ce Merge pull request #1356 from fabienheureux/patch-1
Broken Keymap docs link
2017-06-02 09:21:15 -04:00
Jack Humbert
47c209fa02 Update Keycodes.md 2017-06-02 09:21:01 -04:00
fabienheureux
19816a4998 Broken Keymap docs link 2017-06-02 10:51:12 +02:00
Jack Humbert
9069edd934 Merge pull request #1347 from nooges/nyquist
Add Nyquist keyboard support
2017-06-01 12:58:33 -04:00
Jack Humbert
d548693c8b Merge pull request #1294 from shieldsd/master
Prevent the recording of looping dynamic macros.
2017-06-01 12:18:36 -04:00
Daniel Shields
606e13a47e Prevent the recording of looping dynamic macros.
If a macro play key is inadvertently recorded in a dynamic macro
a loop is created and the macro will not terminate when played.

This should be prevented.
2017-06-01 16:29:58 +01:00
Jack Humbert
ec3e684123 Merge pull request #1350 from originerd/add-originerd-planck-keymap
Add originerd planck keymap
2017-06-01 11:19:40 -04:00
Jack Humbert
05e6dd6527 Merge pull request #1351 from Alfrheim/fixing_dvorak_layout
replacing one R for a T
2017-06-01 11:19:20 -04:00
Jack Humbert
cf77c42c72 Merge pull request #1353 from 333fred/333fred-layout
ergodox/333fred layout
2017-06-01 11:18:56 -04:00
Jack Humbert
cc52856bac Merge pull request #1354 from shieldsd/tweaks
Tweak reported power consumption to work with iOS
2017-06-01 11:18:28 -04:00
Danny Nguyen
aae727d9ec Update keymap layout comments 2017-06-01 11:15:21 -04:00
Daniel Shields
db0ac3bcb3 Tweak reported power consumption to work with iOS 2017-06-01 09:18:33 +01:00
Danny Nguyen
db82b17d6e Remove OLED code and set I2C rate back to 100kHz 2017-06-01 01:26:06 -04:00
Fredric Silberberg
dded79a412
Update licensing on visualizer.c 2017-05-31 18:07:02 -07:00
Fredric Silberberg
cfaf34daec
Updated readme 2017-05-31 17:57:38 -07:00
Fredric Silberberg
aa1b1c5756
Added several new macros 2017-05-31 17:42:50 -07:00
Fredric Silberberg
f35c82ccb2
Fixed numpad 0 layout 2017-05-31 10:27:39 -07:00
Alfrheim
974a77a07c replacing one R for a T 2017-05-31 15:19:37 +02:00
Jitae Kim
c33c2bbade Add originerd planck keymap 2017-05-31 22:00:44 +09:00
Fredric Silberberg
4eba71841e
Use code blocks for keyboard layouts 2017-05-30 23:56:28 -07:00
Fredric Silberberg
95ae256482
Completed iteration 1 of my layout 2017-05-30 23:52:20 -07:00
Jack Humbert
57cfb5f1ae Merge pull request #1348 from Dbroqua/master
Added DK60 keyboard
2017-05-30 23:12:11 -04:00
Fredric Silberberg
949540d601
Added initial keymap files 2017-05-30 18:01:09 -07:00
dbroqua
c5d3faace5 Merge remote-tracking branch 'origin/feature/DK60' 2017-05-30 23:10:14 +02:00
dbroqua
a381eb01f5 - Updated copyright 2017-05-30 23:09:39 +02:00
Danny Nguyen
7a433a7f3d Update copyright info 2017-05-30 16:52:02 -04:00
Danny Nguyen
fbec02c148 Remove Let’s Split plate files 2017-05-30 16:42:04 -04:00
Damien Broqua
061bb4a0b8 Merge remote-tracking branch 'origin/feature/DK60' 2017-05-30 22:17:20 +02:00
Damien Broqua
05f5243426 - Updated readme 2017-05-30 22:17:03 +02:00
Damien Broqua
55d6750254 Merge remote-tracking branch 'origin/feature/DK60' 2017-05-30 22:15:07 +02:00
Damien Broqua
e280f7aad7 - Added Capslock/Esc led 2017-05-30 22:13:34 +02:00
Jack Humbert
328bde1624 Merge pull request #1323 from nikchi/master
Variable tapping terms
2017-05-30 15:38:22 -04:00
Nick Choi
3c4022c41b hmm? 2017-05-30 14:19:57 -04:00
Nick Choi
2c9f846608 Merge pull request #2 from qmk/master
pull in new qmk changes
2017-05-30 14:17:48 -04:00
Danny Nguyen
be204f9cdd Update readme 2017-05-30 13:29:30 -04:00
Jack Humbert
cb791cf6cd Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-05-30 12:49:38 -04:00
Jack Humbert
9ecfc23292 make qmk bot do the hard work 2017-05-30 12:49:26 -04:00
Jack Humbert
4549b0417e Merge pull request #1342 from priyadi/adafruit-mouse-buttons
Adafruit Feather BLE / BLE Friend mouse buttons support
2017-05-30 12:10:45 -04:00
Jack Humbert
3a1a7d6472 Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-05-30 11:46:34 -04:00
Jack Humbert
7eccbfe737 exclude PRs 2017-05-30 11:46:25 -04:00
Damien Broqua
f06f883589 - Some changes on DK60 2017-05-30 16:59:56 +02:00
Nick Choi
5393bc6f4e switched to uint8 and 16 2017-05-29 21:25:50 -04:00
Danny Nguyen
4a8da0cb45 Modify pinout and layouts for Nyquist 2017-05-29 16:20:06 -04:00
Danny Nguyen
aeade1b197 Fork Let’s Split files 2017-05-29 16:04:46 -04:00
Jack Humbert
732a115b32 Merge pull request #1344 from qmk/jackhumbert-patch-1
Re-enable mouse buttons from #1327
2017-05-29 15:17:38 -04:00