summaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox_ez
AgeCommit message (Collapse)AuthorFilesLines
2018-06-13Ergodox EZ refactor (#3171)noroadsleft12-205/+203
* Refactor matrices and keymaps * Fixes for @ericgebhart keymap * Deleted macro aliases * ericgebhart/keymap.c to LAYOUT_ergodox_wrapper
2018-06-13adds timeout to avr i2cJack Humbert1-0/+2
2018-06-12revert some attempts, update i2cJack Humbert3-14/+13
2018-06-12Merge branch 'master' of github.com:qmk/qmk_firmware into hf/shinydoxJack Humbert7-6/+747
2018-06-08Keyboard that works on Qwerty or Bepo OS keyboards. (#3149)Eric Gebhart2-0/+359
* New layout. * new dvorak bepo layout. * first commit of new ergodox_ez dvorak keyboard for qwerty and bepo.
2018-05-30Add bpruitt-goddard Ergodox Layout (#3080)Brian Pruitt-Goddard4-0/+300
* Feat: Create personal ergodox keymap * FEAT: Update bpruitt-goddard keymap with custom layout * Fix: Remove unused pieces from bpruitt-goddard keyboard * Feat: Add QWERTY layer to bpruitt-goddard ergodox keymap * Refactor: Remove unused layers from bpruitt-goddard keymap * Fix: Update base layer for bpruitt-goddard keymap * Fix: Remove un-reachable key combo from FN layer * Fix: Rename FN layer to numpad layer * Feat: Create one-shot modifier layer for mac os use * Doc: Update readme to reflect my keymap * Feat: Add mac desktop space switching * feat: Update keymap layers to use ergodox pretty format
2018-05-24a failed attempt at hot-pluggingErez Zukerman2-7/+12
2018-05-21Fix Ergodox EZ Info.json files (#2979)Drashna Jaelre1-6/+88
* Fix Ergodox EZ Info.json files * Ugh, column stagger! * Whoops, added offset to wrong axis * Add changes to Ergodone and Ergodox Infinity
2018-05-16i2c fixJack Humbert4-8/+5
2018-05-09turn it onJack Humbert1-1/+1
2018-05-09disables RGB Matrix for nowErez Zukerman2-1/+3
just to see if that's why the board doesn't work. And it is... With this, the board works.
2018-05-09a quick attemptErez Zukerman3-1/+136
2018-04-24Syntax update (#2660)Kurth O'Connor1-2/+5
* initial commit * init qmk keymap * update docs * update documentation consolidate readme files; update `make` instructions revise ascii keymap representation * update documentation * edit and update `make` syntax - `make` syntax update - fix typo - add link to teensy video (already linked from online configurator) * permissions restored * remove superfluous files from branch * reset idiosyncratic execute permissions * reset idiosyncratic execute permission
2018-04-21Add pretty layout to all ergodox clones (#2686)Drashna Jaelre2-7/+10
* Add pretty layout to all ergodox clones * Info.json cleanup for EZ * Add info.json for ergodone * info.json cleanup
2018-04-12Remove bootloader from info.jsonsskullY1-1/+0
2018-04-08Clean up some long-standing errors when populating the API (#2715)skullydazed1-3/+3
2018-04-08Pull information from config.h and rules.mk (#2711)skullydazed1-3/+0
* Pull information from config.h and rules.mk * Readd the kbd75 maintainer
2018-03-25Update to drashna files (#2587)Drashna Jaelre4-419/+0
* Add Colemak Mod-DH vars * Add Norman Layot vars * Set Shift Indicator to include CAPS Lock as well * Change MEH to GUI * Add Enter to Macro layer * Switch raise and lower layers to make more sense (to me) * Replace unused quote on Ergodox * Add One Shot defines * Dim indicator LEDs * Add short codes for KC_SECRET * Fix typos * Update OLKB code in userspace * Add global userspace config.h * add compile fix * Automatically include from userspace * update readme * Re-add QMK Scan loop * Add EEPROM reset code to all keymaps * Shorten fauxclick sound * Use layouts instead of keymap, when possible * Add OSM detection to ergodox * Convert Viterbi to LAYOUT macro * Clean up game macros * Because I accidently removed the C6 AUDIO define from my viterbi... Whoops * Minor formatting * Fix Woodpad because it's still there * Move Ergodox keymap into layouts folder * Add build date to version macro * Remove PREVENT_STUCK_MODIFIERS from config
2018-03-21Update info.json for Ergodox EZ (#2577)Drashna Jaelre1-4/+4
2018-03-21Create info.json for Ergodox EZ (#2572)Drashna Jaelre1-0/+25
* Create info.json for Ergodox EZ * Add Orthodox info.json too
2018-03-21Add Pretty Keymaps to Ergodox EZU-LANDSRAAD\drashna2-166/+146
2018-03-20[Proposal?] Allow RGB Underglow to turn off when host is idle/asleep (#2104)Drashna Jaelre1-0/+1
* Add RGB Underglow Sleeping * Add RGBLIGHT_SLEEP to toggle/control RGB light behavior * Update rgb docs * Update for RGB disable command
2018-03-16Rename ONEHAND_ENABLE to SWAP_HANDS_ENABLE for consistencyJoe Wasson3-7/+7
2018-03-16update to Ergodox / Atreus Dvorak 42 key layouts (#2504)lucwastiaux1-1/+3
* add SCREEN_NAV layer for copy/pasting within screen * working readreg/paste macros * working read reg / paste macros * write log and tran patterns, and expand * add ls -la shortcut, add tab on combined layer * put delete word on the right pinky key on shell_nav layer * add TAB on the right side, add reset key * added Cloud9 macros * add cloud9 shortcuts to atreus layout * added BROWSER_CONTROL layer * finalized browser control layer * adding comment * add browser control layer to atreus * add flashing command line * remove the tab on combined layer
2018-03-01Update to drashna keymaps and userspace (#2450)Drashna Jaelre2-22/+39
* Add OSL keycodes and macro handling * Re-add AVRDUDE target * Userspace document cleanup and commenting * Fix Orthodox keymap layout (cosmetic) * Add caveat for KEYMAP Macros * Minor tweaks * Enable Bootmagic in Ergodox EZ * Minor tweaks
2018-03-01Fixed dead links (#2451)Brian Choromanski1-1/+1
* Fixed typo of 'confid.h' to 'config.h' * Fixed broken links in docs * Fixed a lot of dead links
2018-02-23new customized ErgodoxEz keymap with easy to remember modifiers. (#2400)Sean-Li Murmann1-0/+228
* First pass keyboard setup! * More variation * Final layer for today * Added brace to middle key
2018-02-23Update Dvorak 42 key layouts (#2420)lucwastiaux1-36/+223
* add SCREEN_NAV layer for copy/pasting within screen * working readreg/paste macros * working read reg / paste macros * write log and tran patterns, and expand * add ls -la shortcut, add tab on combined layer * put delete word on the right pinky key on shell_nav layer * add TAB on the right side, add reset key * added Cloud9 macros * add cloud9 shortcuts to atreus layout * added BROWSER_CONTROL layer * finalized browser control layer * adding comment
2018-02-12Update to drashna keymaps (#2381)Drashna Jaelre1-8/+8
* Add to list of predefined rgb colors * Change layer colors, to reflect new options * Use Tag Toggle instead * Clean up macros and add breathing indication for OSM Layer * Get Viteri Macropad working properly * Disable unused action features * Use I2C because that's smaller, apparently * Remove viterbi-half code
2018-02-04Update to drashna userspace (Keymap Templating) (#2338)Drashna Jaelre2-73/+93
* Change tapping term to be longer * Make Audio/Underglow settings permanent * Use wait_ms rather than _delay_ms * Readd One Shot Mods * Switch to Imperial March startup sound * Move OSM to it's own layer * Minor Formatting Tweaks * Keymap Templates and formatting fixes
2018-02-02QWERTY based layout with thumb-chording (SHIFT + SPECIAL) and programming layer.mvs1-0/+255
2018-01-25Fix compilation error when RGB light is disabledGreizgh1-0/+2
2018-01-17Update to drashna keymaps (#2281)Drashna Jaelre2-4/+7
* Move faux clicky into userspace * Get Audio and RGB enabled on Orthodox-rev1 * Add faux click to userspace * Add Orthodox Rev3 check to macros * Hack Orthodox Name for drashna keymap * No more One Shots * Ergodox product name hack * Enable Audio on Orthodox by default
2018-01-01Clean up and tweaks of drashna keymaps and userspace (#2200)Drashna Jaelre3-43/+24
* Minor tweaks modified: users/drashna/drashna.c * Fix Workman ASCII art * Add OSM for shifts * Make Viterbi's 00 code consistant * Minor Cleanup off Userspace * Change Tapping Term on Ergodox * Re-add EEPROM code * Minor updates and tweaks * Use QMK_H variables to make keymaps more universal * Forgot 'break;' for covecube layer * Tweak Viterbi files now that I have hands on * Add secrets to Ergodox * RGB tweaks to Viterbi * Viterbi RGB layout tweeks * Minor tweaks * Add One Shot Mod tap toggle * Add Faux Clicky to Viterbi, and disable controller's LEDs * Minor tweaks * Move D3 keycode defines into userspace * Updated Userspace Readme
2017-12-20Add on/off/toggle keycodes for Auto ShiftDrashna Jael're1-1/+1
2017-12-20Add toggle option to AutoShiftU-LANDSRAAD\drashna1-1/+1
2017-12-14Add a keymap for the Ergodox EZ meant to be used with a Bépo keyboard ↵mkende4-0/+418
layout (French ergonomic layout) (#2141) * Initial version of the Ergodox EZ Bépo keymap, TypeMatrix style. * Update the readme file and add some handling of the keyboard LEDs. * Toggling layer requires 2 taps. * Remove a constant as it conflicts with an earier definition. * Fix a typo in a type name. * Fix the arrow layer that had a bad number. * Second main version of my bepo keymap, after the tests of the first one. * Fix the triggering of the function layer and the handling of the LED. * Reduce the shining of the LEDs. * Fix the swap layer (that required a keypress on the other side of the keyboard to be deactivated). * Duplicate some of the mouse button for easy access. * Move some of the secondary functions out of the center keys. * Slightly slow down the mouse and mouse wheel. * Update the comment and readme.md for the V2 of the keymap. * Invert button 2 and 3 of the mouse. Really fix the SWAP layer. * Test with the right alt modifier added as secondary function (on hold) of the space keys. The right alt key becomes a left alt one. * Add specific shift/ctrl for the FN layer; move some mouse keys around to help with that. * Remove one FN modifier-on-hold key that was not useful. * Duplicate the FN layer inside the MOUSE layer. * Add support (not tested yet) for macro recording and play on a single key as a tap dance. * Allow to stop recording the macro by tapping once on the macro key (still un-tested). * Add support for macro recording using some tap dance. * shorten a comment. * Reinstate the FN toggle on the percent key (so that there is an FN toggle on the right-hand-side). * Fix some comments and update the link to the most up-to-date image. * Small fix to the keymap images.
2017-12-14Update Drashna keymaps (#2145)Drashna Jaelre2-12/+37
* Change overwatch to Gamepad * Remove secrets file * Add sample sensitive.h file * Borrow @colinta's secrets.h include method * Remove unnessary placeholder for macros * Set secrets to use PROGMEM for char string * Add readme files to my keymaps and userspace
2017-12-12Vim Layout for Ergodox-EZ (mac only) (#2112)Benny Powers5-0/+1156
* ignore libs * Clang complete file * Add VIM_A, VIM_S, VIM_COMMAND_SHIFT_D, and VIM_COMMAND_SHIFT_A Add VIM_A, VIM_S, VIM_COMMAND_SHIFT_D, and VIM_COMMAND_SHIFT_A a s O * Comment blocks for minimap generated at http://patorjk.com/software/taag/#p=display&h=0&v=0&c=c&f=Banner&t=COMMENT * Be explicit * More Comment blocks * Add J * add A, C, D, J, S, O * Make h j k l explicitly vim commands (useful for JOIN) * add cb ce cw ch cj ck cl db de dw dh dj dk dl vb ve vh vj vk vl x ciw diw viw * debug messages for ci di vi * Var capitalized * Save bytes by disabling mouse keys * Add Y P * Be more explicit about which key was pressed * Be more explicit about which key was sent * Move project to new directory structure * Remove non-vim layout folder * Replace KC_TRNS with KC_NO on normal layer * Insert Mode as default * Try to prevent crashes * Put normal mode back * Revert "ignore libs" This reverts commit 4c5d7592d6c1b70e689c0b9400afca19c71970a7. * add rules.mk * Add mouse bindings * Checkout most recent keymap following rebase * Realign mouse button keys * Make a macro for TO(NORMAL_MODE)
2017-12-10Don't "unselect" left-hand rowsSeebs1-11/+3
"unselecting" left-hand rows is a wasted i2c transaction. On the left-hand side, the ergodox uses a GPIO expander. It does *not* change "direction" (input/output) of pins, it just sets pins high or low. But all the pins are written at once. There's no way to change just one pin's value; you send a full byte of all eight row pins. (Not all of them are in use, but that doesn't matter.) So every pin is either +V or ground. This is in contrast with the right-hand side, which is using input mode to make pins be neutral. So there's no need to "deselect" the rows on the left side at all. To select row 0, you set the GPIO register for the rows to 0xFE. The previous code would then set it back to 0xFF, then set it to 0xFD on the next cycle. But we can just omit the intervening step, and set it to 0xFD next cycle, and get the same results. And yes, I tested that the keyboard still works. On my system, scan rate as reported by DEBUG_SCAN_RATE goes from 445 or so to 579 or so, thus, from ~2.24ms to ~1.73ms. Signed-off-by: seebs <seebs@seebs.net>
2017-12-06Updates to drashna keymaps and userspace (#2093)Drashna Jaelre1-3/+3
* Add "secret" macor * Updating secret macros * Re-add RGB to Ergodox * Fixed issue when RGB was disabled * Consistency changes * Updated bootloader macro * Fixing audio setup * Fix bootloader typo * Update to full list of stings (for completeness) * Template fix * Finally got woodpad to force numlock * Fix for new RGB mode
2017-11-28Updates bootloader settings, adds file size check (#2029)Jack Humbert1-9/+6
* pull fuse settings for bootloader jump * fix 32a chips * make automatic bootloader selection optional * quantify bootloaders * fixs #164, speeds up dfu reset * fix for chips w/o usb * missing an n * fix bootloader sizes, use words for addresses * fix bmini, pearl, and [[ issue, make things quiet * ignore avr errors on arm for now * update settings for the light * document bootloader stuff * add bootloader title
2017-11-27Merge pull request #2047 from seebs/seebs/ergodox_brightnessErez Zukerman3-1/+10
Make brightness easier to change
2017-11-26improve ergodox ez performanceSeebs2-20/+34
With these changes, the ergodox ez goes from 315 scans per second when no keys are pressed (~3.17ms/scan) to 447 (~2.24ms/scan). The changes to the pin read are just condensing the logic, and replacing a lot of conditional operations with a single bitwise inversion. The change to row scanning is more significant, and merits explanation. In general, you can only scan one row of a keyboard at a time, because if you scan two rows, you no longer know which row is pulling a given column down. But in the Ergodox design, this isn't the case; the left hand is controlled by an I2C-based GPIO expander, and the columns and rows are *completely separate* electrically from the columns and rows on the right-hand side. So simply reading rows in parallel offers two significant improvements. One is that we no longer need the 30us delay after each right-hand row, because we're spending more than 30us communicating with the left hand over i2c. Another is that we're no longer wastefully sending i2c messages to the left hand to unselect rows when no rows had actually been selected in the first place. These delays were, between them, coming out to nearly 30% of the time spent in each scan. Signed-off-by: seebs <seebs@seebs.net>
2017-11-26fix typoSeebs1-1/+1
2017-11-23Make brightness easier to changeSeebs3-1/+10
Don't make the #defines unconditional, make them optional so users can override them with per-keymap settings more easily.
2017-11-21Allow multiple process_record() calls per scanSeebs1-0/+5
This is particularly relevant for, e.g., the ergodox EZ and other keyboards with slow scan rates. Without changing the API or behavior of individual process_record() calls, we allow a configuration flag to make multiple calls in a single scan. This will probably have miniscule effects on non-steno users, and it's not enabled by default for any keyboards. Added note about it to ergodox README. Signed-off-by: seebs <seebs@seebs.net>
2017-11-18Update to drashna keymaps (#4)Drashna Jaelre2-161/+12
* Minor updates to keymaps * Minor updates to keymaps
2017-11-17Splits up ps2avrGB boards into their own folders (#2014)Jack Humbert1-0/+148
* move underglow led count from parent to child * Added pearl support * Added personal keymap for pearl * start splitting up ps2avrGB boards * clean up ps2avrgb boards * Move keycodes to their own section * Clarify `KC_PWR` vs `KC_POWER`. Fixes #1994. * Cleaned uppersonal userspace and keymaps (#1998) * Cleanup of keymaps * Remove Tap Dance from Orthodox keymap * Cleaned up userspace and keymaps * Added sample (template)userspace files to my folder * Document the Teensy hardware reset problem * add mfluid keymap to atreus62 * Update hand_wire.md Change "Resin" to "Rosin" * Add keyboard: mt40 (#2001) * add keyboard: chinese planck clone * rename chinese_planck to mt40 * add image for the mt40 board * lets_split: Fix matrix_init for ROW2COL Signed-off-by: Marian Rusu <rusumarian91@gmail.com> * Add Keymap for Whitefox Truefox layout * Add keyboard: ACR60 (#1999) * base acr60 keyboard folder created * mitch acr60 keymap updates, documentation * latest keymap updates * slight modifications to layer switching * Changes to Atreus and Ergodox EZ Dvorak 42key layout (#1997) * 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 * added shifted symbols on symbols layer * working extra symbols on COMBINED layer * bring atreus layout inline with the ergodox one * add necessary macros * working ls macro * added more shell macros * added screen rename / screen number macros * add ctrl-a key in shell-nav to use screen more easily * added shell screen layer * assign screen switching macros to screen layer * define all screen switching macros * more screen-related shortcuts added on shell screen layer * change shell nav bottom right row to match base layer (backspace / delete) * remove some mappings on SHELL_NAV layer as they are now in the screen layer * added more screen macros * changes to COMBINED layer (pipe on the right) and modified shell nav * moved pipe/backslash to then right * documented SHELL_SCREEN layer * put backspace/delete on SHELL_NAV layer * add an explicit lisence file for github to pickup * Updated keymaps to allow base layer alternation for QWERTY, Colemak & Dvorak (#1962) * First commit of the Terminus_Mini firmware and the DivergeJM version of the Nyquist firmware * Fix terminus_mini & nyquist/DivergeJM readme files Previously an outdated copy of the default readme. Updated to match the Nyquist/DivergeJM format (DivergeJM is a split 5x12 implementation of the terminus_mini layout) * Update makefiles to rules.mk Renamed both Makefiles to rules.mk, removed references to makefiles * Updated rules.mk Inadvertantly removed important code from the rules.mk in previous commit. This has been restored. Also disabled Tap_Dance in both rules.mk files * Moved terminus_mini to handwired Realised that existing directory was not appropriate for the terminus_mini project, moved to handwired. * New Frosty Flake layout for QFR TKL Added a TKL layout for the Frosty Flake with a navigation cluster on LOWER under the left hand and a similarly functioning MOUSE layer that includes mouse navigation functionality. * README fix & keymap update for 3 keyboards Fixed the markdown for the handwired/terminus_mini:default, Nyqyist:DivergeJM & frosty_flake:QFR_JM. Added TAPPING_TERM = 150 to config.h for all keyboards Switched LT(LOWER) and LAlt on the mod row for ortholinear boards. * Update readme for QFR_JM to include make instructions * Revert "Merge branch 'master' of https://github.com/mogranjm/qmk_firmware" This reverts commit a45f264ada09acc14fb85390407bc7ff5bb021e3, reversing changes made to 62349c33410671a33d4041d50cf27de1d6bdd9cf. * Revert "Revert "Merge branch 'master' of https://github.com/mogranjm/qmk_firmware"" This reverts commit eae54fb3be2c60dffd704261f84bab98c9e06f93. * Added QWERTY support to the QFR_JM Implemented variable default base layer from the Planck default keymap. * Update README to reflect QWERTY support * Nyquist:DivergeJM - Update RESET location Add a reset button to both hands, accessible when halves are disconnected. * Typo fix * Update DivergeJM Switched master to Left hand, Moved Reset key to a different location * Added macros to send R pointer & dplyr pipe Macros added as a string of keypresses, couldn't figure out how to get SEND_STRING to work. * Added ADJUST -> QWERTY, DVORAK, COLEMAK Re-implemented update_tri_layer fuctionality to reset base layer for Terminus_Mini & DivergeJM Nyquist keymaps to QWERTY, DVORAK or COLEMAK via the ADJUST layer. Updated ReadMe files accordingly. * Fix base layout diagram for Terminus_Mini Remove split from diagram * Changed the R operators to SEND_STRING, rather than keypress macros * Added Dvorak to the QFR_JM keymap * fixed duplicate row in Nyquist keymap * Fix readme - LAlt location on mouse layer * Set EE_HANDS to allow either Nyquist hand to work as master. * Update R operator strings, clean up layering for terminus_mini, QFR_JM and DivergeJM "<-" to " <- " "%>%" to " %>% " Also played around with the layering, removed unnecessary TAP_TOGGLE for LOWER and shuffled FUNCTION and MOUSE momentary actions to reflect layer order. * Update bottom alpha row to output symbols on LOWER This row now outputs the following (z -> /) when in the LOWER layer: <- %>% { [ ` | ] } . / * Updated readme files for QFR_JM, terminus_mini & DivergeJM QFR_JM readme reflects correct LOWER bottom row symbol output, terminus_mini & DivergeJM reflect correct command line make instructions. * Add media keys to QFR_JM LOWER - Replicate QFR default functionality * Fix issue with Mouse layering Stuck on mouse layer because the wrong macro was assigned to the 'exit layer' key. Reassigned that key. * Changed " <- " to "<- " for QFR_JM, terminus_mini & DivergeJM * Add "KC_MAKE" to userspace example * QMK DFU bootloader generation (#2009) * adds :bootloader target * update planck and preonic revisions * remove references to .h files for planck * update preonic keymap * only add keyboard.h files that exist * add production target * hook things up with the new lufa variables * update rules for planck/preonic * back backlight key turn of status led when pressed * add manufacturer/product strings to bootloader * fix push script * Added support for let's split kailh socket version (#2010) * Added support for socket version of the let's split * renamed files * socket-version-works * fix up lets_split keymaps * fix up lets_split keymaps * shrink preonic by a bit * fix lets_split keyboards * update travis script * update travis script * update version silencing
2017-11-14Changes to Atreus and Ergodox EZ Dvorak 42key layout (#1997)lucwastiaux2-227/+233
* 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 * added shifted symbols on symbols layer * working extra symbols on COMBINED layer * bring atreus layout inline with the ergodox one * add necessary macros * working ls macro * added more shell macros * added screen rename / screen number macros * add ctrl-a key in shell-nav to use screen more easily * added shell screen layer * assign screen switching macros to screen layer * define all screen switching macros * more screen-related shortcuts added on shell screen layer * change shell nav bottom right row to match base layer (backspace / delete) * remove some mappings on SHELL_NAV layer as they are now in the screen layer * added more screen macros * changes to COMBINED layer (pipe on the right) and modified shell nav * moved pipe/backslash to then right * documented SHELL_SCREEN layer * put backspace/delete on SHELL_NAV layer
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-05-18 01:41:32 +0200