aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/ergodox_ez
Commit message (Collapse)AuthorAgeFilesLines
...
* Make arguments redo, subproject elimination (#1784)Jack Humbert2017-10-143-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * redo make args to use colons, better folder structuring system [skip ci] * don't put spaces after statements - hard lessons in makefile development * fix-up some other rules.mk * give travis a chance * reset KEYMAPS variable * start converting keyboards to new system * try making all with travis * redo make args to use colons, better folder structuring system [skip ci] * don't put spaces after statements - hard lessons in makefile development * fix-up some other rules.mk * give travis a chance * reset KEYMAPS variable * start converting keyboards to new system * try making all with travis * start to update readmes and keyboards * look in keyboard directories for board.mk * update visualizer rules * fix up some other keyboards/keymaps * fix arm board ld includes * fix board rules * fix up remaining keyboards * reset layout variable * reset keyboard_layouts * fix remainging keymaps/boards * update readmes, docs * add note to makefile error * update readmes * remove planck keymap warnings * update references and docs * test out tarvis build stages * don't use stages for now * don't use stages for now
* Cleanup of my keymaps (#1802)drashna2017-10-102-41/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | * Add woodpad * Cleanup * Remove misc layouts for woodpad * Move woodpad to handwired * Updated RGB Underglow info * Cleanup macros * Fix odd merge issue * Tweaked RGB lighting stuff * Start to merge orthodox/ergodox keymaps (persistant layers) * Add forced NKRO * Added Colemak and Dvorak layers to default orthodox keymap * Added default layer (qwerty/colemak/dvorak) detection to RGB Underglow
* [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
| |