]>
git.donarmstrong.com Git - qmk_firmware.git/log
Joshua T [Sat, 30 Jul 2016 13:46:01 +0000 (08:46 -0500)]
Moved my Ergodox keymap to match upstream changes
Joshua T [Sat, 30 Jul 2016 13:41:22 +0000 (08:41 -0500)]
Merge remote-tracking branch 'upstream/master'
Jack Humbert [Sat, 30 Jul 2016 06:53:29 +0000 (02:53 -0400)]
Merge pull request #589 from algernon/h/ergodox_ez-vs-ergodox
Update some obsolete references
Gergely Nagy [Sat, 30 Jul 2016 06:37:30 +0000 (08:37 +0200)]
Update some obsolete references
Some links were still pointing to `/keyboards/ergodox_ez`, while the
directory is `/keyboards/erdogox` now.
Not all references have been updated, and some of the text here and
there may need updating to mention the ErgoDox Infinity too, but that's
out of the scope for this quick fix.
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
Jack Humbert [Sat, 30 Jul 2016 02:33:29 +0000 (22:33 -0400)]
Merge pull request #587 from fredizzimo/documentation_quick_fix
Fix the quick aliases documentation section
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
Fred Sundvik [Fri, 29 Jul 2016 19:38:06 +0000 (22:38 +0300)]
Fix the quick aliases documentation section
Also move all keyboard customization documentation under the
"Going Beyond the keycodes" heading.
Fred Sundvik [Tue, 12 Jul 2016 14:50:06 +0000 (17:50 +0300)]
Small fix for infinity include guard
Fred Sundvik [Sun, 10 Jul 2016 20:07:00 +0000 (23:07 +0300)]
Fix typo in the readme.
Fred Sundvik [Sun, 10 Jul 2016 19:55:20 +0000 (22:55 +0300)]
A couple of more Ergodox readme fixes
Fred Sundvik [Sun, 10 Jul 2016 19:52:26 +0000 (22:52 +0300)]
Unify the ErgoDox EZ and Infinity documentation
Fred Sundvik [Sun, 10 Jul 2016 19:08:01 +0000 (22:08 +0300)]
Refer to the right path in the readme
Fred Sundvik [Sun, 10 Jul 2016 18:49:48 +0000 (21:49 +0300)]
Move Ergodox readme from ez subfolder to parent
Fred Sundvik [Sun, 10 Jul 2016 11:46:18 +0000 (14:46 +0300)]
Include the main Makefile before including Ergodox infinity drivers
Fred Sundvik [Sun, 10 Jul 2016 11:29:00 +0000 (14:29 +0300)]
Move Infinity Ergodox drivers to subproject, and fix makefile
Fred Sundvik [Sun, 10 Jul 2016 09:05:34 +0000 (12:05 +0300)]
Remove the Infinity Ergodox default keymap
Fred Sundvik [Sun, 10 Jul 2016 09:02:56 +0000 (12:02 +0300)]
Cleanup the townk_osx config.h and make files
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
Fred Sundvik [Sun, 10 Jul 2016 09:01:28 +0000 (12:01 +0300)]
Fix config.h include guards
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.
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.
Fred Sundvik [Sat, 9 Jul 2016 08:27:06 +0000 (11:27 +0300)]
Change _delay_ms to wait_ms in algernon keymap
Fred Sundvik [Sat, 9 Jul 2016 08:26:15 +0000 (11:26 +0300)]
Move some of the Ergodox config settings to shared
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
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
Fred Sundvik [Fri, 8 Jul 2016 06:09:31 +0000 (09:09 +0300)]
All Ez keymaps compiles
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.
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
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”
Erez Zukerman [Fri, 29 Jul 2016 12:09:05 +0000 (08:09 -0400)]
Merge pull request #580 from MatsLanGoH/patch-1
Fixed a typo
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>
coderkun [Fri, 29 Jul 2016 09:28:37 +0000 (11:28 +0200)]
disable sleep LED
coderkun [Sun, 22 May 2016 11:00:52 +0000 (13:00 +0200)]
complete labels for modifiers in keymap schema
coderkun [Sun, 22 May 2016 10:58:54 +0000 (12:58 +0200)]
use Ergodox EZ’s third LED for “scroll lock”
coderkun [Sun, 22 May 2016 10:56:39 +0000 (12:56 +0200)]
fix grave (GRV) and acute (ACUT) accents
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'
Jack Humbert [Thu, 28 Jul 2016 20:34:34 +0000 (16:34 -0400)]
Merge pull request #578 from 0xdec/master
0xdec Preonic keymap
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!
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
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
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
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
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
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
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
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.
Jack Humbert [Thu, 28 Jul 2016 16:24:03 +0000 (12:24 -0400)]
Merge pull request #564 from mazinbokhari/master
Move to keyboards
Callum Oakley [Thu, 28 Jul 2016 11:15:55 +0000 (12:15 +0100)]
Added readme.md for custom layout.
Callum Oakley [Wed, 27 Jul 2016 20:18:19 +0000 (21:18 +0100)]
Added custom keymap.
Added custom keymap.
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>
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>
Seth Chandler [Wed, 27 Jul 2016 06:32:15 +0000 (02:32 -0400)]
remove unnecessary includes
Seth Chandler [Wed, 27 Jul 2016 06:30:17 +0000 (02:30 -0400)]
fix numerous errors in bone2planck keymap
Seth Chandler [Wed, 27 Jul 2016 06:21:09 +0000 (02:21 -0400)]
kill warnings filling up travis buildlog
Seth Chandler [Wed, 27 Jul 2016 06:06:19 +0000 (02:06 -0400)]
update NO_AMP to NO_AMPR
SmackleFunky [Wed, 27 Jul 2016 04:44:24 +0000 (04:44 +0000)]
Allow toggling out of plover layer
Mazin Bokhari [Wed, 27 Jul 2016 03:43:04 +0000 (22:43 -0500)]
Move to keyboards
Erez Zukerman [Wed, 27 Jul 2016 01:54:10 +0000 (21:54 -0400)]
Merge pull request #562 from michaelklos/doc
Added Tap Dance Example
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.
Michael Klos [Tue, 26 Jul 2016 22:41:35 +0000 (18:41 -0400)]
Added Tap Dance Example
Added (simple) Tap Dance example implementation steps.
Jack Humbert [Tue, 26 Jul 2016 19:59:26 +0000 (15:59 -0400)]
disable midi by default
Joshua T [Tue, 26 Jul 2016 06:49:24 +0000 (01:49 -0500)]
Merge remote-tracking branch 'upstream/master'
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.
erlo muvman [Tue, 26 Jul 2016 01:16:11 +0000 (20:16 -0500)]
Delete default.png
erlo muvman [Tue, 26 Jul 2016 01:16:07 +0000 (20:16 -0500)]
Delete default_highres.png
erlo muvman [Tue, 26 Jul 2016 01:14:19 +0000 (20:14 -0500)]
Update readme.md
erlo muvman [Tue, 26 Jul 2016 01:12:48 +0000 (20:12 -0500)]
Update readme.md
erlo muvman [Tue, 26 Jul 2016 01:06:58 +0000 (20:06 -0500)]
Update readme.md
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
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"
Andreas Lindhé [Mon, 25 Jul 2016 09:29:54 +0000 (11:29 +0200)]
Fix misspelled command in Norwegian helper
Jack Humbert [Mon, 25 Jul 2016 02:07:43 +0000 (22:07 -0400)]
Fixes midi functionality
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
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
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
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.
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
Jack Humbert [Mon, 25 Jul 2016 01:56:23 +0000 (21:56 -0400)]
Merge pull request #546 from sethbc/satan-cleanup
Satan cleanup
Erez Zukerman [Mon, 25 Jul 2016 01:04:59 +0000 (18:04 -0700)]
Merge pull request #534 from willwm/teckinesis
Teckinesis for ErgoDox EZ
Will Wolff-Myren [Sun, 24 Jul 2016 21:33:17 +0000 (14:33 -0700)]
Remove images, per @ezuk request. =)
Joe Wasson [Sun, 24 Jul 2016 19:56:28 +0000 (12:56 -0700)]
Fix compiler warning when PREVENT_STUCK_MODIFIERS is enabled.
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
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
Robert Dale [Sun, 24 Jul 2016 14:19:40 +0000 (10:19 -0400)]
added music recording/playing doc
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
Vivien Alger [Sun, 24 Jul 2016 08:57:49 +0000 (10:57 +0200)]
Fix some errors in bepo mapping
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.
Jonathan Lucas [Sun, 24 Jul 2016 04:26:01 +0000 (21:26 -0700)]
Updated Readme
commandlinedesign [Sun, 24 Jul 2016 04:08:00 +0000 (21:08 -0700)]
Did a derp and forgot to set Trans on Arrow layer
commandlinedesign [Sun, 24 Jul 2016 04:02:23 +0000 (21:02 -0700)]
Arrow key fn layer shouldnt overwrite Ctrl key. Better Print Screen position
commandlinedesign [Sun, 24 Jul 2016 03:02:45 +0000 (20:02 -0700)]
Tested, resolved Mouse issue, resolved numpad issue
commandlinedesign [Sun, 24 Jul 2016 02:32:02 +0000 (19:32 -0700)]
Resolved errors
Jonathan Lucas [Sun, 24 Jul 2016 01:52:52 +0000 (18:52 -0700)]
Init Readme
This needs a better description.
Jonathan Lucas [Sun, 24 Jul 2016 01:50:41 +0000 (18:50 -0700)]
Create Makefile
This is untested, use caution.
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.
Jonathan Lucas [Sun, 24 Jul 2016 01:44:01 +0000 (18:44 -0700)]
Merge pull request #1 from jackhumbert/master
Update from parent
Seth Chandler [Sun, 24 Jul 2016 00:55:20 +0000 (20:55 -0400)]
fix typo in readme and satan.h
Seth Chandler [Sun, 24 Jul 2016 00:52:27 +0000 (20:52 -0400)]
cleanup default layout
Seth Chandler [Sun, 24 Jul 2016 00:37:41 +0000 (20:37 -0400)]
update sethbc keymap
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>