Commit Graph

4380 Commits

Author SHA1 Message Date
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
Matthias Schmitt
4c3630dc17 update my neo2 keymap 2017-01-30 23:10:28 +01:00
Brendan Johan Lee
f70758622b [deadcyclo layout] Refactoring. Use custom functions and macros 2017-01-30 19:42:27 +01:00
Brendan Johan Lee
f400ac1d7d [deadcyclo layout] fixed failing tests 2017-01-30 15:45:16 +01:00
Brendan Johan Lee
d43f4a5f57 Merge remote-tracking branch 'upstream/master' 2017-01-30 12:59:17 +01:00
TerryMathews
ef9e544a7e Let's Split: establish rev2fliphalf subproject
Subproject to accomodate second half pad built in opposite orientation
(places TRRS jacks on opposing edges for shorter cable runs)
2017-01-29 22:22:32 -05:00
SjB
5a860b71a1 race condition between oneshot_mods and tap_dance
since the keycode for a tap dance process gets process only after the
TAPPING_TERM timeout, you really only have ONESHOT_TIMEOUT -
TAPPING_TERM time to tap or double tap on the key. This fix save the
oneshot_mods into the action.state structure and applies the mods with
the keycode when it's registered. It also unregisters the mod when the
the tap dance process gets reset.
2017-01-29 13:26:31 -05:00
SjB
45e0d09414 moved oneshot cancellation code outside of process_record.
The oneshot cancellation code do not depend on the
action_tapping_process and since process_record get called via the
action_tapping_process logic moved the oneshot cancellation code into
the action_exec function just before the action_tapping_process call
2017-01-29 13:01:47 -05:00
SjB
f644b9a07a registering a weak_mods when using register_code16
Scenario:
Locking the KC_LSHIFT, and then using a tap dance key that registers a
S(KC_9) will unregister the KC_LSHIFT.

The tap dance or any keycode that is registered should not have the
side effect of cancelling a locked moditifier. We should be using a
similar logic as the TMK codes in tmk_core/comman/action.c:158.
2017-01-29 12:29:43 -05:00
Priyadi Iman Nurcahyo
3835b4bfcc Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethium 2017-01-29 18:38:15 +07:00
Priyadi Iman Nurcahyo
011811af68 minimize LEDs 2017-01-29 18:37:49 +07:00
Priyadi Iman Nurcahyo
306f43e5ee fix greek layers 2017-01-29 18:37:49 +07:00
Priyadi Iman Nurcahyo
c5ab0b2b61 Implement greek layers on my Promethium layout 2017-01-29 18:37:49 +07:00
Yale Thomas
8df30c1c56 added picture of layout 2017-01-28 18:44:14 -08:00
Yale Thomas
ad0ce40db0 usability tweaks 2017-01-28 18:44:01 -08:00
Yale Thomas
d549002d22 mouse keys added 2017-01-28 18:43:40 -08:00
Yale Thomas
4eafa86564 new 'yale' keymap 2017-01-28 18:43:40 -08:00
Stephen Tudor
1d9e0b0120 s/Bkps/Bksp 2017-01-28 20:54:34 -05:00
Luke Silva
77e54e34e1 Add luke keymap, as an example of the tapping macros 2017-01-29 11:27:38 +11:00
Luke Silva
a3357d078e Add support for various tapping macros
A macro key can now be easily set to act as a modifier on hold, and
press a shifted key when tapped. Or to switch layers when held, and
again press a shifted key when tapped.

Various other helper defines have been created which send macros when
the key is pressed, released and tapped, cleaning up the
action_get_macro function inside keymap definitions.

The layer switching macros require a GCC extension - 'compound
statements enclosed within parentheses'. The use of this extension is
already present within the macro subsystem of this project, so its use
in this commit should not cause any additional issues.

MACRO_NONE had to be cast to a (macro_t*) to suppress compiler
warnings within some tapping macros.
2017-01-28 18:42:35 +11:00
Stephen Tudor
7c24ecf580 Carry over Planck updates to my Preonic keymap 2017-01-28 01:38:58 -05:00
Stephen Tudor
321904b8e3 Improve Planck keymap
- added escape+shift mod-tap key
- replaced BRITE with backtick
2017-01-28 01:37:59 -05:00
Stephen Tudor
fa72689145 Merge branch 'master' into smt/planck
* master:
  Clarify license on abnt2 keymap (#1038)
  replace jackhumbert with qmk
  Add gitter image, start update to qmk org
  Remove COLEMAK from preonic_keycodes enum
  layer defines to enum
  Update readme for smt Preonic keymap
  Add smt keymap for Preonic
  updated all the other keymaps to support the new changes.
  fix: infinity60 keyboard was not using quantum features.
  Compare Makefile with itself instead of using `--help`
2017-01-28 00:51:07 -05:00
skullydazed
ec05f65421 Merge pull request #1043 from potz/patch-1
Clarify license on abnt2 keymap (#1038)
2017-01-27 18:40:59 -08:00
lucwastiaux
f6feee8167 eliminate references to shell_layer 2017-01-28 09:45:13 +08:00
lucwastiaux
a1c53d0f93 documented dual mode capslock 2017-01-28 09:42:55 +08:00
milestogo
cb2d4fb80b split kinesis layout into ergodox and planck style symbol layers 2017-01-27 16:45:18 -08:00