352d79e1fb
Merge remote-tracking branch 'upstream/master'
2017-02-13 07:44:28 +08:00
5f8535b356
change thumb cluster key to be shift
2017-02-13 07:16:01 +08:00
902d5077cd
Merge remote-tracking branch 'upstream/master'
2017-02-10 23:34:27 -08:00
420a032e8d
made left shift an MO for SHELL_NAV
2017-02-10 21:44:27 +08:00
2b95f41b91
[Typo] correct link to default keymap in readme.
2017-02-09 09:08:50 -06:00
101465b6ed
Add missing header to ergodox ordinary keymap
2017-02-03 21:09:50 -05:00
3faf06c880
Fix compile warnings in egodox robot_test_layout
...
Fixes the warning "right shift count >= width of type" by adding UL to
the end of constants.
2017-02-03 21:07:24 -05:00
02a95ee08c
Merge remote-tracking branch 'upstream/master'
2017-02-01 08:56:35 +01:00
467e284178
increase timeout for dual mode caps key
2017-02-01 13:46:00 +08:00
748316fc43
Merge pull request #1039 from zabereer/albert_ergodox_keymap
...
albert ergodox keymap
2017-01-31 19:29:19 -05:00
4c3630dc17
update my neo2 keymap
2017-01-30 23:10:28 +01:00
f70758622b
[deadcyclo layout] Refactoring. Use custom functions and macros
2017-01-30 19:42:27 +01:00
f400ac1d7d
[deadcyclo layout] fixed failing tests
2017-01-30 15:45:16 +01:00
f6feee8167
eliminate references to shell_layer
2017-01-28 09:45:13 +08:00
a1c53d0f93
documented dual mode capslock
2017-01-28 09:42:55 +08:00
93c1bfa646
dual capslock functionality, activating shell nav or brackets
2017-01-27 23:55:33 +08:00
d7aa4724fb
Merge remote-tracking branch 'upstream/master'
2017-01-27 15:24:08 +01:00
13fa63b192
[deadcyclo layout] Added more unicode keys and ibus unicode compose trigger keys
2017-01-27 13:53:02 +01:00
fffe76a7b7
albert ergodox keymap
2017-01-26 20:07:47 +00:00
c9ca368008
replace jackhumbert with qmk
2017-01-26 01:52:43 -05:00
8af48194f2
[deadcyclo layout] Added lotsof new emojis and some new unicode keys
2017-01-25 15:16:38 +01:00
d0db044164
Merge remote-tracking branch 'upstream/master'
2017-01-24 21:56:18 +01:00
37ed3d13a4
[deadcyclo layout] Added unicode layer
2017-01-24 21:54:34 +01:00
3c32e38036
[deadcyclo layout] Added support for ergodox ez shine
2017-01-24 19:10:35 +01:00
18cc05e2f7
Added instructions for how to build and flash the firmware with teensy_cli.
2017-01-24 10:02:56 +01:00
841d7e6a1d
turn off rgb_midi in ez
2017-01-23 13:55:24 -05:00
79a823d802
Merge pull request #1020 from remigius42/master
...
Swiss German layout for Ergodox EZ & Infinity
2017-01-22 18:59:57 -05:00
a8a1fbbac8
Merge pull request #1022 from lucwastiaux/master
...
Improvements to Dvorak Programmer Ergodox keymap
2017-01-22 18:59:12 -05:00
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
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
c2c8a12022
SG Ergodox layout: Minor code formatting changes
...
- Swiss German Ergodox layout:
Removed unnecessary spaces.
2017-01-22 12:35:24 +01:00
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
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
803a861b4e
document BRACKETS and SHELL_LAYER
2017-01-22 10:32:17 +08:00
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
6b5cd656fd
Correct layout description of ergodox swissgerman
...
- Added missing HTML macros to media layer.
2017-01-21 20:55:18 +01:00
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
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
4cf0f7dd16
make shell layer more compatible with default layer
2017-01-21 23:42:23 +08:00
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
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
01e750a372
couple of changes to the shell layer
2017-01-21 23:15:37 +08:00
b8b2a55973
Merge remote-tracking branch 'upstream/master'
2017-01-19 06:54:18 -08:00
072237bce8
introduce shell_layer
2017-01-19 22:45:30 +08:00
1ac15e6b3a
put shell nav under tab, introduce an OSL for the brackets layer
2017-01-17 20:34:05 +08:00
99d0b54e5e
Merge pull request #999 from deadcyclo/master
...
Adds layer images to the deadcyclo layout readme
2017-01-15 01:12:21 -05:00
a896b300ec
Merge pull request #1007 from bryan4887/bryan
...
Added Bryan's keymap
2017-01-15 01:10:39 -05:00
aa0939b5ef
Added Bryan's keymap
2017-01-13 21:51:55 -06:00
c4fca8b6bc
Fixed incorrect layer image in deadcyclo readme
2017-01-10 19:23:59 +01:00
1121753746
Merge remote-tracking branch 'upstream/master'
2017-01-10 19:21:33 +01:00
db1aec159d
Added layer images to deadcyclo layout readme
2017-01-10 19:20:25 +01:00
99521a4482
Merge remote-tracking branch 'upstream/master'
2017-01-08 21:47:08 -08:00
8f8d104759
Merged from upstream
2017-01-07 14:01:21 -06:00
5ce7ec9ea5
Increased TAPPING_TERM to 200
2017-01-06 17:08:14 -06:00
6fba925f41
Fixed key not matching its diagram
2017-01-06 17:07:58 -06:00
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
0bd03d698c
new file: keyboards/ergodox/keymaps/ishigoya-jp/keymap.c
2017-01-06 16:41:14 +09:00
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
a85aefd27a
fix version macro making layer 3 sticky on deadcyclo layout
2017-01-03 15:09:25 +01:00
b23a963bec
Added the deadcyclo layout
2017-01-02 19:12:06 +01:00
ffc1d97672
Update config.h
2017-01-02 09:57:39 -05:00
0de3a5d0b2
reverts change outside of personal keymap.
2017-01-01 21:02:43 -07:00
acffbb480f
adds dedicated double-quote key.
2017-01-01 20:09:30 -07:00
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
9675e1357f
Update readme.md
2016-12-21 21:09:20 -05:00
a81279158b
Update readme.md
2016-12-21 21:08:55 -05:00
4e4f365c87
updates readme
2016-12-21 21:05:58 -05:00
10864def46
New default firmware graphic
2016-12-21 21:03:53 -05:00
101416eb82
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
2016-12-19 11:18:22 -05:00
06c64bbff3
rgb clean-up, api clean-up
2016-12-19 11:18:18 -05:00
29731588b7
Flips off MIDI and API_SYSEX
2016-12-19 08:27:05 -05:00
8e28bf39d8
Merge pull request #958 from pvinis/master
...
make a sysctl MO button so i can quickly use the arrows
2016-12-18 20:56:20 -05:00
8a65c640ec
Adds a troubleshooting layout for resetting the EEPROM
2016-12-16 20:53:42 -05:00
df32d5b769
Removes alt/j dual function
2016-12-16 20:13:40 -05:00
34d6f07d2c
make a sysctl MO button so i can quickly use the arrows
2016-12-16 09:46:03 +01:00
803040d4ee
Merge pull request #952 from pvinis/master
...
update my keymap a bit
2016-12-15 00:03:02 -05:00
83e613ad23
Allow power consumption to be set per-keyboard.
2016-12-14 23:29:33 -05:00
ebe351a690
enable brackets using the - key on the right, and cleanups
2016-12-15 07:22:31 +08:00
0523657923
Merge remote-tracking branch 'upstream/master'
2016-12-13 18:06:49 -08:00
75d7eb9cb5
put home/end on thumb cluster
2016-12-10 13:20:05 +08:00
a3c8949627
readme updates
2016-12-10 12:52:59 +08:00
9240f27ba9
Merge remote-tracking branch 'upstream/master'
2016-12-10 12:49:47 +08:00
dc4c8875ba
use thumb cluster key to toggle brackets layer
2016-12-10 12:37:32 +08:00
9a59fee667
tap dance for some layers. one tap sysctl, two taps mouse.
2016-12-09 16:01:11 +01:00
063ade6bb5
add light for some layers
2016-12-09 16:00:46 +01:00
be2863e56d
separate sysctl and mouse layers
2016-12-09 16:00:10 +01:00
d5914a4dfe
add alt key
2016-12-09 14:37:22 +01:00
5d241479f5
media keys
2016-12-09 14:37:07 +01:00
9216bc7377
Merge remote-tracking branch 'upstream/master'
2016-12-06 17:36:19 -08:00
1f52dbcac0
removes double-tab brackets and adds back quot to left cmd.
2016-12-06 14:15:23 -06:00
82922a4937
A new default layout that supports Shine
2016-12-05 20:35:03 -05:00
a05b6a72d9
Adjusts config for better mousekey support
2016-12-05 20:34:24 -05:00
aa70aa3962
Tweaks Kristian's layout again
2016-12-02 13:03:39 -05:00
5d43a2aecf
Kristian's keymap
2016-12-02 12:53:18 -05:00
66b13a66e9
Better layout
2016-11-30 22:22:57 -05:00
4094544d41
Test layout for ErgoDox EZ manufacturing robot
2016-11-29 09:23:16 -05:00
51ae6da99e
Merge pull request #918 from jackhumbert/wu5y7
...
Adds Ergodox EZ RGB lights (both sides using I2C) and implements API base, Midi SysEx API
2016-11-29 08:16:04 -05:00
f946d830f9
guess i didnt pull
2016-11-29 00:11:11 -05:00
efbc205efd
Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7
2016-11-29 00:10:06 -05:00
d0cefef946
enable rgblight by default for ez
2016-11-29 00:09:56 -05:00
06f18e95d4
enable api sysex for ez
2016-11-29 00:06:12 -05:00
5a2501d90f
Add the AZERTY compatibility layer.
2016-11-28 16:38:03 +01:00
f02eccbb29
Change layer names (cosmetic change) and reorder them so that the "shift" layer can be accessed from the "alt" layer when in QWERTY compat mode.
2016-11-28 14:16:42 +01:00
84735836e3
Tweaks position of TOG not to conflict with MO
2016-11-28 08:13:32 -05:00
d2b6438e39
A little cleanup, add some comments, change others.
2016-11-28 14:10:31 +01:00
9caf866618
Tweaks EZ Makefile
2016-11-28 07:59:01 -05:00
2d0ada0190
Pulls LED config into common config for EZ
2016-11-28 07:55:02 -05:00
3f1fca2eb8
Adjust comment.
2016-11-28 11:21:23 +01:00
e26a80508f
Reorganize the numeric keypad layer more like a traditional numeric keypad.
2016-11-28 11:20:00 +01:00
d6d0b7eada
Merge https://github.com/jackhumbert/qmk_firmware
2016-11-27 23:23:21 +01:00
a94eb16bd7
removes the double actions from the metakeys.
2016-11-27 16:12:32 -06:00
7edac212c8
separated into api files/folder
2016-11-26 15:38:44 -05:00
f25596b8dc
rgblight fixes
2016-11-23 21:28:12 -05:00
cefa8468fb
travis pls
2016-11-23 20:16:38 -05:00
450a8fb5b6
Merge branch 'master' of github.com:jackhumbert/qmk_firmware into wu5y7
2016-11-21 20:17:45 -05:00
06a2677b7e
fix infinity
2016-11-21 20:17:32 -05:00
af119baf71
Merge pull request #894 from dchagniot/ergodoxDvorakEmacs
...
Ergodox dvorak emacs
2016-11-21 20:00:40 -05:00
be265decae
Merge pull request #892 from fredizzimo/disable_ergodox_lcd
...
Always initialize the Infinity Ergodox backlight
2016-11-21 19:59:39 -05:00
27ebacb15d
merging lets_split
2016-11-21 19:18:47 -05:00
6f24344be7
typo fix
2016-11-20 20:51:05 +01:00
c86bbf474e
Always initialze the Infinity Ergodox backlight
...
Otherwise it will stay lit. The set_led functionality is also disabled
since it doesn't work properly for slaves.
2016-11-20 19:28:10 +02:00
7f5e71d79f
adds galson keymap
2016-11-19 14:21:12 +00:00
ab6557c1a0
wqMerge branch 'wu5y7' of https://github.com/jackhumbert/qmk_firmware into wu5y7
2016-11-18 22:22:29 -05:00
161bd5596b
midi back and forth
2016-11-18 22:22:24 -05:00
abee809298
moves brackets to top row.
2016-11-18 11:11:08 -06:00
285c5a91f2
Groundwork for dedicated color keycodes
2016-11-17 20:56:36 -05:00
9bbc9a7ce0
Initial Erez Experimental keymap tweaks
2016-11-17 19:47:08 -05:00
3774a7fcda
rgb light through midi
2016-11-17 17:42:14 -05:00
b493f6a4ed
Merge remote-tracking branch 'upstream/master'
2016-11-16 22:36:36 -08:00
4da698fda3
dvorak/plover keyboard layout
...
Plover's steno support likes quasi-qwerty, and gaming likes qwerty,
and I like dvorak, so... what if I could have it all?
Signed-off-by: seebs <seebs@seebs.net>
2016-11-16 15:44:26 -06:00
9f1b27c5ba
Merge pull request #880 from psyill/master
...
Added keymap "videck", an ErgoDox keymap for Vi(m) users.
2016-11-16 14:54:18 -05:00
e9f7487518
mostly working
2016-11-13 23:02:38 -05:00
162f603b1c
Added keymap "videck", an ErgoDox keymap for Vi(m) users.
2016-11-13 22:44:41 +01:00
34bf8558cd
update sethbc ergodox keymap
2016-11-13 00:56:46 -05:00
33e62c080c
merging
2016-11-12 20:54:37 -05:00
1d766c596e
Removed the control action when holding z or /
2016-11-06 13:48:20 -05:00
b8e204322a
added more shortcut keys
2016-11-05 12:07:33 +08:00
78a1dc84dd
updated readme
2016-11-05 11:58:23 +08:00
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
d5270af111
Implements dedicated text zoom keys
2016-11-01 10:03:58 -04:00
7a9be2562d
Merge pull request #851 from J3RN/momentary
...
Switched to momentary
2016-10-31 21:41:19 -04:00
a6401076d5
Merge pull request #843 from lucwastiaux/master
...
Adding Ergodox Dvorak Programmer layout
2016-10-31 21:40:58 -04:00
bd40844e4e
Merge pull request #836 from 20lives/master
...
added new layout
2016-10-31 21:39:40 -04:00
055247f35d
re-introduce brackets layer
2016-10-26 21:00:58 +08:00
427ea7a889
[alphadox] remove tmk reset code
2016-10-25 09:00:45 -07:00
e2916f8ab1
[ergodox][alphadox] undefine tapping_term, ignore_mod_tap_interrupt
2016-10-25 09:00:45 -07:00
22cb73fad3
add alphadox layouts to atreus and ergodox
2016-10-25 09:00:45 -07:00
0d26320cf3
merge upstream
2016-10-23 20:22:28 +03:00
919caaccb7
adding readme
2016-10-23 11:44:16 +08:00
14ac397d5d
add up/down keys on thumb clusters
2016-10-23 00:47:58 +08:00
luc wastiaux
Xyverz
Rob Rogers
Nikolaus Wittenstein
Brendan Johan Lee
Erez Zukerman
Matthias Schmitt
Albert Pretorius
Jack Humbert
Rovanion Luckey
Andreas Schmidt
Bryan Hernandez
Joshua T
ishigoya
Daniel
Gergely Nagy
Pavlos Vinieratos
Kyle Smith
Erez Zukerman
Olivier
Didier Chagniot
Fred Sundvik
samgalson@gmail.com
Seebs
Hans Ellegård
Seth Chandler
Jonathan Arnett
Alpha Chen
Lior Haim