]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
9 years agoMerge pull request #578 from 0xdec/master
Jack Humbert [Thu, 28 Jul 2016 20:34:34 +0000 (16:34 -0400)]
Merge pull request #578 from 0xdec/master

0xdec Preonic keymap

9 years agoMerge pull request #577 from hot-leaf-juice/master
Jack Humbert [Thu, 28 Jul 2016 20:34:16 +0000 (16:34 -0400)]
Merge pull request #577 from hot-leaf-juice/master

Pull request to include my keymap if you want it!

9 years agoMerge pull request #573 from algernon/f/make-all-stop-on-error
Jack Humbert [Thu, 28 Jul 2016 20:32:37 +0000 (16:32 -0400)]
Merge pull request #573 from algernon/f/make-all-stop-on-error

tmk_core/rules.mk: Make PRINT_ERROR* stop on error

9 years agoCreate 0xdec Preonic keymap
Jordi Orlando [Thu, 28 Jul 2016 19:36:20 +0000 (14:36 -0500)]
Create 0xdec Preonic keymap

An ergonomically optimized Colemak keymap for the grid-layout Preonic

9 years agoFixed Function keys (Impossible layout)
Stephen Christie [Thu, 28 Jul 2016 18:56:26 +0000 (14:56 -0400)]
Fixed Function keys (Impossible layout)

9 years agoModified Qwerty, created Qwerty with numbers
Stephen Christie [Thu, 28 Jul 2016 17:49:25 +0000 (13:49 -0400)]
Modified Qwerty, created Qwerty with numbers

9 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Christopher Browne [Thu, 28 Jul 2016 16:42:21 +0000 (12:42 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

9 years agoMerge pull request #572 from algernon/f/tap-dance-debug
Jack Humbert [Thu, 28 Jul 2016 16:28:30 +0000 (12:28 -0400)]
Merge pull request #572 from algernon/f/tap-dance-debug

tap-dance: Add some debugging support

9 years agoMerge pull request #570 from sethbc/fix_bone2planck_build
Jack Humbert [Thu, 28 Jul 2016 16:27:46 +0000 (12:27 -0400)]
Merge pull request #570 from sethbc/fix_bone2planck_build

Fix bone2planck build

9 years agoMerge pull request #569 from sethbc/fix_stanleylai_warnings
Jack Humbert [Thu, 28 Jul 2016 16:27:11 +0000 (12:27 -0400)]
Merge pull request #569 from sethbc/fix_stanleylai_warnings

kill warnings filling up travis buildlog

9 years agoMerge pull request #568 from sethbc/fix-colemak-osx-pc-no
Jack Humbert [Thu, 28 Jul 2016 16:26:43 +0000 (12:26 -0400)]
Merge pull request #568 from sethbc/fix-colemak-osx-pc-no

update NO_AMP to NO_AMPR

9 years agoMerge pull request #566 from SmackleFunky/master
Jack Humbert [Thu, 28 Jul 2016 16:26:11 +0000 (12:26 -0400)]
Merge pull request #566 from SmackleFunky/master

Allow toggling out of plover layer

9 years agoMerge pull request #559 from Talljoe/fix-compiler-warning
Jack Humbert [Thu, 28 Jul 2016 16:24:42 +0000 (12:24 -0400)]
Merge pull request #559 from Talljoe/fix-compiler-warning

Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled.

9 years agoMerge pull request #564 from mazinbokhari/master
Jack Humbert [Thu, 28 Jul 2016 16:24:03 +0000 (12:24 -0400)]
Merge pull request #564 from mazinbokhari/master

Move to keyboards

9 years agoAdded readme.md for custom layout.
Callum Oakley [Thu, 28 Jul 2016 11:15:55 +0000 (12:15 +0100)]
Added readme.md for custom layout.

9 years agoadded homerow-ish brackets
Toni [Thu, 28 Jul 2016 09:58:53 +0000 (11:58 +0200)]
added homerow-ish brackets

9 years agoAdded custom keymap.
Callum Oakley [Wed, 27 Jul 2016 20:18:19 +0000 (21:18 +0100)]
Added custom keymap.

Added custom keymap.

9 years agofirst try ar adding the parenthesis mess for german iso
Toni [Wed, 27 Jul 2016 19:11:55 +0000 (21:11 +0200)]
first try ar adding the parenthesis mess for german iso

9 years agoMerge remote-tracking branch 'origin/master' into iso_split_rshift
Toni [Wed, 27 Jul 2016 18:35:13 +0000 (20:35 +0200)]
Merge remote-tracking branch 'origin/master' into iso_split_rshift
merge with master

9 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Christopher Browne [Wed, 27 Jul 2016 16:57:54 +0000 (12:57 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

9 years agotap-dance: Add some debugging support
Gergely Nagy [Wed, 27 Jul 2016 06:42:09 +0000 (08:42 +0200)]
tap-dance: Add some debugging support

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
9 years agotmk_core/rules.mk: Make PRINT_ERROR* stop on error
Gergely Nagy [Wed, 27 Jul 2016 06:53:05 +0000 (08:53 +0200)]
tmk_core/rules.mk: Make PRINT_ERROR* stop on error

Instead of `&& false`, explicitly `exit 1` to make the rules using these macros
fail. This fixes #571, and likely breaks Travis badly.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
9 years agoremove unnecessary includes
Seth Chandler [Wed, 27 Jul 2016 06:32:15 +0000 (02:32 -0400)]
remove unnecessary includes

9 years agofix numerous errors in bone2planck keymap
Seth Chandler [Wed, 27 Jul 2016 06:30:17 +0000 (02:30 -0400)]
fix numerous errors in bone2planck keymap

9 years agokill warnings filling up travis buildlog
Seth Chandler [Wed, 27 Jul 2016 06:21:09 +0000 (02:21 -0400)]
kill warnings filling up travis buildlog

9 years agoupdate NO_AMP to NO_AMPR
Seth Chandler [Wed, 27 Jul 2016 06:06:19 +0000 (02:06 -0400)]
update NO_AMP to NO_AMPR

9 years agoAllow toggling out of plover layer
SmackleFunky [Wed, 27 Jul 2016 04:44:24 +0000 (04:44 +0000)]
Allow toggling out of plover layer

9 years agoMove to keyboards
Mazin Bokhari [Wed, 27 Jul 2016 03:43:04 +0000 (22:43 -0500)]
Move to keyboards

9 years agoGeneral table cleanup.
Stephen Christie [Wed, 27 Jul 2016 03:33:21 +0000 (23:33 -0400)]
General table cleanup.

9 years agoMerge pull request #562 from michaelklos/doc
Erez Zukerman [Wed, 27 Jul 2016 01:54:10 +0000 (21:54 -0400)]
Merge pull request #562 from michaelklos/doc

Added Tap Dance Example

9 years agoMerge pull request #533 from mazinbokhari/master
Erez Zukerman [Wed, 27 Jul 2016 01:52:39 +0000 (21:52 -0400)]
Merge pull request #533 from mazinbokhari/master

Add my layout optimized for working in emacs, vim, command line, etc.

9 years agoAdded Tap Dance Example
Michael Klos [Tue, 26 Jul 2016 22:41:35 +0000 (18:41 -0400)]
Added Tap Dance Example

Added (simple) Tap Dance example implementation steps.

9 years agoModified Plover layer for Impossible's home position.
Stephen Christie [Tue, 26 Jul 2016 21:39:21 +0000 (17:39 -0400)]
Modified Plover layer for Impossible's home position.

9 years agoRemoved unused layers (keeping QWERTY for later/reference)
Stephen Christie [Tue, 26 Jul 2016 21:37:56 +0000 (17:37 -0400)]
Removed unused layers (keeping QWERTY for later/reference)

9 years agoRemoved unused layers (left QWERTY for later use/reference)
Stephen Christie [Tue, 26 Jul 2016 21:29:19 +0000 (17:29 -0400)]
Removed unused layers (left QWERTY for later use/reference)

9 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Christopher Browne [Tue, 26 Jul 2016 20:35:44 +0000 (16:35 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

9 years agoSimplify HSV->RGB calculation
Jordi Orlando [Tue, 26 Jul 2016 20:31:22 +0000 (15:31 -0500)]
Simplify HSV->RGB calculation

De-dupe repeated code

9 years agodisable midi by default
Jack Humbert [Tue, 26 Jul 2016 19:59:26 +0000 (15:59 -0400)]
disable midi by default

9 years agoIncreament -> increment
Jordi Orlando [Tue, 26 Jul 2016 19:46:30 +0000 (14:46 -0500)]
Increament -> increment

9 years agoClean up rgblight.c
Jordi Orlando [Tue, 26 Jul 2016 19:43:45 +0000 (14:43 -0500)]
Clean up rgblight.c

Fix formatting issues, clarify comments

9 years agoinclude base config.h instead of copying it
Jason Janse van Rensburg [Tue, 26 Jul 2016 14:19:34 +0000 (16:19 +0200)]
include base config.h instead of copying it

9 years agoadded config.h, and missing Ins of filpped navigation layer
Jason Janse van Rensburg [Tue, 26 Jul 2016 12:58:17 +0000 (14:58 +0200)]
added config.h, and missing Ins of filpped navigation layer

9 years agoMerge remote-tracking branch 'upstream/master'
Joshua T [Tue, 26 Jul 2016 06:49:24 +0000 (01:49 -0500)]
Merge remote-tracking branch 'upstream/master'

9 years agoModified Atreus extend and Ergodox.
Joshua T [Tue, 26 Jul 2016 06:44:57 +0000 (01:44 -0500)]
Modified Atreus extend and Ergodox.

Atreus: Removed home row Shift. It's under the thumb anyway. Also replaced dual modifier keys with macro keys (cut, copy, paste, undo).

Ergodox: Made Colemak the default layer instead of Dvorak. Also began the process of bringing it in line with the Atreus layout I've been working on.

9 years agoDelete default.png
erlo muvman [Tue, 26 Jul 2016 01:16:11 +0000 (20:16 -0500)]
Delete default.png

9 years agoDelete default_highres.png
erlo muvman [Tue, 26 Jul 2016 01:16:07 +0000 (20:16 -0500)]
Delete default_highres.png

9 years agoUpdate readme.md
erlo muvman [Tue, 26 Jul 2016 01:14:19 +0000 (20:14 -0500)]
Update readme.md

9 years agoUpdate readme.md
erlo muvman [Tue, 26 Jul 2016 01:12:48 +0000 (20:12 -0500)]
Update readme.md

9 years agoUpdate readme.md
erlo muvman [Tue, 26 Jul 2016 01:06:58 +0000 (20:06 -0500)]
Update readme.md

9 years agoMerged branch master into bone2planck
Jason Janse van Rensburg [Mon, 25 Jul 2016 20:55:28 +0000 (22:55 +0200)]
Merged branch master into bone2planck

9 years agoadded missing F keys in flipped layer
Jason Janse van Rensburg [Mon, 25 Jul 2016 18:21:32 +0000 (20:21 +0200)]
added missing F keys in flipped layer

9 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Christopher Browne [Mon, 25 Jul 2016 16:55:46 +0000 (12:55 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

9 years agoMerge pull request #558 from lindhe/master
Jack Humbert [Mon, 25 Jul 2016 15:16:54 +0000 (11:16 -0400)]
Merge pull request #558 from lindhe/master

Fix misspelled command in Norwegian helper

9 years agoChange Nordic ampersand code to match the English
Andreas Lindhé [Mon, 25 Jul 2016 10:50:27 +0000 (12:50 +0200)]
Change Nordic ampersand code to match the English

Changed from "NO_AMP" to "NO_AMPR" since the KC one is "KC_AMPR"

9 years agoMerge remote-tracking branch 'origin/master' into iso_split_rshift
Toni [Mon, 25 Jul 2016 10:49:38 +0000 (12:49 +0200)]
Merge remote-tracking branch 'origin/master' into iso_split_rshift
whatever

9 years agoFix misspelled command in Norwegian helper
Andreas Lindhé [Mon, 25 Jul 2016 09:29:54 +0000 (11:29 +0200)]
Fix misspelled command in Norwegian helper

9 years agoFixes midi functionality
Jack Humbert [Mon, 25 Jul 2016 02:07:43 +0000 (22:07 -0400)]
Fixes midi functionality

9 years agoMerge pull request #554 from robertdale/music-recording-documentation
Jack Humbert [Mon, 25 Jul 2016 01:58:23 +0000 (21:58 -0400)]
Merge pull request #554 from robertdale/music-recording-documentation

Added music recording/playing doc

9 years agoMerge pull request #552 from robertdale/music-play-fix
Jack Humbert [Mon, 25 Jul 2016 01:58:01 +0000 (21:58 -0400)]
Merge pull request #552 from robertdale/music-play-fix

Fixes issue #551 - ensure there's a recording to play before playing

9 years agoMerge pull request #550 from Darthabel/fix_bepo
Jack Humbert [Mon, 25 Jul 2016 01:57:38 +0000 (21:57 -0400)]
Merge pull request #550 from Darthabel/fix_bepo

Fix some errors in bepo mapping

9 years agoMerge pull request #549 from locksmithdon/patch-1
Jack Humbert [Mon, 25 Jul 2016 01:57:15 +0000 (21:57 -0400)]
Merge pull request #549 from locksmithdon/patch-1

Added LEADER_EXTERNS() call to readme.

9 years agoMerge pull request #548 from CommandLineDesign/CMD-Preonic
Jack Humbert [Mon, 25 Jul 2016 01:56:50 +0000 (21:56 -0400)]
Merge pull request #548 from CommandLineDesign/CMD-Preonic

CMD keymap for Preonic

9 years agoMerge pull request #546 from sethbc/satan-cleanup
Jack Humbert [Mon, 25 Jul 2016 01:56:23 +0000 (21:56 -0400)]
Merge pull request #546 from sethbc/satan-cleanup

Satan cleanup

9 years agoMerge pull request #534 from willwm/teckinesis
Erez Zukerman [Mon, 25 Jul 2016 01:04:59 +0000 (18:04 -0700)]
Merge pull request #534 from willwm/teckinesis

Teckinesis for ErgoDox EZ

9 years agoRemove images, per @ezuk request. =)
Will Wolff-Myren [Sun, 24 Jul 2016 21:33:17 +0000 (14:33 -0700)]
Remove images, per @ezuk request. =)

9 years agoFix compiler warning when PREVENT_STUCK_MODIFIERS is enabled.
Joe Wasson [Sun, 24 Jul 2016 19:56:28 +0000 (12:56 -0700)]
Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled.

9 years agoMerge pull request #542 from algernon/f/hold-the-dance
Erez Zukerman [Sun, 24 Jul 2016 18:36:05 +0000 (11:36 -0700)]
Merge pull request #542 from algernon/f/hold-the-dance

Tap-dance: support for holding keys

9 years agoMerge pull request #535 from algernon/ergodox-ez/algernon
Erez Zukerman [Sun, 24 Jul 2016 18:34:33 +0000 (11:34 -0700)]
Merge pull request #535 from algernon/ergodox-ez/algernon

ergodox_ez: Update my keymap to v1.3

9 years agoadded music recording/playing doc
Robert Dale [Sun, 24 Jul 2016 14:19:40 +0000 (10:19 -0400)]
added music recording/playing doc

9 years agoensure there's a recording to play before playing; also enables the LGUI button to...
Robert Dale [Sun, 24 Jul 2016 14:00:39 +0000 (10:00 -0400)]
ensure there's a recording to play before playing; also enables the LGUI button to play a tone

9 years agoFix some errors in bepo mapping
Vivien Alger [Sun, 24 Jul 2016 08:57:49 +0000 (10:57 +0200)]
Fix some errors in bepo mapping

9 years agoAdded LEADER_EXTERNS() call.
Don Smith [Sun, 24 Jul 2016 07:18:22 +0000 (19:18 +1200)]
Added LEADER_EXTERNS() call.

This seems to be needed in most cases.

9 years agoUpdated Readme
Jonathan Lucas [Sun, 24 Jul 2016 04:26:01 +0000 (21:26 -0700)]
Updated Readme

9 years agoDid a derp and forgot to set Trans on Arrow layer
commandlinedesign [Sun, 24 Jul 2016 04:08:00 +0000 (21:08 -0700)]
Did a derp and forgot to set Trans on Arrow layer

9 years agoArrow key fn layer shouldnt overwrite Ctrl key. Better Print Screen position
commandlinedesign [Sun, 24 Jul 2016 04:02:23 +0000 (21:02 -0700)]
Arrow key fn layer shouldnt overwrite Ctrl key. Better Print Screen position

9 years agoadded readme
Jason Janse van Rensburg [Sun, 24 Jul 2016 03:11:07 +0000 (05:11 +0200)]
added readme

9 years agoTested, resolved Mouse issue, resolved numpad issue
commandlinedesign [Sun, 24 Jul 2016 03:02:45 +0000 (20:02 -0700)]
Tested, resolved Mouse issue, resolved numpad issue

9 years agomoved insert
Jason Janse van Rensburg [Sun, 24 Jul 2016 03:02:06 +0000 (05:02 +0200)]
moved insert

9 years agomoved ctrl
Jason Janse van Rensburg [Sun, 24 Jul 2016 02:52:35 +0000 (04:52 +0200)]
moved ctrl

9 years agoResolved errors
commandlinedesign [Sun, 24 Jul 2016 02:32:02 +0000 (19:32 -0700)]
Resolved errors

9 years agofixed stupid errors
Jason Janse van Rensburg [Sun, 24 Jul 2016 02:08:40 +0000 (04:08 +0200)]
fixed stupid errors

9 years agoMerged branch master into bone2planck
Jason Janse van Rensburg [Sun, 24 Jul 2016 02:08:01 +0000 (04:08 +0200)]
Merged branch master into bone2planck

9 years agoInit Readme
Jonathan Lucas [Sun, 24 Jul 2016 01:52:52 +0000 (18:52 -0700)]
Init Readme

This needs a better description.

9 years agoCreate Makefile
Jonathan Lucas [Sun, 24 Jul 2016 01:50:41 +0000 (18:50 -0700)]
Create Makefile

This is untested, use caution.

9 years agoCreate CMD-Preonic Keymap
Jonathan Lucas [Sun, 24 Jul 2016 01:47:36 +0000 (18:47 -0700)]
Create CMD-Preonic Keymap

This is very Alpha-Mode, and has not been tested or even Made yet.

9 years agoMerge pull request #1 from jackhumbert/master
Jonathan Lucas [Sun, 24 Jul 2016 01:44:01 +0000 (18:44 -0700)]
Merge pull request #1 from jackhumbert/master

Update from parent

9 years agofix typo in readme and satan.h
Seth Chandler [Sun, 24 Jul 2016 00:55:20 +0000 (20:55 -0400)]
fix typo in readme and satan.h

9 years agocleanup default layout
Seth Chandler [Sun, 24 Jul 2016 00:52:27 +0000 (20:52 -0400)]
cleanup default layout

9 years agoupdate sethbc keymap
Seth Chandler [Sun, 24 Jul 2016 00:37:41 +0000 (20:37 -0400)]
update sethbc keymap

9 years agoTable for Fn
Stephen Christie [Fri, 22 Jul 2016 22:17:34 +0000 (18:17 -0400)]
Table for Fn
layer.

9 years agoSwitched to natural arrows, put ENTER on middle Fn, swapped Shift and CTRL.
Stephen Christie [Fri, 22 Jul 2016 21:46:23 +0000 (17:46 -0400)]
Switched to natural arrows, put ENTER on middle Fn, swapped Shift and CTRL.

9 years agoconverted funtions to QMK aliases
Toni [Fri, 22 Jul 2016 09:17:57 +0000 (11:17 +0200)]
converted funtions to QMK aliases

9 years agoreadme.md: Update the tap dance docs
Gergely Nagy [Wed, 20 Jul 2016 10:04:14 +0000 (12:04 +0200)]
readme.md: Update the tap dance docs

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
9 years agoreadme.md: algernon is strictly lowercase
Gergely Nagy [Wed, 20 Jul 2016 09:54:25 +0000 (11:54 +0200)]
readme.md: algernon is strictly lowercase

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
9 years agotap-dance: Code cleanup
Gergely Nagy [Wed, 20 Jul 2016 09:49:59 +0000 (11:49 +0200)]
tap-dance: Code cleanup

Removes a number of duplicated code, by passing actions around instead
of keycodes, so the various dance action functions do not have to look
up the action, but the caller does that for them.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
9 years agotap-dance: Support user_data for the callbacks
Gergely Nagy [Wed, 20 Jul 2016 09:34:45 +0000 (11:34 +0200)]
tap-dance: Support user_data for the callbacks

Refactored the code a little, so all callbacks now receive a `user_data`
pointer, which can be anything. As an example, the key pairs from
`ACTION_TAP_DANCE_DOUBLE` now use this, and custom, built-in functions.

This makes it easier to extend the tap dance functionality, and also
simplifies the code a little.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
9 years agotap-dance: Support for holding keys
Gergely Nagy [Wed, 20 Jul 2016 08:22:52 +0000 (10:22 +0200)]
tap-dance: Support for holding keys

With this change, tap dance will now store the pressed state of the
tap-dance key, and allow one to make an action sooner, while the key is
still held, and only unregister when the key is released.

The registration must happen in the `on_dance_finished` callback, while
unregistering goes to `on_reset`. The surrounding code makes sure not to
call either multiple times.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
9 years agomore cosmetic changes (whitespace)
Toni [Fri, 22 Jul 2016 06:14:08 +0000 (08:14 +0200)]
more cosmetic changes (whitespace)

9 years agopurely cosmetic changes
Toni [Fri, 22 Jul 2016 06:13:06 +0000 (08:13 +0200)]
purely cosmetic changes

9 years agoMerge pull request #543 from VoodaGod/bone2planck
Jack Humbert [Fri, 22 Jul 2016 01:29:54 +0000 (21:29 -0400)]
Merge pull request #543 from VoodaGod/bone2planck

updated bone2planck