summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #778 from TerryMathews/masterJack Humbert2016-09-239-0/+363
|\ | | | | Establish support for TADA68
| * Disable RGB led support until a suitable pin is locatedTerryMathews2016-09-232-4/+7
| |
| * Initial support for TADA68TerryMathews2016-09-229-0/+360
| |
* | Merge pull request #776 from DidierLoiseau/issue-772Jack Humbert2016-09-231-3/+4
|\ \ | | | | | | Fix issue #772 Meh and Hyper not working
| * | Fix issue #772 Meh and Hyper not workingDidier Loiseau2016-09-231-3/+4
| |/
* | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareErez Zukerman2016-09-2213-475/+616
|\ \
| * \ Merge pull request #760 from algernon/ergodox-ez/algernonErez Zukerman2016-09-2213-475/+616
| |\ \ | | |/ | |/| Update the ergodox/algernon keymap to v1.7
| | * Update the ergodox/algernon keymap to v1.7Gergely Nagy2016-09-1813-475/+616
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overall changes =============== * The number row has been completely rearranged on both the **Base** and the **ADORE** layers. * The number/function key behavior was changed: function keys are now on the **Media**. * The `:`/`;` and `-`/`_` keys were put back to their thumb position on the bottom row, on both the **Base** and **ADORE** layers. * The bottom large keys on the inner side of each half now function as [tmux](http://tmux.github.io/) keys: the left to send the prefix, the right to send the `display-panes` key. The left also doubles as a GNU screen prefix key, and sends `C-a` when double tapped. * A number of functions, such as the **AppSel** layer, now require the `hid-commands` tool to be running, with the output of `hid_listen` being piped to it. ADORE ===== * `Y` and `X` have been swapped again. Media/Navigation layer ====================== * The function keys are now on this layer. * Mouse keys have been removed. * Media start/stop/prev/next have been removed. * `Print screen` has been removed. * There is only one screen lock key now. Heatmap ======= * Fixed a few issues in the finger-stats calculation. * The tool now also timestamps and saves all input lines to a logfile, which it loads on start, allowing one to continue the collection after upgrading the tool. * The heatmap tool will now colorize the stats by default. * The periodic stats are now printed in a more compact format. Tools ===== * Added a new tool, `tools/layer-notify` that listens to layer change events on the HID console, and pops up a notification on layer changes. * Another new tool, `tools/text-to-log.py` has been added that converts arbitrary text to a keylogger output, which can be fed to the heatmap generator. * A number of features have been moved to the `tools/hid-commands` utility. These generally are OS dependent, and are easier to implement on the software side. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* | | Adds EPRM reset keyErez Zukerman2016-09-222-2/+12
|/ /
* | Merge pull request #771 from UnderSampled/masterJack Humbert2016-09-213-0/+340
|\ \ | | | | | | Impossible Layout
| * | Fixed Impossible Layout readme tables (again)UnderSampled2016-09-211-0/+12
| | |
| * | Corrected Impossible Layout readme tablesStephen Christie2016-09-211-30/+0
| | |
| * | Filled Impossible Layout documentationStephen Christie2016-09-211-1/+90
| | |
| * | Fixed Qwerty Fn layer to match documented designStephen Christie2016-09-201-5/+5
| | |
| * | Merge branch 'master' of http://github.com/jackhumbert/qmk_firmwareStephen Christie2016-09-19543-15161/+37682
| |\ \
| * \ \ Merge branch 'master' of http://github.com/jackhumbert/qmk_firmwareStephen Christie2016-08-02335-2269/+11874
| |\ \ \
| * | | | Moved Insert, PrtSc, Pause to Adjust; Corner enterStephen Christie2016-08-021-35/+35
| | | | |
| * | | | Corrected Qwerty/Fn Mismatch.Stephen Christie2016-08-011-4/+4
| | | | |
| * | | | Added quote key.Stephen Christie2016-07-311-7/+7
| | | | |
| * | | | Moved CapsLk, ScrollLk, and NumLk to Adjust layerStephen Christie2016-07-301-17/+17
| | | | |
| * | | | Connected all layers through Adjust layerStephen Christie2016-07-291-85/+69
| | | | |
| * | | | Fixed Function keys (Impossible layout)Stephen Christie2016-07-281-4/+4
| | | | |
| * | | | Modified Qwerty, created Qwerty with numbersStephen Christie2016-07-281-24/+40
| | | | |
| * | | | General table cleanup.Stephen Christie2016-07-261-48/+49
| | | | |
| * | | | Modified Plover layer for Impossible's home position.Stephen Christie2016-07-261-9/+10
| | | | |
| * | | | Removed unused layers (keeping QWERTY for later/reference)Stephen Christie2016-07-261-77/+4
| | | | |
| * | | | Removed unused layers (left QWERTY for later use/reference)Stephen Christie2016-07-261-47/+3
| | | | |
| * | | | Table for FnStephen Christie2016-07-221-0/+12
| | | | | | | | | | | | | | | | | | | | layer.
| * | | | Switched to natural arrows, put ENTER on middle Fn, swapped Shift and CTRL.Stephen Christie2016-07-221-6/+19
| | | | |
| * | | | First draft of the 'impossible' layout.Stephen Christie2016-07-213-0/+359
| | | | |
* | | | | Merge pull request #769 from pvinis/fix/tap-dance-each-tap-restoreJack Humbert2016-09-213-5/+8
|\ \ \ \ \ | | | | | | | | | | | | [tap dance] restore each_tap functionality
| * | | | | add user_data fieldPavlos Vinieratos2016-09-211-0/+2
| | | | | |
| * | | | | formattingPavlos Vinieratos2016-09-212-5/+5
| | | | | |
| * | | | | restore each_tap callbackPavlos Vinieratos2016-09-211-0/+1
| | | | | |
* | | | | | Merge pull request #768 from Dbroqua/masterJack Humbert2016-09-211-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Updated backlight levels for KC60
| * | | | | | - Updated backlight levels for KC60dbroqua2016-09-211-1/+1
| | | | | | |
* | | | | | | Merge pull request #767 from IBNobody/lets_split_reduce_hex_sizeJack Humbert2016-09-2110-14/+668
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Lets split reduce hex size
| * | | | | | Created I2C and Serial keymaps for unit testingIBNobody2016-09-204-0/+632
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having a dedicated I2C keymap and a dedicated serial keymap will allow the testing suite to check both conditions.
| * | | | | | Made Serial and I2C not include the OtherIBNobody2016-09-206-14/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This saves 192 bytes
| * | | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-09-202-5/+9
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #765 from jakllsch/more-shifted-dvorak-keycodesJack Humbert2016-09-201-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add more shifted Dvorak key code definitions
| * | | | | | | Add more shifted Dvorak key code definitionsJonathan A. Kollasch2016-09-191-0/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #763 from Dbroqua/masterJack Humbert2016-09-201-5/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | | Updated dbroqua layout for KC60
| * | | | | - Removed HHKB like layoutdbroqua2016-09-192-114/+0
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master'dbroqua2016-09-19119-1264/+5828
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #4 from jackhumbert/masterDamien2016-09-19119-1264/+5828
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | Merge from jackhumbert
| * | | | | | - Updated dbroqua layout for kc60dbroqua2016-09-191-5/+5
| | | | | | |
| * | | | | | - Added capslock led for KC60 keyboard (based on gitbug.com/jpec/kc60 works)dbroqua2016-09-172-0/+114
| |/ / / / /
| * | | | | Merge pull request #3 from jackhumbert/masterDamien2016-08-29191-10238/+11639
| |\ \ \ \ \ | | | | | | | | | | | | | | Merge from jackhumbert
| * \ \ \ \ \ Merge pull request #2 from jackhumbert/masterDamien2016-08-2635-104/+2461
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Merge from jackhumbert