1
0
Fork 0
forked from forks/qmk_firmware
Commit graph

354 commits

Author SHA1 Message Date
Jack Humbert 33e62c080c merging 2016-11-12 20:54:37 -05:00
Jonathan Arnett 1d766c596e
Removed the control action when holding z or / 2016-11-06 13:48:20 -05:00
lucwastiaux b8e204322a added more shortcut keys 2016-11-05 12:07:33 +08:00
lucwastiaux 78a1dc84dd updated readme 2016-11-05 11:58:23 +08:00
lucwastiaux ff8b4a1d89 removed brackets anywhere but in brackets layer, added mouse layer back in, replaced all HYPR with MEH, put semicolon-newline and end-newline on symbol layer 2016-11-05 11:56:59 +08:00
Erez Zukerman d5270af111 Implements dedicated text zoom keys 2016-11-01 10:03:58 -04:00
Erez Zukerman 7a9be2562d Merge pull request #851 from J3RN/momentary
Switched to momentary
2016-10-31 21:41:19 -04:00
Erez Zukerman a6401076d5 Merge pull request #843 from lucwastiaux/master
Adding Ergodox Dvorak Programmer layout
2016-10-31 21:40:58 -04:00
Erez Zukerman bd40844e4e Merge pull request #836 from 20lives/master
added new layout
2016-10-31 21:39:40 -04:00
lucwastiaux 055247f35d re-introduce brackets layer 2016-10-26 21:00:58 +08:00
Alpha Chen 427ea7a889 [alphadox] remove tmk reset code 2016-10-25 09:00:45 -07:00
Alpha Chen e2916f8ab1 [ergodox][alphadox] undefine tapping_term, ignore_mod_tap_interrupt 2016-10-25 09:00:45 -07:00
Alpha Chen 22cb73fad3 add alphadox layouts to atreus and ergodox 2016-10-25 09:00:45 -07:00
Lior Haim 0d26320cf3 merge upstream 2016-10-23 20:22:28 +03:00
lucwastiaux 919caaccb7 adding readme 2016-10-23 11:44:16 +08:00
lucwastiaux 14ac397d5d add up/down keys on thumb clusters 2016-10-23 00:47:58 +08:00
lucwastiaux 64ac74cab6 remove brackets layer, replace a few shortcuts on thumb cluster 2016-10-23 00:44:34 +08:00
lucwastiaux 97e3106848 type brackets in symbol layer, using bottom row 2016-10-23 00:11:16 +08:00
lucwastiaux e0c9ec54dd add tap-dance support, make right shift double-tap=caplock 2016-10-22 22:39:24 +08:00
lucwastiaux bc8092245c change include files 2016-10-22 22:29:05 +08:00
lucwastiaux 53a2bf9215 added dvorak programmer layout 2016-10-22 22:22:34 +08:00
twentylives 8727976a1a fixed copy-cut-paste buttons 2016-10-21 12:13:44 +03:00
Erez Zukerman 2e2b9962cd Merge pull request #833 from h-parks/master
Win10 Writer's Block - An ErgoDox Keymap
2016-10-20 08:55:16 -04:00
twentylives 4ebbb3c297 Merge branch 'master' of https://github.com/20lives/qmk_firmware 2016-10-20 11:07:53 +03:00
twentylives 7090c99adf fixed base layer = key 2016-10-20 11:07:14 +03:00
20lives 464af700eb fix readme 2016-10-19 20:26:58 +03:00
twentylives 65c1127b49 update pics and readme 2016-10-19 20:23:10 +03:00
h-parks f2197611c7 Win10 Writer's Block - An ErgoDox Keymap
fix for compiling on infinity:

replaced `_delay_ms()' with `wait_ms()'
included "wait.h"
2016-10-19 09:33:37 -05:00
h-parks 1688c014cc Win10 Writer's Block - An ErgoDox Keymap
This is a QWERTY layout for ErgoDox on QMK. It's designed to work well in MS Office-like environments. It's tested on Windows 7 and 10.
2016-10-18 21:58:33 -05:00
Xyverz f41d540e81 Add files via upload
Minor changes to my Dvorak keymap. Updated the readme.md to reflect these changes.
2016-10-18 16:28:44 -07:00
Ryan Ascheman fad20756e3 update header file 2016-10-18 13:58:59 -07:00
Ryan Ascheman cabfd78309 didn't read PR comment close enough, correcting folder 2016-10-18 12:48:07 -07:00
20lives 48eb5112b5 Update readme.md 2016-10-18 22:35:05 +03:00
20lives 31193b9cff Update readme.md 2016-10-18 22:33:42 +03:00
twentylives 28dfaa20f5 adding dvorak hebrew layout 2016-10-18 22:27:36 +03:00
Jack Humbert 5f91fb4136 working with power limit 2016-10-16 16:03:33 -04:00
Gergely Nagy f9d8cf35f6 ergodox: Update algernon's keymap to v1.9
Overall changes
===============

* `F12` was replaced by an `Fx` key, that activate the **Media** layer
  as a one-shot layer, and also `Alt` as a one-shot modifier.

Base layer changes
==================

* The `Media Stop` key is now a tap-dance key, and resets the device for
  programming on the fourth tap.

Miscellaneous
=============

* `π` can now be entered with UCIS.
* `🐁` can now be entered with UCIS.

Tools
=====

* The `tools/layer-notify` tool was removed, it was an example, which I
  don't use.

`tools/hid-commands`
--------------------

* Now looks at the `DISABLE_APPSEL_START` environment value, and does
  not display an AppSel notification if it is non-empty.
* Will attempt to re-program the keyboard when receiving a `reflash`
  command.
* No longer tries to select Emacs 24 on `APPSEL_EMACS`, rather, it goes
  for any Emacs.
* The `APPSEL_MUSIC` command now includes Kodi in the list too, as the
  last choice.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-10-16 08:01:50 +02:00
Joshua T 896c1e6f1e Added a bit more detail to header 2016-10-15 18:19:09 -05:00
Joshua T a2adff94bb Reversed tilde and grave 2016-10-15 18:05:22 -05:00
Joshua T 825563f34d Moved Extend tab and ^tab 2016-10-15 17:56:09 -05:00
Joshua T 1455a44a44 Added = to match Atreus 2016-10-15 17:41:36 -05:00
Joshua T 80fe2ea676 Switched Tab and Ctrl back 2016-10-15 17:23:25 -05:00
Joshua T 0714981288 Fixed typo 2016-10-15 17:19:07 -05:00
Joshua T c67f6ee872 Added Menu key (the rclick menu) 2016-10-15 17:03:27 -05:00
Joshua T d9db5395b3 Updated layout to 1.2 - lots of changes
Rewrote QWERTY to make it a first-class citizen instead of just a glorified game layer.

Added a lot of keys to Extend layer to bring it in line with my Atreus.

Plenty of other changes too.
2016-10-15 16:51:40 -05:00
Joshua T a9c8f2f5b8 Reduced TAPPING_TERM to 150
Also removed duplicate definition of PREVENT_STUCK_MODIFIERS
2016-10-15 16:44:26 -05:00
Joshua T 2e6a1a53d7 Merge remote-tracking branch 'upstream/master' 2016-10-15 15:14:10 -05:00
Erez Zukerman 0a9ad8f335 Merge pull request #818 from pvinis/pvinis-keymap
pvinis keymap
2016-10-13 06:41:51 -04:00
Jack & Erez e27a754b70 [Jack & Erez] Simplifies and documents TO 2016-10-12 22:18:27 -04:00
Pavlos Vinieratos 0853227ede add readme 2016-10-11 11:25:54 +02:00
Pavlos Vinieratos 538cdda78e use wait_ms instead of _delay_ms 2016-10-11 10:34:47 +02:00
Pavlos Vinieratos bcc0fa5c81 add messenger 2016-10-11 10:34:47 +02:00
Pavlos Vinieratos 2855de5f0f init keymap 2016-10-11 10:34:47 +02:00
Erez Zukerman 698d02122b Merge pull request #803 from coderkun/coderkun_neo2
Merge Unicode fixes for keymap “coderkun_neo2”
2016-10-10 19:59:28 -04:00
Nathan Johnson e95c1e3f2c Adding whiskey_tango_foxtrot_capslock ergodox keymap 2016-10-09 12:58:31 -05:00
Jonathan Arnett f284bc6af9
Switched to momentary
Also updated the style of these lines slightly to match the style of the
default keymap
2016-10-09 11:40:08 -04:00
Jack Humbert b8679bbe04 RGBW lights 2016-10-05 20:41:38 -04:00
Gergely Nagy aa9c6e9f59
ergodox: Update algernon's keymap to v1.8
ADORE
-----

* Major rearrangements were made, to reduce pinky use, and to balance
  out the hand usage.

Tools
-----

* The `hid-commands` tool will now display a notification when
  the **AppSel** layer is triggered.
* The `log-to-heatmap.py` tool now treats the innermost keys on the
  bottom row as thumb keys, as far as statistics are concerned.

Miscellaneous
-------------

* Fixed the **Steno** toggle key.
* My wife is now present on the keyboard too.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-10-03 19:20:00 +02:00
coderkun 8dd69a1b05 Overwrite method hex_to_unicode() for make it compatible with Neo 2016-10-03 16:36:21 +02:00
coderkun 8655677584 Merge branch 'master' into coderkun_neo2 2016-10-02 10:04:29 +02:00
coderkun a10e100bd5 Add double arrow Unicode characters to FMU layer 2016-10-02 09:55:38 +02:00
xyverz e69e4c1ef2 Merge remote-tracking branch 'jackhumbert/master' 2016-09-30 23:16:50 -07:00
Erez Zukerman 35e6870e5c Merge pull request #788 from chwilk/kastyle-refresh
Kastyle refresh
2016-09-30 08:59:59 -04:00
Chris McLennon cce294df86 Remove config.h 2016-09-28 14:44:41 -05:00
Chris McLennon 65b0eff6d8 Contributing new keymap to Ergodox 2016-09-28 13:24:29 -05:00
chwilk 32cc2f6bd9 Added description of kastyle keymap 2016-09-27 11:27:09 -05:00
chwilk e1bfe13090 Moved hand_swap_config array so all keyboards get it defined 2016-09-26 15:49:10 -05:00
chwilk 90fd0810db Updated kastyle keymap, including swap hands feature 2016-09-26 01:05:06 -05:00
Erez Zukerman ce6a9a6c38 Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2016-09-22 22:05:18 -04:00
Erez Zukerman 6e5142ca3e Adds EPRM reset key 2016-09-22 22:05:12 -04:00
Gergely Nagy 3e128552d9 Update the ergodox/algernon keymap to v1.7
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>
2016-09-18 11:48:47 +02:00
Xyverz 26d6b90dde Update readme.md 2016-09-17 14:43:25 -07:00
Erez Zukerman a258358b6c Merge pull request #758 from absenth/development
Absenth Ergodox Keymap Improvements
2016-09-14 22:51:41 -04:00
Lars R. Noldan 8a01bbc422 Adding Space Cadet, And Correcting Ascii Keymap 2016-09-14 11:54:13 -05:00
Erez Zukerman 23faf9ec81 Merge pull request #734 from adiabatic/master
Ergodox EZ: Zweihander keyboard layout updates
2016-09-11 20:28:09 -04:00
Erez Zukerman 862d93e0cb Merge pull request #740 from absenth/development
Absenth's Layout- QWERTY with additional Media Layer Functions.
2016-09-11 20:27:12 -04:00
Didier Loiseau 21747cc310 Added readme.md for bepo_csa 2016-09-11 22:30:05 +02:00
Didier Loiseau 1aeb59335f Fixed compilation issues after the merge 2016-09-11 02:19:55 +02:00
Didier Chagniot 83b6dd0cd6 readme.md updated 2016-09-10 00:20:21 +02:00
Didier Chagniot 67dfde765f typing with it 2016-09-09 21:42:35 +02:00
Lars 52121cee7a Updated Image Header 2016-09-08 23:32:11 -05:00
Lars 9c2015ea7f first commit of Absenth's Ergodox Firmware 2016-09-08 23:20:17 -05:00
Roman Zolotarev 740b4bbe46 Fix typo 2016-09-08 21:12:34 +08:00
Nathan Sharfi 273a6cc688 - Make thumb-accessible ⌥ and ⌃ into right-⌥ and right-⌃
- 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
2016-09-07 20:28:31 -07:00
Nathan Sharfi e5396ca9e5 zweihander: rename to Makefile 2016-09-07 18:23:01 -07:00
Daniel b807867f95 moves brackets from J/K to U/I to remove block of common vim sequence. 2016-09-06 21:56:27 -06:00
Erez Zukerman 0f111182a6 Merge pull request #732 from romanzolotarev/master
Change CTL_T(KC_ESC) to KC_LCTRL and update readme
2016-09-06 21:35:15 -04:00
Roman Zolotarev da16733e7a
Change CTL_T(KC_ESC) to KC_LCTRL and update readme 2016-09-07 08:03:19 +08:00
joar a3e7042084 norwegian programmer-friendly layout 2016-09-06 16:00:08 +02:00
Erez Zukerman 8b0769fe5a Merge pull request #728 from fitzsim/yoruian
Add new ErgoDox EZ keymap, YORUIAN
2016-09-06 07:07:25 -04:00
Thomas Fitzsimmons ce53c0643d Fix ergodox_yoruian XKB naming 2016-09-06 00:09:14 -04:00
Thomas Fitzsimmons e9ce4960c1 Add new ErgoDox EZ keymap, YORUIAN 2016-09-05 20:53:35 -04:00
Erez Zukerman 5bb29136b1 Merge pull request #686 from coderkun/coderkun_neo2
Merge Ergodox keymap “coderkun_neo2”
2016-09-05 20:33:09 -04:00
Daniel 250f096144 adds tap dance and macro to move underscore and l- and r- brackets to base layer. 2016-09-02 14:35:15 -06:00
Daniel 0c598f53c1 adds Hyper key. improves media layer. first attempt at tap dance. 2016-09-01 23:37:52 -06:00
Daniel dbac9f4954 Merge remote-tracking branch 'upstream/master' 2016-08-31 22:15:47 -06:00
coderkun 137eb118e3 Add box-drawing Unicode characters to keymap “coderkun_neo2” 2016-08-26 13:27:56 +02:00
coderkun c78b44fb18 Set Unicode input mode and override unicode_input_start() method to keymap “coderkun_neo2” 2016-08-26 13:27:56 +02:00
coderkun 5b58d7d145 Disable debugging for Ergodox keymap “coderkun_neo2” 2016-08-26 13:27:56 +02:00
Joshua T 42fa91a57d Merge remote-tracking branch 'upstream/master' 2016-08-24 23:46:52 -05:00
Gergely Nagy f512179e66 ergodox: Update algernon's keymap to v1.6
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>
2016-08-24 23:22:57 +02:00
Olivier b5172e3afa Rename file following upstream folder rename. 2016-08-20 18:19:03 +02:00
Olivier 009ab77d3e Merge https://github.com/jackhumbert/qmk_firmware 2016-08-20 18:07:02 +02:00
Jack Humbert a3f726174c Merge pull request #665 from linsomniac/keymap_jafo
Adding jafo layout.
2016-08-20 11:04:54 -04:00
Jack Humbert a592c9dcf4 Merge pull request #658 from Xyverz/master
Got rid of all the kludge in my ErgoDox keymap.
2016-08-20 11:04:02 -04:00
Jack Humbert 7cef0f56e9 Merge pull request #630 from nrrkeene/master
The Ordinary Layout is the unsurprising layout
2016-08-20 11:01:22 -04:00
Xyverz e4984f65de Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md. 2016-08-19 22:45:20 -07:00
Xyverz aff792545d Changed my keymap to match normal keymaps. 2016-08-19 22:30:34 -07:00
Nicholas Keene 6a9a6b9477 The Ordinary Layout is boring because all the keys are where you expect them to be 2016-08-19 23:44:08 -05:00
Nicholas Keene 8f78ba1f73 The Ordinary Layout is boring because all the keys are where you expect them to be 2016-08-19 23:38:13 -05:00
Sean Reifschneider a25480b3b5 Bringing over changes from default map. 2016-08-19 20:55:50 -06:00
Sean Reifschneider 50531068b3 Adding jafo layout. 2016-08-19 14:42:41 -06:00
Xyverz ed1291bfbd Added compatibility for the Infinity ErgoDox to my Ergodox keymap.
Updated readme.md to reflect this change.
2016-08-18 22:43:31 -07:00
Xyverz aa37a57e0f One last change to the readme. 2016-08-18 00:38:25 -07:00
Xyverz eb81978ecb One last formatting change 2016-08-18 00:35:32 -07:00
Xyverz 118ad691c4 more formatting changes 2016-08-18 00:34:22 -07:00
Xyverz 4dd641a128 Hopefully this fixes the layout diagrams. 2016-08-18 00:27:54 -07:00
Xyverz 035290b7d8 Added a readme, tidied up comments in the keymap. 2016-08-18 00:22:56 -07:00
Xyverz 67227e4c71 Merge branch 'master' of https://github.com/Xyverz/qmk_firmware 2016-08-17 23:55:58 -07:00
Xyverz ef95c10c66 Update readme.md 2016-08-17 14:55:01 -07:00
Xyverz e3486caf87 Create readme.md 2016-08-17 14:54:05 -07:00
Gergely Nagy 29f64d7a93 tap-dance: Major rework, to make it more reliable
This reworks how the tap-dance feature works: instead of one global
state, we have a state for each tap-dance key, so we can cancel them
when another tap-dance key is in flight. This fixes #527.

Since we have a state for each key, we can avoid situation where a keyup
would mess with our global state. This fixes #563.

And while here, we also make sure to fire events only once, and this
fixes #574.

There is one breaking change, though: tap-dance debugging support was
removed, because dumping the whole state would increase the firmware
size too much. Any keymap that made use of this, will have to be
updated (but there's no such keymap in the repo).

Also, there's a nice trick used in this rework: we need to iterate
through tap_dance_actions in a few places, to check for timeouts, and so
on. For this, we'd need to know the size of the array. We can't discover
that at compile-time, because tap-dance gets compiled separately. We'd
like to avoid having to terminate the list with a sentinel value,
because that would require updates to all keymaps that use the feature.
So, we keep track of the highest tap-dance code seen so far, and iterate
until that index.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-17 15:05:58 +02:00
Daniel 8019a074cf minor tweaks to numpad and media layer 2016-08-14 20:43:05 -05:00
Xyverz 1920c290a4 Merge remote-tracking branch 'upstream/master' 2016-08-13 19:51:49 -07:00
Nicholas Keene ba7f2b1d3f The Ordinary Layout is the unsurprising layout 2016-08-13 15:53:03 -05:00
Daniel 558bf2ed07 completes first-pass at media layer 2016-08-12 19:27:44 -05:00
Daniel 916d12f9fa completes first-pass at symbol layer 2016-08-12 14:37:13 -05:00
Gergely Nagy b98d47abe5 ergodox: Update my keymap to v1.5
Major changes include:

* The **1HAND** layer has been removed.
* A `Delete` key is now available on the right thumb cluster.
* The **ADORE** layer received a major update, see the updated layout
  image.
* It is now possible to enable automatic logging for the **ADORE**
  layer, by setting the `ADORE_AUTOLOG` makefile variable to `yes` when
  compiling the keymap. It is off by default.
* The `~` key and the `Media Next/Prev` key have been swapped on
  the **base** layer.
* On the **ARROW** layer, `Backspace` has been replaced by `Enter`.
* There is some experimental support for entering Unicode symbols.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-08-12 16:36:07 +02:00
Daniel fe7b46579c completes first-pass at base layer 2016-08-10 19:37:59 -05:00
Ian Sterling 6f700f1eb0 Adding my own layouts for the Phantom and Ergodox. My Ergodox layout adds persistent layers
based on the Planck and Preonic setup. The layout arrays are pulled directly from the
ergodox/ez/ez.h keymap definition starting at line 81.
2016-08-09 23:49:27 -07:00
Joshua T ea8638b944 Changed left thumb back to Ctrl/Alt
Removed Shift from left thumb
2016-08-09 21:29:22 -05:00
Joshua T fdb8a4cd65 Created keymap-specific config.h 2016-08-09 21:28:31 -05:00
Xyverz c062b6a13d Delete keymap.c
file cleanup
2016-08-08 18:52:48 -07:00
Xyverz c060afe68e Delete old_keymap.c
file cleanup
2016-08-08 18:47:13 -07:00
Xyverz bf93fa510b Delete readme.md
file cleanup, removing file that doesn't apply to my layout.
2016-08-08 18:46:34 -07:00
Xyverz de1db144d0 Delete dvorak.png
Not reflective of my layout.
2016-08-08 18:44:09 -07:00
Ian Sterling 552399df4c Adding my own keymaps to the following keyboards:
Planck, Preonic, Atreus, Ergodox
2016-08-08 18:34:08 -07:00
Joshua T 6df31120a1 Merge remote-tracking branch 'upstream/master' 2016-08-07 23:28:59 -05:00
Erez Zukerman 79a9e04706 Merge pull request #592 from sethbc/ez-sethbc
Ez sethbc
2016-08-02 08:03:09 -04:00
Erez Zukerman 8c52327aa6 Merge pull request #593 from J3RN/master
Updated the J3RN ErgoDox keymap
2016-08-02 08:02:27 -04:00
Erez Zukerman 6eab4ecd7e Merge pull request #600 from adiabatic/master
zweihander-osx: add left-hand-thumb tab key
2016-08-02 08:01:56 -04:00
Nathan Sharfi 07a631bd5a Thumb ⌫ into ⇥, numpad & into :, yank home/end
Also: add (back?) in the light-shine disabler
2016-07-31 14:21:08 -07:00
Nathan Sharfi d889648d53 Merge branch 'master' of github.com:jackhumbert/qmk_firmware
# Conflicts:
#	keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
#	keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
2016-07-31 14:02:25 -07:00
Fred Sundvik 97817a773e Generate version information to version.h
So that only the files that really needs a version are recompiled.
2016-07-31 13:42:05 +03:00
Jonathan Arnett 1876e100be
Updated readme with recent changes 2016-07-30 14:37:54 -04:00
Jack Humbert 17bd4ac062
Updated my keymap 2016-07-30 14:07:27 -04:00
Seth Chandler a6ec5fa74a rebase 2016-07-30 10:46:13 -04:00
Joshua T 0064f1f84c Moved my Ergodox keymap to match upstream changes 2016-07-30 08:46:01 -05:00
Gergely Nagy 8a9bf1f165 Update some obsolete references
Some links were still pointing to `/keyboards/ergodox_ez`, while the
directory is `/keyboards/erdogox` now.

Not all references have been updated, and some of the text here and
there may need updating to mention the ErgoDox Infinity too, but that's
out of the scope for this quick fix.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-07-30 08:37:30 +02:00
Fred Sundvik 650298cec3 Cleanup the townk_osx config.h and make files 2016-07-29 21:09:34 +03:00
Fred Sundvik fd7f20b029 Rename supercoder config_user to config.h
Also fixup the include path of parent config
2016-07-29 21:09:33 +03:00
Fred Sundvik 1641743b9d Change _delay_ms to wait_ms in algernon keymap 2016-07-29 21:09:21 +03:00
Fred Sundvik b0376687f4 All Ez keymaps compiles 2016-07-29 20:48:19 +03:00
Fred Sundvik 9af995c59b Initial structure for Ergodox as subprojects
Only the EZ default keymaps compiles at the moment though.
2016-07-29 20:48:04 +03:00