summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:jackhumbert/qmk_firmwareErez Zukerman2016-09-2213-475/+616
|\
| * 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 #758 from absenth/developmentErez Zukerman2016-09-143-6/+9
|\ | | | | Absenth Ergodox Keymap Improvements
| * Adding Space Cadet, And Correcting Ascii KeymapLars R. Noldan2016-09-143-6/+9
| |
* | Merge pull request #734 from adiabatic/masterErez Zukerman2016-09-113-10/+12
|\ \ | | | | | | Ergodox EZ: Zweihander keyboard layout updates
| * | - Make thumb-accessible ⌥ and ⌃ into right-⌥ and right-⌃Nathan Sharfi2016-09-072-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - remove media-space and media-shift-space; put a play/pause key at media-m instead - add print screen, scroll lock, and pause/break to the media layer And in the readme: - don't say we don't have any Windows-specific keys - add mnemonics for thumb-alt and thumb-ctrl positioning
| * | zweihander: rename to MakefileNathan Sharfi2016-09-071-0/+0
| | |
* | | Merge pull request #740 from absenth/developmentErez Zukerman2016-09-113-0/+191
|\ \ \ | | |/ | |/| Absenth's Layout- QWERTY with additional Media Layer Functions.
| * | Updated Image HeaderLars2016-09-081-0/+0
| | |
| * | first commit of Absenth's Ergodox FirmwareLars2016-09-083-0/+191
| | |
* | | Added readme.md for bepo_csaDidier Loiseau2016-09-111-0/+162
| | |
* | | Fixed compilation issues after the mergeDidier Loiseau2016-09-111-0/+527
| | |
* | | Merge pull request #715 from profet23/masterJack Humbert2016-09-094-0/+234
|\ \ \ | |/ / |/| | Support for Ergodoxes with 80 keys.
| * | Changing keymap name to "profet_80"profet232016-09-083-0/+0
| | |
| * | Removing separate ergodox80 project.profet232016-09-064-0/+234
| | | | | | | | | | | | | | | Created KEYMAP_80 in ez.h to support 80 key ergodoxes. Creating default_80 keymap as ez keymap.
* | | Fix typoRoman Zolotarev2016-09-081-1/+1
| |/ |/|
* | Merge pull request #732 from romanzolotarev/masterErez Zukerman2016-09-062-27/+40
|\ \ | | | | | | Change CTL_T(KC_ESC) to KC_LCTRL and update readme
| * | Change CTL_T(KC_ESC) to KC_LCTRL and update readmeRoman Zolotarev2016-09-072-27/+40
| | |
* | | norwegian programmer-friendly layoutjoar2016-09-066-0/+420
|/ /
* | Merge pull request #728 from fitzsim/yoruianErez Zukerman2016-09-066-0/+277
|\ \ | | | | | | Add new ErgoDox EZ keymap, YORUIAN
| * | Fix ergodox_yoruian XKB namingThomas Fitzsimmons2016-09-062-2/+2
| | |
| * | Add new ErgoDox EZ keymap, YORUIANThomas Fitzsimmons2016-09-056-0/+277
| |/
* | Merge pull request #686 from coderkun/coderkun_neo2Erez Zukerman2016-09-052-7/+19
|\ \ | | | | | | Merge Ergodox keymap “coderkun_neo2”
| * | Add box-drawing Unicode characters to keymap “coderkun_neo2”coderkun2016-08-261-6/+6
| | |
| * | Set Unicode input mode and override unicode_input_start() method to keymap ↵coderkun2016-08-261-2/+14
| | | | | | | | | | | | “coderkun_neo2”
| * | Disable debugging for Ergodox keymap “coderkun_neo2”coderkun2016-08-262-1/+1
| | |
* | | Merge pull request #678 from algernon/ergodox-ez/algernonErez Zukerman2016-09-058-523/+552
|\ \ \ | |_|/ |/| | ergodox: Update algernon's keymap to v1.6
| * | ergodox: Update algernon's keymap to v1.6Gergely Nagy2016-08-248-523/+552
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Major changes include: Base layer changes ------------------ * The parentheses & bracket keys have been merged: tapping them results in `[` or `{` (if it was shifted), double tapping leads to `(`. * The `:;` and `-_` keys are now available on the base layer, on their **ADORE** location, too, just below `[{(`/`]})`. * The `Apps` key has been replaced by `F12`. * The `-`/`_` is no longer a tap-dance key. ADORE layer changes ------------------- * Adjustments were made to the **ADORE** layer, to separate some inconvenient combinations. Miscellaneous changes --------------------- * `LEAD u` now starts the symbolic unicode input system, instead of the OS-one. * The mouse acceleration keys on the **Navigation and Media* layer have been turned into toggles: tap them once to turn them on, until tapped again. Tapping an accelerator button will turn all the others off. * When the **ARROW** layer is on, the *red* and *blue* LEDs light up now. Heatmap ------- * The built-in keylogger has been greatly enhanced, it now outputs the pressed state, and the layer (Dvorak or ADORE). As such, the `ADORE_AUTOLOG` option has been removed, instead there is `AUTOLOG_ENABLE` now, which when enabled, makes the keylogger start when the keyboard boots. It defaults to off. * The heatmap generator received a lot of updates. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* | Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-261-23/+142
|\ \
| * \ Merge pull request #664 from linsomniac/infinity_readmeErez Zukerman2016-08-261-23/+144
| |\ \ | | |/ | |/| Adding nicer Infinity build instructions.
| | * Making the existing firmware link betterSean Reifschneider2016-08-241-1/+2
| | |
| | * Changes based on @fredizzimo review, flashing Infinity detailsSean Reifschneider2016-08-241-0/+34
| | |
| | * Changes from review by @fredizzimo and @XyverzSean Reifschneider2016-08-221-19/+16
| | |
| | * Tweaks after review.Sean Reifschneider2016-08-191-3/+3
| | |
| | * Restructuring of the ergodox README.Sean Reifschneider2016-08-191-29/+105
| | |
| | * Noting the change directory.Sean Reifschneider2016-08-191-0/+1
| | |
| | * Adding submodule note.Sean Reifschneider2016-08-191-0/+1
| | |
| | * Adding nicer Infinity build instructions.Sean Reifschneider2016-08-191-0/+11
| | |
* | | Merge remote-tracking branch 'upstream/master' into makefile_overhaulFred Sundvik2016-08-243-0/+419
|\| |
| * | Merge pull request #677 from SmackleFunky/masterJack Humbert2016-08-233-0/+419
| |\ \ | | | | | | | | Virtual Serial Port - and a Layout that uses that virtual serial port for Plover
| | * | move to ergodox-ez onlyJason Green2016-08-233-0/+0
| | | |
| | * | Remove unneeded includeJason Green2016-08-231-1/+0
| | | |
| | * | add missing #includeJason Green2016-08-231-0/+1
| | | |
| | * | TxBolt (Steno) Serial protocol for Ergodox EzJason Green2016-08-233-0/+419
| | | |
* | | | Merge branch 'master' into makefile_overhaulFred Sundvik2016-08-2318-484/+685
|\| | |
| * | | Add default swap configs for a couple of boards.Joe Wasson2016-08-201-0/+24
| |/ /
| * | Merge pull request #665 from linsomniac/keymap_jafoJack Humbert2016-08-205-0/+213
| |\ \ | | | | | | | | Adding jafo layout.
| | * | Bringing over changes from default map.Sean Reifschneider2016-08-191-4/+3
| | | |
| | * | Adding jafo layout.Sean Reifschneider2016-08-195-0/+214
| | |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 09:17:48 +0000