megamanmalte/qmk_firmware
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
4169 commits 1 branch 0 tags 275 MiB
Commit graph

317 commits

Author SHA1 Message Date
Brendan Johan Lee 02a95ee08c Merge remote-tracking branch 'upstream/master' 2017-02-01 08:56:35 +01:00
Erez Zukerman 748316fc43 Merge pull request #1039 from zabereer/albert_ergodox_keymap 
albert ergodox keymap
 2017-01-31 19:29:19 -05:00
Matthias Schmitt 4c3630dc17 update my neo2 keymap 2017-01-30 23:10:28 +01:00
Brendan Johan Lee f70758622b [deadcyclo layout] Refactoring. Use custom functions and macros 2017-01-30 19:42:27 +01:00
Brendan Johan Lee f400ac1d7d [deadcyclo layout] fixed failing tests 2017-01-30 15:45:16 +01:00
Brendan Johan Lee d7aa4724fb Merge remote-tracking branch 'upstream/master' 2017-01-27 15:24:08 +01:00
Brendan Johan Lee 13fa63b192 [deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keys 2017-01-27 13:53:02 +01:00
Albert Pretorius fffe76a7b7 albert ergodox keymap 2017-01-26 20:07:47 +00:00
Jack Humbert c9ca368008 replace jackhumbert with qmk 2017-01-26 01:52:43 -05:00
Brendan Johan Lee 8af48194f2 [deadcyclo layout] Added lotsof new emojis and some new unicode keys 2017-01-25 15:16:38 +01:00
Brendan Johan Lee d0db044164 Merge remote-tracking branch 'upstream/master' 2017-01-24 21:56:18 +01:00
Brendan Johan Lee 37ed3d13a4 [deadcyclo layout] Added unicode layer 2017-01-24 21:54:34 +01:00
Brendan Johan Lee 3c32e38036 [deadcyclo layout] Added support for ergodox ez shine 2017-01-24 19:10:35 +01:00
Jack Humbert 841d7e6a1d turn off rgb_midi in ez 2017-01-23 13:55:24 -05:00
Jack Humbert 79a823d802 Merge pull request #1020 from remigius42/master 
Swiss German layout for Ergodox EZ & Infinity
 2017-01-22 18:59:57 -05:00
Jack Humbert a8a1fbbac8 Merge pull request #1022 from lucwastiaux/master 
Improvements to Dvorak Programmer Ergodox keymap
 2017-01-22 18:59:12 -05:00
Andreas Schmidt 08c192caea SG Ergodox layout: Updated layout documentation 
- Swiss German Ergodox layout:
    Updated layout documentation based on previous
    layout changes.
 2017-01-22 12:57:58 +01:00
Andreas Schmidt afd2c2ee9e SG Ergodox layout: Fixed ENTER key mapping 
- Swiss German Ergodox layout:
    Additional ENTER key was mapped to wrong layer
    and keyboard half.
 2017-01-22 12:43:46 +01:00
Andreas Schmidt c2c8a12022 SG Ergodox layout: Minor code formatting changes 
- Swiss German Ergodox layout:
    Removed unnecessary spaces.
 2017-01-22 12:35:24 +01:00
Andreas Schmidt 5c4a73d788 SG Ergodox layout: Add ENTER to left keyboard 
- Swiss German Ergodox layout:
    Added ENTER key to left keyboard half on media layer
    such that the enter key is available on both halves to
    be able to flash both halves without an additional keyboard.
 2017-01-22 12:32:40 +01:00
Andreas Schmidt 3fd9aa3660 SG Ergodox layout: Add <br/> macro to media layer 
- Added <br/> macro to media layer of Swiss German layout
    for Ergodox
 2017-01-22 12:30:18 +01:00
lucwastiaux 803a861b4e document BRACKETS and SHELL_LAYER 2017-01-22 10:32:17 +08:00
Andreas Schmidt eb6abb6305 Renamed JSON source of Ergodox Swiss German 
- Renamed the JSON source files for the layout description of
    the Ergodox Swiss German keymap
 2017-01-21 20:58:28 +01:00
Andreas Schmidt 6b5cd656fd Correct layout description of ergodox swissgerman 
- Added missing HTML macros to media layer.
 2017-01-21 20:55:18 +01:00
Andreas Schmidt 250628de04 Removed Ergodox EZ & Infinity specific keymaps 
- Removed the keymaps for Swiss German spefic for Ergodox EZ
    and Infinity after previously merging them.
 2017-01-21 20:22:24 +01:00
Andreas Schmidt c26c81c7f3 Merged keymap for Ergodox EZ & Infinity 
- Merged keymap for Ergodox EZ & Infinity into one single
    keymap using pre-processor macros.
 2017-01-21 20:20:47 +01:00
lucwastiaux 4cf0f7dd16 make shell layer more compatible with default layer 2017-01-21 23:42:23 +08:00
Andreas Schmidt bf0b355bc8 Add Swiss German layout for Ergodox Infinity 
- Add Swiss German layout for Ergodox Infinity based on default
    layout for Ergodox EZ.
- Minor changes in the event loop to prevent flashing display
    background lights.
 2017-01-21 16:24:41 +01:00
Andreas Schmidt cbb1927d6f Add Swiss German layout for Ergodox EZ 
- Add Swiss German layout for Ergodox EZ based on default
    layout for Ergodox EZ.
- Minor changes in the event loop to prevent flashing of leds.
 2017-01-21 16:22:40 +01:00
lucwastiaux 01e750a372 couple of changes to the shell layer 2017-01-21 23:15:37 +08:00
lucwastiaux 072237bce8 introduce shell_layer 2017-01-19 22:45:30 +08:00
lucwastiaux 1ac15e6b3a put shell nav under tab, introduce an OSL for the brackets layer 2017-01-17 20:34:05 +08:00
Jack Humbert 99d0b54e5e Merge pull request #999 from deadcyclo/master 
Adds layer images to the deadcyclo layout readme
 2017-01-15 01:12:21 -05:00
Jack Humbert a896b300ec Merge pull request #1007 from bryan4887/bryan 
Added Bryan's keymap
 2017-01-15 01:10:39 -05:00
Bryan Hernandez aa0939b5ef Added Bryan's keymap 2017-01-13 21:51:55 -06:00
Brendan Johan Lee c4fca8b6bc Fixed incorrect layer image in deadcyclo readme 2017-01-10 19:23:59 +01:00
Brendan Johan Lee 1121753746 Merge remote-tracking branch 'upstream/master' 2017-01-10 19:21:33 +01:00
Brendan Johan Lee db1aec159d Added layer images to deadcyclo layout readme 2017-01-10 19:20:25 +01:00
Joshua T 8f8d104759 Merged from upstream 2017-01-07 14:01:21 -06:00
Joshua T 5ce7ec9ea5 Increased TAPPING_TERM to 200 2017-01-06 17:08:14 -06:00
Joshua T 6fba925f41 Fixed key not matching its diagram 2017-01-06 17:07:58 -06:00
ishigoya 402e6c13a1 new file: keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-enL.png 
new file:   keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-jpL.png
	new file:   keyboards/ergodox/keymaps/ishigoya-jp/img/keyboard-layout-numL.png
	modified:   keyboards/ergodox/keymaps/ishigoya-jp/keymap.c
	new file:   keyboards/ergodox/keymaps/ishigoya-jp/readme.md
 2017-01-06 17:53:04 +09:00
ishigoya 0bd03d698c new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.c 2017-01-06 16:41:14 +09:00
Jack Humbert e5c7b5d8fc Merge pull request #983 from common-nighthawk/master 
adds personal keymap for ergodox optimized for macOS with Vim
 2017-01-04 23:41:56 -05:00
Brendan Johan Lee a85aefd27a fix version macro making layer 3 sticky on deadcyclo layout 2017-01-03 15:09:25 +01:00
Brendan Johan Lee b23a963bec Added the deadcyclo layout 2017-01-02 19:12:06 +01:00
Jack Humbert ffc1d97672 Update config.h 2017-01-02 09:57:39 -05:00
Daniel 0de3a5d0b2 reverts change outside of personal keymap. 2017-01-01 21:02:43 -07:00
Daniel acffbb480f adds dedicated double-quote key. 2017-01-01 20:09:30 -07:00
Gergely Nagy eb588d630c ergodox: Update algernon's keymap to v1.10 
Miscellaneous
=============

* `µ` can now be entered with UCIS.
* `™` can now be entered with UCIS.

Tools
=====

* `tools/hid-commands` can now find Banshee, and prefers it over Kodi.
* `tools/hid-commands` can now find Chrome too, not juts Chromium.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
 2016-12-28 19:27:48 +01:00