]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
7 years agoMerge pull request #503 from fredizzimo/ergodox_subproject
Jack Humbert [Sat, 30 Jul 2016 02:32:27 +0000 (22:32 -0400)]
Merge pull request #503 from fredizzimo/ergodox_subproject

Add both Ergodox EZ and Infinity Ergodox as sub-projects of Ergodox

7 years agoSmall fix for infinity include guard
Fred Sundvik [Tue, 12 Jul 2016 14:50:06 +0000 (17:50 +0300)]
Small fix for infinity include guard

7 years agoFix typo in the readme.
Fred Sundvik [Sun, 10 Jul 2016 20:07:00 +0000 (23:07 +0300)]
Fix typo in the readme.

7 years agoA couple of more Ergodox readme fixes
Fred Sundvik [Sun, 10 Jul 2016 19:55:20 +0000 (22:55 +0300)]
A couple of more Ergodox readme fixes

7 years agoUnify the ErgoDox EZ and Infinity documentation
Fred Sundvik [Sun, 10 Jul 2016 19:52:26 +0000 (22:52 +0300)]
Unify the ErgoDox EZ and Infinity documentation

7 years agoRefer to the right path in the readme
Fred Sundvik [Sun, 10 Jul 2016 19:08:01 +0000 (22:08 +0300)]
Refer to the right path in the readme

7 years agoMove Ergodox readme from ez subfolder to parent
Fred Sundvik [Sun, 10 Jul 2016 18:49:48 +0000 (21:49 +0300)]
Move Ergodox readme from ez subfolder to parent

7 years agoInclude the main Makefile before including Ergodox infinity drivers
Fred Sundvik [Sun, 10 Jul 2016 11:46:18 +0000 (14:46 +0300)]
Include the main Makefile before including Ergodox infinity drivers

7 years agoMove Infinity Ergodox drivers to subproject, and fix makefile
Fred Sundvik [Sun, 10 Jul 2016 11:29:00 +0000 (14:29 +0300)]
Move Infinity Ergodox drivers to subproject, and fix makefile

7 years agoRemove the Infinity Ergodox default keymap
Fred Sundvik [Sun, 10 Jul 2016 09:05:34 +0000 (12:05 +0300)]
Remove the Infinity Ergodox default keymap

7 years agoCleanup the townk_osx config.h and make files
Fred Sundvik [Sun, 10 Jul 2016 09:02:56 +0000 (12:02 +0300)]
Cleanup the townk_osx config.h and make files

7 years agoRename supercoder config_user to config.h
Fred Sundvik [Sun, 10 Jul 2016 09:02:17 +0000 (12:02 +0300)]
Rename supercoder config_user to config.h

Also fixup the include path of parent config

7 years agoFix config.h include guards
Fred Sundvik [Sun, 10 Jul 2016 09:01:28 +0000 (12:01 +0300)]
Fix config.h include guards

7 years agoDefine weak matrix user function for Infinity Ergodox
Fred Sundvik [Sat, 9 Jul 2016 18:24:02 +0000 (21:24 +0300)]
Define weak matrix user function for Infinity Ergodox

So that a few keyboards, which don't use them, links properly.

7 years agoSpeed up ChibiOS keymap compilation
Fred Sundvik [Sat, 9 Jul 2016 17:58:19 +0000 (20:58 +0300)]
Speed up ChibiOS keymap compilation

By sharing the external library object files between the whole
keyboard, instead of re-compiling them for each keymap.

7 years agoChange _delay_ms to wait_ms in algernon keymap
Fred Sundvik [Sat, 9 Jul 2016 08:27:06 +0000 (11:27 +0300)]
Change _delay_ms to wait_ms in algernon keymap

7 years agoMove some of the Ergodox config settings to shared
Fred Sundvik [Sat, 9 Jul 2016 08:26:15 +0000 (11:26 +0300)]
Move some of the Ergodox config settings to shared

7 years agoAdd empty led control functions to Infinity Ergodox
Fred Sundvik [Fri, 8 Jul 2016 22:38:58 +0000 (01:38 +0300)]
Add empty led control functions to Infinity Ergodox

So that most keymaps compiles and links

7 years agoMost ergodox keymaps compiles on Infinity
Fred Sundvik [Fri, 8 Jul 2016 21:41:15 +0000 (00:41 +0300)]
Most ergodox keymaps compiles on Infinity

There are linker errors due to missing led funcitonality though

7 years agoAll Ez keymaps compiles
Fred Sundvik [Fri, 8 Jul 2016 06:09:31 +0000 (09:09 +0300)]
All Ez keymaps compiles

7 years agoInitial structure for Ergodox as subprojects
Fred Sundvik [Thu, 7 Jul 2016 19:28:28 +0000 (22:28 +0300)]
Initial structure for Ergodox as subprojects

Only the EZ default keymaps compiles at the moment though.

7 years agoMerge pull request #584 from algernon/ergodox-ez/algernon
Erez Zukerman [Fri, 29 Jul 2016 12:11:37 +0000 (08:11 -0400)]
Merge pull request #584 from algernon/ergodox-ez/algernon

ergodox_ez: Upgrade my keymap to v1.4

7 years agoMerge pull request #583 from coderkun/coderkun_neo2
Erez Zukerman [Fri, 29 Jul 2016 12:10:46 +0000 (08:10 -0400)]
Merge pull request #583 from coderkun/coderkun_neo2

Ergodox EZ: update keymap “coderkun_neo2”

7 years agoMerge pull request #580 from MatsLanGoH/patch-1
Erez Zukerman [Fri, 29 Jul 2016 12:09:05 +0000 (08:09 -0400)]
Merge pull request #580 from MatsLanGoH/patch-1

Fixed a typo

7 years agoergodox_ez: Upgrade my keymap to v1.4
Gergely Nagy [Fri, 29 Jul 2016 10:24:33 +0000 (12:24 +0200)]
ergodox_ez: Upgrade my keymap to v1.4

* When toggling the key logging on or off, the LEDs will do a little dance.
* The keylogger is now optional, but enabled by default. Use `KEYLOGGER_ENABLE=no` on the `make` command line to disable it.
* The `TAB`/`ARRW` key was turned into a tap-dance key, allowing one to toggle the **ARROW** layer on by double-tapping, and as such, avoid the need to hold the key.
* The `-`/`_` key was turned into a tap-dance key too.
* There is now a way to travel time with the keyboard, toggle the feature on by hitting `LEAD t`.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
7 years agodisable sleep LED
coderkun [Fri, 29 Jul 2016 09:28:37 +0000 (11:28 +0200)]
disable sleep LED

7 years agocomplete labels for modifiers in keymap schema
coderkun [Sun, 22 May 2016 11:00:52 +0000 (13:00 +0200)]
complete labels for modifiers in keymap schema

7 years agouse Ergodox EZ’s third LED for “scroll lock”
coderkun [Sun, 22 May 2016 10:58:54 +0000 (12:58 +0200)]
use Ergodox EZ’s third LED for “scroll lock”

7 years agofix grave (GRV) and acute (ACUT) accents
coderkun [Sun, 22 May 2016 10:56:39 +0000 (12:56 +0200)]
fix grave (GRV) and acute (ACUT) accents

7 years agoFixed a typo
Matthias [Fri, 29 Jul 2016 01:02:59 +0000 (10:02 +0900)]
Fixed a typo

Fixed a typo in line 738 'void martix_init' to 'void matrix_init'

7 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

7 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!

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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.

7 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

7 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.

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

Added custom keymap.

7 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>
7 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>
7 years agoremove unnecessary includes
Seth Chandler [Wed, 27 Jul 2016 06:32:15 +0000 (02:32 -0400)]
remove unnecessary includes

7 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

7 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

7 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

7 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

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

7 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

7 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.

7 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.

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

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

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

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

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

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

7 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

7 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"

7 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

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

7 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

7 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

7 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

7 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.

7 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

7 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

7 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

7 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. =)

7 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.

7 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

7 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

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

7 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

7 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

7 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.

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

7 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

7 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

7 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

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

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

This needs a better description.

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

This is untested, use caution.

7 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.

7 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

7 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

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

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

7 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>
7 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>
7 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>
7 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>
7 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>
7 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

7 years agoMerge pull request #541 from milestogo/master
Jack Humbert [Fri, 22 Jul 2016 01:05:06 +0000 (21:05 -0400)]
Merge pull request #541 from milestogo/master

initial kinisis advantage build

7 years agoMerge pull request #540 from replicaJunction/feature-atreus-keymapFunction
Jack Humbert [Fri, 22 Jul 2016 01:04:45 +0000 (21:04 -0400)]
Merge pull request #540 from replicaJunction/feature-atreus-keymapFunction

Adjusted Atreus KEYMAP() function.

7 years agoMerge pull request #538 from robertdale/preonic-map-correction
Jack Humbert [Fri, 22 Jul 2016 01:03:56 +0000 (21:03 -0400)]
Merge pull request #538 from robertdale/preonic-map-correction

Preonic: Corrected the ascii layout to match the coded layout