summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox_ez
Commit message (Collapse)AuthorAgeFilesLines
* [cleanup] consistent 2 space indentationCampbell Barton2017-10-052-55/+55
| | | | Was mixed between 2&4
* added matrixman layoutMatt2017-09-292-0/+313
|
* updated drashna's keymaps (#1769)drashna2017-09-293-88/+44
| | | | | | | | | | | | * Add woodpad * Cleanup * Remove misc layouts for woodpad * Move woodpad to handwired * Updated RGB Underglow info
* remove all makefiles from keyboard directoriesJack Humbert2017-09-274-26/+0
|
* Adding Ergodox EZ and Atreus Dvorak 42-key layouts (#1705)lucwastiaux2017-09-152-0/+338
| | | | | | | | | | | | | | | | * importing 42 key dvorak layout * added comment for build instructions * adding atreus dvorak 42 key layout * added readme * add readme * build instructions * additional MEH shortcuts
* Remove all Makefiles from the keyboards directory. (#1660)skullydazed2017-09-083-0/+18
| | | | | | | | | | | | | | | | | | | | | | * Remove all Makefiles from the keyboards directory. * update keymaps added in the last 8 days * Ignore keyboard/keymap makefiles * update hand_wire to reflect our new Makefile-less reality * Update the make guide to reflect the new reality * move planck keymap options to rules.mk * update planck keymaps 4real * trigger travis * add back build_keyboard.mk * restore changes to build_keyboard
* Update drashna's keymap (#1649)drashna2017-08-303-205/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial commit for my custom layout * fix switching into and out of numfun layer * enable tap dance to lock layers * enable layer indicator LEDs * remove Colemak2 layer because it was dumb * remove handler for nonexistent keycode * add new movement keys to lower layer * standardize indentation because I'm not a monster * add Woodpad keyboard with Michael's Tryggve layout * Add dvorak/colemak layers * add hash * Update keymap.c * Fixed OSL Symbol layer layout issue * Minor later tweak * Clean up actions * Diablo 3 macro keys remove * Fixed numbad issues * Remove Underglow toggle * Fix layer consistency * cleanup of code * line feed * small fixes * Major merge * Merge cleanup on my keymap * Cleanup * Update compile command * Swapped arrows * Additional cleanup * Revert "Woodpad" * update * minor update * staging for pull request * Finish removing layer underglow toggles
* Creates a layouts/ folder for keymaps shared between keyboards (#1609)Jack Humbert2017-08-2331-0/+4491
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * include variables and .h files as pp directives * start layout compilation * split ergodoxes up * don't compile all layouts for everything * might seg fault * reset layouts variable * actually reset layouts * include rules.mk instead * remove includes from rules.mk * update variable setting * load visualizer from path * adds some more examples * adds more layouts * more boards added * more boards added * adds documentation for layouts * use lowercase names for LAYOUT_ * add layout.json files for each layout * add community folder, default keymaps for layouts * touch-up default layouts * touch-up layouts, some keyboard rules.mk * update documentation for layouts * fix up serial/i2c switches
* Initial structure for Ergodox as subprojectsFred Sundvik2016-07-29189-23832/+0
| | | | Only the EZ default keymaps compiles at the moment though.
* Merge pull request #584 from algernon/ergodox-ez/algernonErez Zukerman2016-07-294-28/+687
|\ | | | | ergodox_ez: Upgrade my keymap to v1.4
| * ergodox_ez: Upgrade my keymap to v1.4Gergely Nagy2016-07-294-28/+687
| | | | | | | | | | | | | | | | | | | | * When toggling the key logging on or off, the LEDs will do a little dance. * The keylogger is now optional, but enabled by default. Use `KEYLOGGER_ENABLE=no` on the `make` command line to disable it. * The `TAB`/`ARRW` key was turned into a tap-dance key, allowing one to toggle the **ARROW** layer on by double-tapping, and as such, avoid the need to hold the key. * The `-`/`_` key was turned into a tap-dance key too. * There is now a way to travel time with the keyboard, toggle the feature on by hitting `LEAD t`. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* | disable sleep LEDcoderkun2016-07-291-1/+2
| |
* | complete labels for modifiers in keymap schemacoderkun2016-07-291-2/+2
| |
* | use Ergodox EZ’s third LED for “scroll lock”coderkun2016-07-291-2/+9
| |
* | fix grave (GRV) and acute (ACUT) accentscoderkun2016-07-291-2/+2
|/
* Merge pull request #568 from sethbc/fix-colemak-osx-pc-noJack Humbert2016-07-281-1/+1
|\ | | | | update NO_AMP to NO_AMPR
| * update NO_AMP to NO_AMPRSeth Chandler2016-07-271-1/+1
| |
* | Merge pull request #566 from SmackleFunky/masterJack Humbert2016-07-281-2/+2
|\ \ | | | | | | Allow toggling out of plover layer
| * | Allow toggling out of plover layerSmackleFunky2016-07-271-2/+2
| |/
* / Move to keyboardsMazin Bokhari2016-07-262-0/+350
|/
* Merge pull request #534 from willwm/teckinesisErez Zukerman2016-07-2410-0/+1819
|\ | | | | Teckinesis for ErgoDox EZ
| * Remove images, per @ezuk request. =)Will Wolff-Myren2016-07-243-10/+0
| |
| * Update readme.mdWill Wolff-Myren2016-07-171-5/+7
| | | | | | | | * Markdown cleanup
| * Update readme.mdWill Wolff-Myren2016-07-177-178/+191
| | | | | | | | | | | | * Updated layout images, json from Keyboard Layout Designer * Added links to Keyboard Layout Designer templates. * Added images of TECK, Kinesis layouts.
| * Update description comment.Will Wolff-Myren2016-07-171-2/+3
| |
| * [MEDIA]: Remove Power, Sleep, Mail, MyCompWill Wolff-Myren2016-07-171-6/+6
| | | | | | | | | | I kept hitting these on accident while attempting to move the cursor or mouse. =P
| * [BASE]: Meh, Hyper now have symbols on both sidesWill Wolff-Myren2016-07-171-4/+4
| | | | | | | | | | Left: MEH_T(KC_BSLS),ALL_T(KC_SLSH) Right: ALL_T(KC_LBRC),MEH_T(KC_RBRC)
| * Update Base Layer comment to match new layout.Will Wolff-Myren2016-07-171-1/+1
| |
| * [BASE]: KC_MINS -> KC_GRVWill Wolff-Myren2016-07-171-1/+1
| |
| * RSpec: KC_EQL -> KC_MINSWill Wolff-Myren2016-07-171-2/+2
| |
| * LSpec: KC_GRV -> KC_EQLWill Wolff-Myren2016-07-171-2/+2
| |
| * Replaced ordinary-media.{png|json} with new media layoutWill Wolff-Myren2016-07-144-27/+436
| |
| * Replaced ordinary-symbol.{png|json} with new base layout.Will Wolff-Myren2016-07-145-29/+430
| |
| * Replaced ordinary-base.{png|json} with new base layout.Will Wolff-Myren2016-07-144-27/+452
| |
| * Replaced readme.md with stubWill Wolff-Myren2016-07-141-92/+5
| | | | | | | | (incl. reference to original layout)
| * Created "teckinesis" keymap folderWill Wolff-Myren2016-07-1310-0/+665
| | | | | | | | (Based on "ordinary" keymap by Nicholas Keene)
* | Merge pull request #535 from algernon/ergodox-ez/algernonErez Zukerman2016-07-249-214/+855
|\ \ | | | | | | ergodox_ez: Update my keymap to v1.3
| * | ergodox_ez: Update my keymap to v1.3Gergely Nagy2016-07-189-214/+855
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates my ErgoDox EZ layout to v1.3, which has the following noteworthy changes: * Added support for logging keys, by pressing `LEAD d`. Also included is a tool to generate a **heatmap** out of the logs. * The arrow and navigation keys were rearranged again, and now require an additional key being held to activate. See the **base layer** for an image that shows where arrows are. * The **experimental** layer has been redone, and is now called **ADORE**, and as such, can be enabled by `LEAD a` now. * Switching between Dvorak and ADORE is now persisted into EEPROM, and survives a reboot. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* | | update broken linkSeth Chandler2016-07-171-1/+1
|/ /
* | Merge branch 'master' of https://github.com/Skrymir/qmk_firmwareJosh Colbeck2016-07-062-0/+213
|\ \ | |/ |/|
| * Changed layer switching to momentaryJosh Colbeck2016-07-061-6/+6
| | | | | | | | corrected macro
| * Merge remote-tracking branch 'jackhumbert/master' into patch-1Josh Colbeck2016-07-042-11/+5
| |\
| * | Added macro and readmeJosh Colbeck2016-07-042-18/+40
| | | | | | | | | | | | macros to for often used eclipse shortcuts
| * | Added new keymapJosh Colbeck2016-07-041-0/+191
| | |
| * | Revert "Changed layout of left hand main layer"Josh Colbeck2016-07-031-12/+12
| | | | | | | | | | | | This reverts commit 8149924399cf3d31d80444a10477a29f53a4990e.
| * | Changed layout of left hand main layerJoshua Colbeck2016-07-031-12/+12
| | |
* | | fix/annotate wait_us linesJack Humbert2016-07-061-0/+12
| |/ |/|
* | Adds wait to i2c (debounce)Jack Humbert2016-07-041-3/+3
| |
* | Improves debounceJack Humbert2016-07-042-9/+3
|/
* Moves features to their own files (process_*), adds tap dance feature (#460)Jack Humbert2016-06-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * non-working commit * working * subprojects implemented for planck * pass a subproject variable through to c * consolidates clueboard revisions * thanks for letting me know about conflicts.. * turn off audio for yang's * corrects starting paths for subprojects * messing around with travis * semicolon * travis script * travis script * script for travis * correct directory (probably), amend files to commit * remove origin before adding * git pull, correct syntax * git checkout * git pull origin branch * where are we? * where are we? * merging * force things to happen * adds commit message, adds add * rebase, no commit message * rebase branch * idk! * try just pull * fetch - merge * specify repo branch * checkout * goddammit * merge? idk * pls * after all * don't split up keyboards * syntax * adds quick for all-keyboards * trying out new script * script update * lowercase * all keyboards * stop replacing compiled.hex automatically * adds if statement * skip automated build branches * forces push to automated build branch * throw an add in there * upstream? * adds AUTOGEN * ignore all .hex files again * testing out new repo * global ident * generate script, keyboard_keymap.hex * skip generation for now, print pandoc info, submodule update * try trusty * and sudo * try generate * updates subprojects to keyboards * no idea * updates to keyboards * cleans up clueboard stuff * setup to use local readme * updates cluepad, planck experimental * remove extra led.c [ci skip] * audio and midi moved over to separate files * chording, leader, unicode separated * consolidate each [skip ci] * correct include * quantum: Add a tap dance feature (#451) * quantum: Add a tap dance feature With this feature one can specify keys that behave differently, based on the amount of times they have been tapped, and when interrupted, they get handled before the interrupter. To make it clear how this is different from `ACTION_FUNCTION_TAP`, lets explore a certain setup! We want one key to send `Space` on single tap, but `Enter` on double-tap. With `ACTION_FUNCTION_TAP`, it is quite a rain-dance to set this up, and has the problem that when the sequence is interrupted, the interrupting key will be send first. Thus, `SPC a` will result in `a SPC` being sent, if they are typed within `TAPPING_TERM`. With the tap dance feature, that'll come out as `SPC a`, correctly. The implementation hooks into two parts of the system, to achieve this: into `process_record_quantum()`, and the matrix scan. We need the latter to be able to time out a tap sequence even when a key is not being pressed, so `SPC` alone will time out and register after `TAPPING_TERM` time. But lets start with how to use it, first! First, you will need `TAP_DANCE_ENABLE=yes` in your `Makefile`, because the feature is disabled by default. This adds a little less than 1k to the firmware size. Next, you will want to define some tap-dance keys, which is easiest to do with the `TD()` macro, that - similar to `F()`, takes a number, which will later be used as an index into the `tap_dance_actions` array. This array specifies what actions shall be taken when a tap-dance key is in action. Currently, there are two possible options: * `ACTION_TAP_DANCE_DOUBLE(kc1, kc2)`: Sends the `kc1` keycode when tapped once, `kc2` otherwise. * `ACTION_TAP_DANCE_FN(fn)`: Calls the specified function - defined in the user keymap - with the current state of the tap-dance action. The first option is enough for a lot of cases, that just want dual roles. For example, `ACTION_TAP_DANCE(KC_SPC, KC_ENT)` will result in `Space` being sent on single-tap, `Enter` otherwise. And that's the bulk of it! Do note, however, that this implementation does have some consequences: keys do not register until either they reach the tapping ceiling, or they time out. This means that if you hold the key, nothing happens, no repeat, no nothing. It is possible to detect held state, and register an action then too, but that's not implemented yet. Keys also unregister immediately after being registered, so you can't even hold the second tap. This is intentional, to be consistent. And now, on to the explanation of how it works! The main entry point is `process_tap_dance()`, called from `process_record_quantum()`, which is run for every keypress, and our handler gets to run early. This function checks whether the key pressed is a tap-dance key. If it is not, and a tap-dance was in action, we handle that first, and enqueue the newly pressed key. If it is a tap-dance key, then we check if it is the same as the already active one (if there's one active, that is). If it is not, we fire off the old one first, then register the new one. If it was the same, we increment the counter and the timer. This means that you have `TAPPING_TERM` time to tap the key again, you do not have to input all the taps within that timeframe. This allows for longer tap counts, with minimal impact on responsiveness. Our next stop is `matrix_scan_tap_dance()`. This handles the timeout of tap-dance keys. For the sake of flexibility, tap-dance actions can be either a pair of keycodes, or a user function. The latter allows one to handle higher tap counts, or do extra things, like blink the LEDs, fiddle with the backlighting, and so on. This is accomplished by using an union, and some clever macros. In the end, lets see a full example! ```c enum { CT_SE = 0, CT_CLN, CT_EGG }; /* Have the above three on the keymap, TD(CT_SE), etc... */ void dance_cln (qk_tap_dance_state_t *state) { if (state->count == 1) { register_code (KC_RSFT); register_code (KC_SCLN); unregister_code (KC_SCLN); unregister_code (KC_RSFT); } else { register_code (KC_SCLN); unregister_code (KC_SCLN); reset_tap_dance (state); } } void dance_egg (qk_tap_dance_state_t *state) { if (state->count >= 100) { SEND_STRING ("Safety dance!"); reset_tap_dance (state); } } const qk_tap_dance_action_t tap_dance_actions[] = { [CT_SE] = ACTION_TAP_DANCE_DOUBLE (KC_SPC, KC_ENT) ,[CT_CLN] = ACTION_TAP_DANCE_FN (dance_cln) ,[CT_EGG] = ACTION_TAP_DANCE_FN (dance_egg) }; ``` This addresses #426. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> * hhkb: Fix the build with the new tap-dance feature Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> * tap_dance: Move process_tap_dance further down Process the tap dance stuff after midi and audio, because those don't process keycodes, but row/col positions. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> * tap_dance: Use conditionals instead of dummy functions To be consistent with how the rest of the quantum features are implemented, use ifdefs instead of dummy functions. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org> * Merge branch 'master' into quantum-keypress-process # Conflicts: # Makefile # keyboards/planck/rev3/config.h # keyboards/planck/rev4/config.h * update build script
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 16:31:46 +0000