summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix misspelled command in Norwegian helperAndreas Lindhé2016-07-251-1/+1
|
* Merge pull request #543 from VoodaGod/bone2planckJack Humbert2016-07-211-74/+120
|\ | | | | updated bone2planck
| * fixed include pathsJason Janse van Rensburg2016-07-201-16/+16
| |
| * reformatJason Janse van Rensburg2016-07-201-16/+16
| |
| * updated bone2planckJason Janse van Rensburg2016-07-201-65/+111
| |
* | Merge pull request #541 from milestogo/masterJack Humbert2016-07-2129-0/+2816
|\ \ | | | | | | initial kinisis advantage build
| * | adding traveller keyboardmilestogo2016-07-207-0/+697
| | |
| * | initial kinisis advantage buildmilestogo2016-07-1922-0/+2119
| |/
* | Merge pull request #540 from replicaJunction/feature-atreus-keymapFunctionJack Humbert2016-07-211-5/+5
|\ \ | | | | | | Adjusted Atreus KEYMAP() function.
| * | Adjusted Atreus KEYMAP() function.Joshua T2016-07-191-5/+5
| |/ | | | | | | | | | | This change adjusts the KEYMAP() function to provide a more visual representation of the key positions on the keyboard. Previously, keymaps have been defined directly using arrays for the Atreus keyboard. While this works, it doesn't utilize the helpful KEYMAP() function at all to allow the user to visually position the key codes for ease of editing. See the Ergodox-EZ KEYMAP() function and layouts for a great example of how this can work. This change should not break any existing Atreus layouts. At the time of this commit, there are two existing layouts for the Atreus board, and neither use the KEYMAP() function.
* | Merge pull request #538 from robertdale/preonic-map-correctionJack Humbert2016-07-211-5/+5
|\ \ | | | | | | Preonic: Corrected the ascii layout to match the coded layout
| * | added Midi On/Off; Enter is actually transparentRobert Dale2016-07-191-3/+3
| | |
| * | Corrected the ascii layout to match the coded layoutRobert Dale2016-07-191-3/+3
| |/
* | Merge pull request #536 from pvinis/debug-docJack Humbert2016-07-211-1/+1
|\ \ | | | | | | add some debugging doc, after i found out how to print debug messages
| * | add link to hid_listenPavlos Vinieratos2016-07-191-1/+1
| | |
| * | add some debugging doc, after i found out how to print debug messagesPavlos Vinieratos2016-07-191-1/+1
| |/
* | Merge pull request #530 from sethbc/masterJack Humbert2016-07-2110-8/+53
|\ \ | | | | | | Misc. fixes from sethbc
| * | don't believe the hex files are posted to qmk.fmSeth Chandler2016-07-171-1/+1
| | |
| * | update more non-existent readmes for QMK.fmSeth Chandler2016-07-174-0/+16
| | |
| * | update broken linkSeth Chandler2016-07-171-1/+1
| | |
| * | update audio linksSeth Chandler2016-07-171-1/+1
| | |
| * | update tmk linkSeth Chandler2016-07-171-1/+1
| | |
| * | update link to Vagrant docfileSeth Chandler2016-07-171-1/+1
| | |
| * | update readmes in certain directories to work with qmk.fmSeth Chandler2016-07-172-0/+8
| | |
| * | add custom makefile for sethbc keymapSeth Chandler2016-07-161-0/+21
| | |
| * | update makefile to default to no virtual dip switchesSeth Chandler2016-07-161-1/+1
| | |
| * | update readme imagesSeth Chandler2016-07-161-2/+2
| |/
* | 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