summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #529 from CommandLineDesign/CMD60-newKeymapJack Humbert2016-07-216-0/+364
|\ | | | | Added CMD60 keymap
| * Fix erroneous characterJonathan Lucas2016-07-161-1/+1
| | | | | | Must have been keeb testing :)
| * Added CMD60 keymapJonathan Lucas2016-07-166-0/+364
| |
* | Merge pull request #525 from edasque/masterJack Humbert2016-07-212-0/+43
|\ \ | | | | | | Added Docker as a simple way to build firmwares
| * | Further simplyfying the docker usageErik Dasque2016-07-151-7/+3
| | | | | | | | | | | | We'll be able to change the image user name if we set up the initial repo to trigger Docker images rebuilds on hub.docker.com
| * | Adding Docker build system & documentationErik Dasque2016-07-152-0/+47
| |/
* | Merge pull request #522 from exiva/extrakey-macfixJack Humbert2016-07-211-2/+2
|\ \ | | | | | | Fix OS X Recognizing keyboard as Mouse/Tablet
| * | Fix OS X Recognizing keyboard as Mouse/TabletTravis La Marr2016-07-151-2/+2
| |/ | | | | | | | | | | | | Modified the LUFA USB HID Descriptor to change the logical/usage minimums for System Control from 0x01 (Mouse) to 0x81 (System Power Down), this fixes OS X recognizing the Planck as having a mouse and tablet, even with mousekeys off.
* | Merge pull request #521 from exiva/makefile-waitJack Humbert2016-07-211-0/+4
|\ \ | | | | | | Make DFU wait for bootloader
| * | Make DFU wait for bootloaderTravis La Marr2016-07-151-0/+4
| |/ | | | | | | | | Added a loop for waiting for the keyboard to be put in bootloader mode, rather than failing out. Makes building keymaps easier.
* | Merge pull request #518 from jakllsch/upstreamJack Humbert2016-07-218-13/+20
|\ \ | | | | | | keymap_extras changes
| * | keymap_dvorak.h: add missing shifted keys, fix whitespaceJonathan A. Kollasch2016-07-141-4/+11
| | |
| * | extra_keymaps: use RALT() instead of 0x1400 for AltGrJonathan A. Kollasch2016-07-147-7/+7
| | |
| * | keymap_extras: add newline at end of filesJonathan A. Kollasch2016-07-142-2/+2
| |/
* | Merge pull request #516 from pvinis/tap-dance-anywayJack Humbert2016-07-213-16/+103
|\ \ | |/ |/| Tap dance anyway
| * add a couple of commentsPavlos Vinieratos2016-07-191-0/+2
| |
| * on_each_tap_fn is called on tap down and tap upPavlos Vinieratos2016-07-191-1/+1
| |
| * add a bit of documentationPavlos Vinieratos2016-07-191-3/+45
| |
| * in the default case, it should be called if there is actually a tapPavlos Vinieratos2016-07-181-2/+2
| | | | | | | | | | dance happening, and in the normal case, it should be called when the tap down is happening.
| * change naming, and remove extraneous definitionPavlos Vinieratos2016-07-172-36/+23
| |
| * add an `anyway` and a `reset` callbackPavlos Vinieratos2016-07-162-5/+59
| | | | | | | | | | | | | | when using tap dance, we have the `regular` callback that is called on the last tap. this commit adds an `anyway` callback that is called on every tap, and a `reset` callback that is called on reset of the tap dance taps.
| * in case its NULLPavlos Vinieratos2016-07-161-1/+3
|/
* Merge pull request #489 from Skrymir/masterJack Humbert2016-07-142-0/+213
|\ | | | | New ergodox-ez layout
| * Merge pull request #2 from jackhumbert/masterJoshua Colbeck2016-07-1282-786/+2969
| |\ | | | | | | Pull from upstream
| * \ Merge branch 'master' of https://github.com/Skrymir/qmk_firmwareJosh Colbeck2016-07-062-0/+213
| |\ \
| | * \ Merge pull request #1 from Skrymir/patch-1Joshua Colbeck2016-07-0612-244/+495
| | |\ \ | | | | | | | | | | add ergodox layout
| | | * | Changed layer switching to momentaryJosh Colbeck2016-07-061-6/+6
| | | | | | | | | | | | | | | | | | | | corrected macro
| | | * | Merge remote-tracking branch 'jackhumbert/master' into patch-1Josh Colbeck2016-07-042-14/+14
| | | |\ \
| | | * \ \ Merge remote-tracking branch 'jackhumbert/master' into patch-1Josh Colbeck2016-07-048-230/+268
| | | |\ \ \
| | | * | | | Added macro and readmeJosh Colbeck2016-07-042-18/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | macros to for often used eclipse shortcuts
| | | * | | | Added new keymapJosh Colbeck2016-07-041-0/+191
| | | | | | |
| | | * | | | Revert "Changed layout of left hand main layer"Josh Colbeck2016-07-031-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8149924399cf3d31d80444a10477a29f53a4990e.
| | | * | | | Changed layout of left hand main layerJoshua Colbeck2016-07-031-12/+12
| | |/ / / /
* | | | | | Merge pull request #515 from pvinis/reset-functionJack Humbert2016-07-142-10/+16
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | extract reset keyboard into a function
| * | | | | extract reset keyboard into a functionPavlos Vinieratos2016-07-132-10/+16
|/ / / / / | | | | | | | | | | | | | | | that makes it easy to call reset_keyboard() from a function in a keymap
* | | | | Merge pull request #477 from Smilliam/masterJack Humbert2016-07-113-1/+19
|\ \ \ \ \ | | | | | | | | | | | | Canceling Space Cadet state with opposite shift key
| * | | | | amended extraneous file editsSmilliam2016-07-102-7/+1
| | | | | |
| * | | | | Made rollover behavior for space cadet optionalSmilliam2016-07-104-10/+26
| | | | | |
| * | | | | fixed indentation.Smilliam2016-07-041-8/+8
| | | | | |
| * | | | | Allow Space Cadet state to be canceled by alternate Shift keySmilliam2016-07-041-0/+8
| | |_|_|/ | |/| | | | | | | | | | | | | Allows you to press RSHIFT to cancel the insertion of a "(" when holding down LSHIFT. Alternatively, allows you to press LSHIFT to cancel the insertion of a ")" when holding down RSHIFT. This change enables you to renege from outputting a character should you press a shift key erroneously.
* | | | | Merge pull request #506 from stanleylai/masterJack Humbert2016-07-112-0/+104
|\ \ \ \ \ | | | | | | | | | | | | Added my custom keymap for Satan
| * | | | | Added my custom keymap for SatanStanley Lai2016-07-102-0/+104
| | | | | |
* | | | | | Merge pull request #507 from ruiqimao/masterskullydazed2016-07-114-17/+33
|\ \ \ \ \ \ | |/ / / / / |/| | | | | fixed clueboard LED pin assignments and matrix documentation
| * | | | | fixed clueboard LED pin assignments and matrix documentationRuiqi Mao2016-07-114-17/+33
|/ / / / /
* | | | | Merge pull request #505 from fredizzimo/documentation_fixJack Humbert2016-07-101-3/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove out of place documentation, caused by ChibiOS merge
| * | | | | Remove out of place documentation, caused by ChibiOS mergeFred Sundvik2016-07-101-3/+0
| | | | | |
* | | | | | Merge pull request #502 from robotmaxtron/masterJack Humbert2016-07-095-0/+544
|\ \ \ \ \ \ | | | | | | | | | | | | | | Adding robotmaxtron's GH60 Keymap
| * | | | | | Update keymap.cMax Whittingham2016-07-091-3/+1
| | | | | | |
| * | | | | | Cleaning up repoMax Whittingham2016-07-095-0/+546
|/ / / / / /
* | | | | | Merge pull request #500 from TerryMathews/masterJack Humbert2016-07-091-0/+116
|\ \ \ \ \ \ | | | | | | | | | | | | | | Establish Poker clone keymap for Satan
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-10 13:56:16 +0000