]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
7 years agozweihander-osx: use eject instead of power
Nathan Sharfi [Tue, 31 May 2016 23:15:35 +0000 (16:15 -0700)]
zweihander-osx: use eject instead of power

https://support.apple.com/en-us/HT201236 says that ⌃⌘⏏ will quit all apps and then restart your Mac; ⌃⌘-power will shut things down in an…ungraceful fashion.

I reboot into Windows fairly frequently; I'd rather have the nice behavior at my fingertips, not the rude one.

7 years agoMerge branch 'master' of github.com:jackhumbert/qmk_firmware
Nathan Sharfi [Tue, 31 May 2016 22:22:45 +0000 (15:22 -0700)]
Merge branch 'master' of github.com:jackhumbert/qmk_firmware

7 years agoUpdate to Makefile an ergodox readme (#365)
Hartmut Goebel [Tue, 31 May 2016 14:03:04 +0000 (16:03 +0200)]
Update to Makefile an ergodox readme (#365)

* Autodetect teensy-loader-cli over teensy_loader_cli.

Some distributions (e.g. Arch Linux, Guix) install teensy_loader_cli
as teensy-loader-cli. Use this one if it is installed.

* Update ergodox_ez/readme.md

- Mention Linux distris providing teensy-loader-cli
- Mention `make teensy ...`

7 years agoMerge branch 'master' of github.com:jackhumbert/qmk_firmware
Nathan Sharfi [Mon, 30 May 2016 22:45:17 +0000 (15:45 -0700)]
Merge branch 'master' of github.com:jackhumbert/qmk_firmware

7 years agozweihander: Add :, disable sleep LED waves
Nathan Sharfi [Mon, 30 May 2016 22:44:59 +0000 (15:44 -0700)]
zweihander: Add :, disable sleep LED waves

7 years agoMerge pull request #353 from algernon/ergodox-ez/algernon
Erez Zukerman [Sun, 29 May 2016 17:53:29 +0000 (13:53 -0400)]
Merge pull request #353 from algernon/ergodox-ez/algernon

My layout for the ErgoDox EZ

7 years agoAdd support for the KC60 v2.0 2015-09-12 (#360)
Samuel Goodwin [Sun, 29 May 2016 17:18:01 +0000 (19:18 +0200)]
Add support for the KC60 v2.0 2015-09-12 (#360)

* Don't save the ctags file in the repo.

* Initial support for the KC60 board. Only 5x5 working so far.

* Rename because this isn't the same KC60 as others.

* Add in some generic layout.
Pins seem to be in the right order except the 6th column spews
gibberish.

* Don't need this for now.

* Move this to some other folder.

* Trying again to start over.

* Don't need to start over because I figured out why the 'broken' stuff wasn't working.

* Attempt to enable backlighting. It's on on pin B7 like other boards.

* Fix last port changes and fix LED control in keymap.

* Trying some other LED code.

* Bootloader needs to be bigger. Disabling backlight for now.

* Simplify LED code while I try to figure it out.

* Turn back on backlighting.

* Backlighting works now. Just need to get levels or breathing working.

* Trying to allow for turning off the LEDs before I get to brightness levels.

* The missing link: need to run the init_ports function for LEDs to work properly.

* Removing breathing stuff since it bricks the board.

* Clean up default layer.

* Cleanup keymap, KC60 doesn't support a 5th right bottom-row button.

7 years agoFix build errors (#359)
Daniel Svensson [Sun, 29 May 2016 14:39:27 +0000 (16:39 +0200)]
Fix build errors (#359)

* brings gh60 up-to-date (needs testing)

* brings hhkb up-to-date (needs testing)

* brings jd45 up-to-date (needs testing)

7 years agoCorrects a backtick
Erez Zukerman [Sun, 29 May 2016 00:51:25 +0000 (20:51 -0400)]
Corrects a backtick

7 years agoCorrects links
Erez Zukerman [Sun, 29 May 2016 00:50:24 +0000 (20:50 -0400)]
Corrects links

7 years agoAdds a roadmap to the intro section of the docs
Erez Zukerman [Sun, 29 May 2016 00:48:20 +0000 (20:48 -0400)]
Adds a roadmap to the intro section of the docs

7 years agomakes .SILENT (less verbose) by default - override with VERBOSE=1
Jack Humbert [Sat, 28 May 2016 19:33:08 +0000 (15:33 -0400)]
makes .SILENT (less verbose) by default - override with VERBOSE=1

also took out some @echo newlines to make things a bit cleaner

7 years agoprocess_record implementation (non-breaking for process_action ATM)
Jack Humbert [Sat, 28 May 2016 19:22:30 +0000 (15:22 -0400)]
process_record implementation (non-breaking for process_action ATM)

7 years agoupdates quantum template to prevent backlight conflicts
Jack Humbert [Sat, 28 May 2016 16:05:17 +0000 (12:05 -0400)]
updates quantum template to prevent backlight conflicts

7 years agobrings alps64 up-to-date (needs testing)
Jack Humbert [Sat, 28 May 2016 15:56:06 +0000 (11:56 -0400)]
brings alps64 up-to-date (needs testing)

7 years agozweihander-osx: Add =, :, juggle Home/End
Nathan Sharfi [Sat, 28 May 2016 01:41:16 +0000 (18:41 -0700)]
zweihander-osx: Add =, :, juggle Home/End

7 years agozweihander-osx: Bump ALFRED_LEAD_TIME to 250ms
Nathan Sharfi [Thu, 26 May 2016 22:08:01 +0000 (15:08 -0700)]
zweihander-osx: Bump ALFRED_LEAD_TIME to 250ms

7 years agoremoves duplicate double quote and odd whitespace
Jack Humbert [Thu, 26 May 2016 21:14:01 +0000 (17:14 -0400)]
removes duplicate double quote and odd whitespace

7 years agoergodox_ez/algernon: Add a HEX file
Gergely Nagy [Thu, 26 May 2016 13:31:25 +0000 (15:31 +0200)]
ergodox_ez/algernon: Add a HEX file

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
7 years agoergodox_ez/algernon: New layout.
Gergely Nagy [Thu, 26 May 2016 13:25:04 +0000 (15:25 +0200)]
ergodox_ez/algernon: New layout.

This is a squashed up version of the layout I have been working on for
the past month or so. Based on Dvorak, with a lot of unconventional
stuff thrown in for good measures.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
7 years agoMerge pull request #352 from algernon/ergodox-ez/supercoder
Erez Zukerman [Thu, 26 May 2016 12:40:20 +0000 (08:40 -0400)]
Merge pull request #352 from algernon/ergodox-ez/supercoder

ergodox_ez: Add a SuperCoder keymap

7 years agoergodox_ez: Add a SuperCoder keymap
Gergely Nagy [Thu, 26 May 2016 12:13:20 +0000 (14:13 +0200)]
ergodox_ez: Add a SuperCoder keymap

Inspired by @faxm0dem, and the SuperCoder 2000 "keyboard".

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
7 years agoMerge pull request #351 from adiabatic/master
Erez Zukerman [Thu, 26 May 2016 01:41:18 +0000 (21:41 -0400)]
Merge pull request #351 from adiabatic/master

Add KC_DQUO ("); update Zweihander

7 years agoAdd single and double quotes to numpad layer
Nathan Sharfi [Thu, 26 May 2016 01:13:00 +0000 (18:13 -0700)]
Add single and double quotes to numpad layer

…as well as recover from a bunch of Git user errors.

7 years agoAdd double quote for everyone; update Zweihander
Nathan Sharfi [Thu, 26 May 2016 00:25:04 +0000 (17:25 -0700)]
Add double quote for everyone; update Zweihander

8 years ago[Erez & Jack] Removes keyboards which are not active on qmk
Erez Zukerman [Wed, 25 May 2016 03:55:29 +0000 (23:55 -0400)]
[Erez & Jack] Removes keyboards which are not active on qmk

8 years ago[Erez & Jack] Optimizes shift_interrupted array
Erez Zukerman [Wed, 25 May 2016 03:48:46 +0000 (23:48 -0400)]
[Erez & Jack] Optimizes shift_interrupted array

8 years ago[Erez & Jack] Packages Space Cadet shifts into keycodes
Erez Zukerman [Wed, 25 May 2016 03:27:59 +0000 (23:27 -0400)]
[Erez & Jack] Packages Space Cadet shifts into keycodes

8 years ago[Erez & Jack] Documents new Leader key functionality
Erez Zukerman [Wed, 25 May 2016 02:37:25 +0000 (22:37 -0400)]
[Erez & Jack] Documents new Leader key functionality

8 years agoConverted audio play functions to *_user (#349)
Jack Humbert [Tue, 24 May 2016 15:56:53 +0000 (11:56 -0400)]
Converted audio play functions to *_user (#349)

* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs

* Usability tweaks

* TWEAE

* nightly

added extra kcs to keymap common

* turned on Plank audio

* Added backlight breathing to atomic

* reverted accidental merge

* Added music and audio toggles to Quantum.c

* Redid the audio callbacks

* Adjusted default planck layout to use the user tone naming

* tabs to spaces

* Rewrote the ALL recipe to allow for faster parallel make

* tabs to spaces

* Renamed custom event functions to be 'startup_user' and 'shutdown_user'. Also moved the prototypes around.

* Tweaked pvc atomic layout to work with the pvc planck.

* updates midi scale calling

8 years agoClean up #343's code (#348)
Eric Tang [Tue, 24 May 2016 15:44:40 +0000 (08:44 -0700)]
Clean up #343's code (#348)

8 years agoupdates midi in play_note to better octave
Jack Humbert [Tue, 24 May 2016 03:44:36 +0000 (23:44 -0400)]
updates midi in play_note to better octave

8 years agoOptimize matrix scanning (#343)
Eric Tang [Tue, 24 May 2016 03:42:21 +0000 (20:42 -0700)]
Optimize matrix scanning (#343)

8 years agoadds petereichinger's planck keymap (#340)
Peter [Fri, 20 May 2016 15:14:08 +0000 (17:14 +0200)]
adds petereichinger's planck keymap (#340)

* Add custom keymap

* A little readme and remove old layout comments

8 years agoMerge pull request #324 from Bubblepoint/master
Erez Zukerman [Thu, 19 May 2016 19:54:16 +0000 (15:54 -0400)]
Merge pull request #324 from Bubblepoint/master

Add adnw/k_o_y layout

8 years agofixed small bug with AUDIO_ENABLED (#339)
purpleP [Thu, 19 May 2016 12:36:28 +0000 (15:36 +0300)]
fixed small bug with AUDIO_ENABLED (#339)

8 years agoadapts unicode to quantum.c (#333)
Jack Humbert [Thu, 19 May 2016 03:47:16 +0000 (23:47 -0400)]
adapts unicode to quantum.c (#333)

* Unicode

to have unicode input you need to:

- set your OS input method to UNICODE if needed
- enable unicode in your makefile
- copy the action_function from
keyboard/planck/keymaps/unicode/unicode.c to your keymap.c
set the target OS method in your keymap.c: void matrix_init_user() {
set_unicode_mode(UC_OSX); } you can then switch when you want with:
set_unicode_mode(UC_OSX); set_unicode_mode(UC_LNX);
set_unicode_mode(UC_WIN);
put some unicode codes in your keymap like so: UC(0x0061)
I did change the bit mask in quantum/keymap_common.c and .h
I’m afraid we will need uint32 to get a total support for all unicode
tables or relocate the handler as @mbarkhau did.

* rearranges keycode values, hooks-up unicode

* removes extra lalt ref

* adds unicode shortcuts and example

8 years agooutputs size when make dfuing
Jack Humbert [Thu, 19 May 2016 03:16:31 +0000 (23:16 -0400)]
outputs size when make dfuing

8 years agoadds music and audio toggles (#337)
Jack Humbert [Thu, 19 May 2016 03:14:00 +0000 (23:14 -0400)]
adds music and audio toggles (#337)

* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs

* Usability tweaks

* TWEAE

* nightly

added extra kcs to keymap common

* turned on Plank audio

* Added backlight breathing to atomic

* reverted accidental merge

* Added music and audio toggles to Quantum.c

* Redid the audio callbacks

* music/audio_on_user

8 years agoAdded Swiss-German keymap. (#335)
heartsekai [Wed, 18 May 2016 19:22:04 +0000 (21:22 +0200)]
Added Swiss-German keymap. (#335)

8 years agoadds KC_NUBS, KC_NUHS and shifted versions to default keymaps
Jack Humbert [Wed, 18 May 2016 02:17:23 +0000 (22:17 -0400)]
adds KC_NUBS, KC_NUHS and shifted versions to default keymaps

8 years agofixes default planck keymap
Jack Humbert [Tue, 17 May 2016 03:08:16 +0000 (23:08 -0400)]
fixes default planck keymap

8 years agoFolders for each keymap.c file (#332)
Jacob Bilger [Sun, 15 May 2016 05:22:51 +0000 (01:22 -0400)]
Folders for each keymap.c file (#332)

* Add folders to keymaps

* test

* test

8 years agocleans up default keymaps (olkb)
Jack Humbert [Sun, 15 May 2016 05:07:48 +0000 (01:07 -0400)]
cleans up default keymaps (olkb)

8 years agoupdates midi functionality (#331)
Jack Humbert [Sun, 15 May 2016 04:51:06 +0000 (00:51 -0400)]
updates midi functionality (#331)

* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* adds music sequencer functionality

* implements audio/music functions in quantum.c

* splits up process_action to allow independent processing of actions

* moves midi stuff to quantum.c

* adds additional scales for midi

8 years agosplits process_action up to handle records separately (#329)
Jack Humbert [Sun, 15 May 2016 04:47:25 +0000 (00:47 -0400)]
splits process_action up to handle records separately (#329)

* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* adds music sequencer functionality

* implements audio/music functions in quantum.c

* splits up process_action to allow independent processing of actions

* merging?

8 years agoadds a sequencer to the music mode (#330)
Jack Humbert [Sun, 15 May 2016 04:40:59 +0000 (00:40 -0400)]
adds a sequencer to the music mode (#330)

* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* adds music sequencer functionality

* implements audio/music functions in quantum.c

* Merge branch 'master' into process-record

8 years agoLeader key implementation (#326)
Erez Zukerman [Sun, 15 May 2016 04:27:32 +0000 (00:27 -0400)]
Leader key implementation (#326)

* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* updates process_action functions to return bool

8 years agoAdds explanatory note re history of TMK and QMK
Erez Zukerman [Sun, 15 May 2016 02:07:16 +0000 (22:07 -0400)]
Adds explanatory note re history of TMK and QMK

8 years agoadds Bilger321's planck keymap
Jacob Bilger [Sun, 15 May 2016 01:11:33 +0000 (21:11 -0400)]
adds Bilger321's planck keymap

8 years agoreadme added
Tobias Matt [Sat, 14 May 2016 08:04:14 +0000 (10:04 +0200)]
readme added

8 years agoMerge pull request #320 from Townk/townkmap
Erez Zukerman [Sat, 14 May 2016 01:54:23 +0000 (21:54 -0400)]
Merge pull request #320 from Townk/townkmap

Townkmap

8 years agoMerge pull request #317 from Twey/master
Erez Zukerman [Sat, 14 May 2016 01:51:03 +0000 (21:51 -0400)]
Merge pull request #317 from Twey/master

Updates to `keymaps/twey` to the media layer and for Plover 3.0

8 years agoMerge pull request #307 from sboesebeck/master
Erez Zukerman [Sat, 14 May 2016 01:50:28 +0000 (21:50 -0400)]
Merge pull request #307 from sboesebeck/master

minor change to default layouts

8 years agoMerge remote-tracking branch 'upstream/master'
Tobias Matt [Fri, 13 May 2016 08:08:29 +0000 (10:08 +0200)]
Merge remote-tracking branch 'upstream/master'

8 years ago[planck] adds button for toggling output in plover app (#323)
cwhits [Thu, 12 May 2016 19:08:53 +0000 (15:08 -0400)]
[planck] adds button for toggling output in plover app (#323)

* [planck] toggle plover output in app when toggling plover layer on keyboard

* [planck] moved plover toggle to separate key

* [planck] renamed toggle button

8 years agoRemove unused variable on the keymap.
Thiago Alves [Wed, 11 May 2016 21:01:15 +0000 (14:01 -0700)]
Remove unused variable on the keymap.

8 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Stephan Bösebeck [Wed, 11 May 2016 20:05:19 +0000 (22:05 +0200)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

8 years agoAdd an initial Readme to the keymap.
Thiago Alves [Wed, 11 May 2016 03:58:59 +0000 (20:58 -0700)]
Add an initial Readme to the keymap.

8 years ago[Erez & Jack] Documents audio output
Erez Zukerman [Wed, 11 May 2016 00:48:14 +0000 (20:48 -0400)]
[Erez & Jack] Documents audio output

8 years agoTweak some key positions and changed macro location.
Thiago Alves [Tue, 10 May 2016 23:26:56 +0000 (16:26 -0700)]
Tweak some key positions and changed macro location.

After using the layout a while I learn that the - and = positions should be
swapped since I keep typing = when I intend to type -.

I also, removed the only macro from the top left on the right hand to put the
power button there and since I never use the arrow keys on the separated groups
of keys, I added 4 macros there to get a feel for it.

8 years agoAdd custom config.h and revert the changes on the global one.
Thiago Alves [Tue, 10 May 2016 23:15:32 +0000 (16:15 -0700)]
Add custom config.h and revert the changes on the global one.

Some options I defined on the config.h file don't make much sense to other
keymaps so I revert the global config.h and add those options on the keymap
custom one.

8 years agokeymaps/twey: fix documentation
James ‘Twey’ Kay [Tue, 10 May 2016 21:33:06 +0000 (22:33 +0100)]
keymaps/twey: fix documentation

8 years agokeymaps/twey: Plover 3.0 has a standard TOGGLE keybinding; use that instead
James ‘Twey’ Kay [Tue, 10 May 2016 21:30:17 +0000 (22:30 +0100)]
keymaps/twey: Plover 3.0 has a standard TOGGLE keybinding; use that instead

8 years agokeymaps/twey: Add more history keys to media layer; stop using toggleable media layer
James ‘Twey’ Kay [Tue, 10 May 2016 21:23:36 +0000 (22:23 +0100)]
keymaps/twey: Add more history keys to media layer; stop using toggleable media layer

8 years agoUpdate build guide with instructions to copy the whole keymap folder (#315)
Peter [Mon, 9 May 2016 23:23:51 +0000 (01:23 +0200)]
Update build guide with instructions to copy the whole keymap folder (#315)

8 years agoUpdate the .hex file on the keymap folder.
Thiago Alves [Thu, 5 May 2016 17:19:26 +0000 (10:19 -0700)]
Update the .hex file on the keymap folder.

8 years agoRevert the Makefile to the original one.
Thiago Alves [Thu, 5 May 2016 16:54:43 +0000 (09:54 -0700)]
Revert the Makefile to the original one.

Make sure I customize things as much as possible inside the keymap itself.

8 years agoChange the access to the extra layer to be simetric.
Thiago Alves [Wed, 4 May 2016 21:19:30 +0000 (14:19 -0700)]
Change the access to the extra layer to be simetric.

Instead of having a key on the left side for one layer and a key on the right
side for the other layer, I put two dedicated layers on each side to get to the
proper layers.

8 years agoAdd my personal keymap for OSX use.
Thiago Alves [Tue, 26 Apr 2016 06:46:37 +0000 (23:46 -0700)]
Add my personal keymap for OSX use.

This keymap was created to have a feel keys on a different place and to have as
fewer layers as possible.

Currently I have only 2 extra layers and only one of them is really required to
have all possible keys available.

Check out the README.md file for more information.

8 years agoBacklight Breathing for Planck and Atomic
Jack Humbert [Mon, 9 May 2016 17:17:15 +0000 (13:17 -0400)]
Backlight Breathing for Planck and Atomic

* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs

* Usability tweaks

* TWEAE

* nightly

added extra kcs to keymap common

* turned on Plank audio

* Added backlight breathing to atomic

* reverted accidental merge

* adds backlight pulse to planck

8 years agoquantum accommodates more than 16 columns
Jack Humbert [Mon, 9 May 2016 04:36:23 +0000 (00:36 -0400)]
quantum accommodates more than 16 columns

8 years agoAdds next tab/prev tab back to symb layer and updates legend
Erez Zukerman [Sun, 8 May 2016 17:54:22 +0000 (13:54 -0400)]
Adds next tab/prev tab back to symb layer and updates legend

8 years agoA little more tweaking
Erez Zukerman [Sun, 8 May 2016 17:45:26 +0000 (13:45 -0400)]
A little more tweaking

8 years agoTweaks layers 1 & 2 in my experimental layout
Erez Zukerman [Sun, 8 May 2016 17:39:17 +0000 (13:39 -0400)]
Tweaks layers 1 & 2 in my experimental layout

8 years agoMerge pull request #311 from adiabatic/ergodox-zweihander-osx
Erez Zukerman [Fri, 6 May 2016 22:28:43 +0000 (18:28 -0400)]
Merge pull request #311 from adiabatic/ergodox-zweihander-osx

Add KC_LABK and KC_RABK (< and >)

8 years agoAdd KC_L[LR]ABK to top-level README
Nathan Sharfi [Fri, 6 May 2016 13:22:26 +0000 (06:22 -0700)]
Add KC_L[LR]ABK to top-level README

8 years agoMerge pull request #310 from nrrkeene/master
Erez Zukerman [Fri, 6 May 2016 13:13:30 +0000 (09:13 -0400)]
Merge pull request #310 from nrrkeene/master

Lock layers by pressing both shift keys

8 years agoRearrange code layer on Zweihander
Nathan Sharfi [Fri, 6 May 2016 12:47:55 +0000 (05:47 -0700)]
Rearrange code layer on Zweihander

Makes it more like the iOS keyboard (and therefore easier to remember). Also adds angle brackets for HTML and comparisons.

8 years agoAdd KC_LABK and KC_RABK (< and >)
Nathan Sharfi [Fri, 6 May 2016 12:40:02 +0000 (05:40 -0700)]
Add KC_LABK and KC_RABK (< and >)

8 years agozweihander: add ⌘X, ⌘C, ⌘V to media thumb keys
Nathan Sharfi [Fri, 6 May 2016 12:19:17 +0000 (05:19 -0700)]
zweihander: add ⌘X, ⌘C, ⌘V to media thumb keys

8 years agoThe Ordinary Layout is the layout you are looking for. Come and see.
Nicholas Keene [Fri, 6 May 2016 04:18:48 +0000 (23:18 -0500)]
The Ordinary Layout is the layout you are looking for. Come and see.

8 years agoThe Ordinary Layout is extraordinarily familiar and powerful
Nicholas Keene [Fri, 6 May 2016 03:55:55 +0000 (22:55 -0500)]
The Ordinary Layout is extraordinarily familiar and powerful

8 years agoUses @eltang's famous macro! Still not perfect though :(
Erez Zukerman [Fri, 6 May 2016 03:18:46 +0000 (23:18 -0400)]
Uses @eltang's famous macro! Still not perfect though :(

8 years ago[Erez & Jack] Updates docs with one-shot information and config_user.h
Erez Zukerman [Fri, 6 May 2016 02:58:06 +0000 (22:58 -0400)]
[Erez & Jack] Updates docs with one-shot information and config_user.h

8 years ago[Jack & Erez] Defines MOD_HYPR and MOD_MEH
Erez Zukerman [Fri, 6 May 2016 02:44:24 +0000 (22:44 -0400)]
[Jack & Erez] Defines MOD_HYPR and MOD_MEH

8 years ago[Jack & Erez] Creates a makefile.mk and a config file for the experimental layout
Erez Zukerman [Fri, 6 May 2016 02:24:09 +0000 (22:24 -0400)]
[Jack & Erez] Creates a makefile.mk and a config file for the experimental layout

8 years ago[Jack & Erez] Enables config_user.h per keymap
Erez Zukerman [Fri, 6 May 2016 02:23:32 +0000 (22:23 -0400)]
[Jack & Erez] Enables config_user.h per keymap

8 years ago[Jack & Erez] Adds an option for user-specific config.h files
Erez Zukerman [Fri, 6 May 2016 02:19:59 +0000 (22:19 -0400)]
[Jack & Erez] Adds an option for user-specific config.h files

8 years ago[Jack & Erez] Removes duplicate reference, sorts whitespace
Erez Zukerman [Fri, 6 May 2016 02:19:29 +0000 (22:19 -0400)]
[Jack & Erez] Removes duplicate reference, sorts whitespace

8 years agoadds keycode shortcuts for OSL and OSM
Jack Humbert [Fri, 6 May 2016 01:50:51 +0000 (21:50 -0400)]
adds keycode shortcuts for OSL and OSM

8 years agoAdds oneshot layer and oneshot tap toggling (#308)
Thiago Alves [Fri, 6 May 2016 01:41:37 +0000 (18:41 -0700)]
Adds oneshot layer and oneshot tap toggling (#308)

This commit is mostly a cherry-pick from `ahtn` at
https://github.com/tmk/tmk_keyboard/pull/255.

These are the changes:

* Adds ACTION_LAYER_ONESHOT
* Adds ONESHOT_TAP_TOGGLE
* Mentions sticky keys in the docs on oneshot.

8 years agoReferencing the hex file (#309)
Tom Duckering [Thu, 5 May 2016 22:27:28 +0000 (23:27 +0100)]
Referencing the hex file (#309)

Seems that this is a typo. When I used the hex file it worked so presuming that means it's right ;)

8 years agoupdates atreus's column mapping
Jack Humbert [Thu, 5 May 2016 16:05:09 +0000 (12:05 -0400)]
updates atreus's column mapping

8 years agoremove typo
Stephan Bösebeck [Thu, 5 May 2016 14:52:40 +0000 (16:52 +0200)]
remove typo

8 years agomaking default osx more ELG conform
Stephan Bösebeck [Thu, 5 May 2016 14:48:51 +0000 (16:48 +0200)]
making default osx more ELG conform

8 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Stephan Bösebeck [Thu, 5 May 2016 14:28:47 +0000 (16:28 +0200)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

8 years agoThe Ordinary Layout is the most natural and powerful layout for the Ergodox EZ. Come...
Nicholas Keene [Thu, 5 May 2016 03:17:47 +0000 (22:17 -0500)]
The Ordinary Layout is the most natural and powerful layout for the Ergodox EZ. Come check it out.

8 years agoMerge pull request #305 from nrrkeene/master
Erez Zukerman [Thu, 5 May 2016 02:31:00 +0000 (22:31 -0400)]
Merge pull request #305 from nrrkeene/master

Custom handling for shift keys, improved media layer

8 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Stephan Bösebeck [Wed, 4 May 2016 06:03:25 +0000 (08:03 +0200)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware