jordan
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,855 Commits
40 Branches
291 Tags
98 MiB
master
rgb_matrix
planck_rev6
error_log_cleanup
info_json_docs
info_json_updates
keycode_versioning
readme-update
cb2x1800
new_project_fix
moxygen
clueboard_hotswap
handwire
twi2c
arm_audio_fixes
xmega_support
audio_out
gb_port
clueboard_1
info_json_populate
pjrc_hid
subvendor_ids
stm32l476
docs
matrix_update
ps2avrgb
travis_phases
dz_support
make_autocomplete
hid_api
clueboard_arm
sid
keyboards_json
keyboard_identifiers
pp_definitions
teensy_lc_synth
eeprom_update
process_keycode_update
b6_b7_audio
example_keyboards
preonic-1.0
planck-4.0
preonic-2.0
planck-5.0
planck-4.2
planck-4.1
ergodox_ez-161205
0.6.9
0.6.8
0.6.7
0.6.6
0.6.5
0.6.4
0.6.3
0.6.20
0.6.2
0.6.19
0.6.18
0.6.17
0.6.16
0.6.15
0.6.14
0.6.13
0.6.12
0.6.11
0.6.10
0.6.1
0.6.0
0.5.99
0.5.98
0.5.97
0.5.96
0.5.95
0.5.94
0.5.93
0.5.92
0.5.91
0.5.90
0.5.9
0.5.89
0.5.88
0.5.87
0.5.86
0.5.85
0.5.84
0.5.83
0.5.82
0.5.81
0.5.80
0.5.8
0.5.79
0.5.78
0.5.77
0.5.76
0.5.75
0.5.74
0.5.73
0.5.72
0.5.71
0.5.70
0.5.7
0.5.69
0.5.68
0.5.67
0.5.66
0.5.65
0.5.64
0.5.63
0.5.62
0.5.61
0.5.60
0.5.6
0.5.59
0.5.58
0.5.57
0.5.56
0.5.55
0.5.54
0.5.53
0.5.52
0.5.51
0.5.50
0.5.5
0.5.49
0.5.48
0.5.47
0.5.46
0.5.45
0.5.44
0.5.43
0.5.42
0.5.41
0.5.40
0.5.4
0.5.39
0.5.38
0.5.37
0.5.36
0.5.35
0.5.34
0.5.33
0.5.32
0.5.31
0.5.30
0.5.3
0.5.29
0.5.28
0.5.27
0.5.264
0.5.263
0.5.262
0.5.261
0.5.260
0.5.26
0.5.259
0.5.258
0.5.257
0.5.256
0.5.255
0.5.254
0.5.253
0.5.252
0.5.251
0.5.250
0.5.25
0.5.249
0.5.248
0.5.247
0.5.246
0.5.245
0.5.244
0.5.243
0.5.242
0.5.241
0.5.240
0.5.24
0.5.239
0.5.238
0.5.237
0.5.236
0.5.235
0.5.234
0.5.233
0.5.232
0.5.231
0.5.230
0.5.23
0.5.229
0.5.228
0.5.227
0.5.226
0.5.225
0.5.224
0.5.223
0.5.222
0.5.221
0.5.220
0.5.22
0.5.219
0.5.218
0.5.217
0.5.216
0.5.215
0.5.214
0.5.213
0.5.212
0.5.211
0.5.210
0.5.21
0.5.209
0.5.208
0.5.207
0.5.206
0.5.205
0.5.204
0.5.203
0.5.202
0.5.201
0.5.200
0.5.20
0.5.2
0.5.199
0.5.198
0.5.197
0.5.196
0.5.195
0.5.194
0.5.193
0.5.192
0.5.191
0.5.190
0.5.189
0.5.188
0.5.187
0.5.186
0.5.185
0.5.184
0.5.183
0.5.182
0.5.181
0.5.180
0.5.179
0.5.178
0.5.177
0.5.176
0.5.175
0.5.174
0.5.173
0.5.172
0.5.171
0.5.170
0.5.17
0.5.169
0.5.168
0.5.167
0.5.166
0.5.165
0.5.164
0.5.163
0.5.162
0.5.161
0.5.160
0.5.16
0.5.159
0.5.158
0.5.157
0.5.156
0.5.155
0.5.154
0.5.153
0.5.152
0.5.151
0.5.150
0.5.15
0.5.149
0.5.148
0.5.147
0.5.146
0.5.145
0.5.144
0.5.143
0.5.142
0.5.141
0.5.140
0.5.14
0.5.139
0.5.138
0.5.137
0.5.136
0.5.135
0.5.134
0.5.133
0.5.132
0.5.131
0.5.130
0.5.13
0.5.129
0.5.128
0.5.127
0.5.126
0.5.125
0.5.124
0.5.123
0.5.122
0.5.121
0.5.120
0.5.12
0.5.119
0.5.118
0.5.117
0.5.116
0.5.115
0.5.114
0.5.113
0.5.112
0.5.111
0.5.110
0.5.11
0.5.109
0.5.108
0.5.107
0.5.106
0.5.105
0.5.104
0.5.103
0.5.102
0.5.101
0.5.100
0.5.10
0.5.1
0.5.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '12159e782c'
${ noResults }
Commit Graph

434 Commits (12159e782cc6233b82760bf21631be730d42087b)

Author SHA1 Message Date
Jason Green 7009112752 move to ergodox-ez only 8 years ago
Fred Sundvik 8f2af3c6bc Merge branch 'master' into makefile_overhaul 8 years ago
Jason Green 104ca8a5e1 Remove unneeded include 8 years ago
Jason Green ec62cbe384 add missing #include 8 years ago
Jason Green 86656690f1 TxBolt (Steno) Serial protocol for Ergodox Ez 8 years ago
Sean Reifschneider 0418ecc073 Changes from review by @fredizzimo and @Xyverz 8 years ago
Joe Wasson 66adbfcab5 Add default swap configs for a couple of boards. 8 years ago
Olivier b5172e3afa Rename file following upstream folder rename. 8 years ago
Olivier 009ab77d3e Merge https://github.com/jackhumbert/qmk_firmware 8 years ago
Jack Humbert a3f726174c Merge pull request #665 from linsomniac/keymap_jafo 
Adding jafo layout.
 8 years ago
Jack Humbert a592c9dcf4 Merge pull request #658 from Xyverz/master 
Got rid of all the kludge in my ErgoDox keymap.
 8 years ago
Jack Humbert 7cef0f56e9 Merge pull request #630 from nrrkeene/master 
The Ordinary Layout is the unsurprising layout
 8 years ago
Xyverz e4984f65de Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md. 8 years ago
Xyverz aff792545d Changed my keymap to match normal keymaps. 8 years ago
Nicholas Keene 6a9a6b9477 The Ordinary Layout is boring because all the keys are where you expect them to be 8 years ago
Nicholas Keene 8f78ba1f73 The Ordinary Layout is boring because all the keys are where you expect them to be 8 years ago
Sean Reifschneider d98e5ddf30 Tweaks after review. 8 years ago
Sean Reifschneider 9e03517ae5 Restructuring of the ergodox README. 8 years ago
Sean Reifschneider a25480b3b5 Bringing over changes from default map. 8 years ago
Fred Sundvik da226e6126 Update keyboard readme files with new makefile instructions 8 years ago
Fred Sundvik 051017c312 Split subproject make files into Makefile and rules.mk 8 years ago
Fred Sundvik 44441de8ca Split keyboard makefiles into rules and Makefile 8 years ago
Sean Reifschneider 30c63b1495 Noting the change directory. 8 years ago
Sean Reifschneider b918aa6bab Adding submodule note. 8 years ago
Sean Reifschneider 50531068b3 Adding jafo layout. 8 years ago
Sean Reifschneider 32216066e7 Adding nicer Infinity build instructions. 8 years ago
Xyverz ed1291bfbd Added compatibility for the Infinity ErgoDox to my Ergodox keymap. 
Updated readme.md to reflect this change.
 8 years ago
Xyverz aa37a57e0f One last change to the readme. 8 years ago
Xyverz eb81978ecb One last formatting change 8 years ago
Xyverz 118ad691c4 more formatting changes 8 years ago
Xyverz 4dd641a128 Hopefully this fixes the layout diagrams. 8 years ago
Xyverz 035290b7d8 Added a readme, tidied up comments in the keymap. 8 years ago
Xyverz 67227e4c71 Merge branch 'master' of https://github.com/Xyverz/qmk_firmware 8 years ago
Xyverz ef95c10c66 Update readme.md 8 years ago
Xyverz e3486caf87 Create readme.md 8 years ago
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>
 8 years ago
Daniel 8019a074cf minor tweaks to numpad and media layer 8 years ago
Xyverz 1920c290a4 Merge remote-tracking branch 'upstream/master' 8 years ago
Nicholas Keene ba7f2b1d3f The Ordinary Layout is the unsurprising layout 8 years ago
Daniel 558bf2ed07 completes first-pass at media layer 8 years ago
Daniel 916d12f9fa completes first-pass at symbol layer 8 years ago
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>
 8 years ago
Daniel fe7b46579c completes first-pass at base layer 8 years ago
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.
 8 years ago
Joshua T ea8638b944 Changed left thumb back to Ctrl/Alt 
Removed Shift from left thumb
 8 years ago
Joshua T fdb8a4cd65 Created keymap-specific config.h 8 years ago
Joshua T 5d78311612 Reverted Ergodox config.h 
I will create a separate config.h for my keymap
 8 years ago
Xyverz c062b6a13d Delete keymap.c 
file cleanup
 8 years ago
Xyverz c060afe68e Delete old_keymap.c 
file cleanup
 8 years ago
Xyverz bf93fa510b Delete readme.md 
file cleanup, removing file that doesn't apply to my layout.
 8 years ago
Xyverz de1db144d0 Delete dvorak.png 
Not reflective of my layout.
 8 years ago
Ian Sterling 552399df4c Adding my own keymaps to the following keyboards: 
Planck, Preonic, Atreus, Ergodox
 8 years ago
Joshua T 6df31120a1 Merge remote-tracking branch 'upstream/master' 8 years ago
Erez Zukerman 79a9e04706 Merge pull request #592 from sethbc/ez-sethbc 
Ez sethbc
 9 years ago
Erez Zukerman 8c52327aa6 Merge pull request #593 from J3RN/master 
Updated the J3RN ErgoDox keymap
 9 years ago
Erez Zukerman 6eab4ecd7e Merge pull request #600 from adiabatic/master 
zweihander-osx: add left-hand-thumb tab key
 9 years ago
Erez Zukerman 56aa51664e Updates ErgoDox readme 9 years ago
Nathan Sharfi 07a631bd5a Thumb ⌫ into ⇥, numpad & into :, yank home/end 
Also: add (back?) in the light-shine disabler
 9 years ago
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
 9 years ago
Fred Sundvik 97817a773e Generate version information to version.h 
So that only the files that really needs a version are recompiled.
 9 years ago
Jonathan Arnett 1876e100be
Updated readme with recent changes 9 years ago
Jack Humbert 17bd4ac062
Updated my keymap 9 years ago
Seth Chandler a6ec5fa74a rebase 9 years ago
Joshua T 0064f1f84c Moved my Ergodox keymap to match upstream changes 9 years ago
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>
 9 years ago
Fred Sundvik 566c79554e Small fix for infinity include guard 9 years ago
Fred Sundvik 6e8a5aca9d Fix typo in the readme. 9 years ago
Fred Sundvik 401dd09077 A couple of more Ergodox readme fixes 9 years ago
Fred Sundvik c65da1f208 Unify the ErgoDox EZ and Infinity documentation 9 years ago
Fred Sundvik 44cefcb40a Refer to the right path in the readme 9 years ago
Fred Sundvik 349f189e83 Move Ergodox readme from ez subfolder to parent 9 years ago
Fred Sundvik ad416fb1a3 Include the main Makefile before including Ergodox infinity drivers 9 years ago
Fred Sundvik 592ef7c6f0 Move Infinity Ergodox drivers to subproject, and fix makefile 9 years ago
Fred Sundvik 37052a53f1 Remove the Infinity Ergodox default keymap 9 years ago
Fred Sundvik 650298cec3 Cleanup the townk_osx config.h and make files 9 years ago
Fred Sundvik fd7f20b029 Rename supercoder config_user to config.h 
Also fixup the include path of parent config
 9 years ago
Fred Sundvik 426e9ecc6f Fix config.h include guards 9 years ago
Fred Sundvik a6577b272e Define weak matrix user function for Infinity Ergodox 
So that a few keyboards, which don't use them, links properly.
 9 years ago
Fred Sundvik 1641743b9d Change _delay_ms to wait_ms in algernon keymap 9 years ago
Fred Sundvik e7670f6d19 Move some of the Ergodox config settings to shared 9 years ago
Fred Sundvik e0f28c2b10 Add empty led control functions to Infinity Ergodox 
So that most keymaps compiles and links
 9 years ago
Fred Sundvik e01b4c3fd9 Most ergodox keymaps compiles on Infinity 
There are linker errors due to missing led funcitonality though
 9 years ago
Fred Sundvik b0376687f4 All Ez keymaps compiles 9 years ago
Fred Sundvik 9af995c59b Initial structure for Ergodox as subprojects 
Only the EZ default keymaps compiles at the moment though.
 9 years ago