aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox_ez
AgeCommit message (Collapse)Author
2018-07-25Keymap: Bocaj Ergodox Updates (#3364)Gravatar Jacob Jerrell
* Bocaj Layout Revamp * Pull in Upstream (#1) * Various tweaks for some Input:Club build processes * change KEYMAP to LAYOUT for all new keyboards made using this script * Add support for rev3 of the Atom47 (#2672) * Added support for rev3 of the Atom47 * Updated Atom47 readme's * Fix redefine error on rev2 and add maartenwut's keymap * Fix redefine error on LEdiodes keymap * Add Nyquist keymap (#2692) * nyquist * danielhklein nyquist setup * shift left controls * remove readme * cleanup before pr * ready for pr * Adds Phantom TKL support (#2696) * Add an info.json to phantom keyboard * Add layouts - KEYMAP_WINKEYLESS - KEYMAP_7BIT - KEYMAP_ISO - KEYMAP_ISO_WINKEYLESS * Add key_counts * Add 2 missing F-Row keys * Add TKC1800 info.json Created an info.json for the tkc1800. * Clueboard 60 info.json - adds - LAYOUT_60_ansi - LAYOUT_60_iso - KEYMAP_AEK - KEYMAP - LAYOUT_60_ansi_split_bs_rshift * Add the Speedo keyboard * Fix KC60 info.json file (#2707) * change KEYMAP to LAYOUT in all the KC60 files * Redo the info.json file * Small fixes to TKC1800 - adjust F-row to use 0.25 spacing - split left shift - add key_count * Fix some Configurator Warnings regarding LAYOUT vs KEYMAP (#2708) * change diverge 3 KC_KEYMAP to LAYOUT * Change KEYMAP to LAYOUT for handwired arrow pad * change M10A to LAYOUT for m10-a * Change KC_KEYMAP to LAYOUT_kc and KEYMAP to LAYOUT for mf68 * change KC_KEYMAP to LAYOUT for nano * Refactor to LAYOUT * refactor to LAYOUT-ansi and LAYOUT_iso for s65 * LAYOUT conversions for lfkkeyboards * missed a few renames * mini1800 for lfkeyobards support of LAYOUT * Improve state/chord handling and clean up namespace Some values that can never, ever, change were held in local variables, rather than in PROGMEM. Fixed. Change "pressed" to a signed int so the test for < 0 makes sense, and to avoid possible weird failure modes in the case where a key release comes in when pressed is already zero. (Shouldn't happen, sure, but computers are weird.) A lot of things in process_steno had external linkage for no particular reason. They've been marked static. Stuff still builds. Distinguish between currently-held keys and keys that have been held, and expose these values through a nicely-named API so other code could, say, check on the current set of steno chording in order to make displays. Also in passing fix up the "state" value having external linkage so it could clash with other people's variable declarations. The API also provides hooks for key processing and steno chord events, so you can monitor those events without having to run in matrix_scan_user and recheck the values directly. Also document these. There is no path through processing a key that doesn't end with a return false, so the nested return foo() are gone and we just return false. * Pull information from config.h and rules.mk (#2711) * Pull information from config.h and rules.mk * Readd the kbd75 maintainer * Remove obsolete info.json entries (#2712) * Clean up some long-standing errors when populating the API (#2715) * More Configurator Warning Fixes (#2716) * mf68_ble did not have the correct .c and .h files * Fix JC65 KEYMAP to LAYOUT * Change KEYMAP to LAYOUT for s60_x * Convert KEYMAP to LAYOUT for lets_split boards * Convert KEYMAP to LAYOUT * more fixes to keymap for iris * convert KEYMAP to LAYOUT for levinson keyboard * change losinggeneration's KEYMAP to LAYOUT * convert KEYMAP to LAYOUT * convert KEYMAP to LAYOUT for nyquist * convert KEYMAP to LAYOUT * convert KEYMAP to LAYOUT for viterbi * convert KEYMAP to LAYOUT * convert KEYMAP and its subsidiries to the LAYOUT standard * convert KEYMAP and its subsidiries to the new LAYOUT standard * Normacos keymap for let's split keyboard (#2691) * Cheers let's split keymap * fixed typo on norman layer of cheers keymap for let's split * fixed right handed mappings for home row * cheers keymap for let's split redefinition * updated Cheers keymap for let's split * cheers keymap for let's split updated with some terminal macros * renamed cheers let's split keymap to a more appropriate normacos * updated normacos keymap doc / removed non functional keys * reset let's split rules to default values * added more spotlight search macros * normalized keymap comments * Moved numpad on lower layer * hhkb jp personal keymap (#2698) * Add JJ40 Cockpit personal keymap (#2713) * Add JJ40 Cockpit keymap * Fix lower layer symbols * Add readme for "major" keyboards to eliminate more QMK Configurator errors (#2718) * add readme to ktype keyboard * add readme to m10a * add readme to mini1800 * add readme to parent directory * Revert "Pull in Upstream (#1)" This reverts commit eeba0cec17ccb636e4225eed88aeae72b99f5e45. * Updates to Bocaj Files - Gave up on Tap Dance for ' -> ' + Added another 'Secret' + Add ' -> ' to the Swap Hands key + Add Swap Hands to the ' -> ' key + Made Hand Swapping a momentary toggle - Removed Auto Shift + Added Layer Toggle to KC_QUOTE for the _TOOLS layer - Disabled Tap Dance * Merge remote-tracking branch 'upstream/master' * Updates to Bocaj Added Game Layers, Removed Unused Macros * Removed 'secrets.h' * Updates to Bocaj Remove 'secrets'. Remove 'sendstring_workman.h' and set related layer back to qwerty due to macro compatibility issues * Total revisioning of keymap and layout structure * Missed readme.md file * Bocaj - Permissive Hold setting enabled
2018-07-08Revert to RGB Underglow being enabled, rather than rgb matrixGravatar Drashna Jaelre
2018-07-08Re-add RGBW code, so RGB Underglow will compileGravatar Drashna Jaelre
2018-07-03Merge pull request #3229 from qmk/hf/shinydoxGravatar Erez Zukerman
Adds I2C timeout and return values, adds support for future RGB Ergodox EZ
2018-06-23adds immediate i2c return, fixes ez matrix codeGravatar Jack Humbert
2018-06-22refactor, non-workingGravatar Jack Humbert
2018-06-22feat: add a keymap of kou (#3219)Gravatar kouMatsumoto
2018-06-15Fixed no-op ifndef for ergodox ez (#3189)Gravatar Alex Malott
2018-06-12Ergodox EZ refactor (#3171)Gravatar noroadsleft
* Refactor matrices and keymaps * Fixes for @ericgebhart keymap * Deleted macro aliases * ericgebhart/keymap.c to LAYOUT_ergodox_wrapper
2018-06-12adds timeout to avr i2cGravatar Jack Humbert
2018-06-12revert some attempts, update i2cGravatar Jack Humbert
2018-06-12Merge branch 'master' of github.com:qmk/qmk_firmware into hf/shinydoxGravatar Jack Humbert
2018-06-08Keyboard that works on Qwerty or Bepo OS keyboards. (#3149)Gravatar Eric Gebhart
* New layout. * new dvorak bepo layout. * first commit of new ergodox_ez dvorak keyboard for qwerty and bepo.
2018-05-29Add bpruitt-goddard Ergodox Layout (#3080)Gravatar Brian Pruitt-Goddard
* 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-pluggingGravatar Erez Zukerman
2018-05-20Fix Ergodox EZ Info.json files (#2979)Gravatar Drashna Jaelre
* Fix Ergodox EZ Info.json files * Ugh, column stagger! * Whoops, added offset to wrong axis * Add changes to Ergodone and Ergodox Infinity
2018-05-15i2c fixGravatar Jack Humbert
2018-05-09turn it onGravatar Jack Humbert
2018-05-09disables RGB Matrix for nowGravatar Erez Zukerman
just to see if that's why the board doesn't work. And it is... With this, the board works.
2018-05-09a quick attemptGravatar Erez Zukerman
2018-04-24Syntax update (#2660)Gravatar Kurth O'Connor
* 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)Gravatar Drashna Jaelre
* Add pretty layout to all ergodox clones * Info.json cleanup for EZ * Add info.json for ergodone * info.json cleanup
2018-04-11Remove bootloader from info.jsonsGravatar skullY
2018-04-07Clean up some long-standing errors when populating the API (#2715)Gravatar skullydazed
2018-04-07Pull information from config.h and rules.mk (#2711)Gravatar skullydazed
* Pull information from config.h and rules.mk * Readd the kbd75 maintainer
2018-03-25Update to drashna files (#2587)Gravatar Drashna Jaelre
* 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)Gravatar Drashna Jaelre
2018-03-20Create info.json for Ergodox EZ (#2572)Gravatar Drashna Jaelre
* Create info.json for Ergodox EZ * Add Orthodox info.json too
2018-03-20Add Pretty Keymaps to Ergodox EZGravatar U-LANDSRAAD\drashna
2018-03-19[Proposal?] Allow RGB Underglow to turn off when host is idle/asleep (#2104)Gravatar Drashna Jaelre
* 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 consistencyGravatar Joe Wasson
2018-03-16update to Ergodox / Atreus Dvorak 42 key layouts (#2504)Gravatar lucwastiaux
* 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)Gravatar Drashna Jaelre
* 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)Gravatar Brian Choromanski
* 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)Gravatar Sean-Li Murmann
* First pass keyboard setup! * More variation * Final layer for today * Added brace to middle key
2018-02-23Update Dvorak 42 key layouts (#2420)Gravatar lucwastiaux
* 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)Gravatar Drashna Jaelre
* 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)Gravatar Drashna Jaelre
* 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.Gravatar mvs
2018-01-25Fix compilation error when RGB light is disabledGravatar Greizgh
2018-01-17Update to drashna keymaps (#2281)Gravatar Drashna Jaelre
* 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)Gravatar Drashna Jaelre
* 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 ShiftGravatar Drashna Jael're
2017-12-20Add toggle option to AutoShiftGravatar U-LANDSRAAD\drashna
2017-12-14Add a keymap for the Ergodox EZ meant to be used with a Bépo keyboard ↵Gravatar mkende
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)Gravatar Drashna Jaelre
* 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-11Vim Layout for Ergodox-EZ (mac only) (#2112)Gravatar Benny Powers
* 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 rowsGravatar Seebs
"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-05Updates to drashna keymaps and userspace (#2093)Gravatar Drashna Jaelre
* 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-27Updates bootloader settings, adds file size check (#2029)Gravatar Jack Humbert
* 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