Commit graph

1136 commits

Author SHA1 Message Date
Daniel 8019a074cf minor tweaks to numpad and media layer 2016-08-14 20:43:05 -05:00
di0ib 959c48e146 moved to handwired folder 2016-08-14 14:13:58 -10:00
di0ib 288bf4faa3 Merge branch 'master' of https://github.com/di0ib/qmk_firmware 2016-08-14 13:20:00 -10:00
di0ib df56d742b1 Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-08-14 13:19:20 -10:00
Jack Humbert 4865e6f81f Merge pull request #631 from jacwib/master
Jacwib's keymap
2016-08-14 18:50:22 -04:00
di0ib 503ec7f9f6 Updated readme
Added link to Minorca/Sebright blog.
2016-08-14 11:15:46 -10:00
di0ib f58a67c991 cleanup readme 2016-08-14 11:10:12 -10:00
di0ib 1eaa685872 Correct data pin to D5 2016-08-14 11:08:15 -10:00
di0ib 65060ad000 Fix list 2016-08-14 11:07:35 -10:00
di0ib dde9ee572c clean up readnme 2016-08-14 11:06:46 -10:00
di0ib b4218a2b3e Merge remote-tracking branch 'refs/remotes/jackhumbert/master' 2016-08-14 10:58:22 -10:00
di0ib c6c2c3fc14 minorca
minirca with RGB keymap
2016-08-14 10:58:10 -10:00
Toni 5705a40320 increased readability with a defince 2016-08-14 20:06:47 +02:00
Felix Uhl df01d502d4 Ported all keymaps
Old TMK keymaps were ported and confirmed to compile
All keymaps compiled and added to zip-archive.
Documentation was updated.
2016-08-14 13:07:03 +02:00
Felix Uhl 6774f300da Update readme.md 2016-08-14 11:48:59 +02:00
Felix Uhl ec75c04663 Fixed links to keymap sources 2016-08-14 11:44:43 +02:00
jacwib 54e37fd2d1 Fix bug 2016-08-14 11:08:01 +02:00
jacwib 6ba27ea318 Remove pointless comments 2016-08-14 11:02:46 +02:00
jacwib e4e13ddc54 Update readme.md 2016-08-14 10:57:47 +02:00
jacwib 26f4a0cf04 Update Makefile 2016-08-14 10:49:26 +02:00
jacwib 62004866b3 Update config.h 2016-08-14 10:49:06 +02:00
jacwib cf91aa416a Update keymap.c 2016-08-14 10:48:52 +02:00
jacwib 1ab78110bd Update readme.md 2016-08-14 10:48:22 +02:00
jacwib 880486bd24 Jack's keymap. 2016-08-14 10:46:40 +02:00
Xyverz 049343e523 Added my own layout to the Phantom. 2016-08-14 00:33:11 -07:00
Xyverz 97fca1efff Fixing a mixup. Tidying up the keymap. 2016-08-13 20:14:27 -07:00
Xyverz 1920c290a4 Merge remote-tracking branch 'upstream/master' 2016-08-13 19:51:49 -07:00
Erez Zukerman 6323f3d1e7 Merge pull request #623 from algernon/ergodox-ez/algernon
ergodox: Update my keymap to v1.5
2016-08-13 20:12:15 -04:00
Felix Uhl 911cc68325 Added all original S60-X keymaps
All keymaps that were included in VinnyCordeiro's repository were ported to QMK.
Main Readme was copied over from VC's repo, slightly altered.
Main Makefile was updated to reflect VC's original configuration.
Small changes in felix keymap.
2016-08-14 00:41:09 +02:00
Nicholas Keene ba7f2b1d3f The Ordinary Layout is the unsurprising layout 2016-08-13 15:53:03 -05:00
Ian Sterling e87506767c Removal of old minivan44 folder. 2016-08-13 10:44:42 -07:00
Ian Sterling 2d0f585e42 Renamed minivan44 to tv44 in all occurrences per wishes of
Jack and Evan.
2016-08-13 10:36:08 -07:00
Toni e0aa216905 Merge remote-tracking branch 'origin/master' into iso_split_rshift
update from Upstream
2016-08-13 09:24:24 +02:00
Ian Sterling c07fe96581 Adding the MiniVan44 aka TheVan 44 by u/evangs to the repo.
Initial Commit.
2016-08-12 23:45:40 -07:00
Xyverz 3bae791372 Update keymap.c 2016-08-12 22:30:01 -07:00
Ian Sterling 458607ee5e Corrections to the Atreus Makefile and updates to my keymap 2016-08-12 22:26:30 -07:00
Daniel 558bf2ed07 completes first-pass at media layer 2016-08-12 19:27:44 -05:00
Callum Oakley 993d72b11f added a lock screen key 2016-08-12 21:05:52 +01:00
Daniel 916d12f9fa completes first-pass at symbol layer 2016-08-12 14:37:13 -05:00
Toni cafa528b88 only aesthetics 2016-08-12 19:14:48 +02:00
cbbrowne c21a882ec9 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-12 11:17:34 -04:00
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>
2016-08-12 16:36:07 +02:00
shela 11e23fd3fd add new line 2016-08-12 21:45:36 +09:00
shela c9272fee08 add new line 2016-08-12 21:33:32 +09:00
shela 1c8d64d3b3 add my keymap 2016-08-12 21:24:43 +09:00
Jack Humbert 97cd7afc32 Merge pull request #618 from denolfe/master
Add denolfe satan keymap
2016-08-11 21:34:34 -04:00
Jack Humbert a087a207f1 Merge pull request #608 from finleye/master
Adds keymap based on Kinesis advantage
2016-08-11 21:32:32 -04:00
Felix Uhl 4725942dc7 Small changes
Enabled Bootmagic and ISO layouts on felix keymap
Added unused pins
2016-08-11 21:49:10 +02:00
Xyverz 71e1bb2e1c Delete keymap.c
Not ready to submit this one just yet.
2016-08-11 11:04:57 -07:00
Xyverz eeade4af84 Update keymap.c
Changed right-hand F-key layout in order to add KC_PLUS to _L2.
2016-08-11 09:48:23 -07:00
Xyverz d1f418d85d Update Makefile
Corrected spelling of "ATREUS" in all locations. (ATRUES -> ATREUS)
2016-08-11 09:46:05 -07:00
Elliot DeNolf 56f86413e0 Add denolfe satan keymap 2016-08-11 09:54:02 -06:00
Felix Uhl 38766dbc82 Minor changes to keymaps
Clarified extra keys
Made ISO-keys non-dead in default layout
Added non-US backslash on felix layout
2016-08-11 09:36:37 +02:00
Daniel fe7b46579c completes first-pass at base layer 2016-08-10 19:37:59 -05:00
Felix Uhl aa1a90af66 Added S60-X to keyboards with two layouts. 2016-08-11 00:54:55 +02:00
cbbrowne 83913f9197 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-10 11:36:37 -04:00
Ian Sterling 0d60355241 Added braces using LSFT(KC_LBRC) and LSFT(KC_RBRC) since the normal RBCR and LBCR didn't work for me. 2016-08-09 23:56:21 -07:00
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.
2016-08-09 23:49:27 -07:00
Joshua T 6a24bac9c4 Moved Shift keys to Z and ?
Instead of using a thumb shift, I was given the idea of using the pinky keys as dual-role keys that also send the Shift keypress.

This gives me a Shift key on each hand again, but it will make me learn to Shift with opposite hands after all.
2016-08-09 22:16:21 -05:00
Joshua T ec67d32bd4 Merged branch master into master 2016-08-09 21:30:31 -05:00
Joshua T ea8638b944 Changed left thumb back to Ctrl/Alt
Removed Shift from left thumb
2016-08-09 21:29:22 -05:00
Joshua T fdb8a4cd65 Created keymap-specific config.h 2016-08-09 21:28:31 -05:00
Joshua T 5d78311612 Reverted Ergodox config.h
I will create a separate config.h for my keymap
2016-08-09 21:27:38 -05:00
Joshua T daa83afe2b Created keymap local config.h file
Reverted the Atreus config.h to default and added one specific to this keymap.
2016-08-09 20:51:22 -05:00
Callum Oakley 2a160bbbe3 Update keymap. (#616)
* changed order of bottom row of symbol layer to ease acess to brackets

* updated readme.md to reflect keymap changes
2016-08-09 12:33:07 -04:00
Xyverz ca3278cc35 adds Xyverz's keymaps (#615)
* Adding my own keymaps to the following keyboards:

Planck, Preonic, Atreus, Ergodox

* Delete dvorak.png

Not reflective of my layout.

* Delete readme.md

file cleanup, removing file that doesn't apply to my layout.

* Delete old_keymap.c

file cleanup

* Delete README.md

file clean up.

* Delete README.md

file cleanup

* Delete keymap.c

file cleanup

* Changed behavior of _DVORAK layout's KC_RSFT to SFT_T(KC_ENT) for flexibility's sake.
Updated the rest of the keymap to reflect the current (as of 19:37 on 08 Aug 2018) default
layout and default makefile.
2016-08-09 12:31:56 -04:00
cbbrowne 6a618fd44d Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-09 12:10:48 -04:00
Callum Oakley 49fbcb3e7c Merge remote-tracking branch 'upstream/master' 2016-08-09 12:39:59 +01:00
Callum Oakley 725dd7328f updated readme.md to reflect keymap changes 2016-08-09 11:09:52 +01:00
Callum Oakley 5f37b11f2c changed order of bottom row of symbol layer to ease acess to brackets 2016-08-09 11:03:12 +01:00
Ian Sterling 78a6fae453 Merge branch 'master' of https://github.com/Xyverz/qmk_firmware 2016-08-08 19:40:41 -07:00
Ian Sterling 39dd3d674c Changed behavior of _DVORAK layout's KC_RSFT to SFT_T(KC_ENT) for flexibility's sake.
Updated the rest of the keymap to reflect the current (as of 19:37 on 08 Aug 2018) default
layout and default makefile.
2016-08-08 19:35:13 -07:00
Xyverz c062b6a13d Delete keymap.c
file cleanup
2016-08-08 18:52:48 -07:00
Xyverz 4e030313f7 Delete README.md
file cleanup
2016-08-08 18:51:34 -07:00
Xyverz 1493836762 Delete README.md
file clean up.
2016-08-08 18:48:36 -07:00
Xyverz c060afe68e Delete old_keymap.c
file cleanup
2016-08-08 18:47:13 -07:00
Xyverz bf93fa510b Delete readme.md
file cleanup, removing file that doesn't apply to my layout.
2016-08-08 18:46:34 -07:00
Xyverz de1db144d0 Delete dvorak.png
Not reflective of my layout.
2016-08-08 18:44:09 -07:00
Ian Sterling 552399df4c Adding my own keymaps to the following keyboards:
Planck, Preonic, Atreus, Ergodox
2016-08-08 18:34:08 -07:00
skullY adad05c3fb Add support for the cluecard 2016-08-08 16:11:54 -07:00
skullY d561f63bd1 Clueboard: Fix the title in keymaps/skully/readme.md 2016-08-08 13:46:55 -07:00
skullY e85bf50e1a Clueboard: Add some readme.md files and do some minor cleanup. 2016-08-08 13:43:24 -07:00
Corey Finley 76cd7c5444 Adds keymap based on Kinesis advantage 2016-08-08 15:17:10 -04:00
cbbrowne 6ce0195e24 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-08 13:50:01 -04:00
Jack Humbert a3167bdc09 Merge pull request #609 from sethbc/fix_clueboard_orphaned_files
remove orphaned clueboard files
2016-08-08 12:09:14 -04:00
Joshua T 6df31120a1 Merge remote-tracking branch 'upstream/master' 2016-08-07 23:28:59 -05:00
JeeBak Kim ef83f1d04f Tap for ;, hold for GUI, tap for ", hold for Alt 2016-08-07 12:44:45 -07:00
JeeBak Kim 3d86e5b7a7 Tap for Tab, hold for Hyper 2016-08-07 11:05:10 -07:00
Toni b5fcb5a744 new variant with the curly braces on tab layer 2016-08-07 11:37:28 +02:00
JeeBak Kim 68e287013b Add Tab Close, New, Reopen macros to TouchCursor layer 2016-08-06 13:36:46 -07:00
JeeBak Kim bda4d15ffa Add Virtual Desktop Switching macros to TouchCursor layer 2016-08-06 12:00:37 -07:00
JeeBak Kim 57218827cb Move KC_ACL1 button 2016-08-06 00:08:59 -07:00
JeeBak Kim 96ed96f924 Fix KC_ALT_TAB/KC_CMD_TAB logic 2016-08-06 00:01:12 -07:00
JeeBak Kim 6483a2a04b Mouse layer updates
- Rename to MOUSECURSOR
- Use "d" key, since middle finger is stronger than pinky
- Shuffle some mouse buttons around
2016-08-05 23:32:00 -07:00
Seth Chandler 545925fb1b remove orphaned clueboard files 2016-08-05 23:19:12 -04:00
Toni dcf672223f enterfn / enterisctrl on hold added 2016-08-05 20:53:58 +02:00
JeeBak Kim 36abd4463f Revert swapp of AltTab/CmdTab in readme. Layout did not change 2016-08-04 14:26:03 -07:00
cbbrowne 64e051652b Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-08-04 11:10:41 -04:00
JeeBak Kim 7db1d7902b Workaround for KC_COPY, etc. based on current AG_NORM/AG_SWAP setting 2016-08-03 21:21:28 -07:00
JeeBak Kim 9a4e72fa71 Add CmdSlash to TouchCursor Layer 2016-08-03 19:19:18 -07:00
JeeBak Kim 16f4a31784 Number layer tweaks 2016-08-03 19:19:18 -07:00
JeeBak Kim fdd89e7f0d Add Alt-Tab, Cmd-Tab, and Ctl-Tab Macros to TouchCursor layer, swap LGUI and LSFT 2016-08-03 19:19:18 -07:00
JeeBak Kim abc3cd4d72 Update readme.md 2016-08-03 19:19:18 -07:00
Jack Humbert 301e46c529 Merge pull request #599 from Depariel/master
Fixed compiling errors and updated keymaps for infinity_chibios
2016-08-03 00:10:41 -04:00
Stephen Christie bf2b260429 Merge branch 'master' of http://github.com/jackhumbert/qmk_firmware 2016-08-02 22:51:30 -04:00
Stephen Christie 0acb394ac4 Moved Insert, PrtSc, Pause to Adjust; Corner enter 2016-08-02 22:32:27 -04:00
Erez Zukerman 79a9e04706 Merge pull request #592 from sethbc/ez-sethbc
Ez sethbc
2016-08-02 08:03:09 -04:00
Erez Zukerman 8c52327aa6 Merge pull request #593 from J3RN/master
Updated the J3RN ErgoDox keymap
2016-08-02 08:02:27 -04:00
Erez Zukerman 6eab4ecd7e Merge pull request #600 from adiabatic/master
zweihander-osx: add left-hand-thumb tab key
2016-08-02 08:01:56 -04:00
Erez Zukerman 56aa51664e Updates ErgoDox readme 2016-08-01 21:15:01 -04:00
Stephen Christie 76ef37e72d Corrected Qwerty/Fn Mismatch. 2016-08-01 18:54:25 -04:00
Jack Humbert d5baa4773d Merge pull request #596 from fredizzimo/rid_of_quick
Fix the makefile dependencies and remove quick targets
2016-08-01 02:24:53 -04:00
Depariel a675c1aee0 added support for Infinity 1.1a (4th drop) matrix, no LED support yet 2016-07-31 23:12:16 -04:00
Stephen Christie 4b74c90cdb Added quote key. 2016-07-31 22:39:25 -04:00
Nathan Sharfi 07a631bd5a Thumb ⌫ into ⇥, numpad & into :, yank home/end
Also: add (back?) in the light-shine disabler
2016-07-31 14:21:08 -07:00
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
2016-07-31 14:02:25 -07:00
Depariel 0c4177e077 fixed typo in hasu/keymap.c 2016-07-31 15:16:55 -04:00
Depariel ceecb7c819 fixed compiling bugs in infinity_chibios.h, updated keymaps, added depariel keymap 2016-07-31 14:25:25 -04:00
Fred Sundvik 97817a773e Generate version information to version.h
So that only the files that really needs a version are recompiled.
2016-07-31 13:42:05 +03:00
JeeBak Kim 230d313dbd Update readme.md 2016-07-30 17:30:10 -07:00
JeeBak Kim a2ed7ce795 Add additional shortcut keymaps to TOUCHCURSOR layer 2016-07-30 12:52:51 -07:00
JeeBak Kim db8ad8204e Add additional maps for [, and ], to LOWER 2016-07-30 12:52:51 -07:00
JeeBak Kim b54a58859f Make RAISE layer an all numbers/arithmatic layer 2016-07-30 12:52:51 -07:00
JeeBak Kim 216efe6c99 Move reset to a less accessible location 2016-07-30 12:52:51 -07:00
JeeBak Kim e0dd9d6af0 Add -, +, and . to RAISE 2016-07-30 12:52:51 -07:00
JeeBak Kim 6a2c681ae9 Change calls from persistant_default_layer_set() to default_layer_set() 2016-07-30 12:52:51 -07:00
JeeBak Kim eb9416a67d PrintScreen and RGUI replace BACKLIT and Ctrl. Move BACKLIT to LOWER/RAISE layers 2016-07-30 12:52:46 -07:00
Jonathan Arnett 1876e100be
Updated readme with recent changes 2016-07-30 14:37:54 -04:00
Jack Humbert 17bd4ac062
Updated my keymap 2016-07-30 14:07:27 -04:00
JeeBak Kim 984fc2b630 Media keys for all the "regular" layers 2016-07-30 10:13:50 -07:00
JeeBak Kim 7209310d1b Add mouse layer, and remove default arrow keys (touchcursor only, now) 2016-07-30 10:13:50 -07:00
JeeBak Kim a6bae9fb07 Add numbers to _RAISE 2016-07-30 10:13:49 -07:00
JeeBak Kim 6baf77d8fb Move _RAISE symbols to _LOWER 2016-07-30 10:13:49 -07:00
JeeBak Kim ad7e4af45c Tap for Enter, hold for Shift 2016-07-30 10:13:49 -07:00
JeeBak Kim b5d77440b6 Add personalized TouchCursor layer 2016-07-30 10:13:49 -07:00
JeeBak Kim eb1a06d3ae Tap for Esc, hold for Control 2016-07-30 10:13:44 -07:00
Seth Chandler a6ec5fa74a rebase 2016-07-30 10:46:13 -04:00
Seth Chandler 694567f799 update makefile 2016-07-30 10:42:57 -04:00
Seth Chandler a01d703a58 initial commit of sethbc keymap 2016-07-30 10:42:57 -04:00
Joshua T cf795a6f93 Moved PREVENT_STUCK_MODIFIERS to config.h 2016-07-30 09:19:17 -05:00
Joshua T 0064f1f84c Moved my Ergodox keymap to match upstream changes 2016-07-30 08:46:01 -05:00
Joshua T e9a501d447 Merge remote-tracking branch 'upstream/master' 2016-07-30 08:41:22 -05:00
JeeBak Kim f78a994355 Add "jeebak" keymap folder as a copy of the "default" folder 2016-07-30 00:16:04 -07:00
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>
2016-07-30 08:37:30 +02:00
Stephen Christie 5f2d3f27de Moved CapsLk, ScrollLk, and NumLk to Adjust layer 2016-07-30 00:56:43 -04:00
Fred Sundvik 566c79554e Small fix for infinity include guard 2016-07-29 21:09:42 +03:00
Fred Sundvik 6e8a5aca9d Fix typo in the readme. 2016-07-29 21:09:41 +03:00
Fred Sundvik 401dd09077 A couple of more Ergodox readme fixes 2016-07-29 21:09:40 +03:00
Fred Sundvik c65da1f208 Unify the ErgoDox EZ and Infinity documentation 2016-07-29 21:09:39 +03:00
Fred Sundvik 44cefcb40a Refer to the right path in the readme 2016-07-29 21:09:38 +03:00
Fred Sundvik 349f189e83 Move Ergodox readme from ez subfolder to parent 2016-07-29 21:09:37 +03:00
Fred Sundvik ad416fb1a3 Include the main Makefile before including Ergodox infinity drivers 2016-07-29 21:09:37 +03:00
Fred Sundvik 592ef7c6f0 Move Infinity Ergodox drivers to subproject, and fix makefile 2016-07-29 21:09:36 +03:00
Fred Sundvik 37052a53f1 Remove the Infinity Ergodox default keymap 2016-07-29 21:09:35 +03:00
Fred Sundvik 650298cec3 Cleanup the townk_osx config.h and make files 2016-07-29 21:09:34 +03:00
Fred Sundvik fd7f20b029 Rename supercoder config_user to config.h
Also fixup the include path of parent config
2016-07-29 21:09:33 +03:00
Fred Sundvik 426e9ecc6f Fix config.h include guards 2016-07-29 21:09:32 +03:00
Fred Sundvik a6577b272e Define weak matrix user function for Infinity Ergodox
So that a few keyboards, which don't use them, links properly.
2016-07-29 21:09:31 +03:00
Fred Sundvik 1641743b9d Change _delay_ms to wait_ms in algernon keymap 2016-07-29 21:09:21 +03:00
Fred Sundvik e7670f6d19 Move some of the Ergodox config settings to shared 2016-07-29 20:48:22 +03:00
Fred Sundvik e0f28c2b10 Add empty led control functions to Infinity Ergodox
So that most keymaps compiles and links
2016-07-29 20:48:21 +03:00
Fred Sundvik e01b4c3fd9 Most ergodox keymaps compiles on Infinity
There are linker errors due to missing led funcitonality though
2016-07-29 20:48:20 +03:00
Fred Sundvik b0376687f4 All Ez keymaps compiles 2016-07-29 20:48:19 +03:00
Fred Sundvik 9af995c59b Initial structure for Ergodox as subprojects
Only the EZ default keymaps compiles at the moment though.
2016-07-29 20:48:04 +03:00
Erez Zukerman 30003d48f9 Merge pull request #584 from algernon/ergodox-ez/algernon
ergodox_ez: Upgrade my keymap to v1.4
2016-07-29 08:11:37 -04:00
Gergely Nagy f82437f08e ergodox_ez: Upgrade my keymap to v1.4
* 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>
2016-07-29 12:24:33 +02:00
coderkun 3ace37271b disable sleep LED 2016-07-29 11:28:37 +02:00
coderkun 70755d6614 complete labels for modifiers in keymap schema 2016-07-29 11:07:50 +02:00
coderkun 08239aadea use Ergodox EZ’s third LED for “scroll lock” 2016-07-29 11:07:50 +02:00
coderkun 61fbb47eb6 fix grave (GRV) and acute (ACUT) accents 2016-07-29 11:06:18 +02:00
Stephen Christie c018743729 Connected all layers through Adjust layer 2016-07-29 00:08:48 -04:00
Jack Humbert 7559edc6e6 Merge pull request #578 from 0xdec/master
0xdec Preonic keymap
2016-07-28 16:34:34 -04:00
Jack Humbert 9b5edbdce9 Merge pull request #577 from hot-leaf-juice/master
Pull request to include my keymap if you want it!
2016-07-28 16:34:16 -04:00
Jordi Orlando 3b39910cb9 Create 0xdec Preonic keymap
An ergonomically optimized Colemak keymap for the grid-layout Preonic
2016-07-28 14:36:20 -05:00
Stephen Christie 6567fa1ebe Fixed Function keys (Impossible layout) 2016-07-28 14:57:45 -04:00
Stephen Christie a4e5a4d566 Modified Qwerty, created Qwerty with numbers 2016-07-28 13:49:25 -04:00
Christopher Browne 2d59c97ec1 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-28 12:42:21 -04:00
Jack Humbert e5ac0e8369 Merge pull request #570 from sethbc/fix_bone2planck_build
Fix bone2planck build
2016-07-28 12:27:46 -04:00
Jack Humbert a6d279a343 Merge pull request #569 from sethbc/fix_stanleylai_warnings
kill warnings filling up travis buildlog
2016-07-28 12:27:11 -04:00
Jack Humbert 36df9fd3fd Merge pull request #568 from sethbc/fix-colemak-osx-pc-no
update NO_AMP to NO_AMPR
2016-07-28 12:26:43 -04:00
Jack Humbert f96a2a74ea Merge pull request #566 from SmackleFunky/master
Allow toggling out of plover layer
2016-07-28 12:26:11 -04:00
Callum Oakley 1eeceee355 Added readme.md for custom layout. 2016-07-28 12:15:55 +01:00
Toni 684d869fab added homerow-ish brackets 2016-07-28 11:58:53 +02:00
Callum Oakley 9822b9f743 Added custom keymap.
Added custom keymap.
2016-07-27 21:18:19 +01:00
Toni 6ff8a81520 first try ar adding the parenthesis mess for german iso 2016-07-27 21:11:55 +02:00
Toni 9f21c0aa06 Merge remote-tracking branch 'origin/master' into iso_split_rshift
merge with master
2016-07-27 20:35:13 +02:00
Seth Chandler 180a3da44d remove unnecessary includes 2016-07-27 02:32:15 -04:00
Seth Chandler 95ef3f864e fix numerous errors in bone2planck keymap 2016-07-27 02:30:17 -04:00
Seth Chandler 368d0bdf68 kill warnings filling up travis buildlog 2016-07-27 02:21:09 -04:00
Seth Chandler 13bb3a7379 update NO_AMP to NO_AMPR 2016-07-27 02:06:19 -04:00
SmackleFunky fdd07991de Allow toggling out of plover layer 2016-07-27 04:44:24 +00:00
Mazin Bokhari 3fd1c9d72b Move to keyboards 2016-07-26 22:43:04 -05:00
Stephen Christie 57952949fe General table cleanup. 2016-07-26 23:33:21 -04:00
Stephen Christie ff8136b883 Modified Plover layer for Impossible's home position. 2016-07-26 17:39:21 -04:00
Stephen Christie 465cf08c63 Removed unused layers (keeping QWERTY for later/reference) 2016-07-26 17:37:56 -04:00
Stephen Christie fb2a7d787a Removed unused layers (left QWERTY for later use/reference) 2016-07-26 17:29:19 -04:00
Christopher Browne 2a349e96bb Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-26 16:35:44 -04:00
Jack Humbert b66131eeb5 disable midi by default 2016-07-26 15:59:26 -04:00
Jason Janse van Rensburg a41a7a9100 include base config.h instead of copying it 2016-07-26 16:19:34 +02:00
Jason Janse van Rensburg 8244fa40cc added config.h, and missing Ins of filpped navigation layer 2016-07-26 14:58:17 +02:00
Joshua T 5607b716ba Merge remote-tracking branch 'upstream/master' 2016-07-26 01:49:24 -05:00
Joshua T 876a6bdd4c Modified Atreus extend and Ergodox.
Atreus: Removed home row Shift. It's under the thumb anyway. Also replaced dual modifier keys with macro keys (cut, copy, paste, undo).

Ergodox: Made Colemak the default layer instead of Dvorak. Also began the process of bringing it in line with the Atreus layout I've been working on.
2016-07-26 01:44:57 -05:00
Jason Janse van Rensburg 27d27b179b Merged branch master into bone2planck 2016-07-25 22:55:28 +02:00
Jason Janse van Rensburg 3e462fac31 added missing F keys in flipped layer 2016-07-25 20:21:32 +02:00
Christopher Browne 17a7570e08 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-25 12:55:46 -04:00
Toni 5e2e8c89e8 Merge remote-tracking branch 'origin/master' into iso_split_rshift
whatever
2016-07-25 12:49:38 +02:00
Jack Humbert 8b94e26d7c Fixes midi functionality 2016-07-24 22:07:43 -04:00
Jack Humbert 670327f1d0 Merge pull request #548 from CommandLineDesign/CMD-Preonic
CMD keymap for Preonic
2016-07-24 21:56:50 -04:00
Jack Humbert 384d9cd6bb Merge pull request #546 from sethbc/satan-cleanup
Satan cleanup
2016-07-24 21:56:23 -04:00
Erez Zukerman 4885225159 Merge pull request #534 from willwm/teckinesis
Teckinesis for ErgoDox EZ
2016-07-24 18:04:59 -07:00
Will Wolff-Myren f4cb84c940 Remove images, per @ezuk request. =) 2016-07-24 14:33:17 -07:00
Erez Zukerman 36f2e22283 Merge pull request #535 from algernon/ergodox-ez/algernon
ergodox_ez: Update my keymap to v1.3
2016-07-24 11:34:33 -07:00
Jonathan Lucas e6a41e43aa Updated Readme 2016-07-23 21:26:01 -07:00
commandlinedesign c826bcfc39 Did a derp and forgot to set Trans on Arrow layer 2016-07-23 21:08:00 -07:00
commandlinedesign 4480a74a4b Arrow key fn layer shouldnt overwrite Ctrl key. Better Print Screen position 2016-07-23 21:02:23 -07:00
Jason Janse van Rensburg 4e0bf283f6 added readme 2016-07-24 05:11:07 +02:00
commandlinedesign c1fb82623c Tested, resolved Mouse issue, resolved numpad issue 2016-07-23 20:02:45 -07:00
Jason Janse van Rensburg 1bfd57e234 moved insert 2016-07-24 05:02:06 +02:00
Jason Janse van Rensburg 58f092cf87 moved ctrl 2016-07-24 04:52:35 +02:00
commandlinedesign fbafb9449e Resolved errors 2016-07-23 19:32:02 -07:00
Jason Janse van Rensburg 34bce6f206 fixed stupid errors 2016-07-24 04:08:40 +02:00
Jonathan Lucas 9b3708f830 Init Readme
This needs a better description.
2016-07-23 18:52:52 -07:00
Jonathan Lucas 3c7075011b Create Makefile
This is untested, use caution.
2016-07-23 18:50:41 -07:00
Jonathan Lucas b5761df57b Create CMD-Preonic Keymap
This is very Alpha-Mode, and has not been tested or even Made yet.
2016-07-23 18:47:36 -07:00
Seth Chandler 75f0922711 fix typo in readme and satan.h 2016-07-23 20:55:20 -04:00
Seth Chandler ef533be2d6 cleanup default layout 2016-07-23 20:52:27 -04:00
Seth Chandler 81fe3d962c update sethbc keymap 2016-07-23 20:37:41 -04:00
Stephen Christie 723857bf8a Table for Fn
layer.
2016-07-22 18:19:07 -04:00
Stephen Christie a39eaa7fb5 Switched to natural arrows, put ENTER on middle Fn, swapped Shift and CTRL. 2016-07-22 17:46:23 -04:00
Toni 5631f1436c converted funtions to QMK aliases 2016-07-22 11:17:57 +02:00
Toni 197244e47f more cosmetic changes (whitespace) 2016-07-22 08:14:08 +02:00
Toni c1f014b1dd purely cosmetic changes 2016-07-22 08:13:06 +02:00
Jack Humbert 8e1d96983a Merge pull request #543 from VoodaGod/bone2planck
updated bone2planck
2016-07-21 21:29:54 -04:00
Jack Humbert 66fed12c98 Merge pull request #541 from milestogo/master
initial kinisis advantage build
2016-07-21 21:05:06 -04:00
Jack Humbert 5249b4451c Merge pull request #540 from replicaJunction/feature-atreus-keymapFunction
Adjusted Atreus KEYMAP() function.
2016-07-21 21:04:45 -04:00
Jack Humbert fb0bba5981 Merge pull request #538 from robertdale/preonic-map-correction
Preonic: Corrected the ascii layout to match the coded layout
2016-07-21 21:03:56 -04:00
Jack Humbert 6f9f9baff4 Merge pull request #530 from sethbc/master
Misc. fixes from sethbc
2016-07-21 21:01:35 -04:00
Stephen Christie eeb100f87d First draft of the 'impossible' layout. 2016-07-21 18:19:08 -04:00
milestogo 24e4e6dd18 adding traveller keyboard 2016-07-20 21:12:00 -07:00
Jason Janse van Rensburg b0e9dbecee fixed include paths 2016-07-20 17:05:23 +02:00
Jason Janse van Rensburg 32f5b34ad2 reformat 2016-07-20 16:58:10 +02:00
Jason Janse van Rensburg 3d7244e604 updated bone2planck 2016-07-20 16:42:09 +02:00
Joshua T 15ee180f0e Created readme and added screenshots 2016-07-20 00:38:56 -05:00
milestogo 1984861338 initial kinisis advantage build 2016-07-19 22:35:38 -07:00
Joshua T 8ee9c486fd Adjusted Atreus KEYMAP() function.
This change adjusts the KEYMAP() function to provide a more visual representation of the key positions on the keyboard. Previously, keymaps have been defined directly using arrays for the Atreus keyboard. While this works, it doesn't utilize the helpful KEYMAP() function at all to allow the user to visually position the key codes for ease of editing. See the Ergodox-EZ KEYMAP() function and layouts for a great example of how this can work.

This change should not break any existing Atreus layouts. At the time of this commit, there are two existing layouts for the Atreus board, and neither use the KEYMAP() function.
2016-07-19 17:46:03 -05:00
Joshua T 2a4947b28b Modified Atreus layout to account for keymap() function 2016-07-19 17:39:15 -05:00
Joshua T 8cb2cf375b Adjusted Atreus KEYMAP() function.
This change adjusts the KEYMAP() function to provide a more visual representation of the key positions on the keyboard. Previously, keymaps have been defined directly using arrays for the Atreus keyboard. While this works, it doesn't utilize the helpful KEYMAP() function at all to allow the user to visually position the key codes for ease of editing. See the Ergodox-EZ KEYMAP() function and layouts for a great example of how this can work.

This change should not break any existing Atreus layouts. At the time of this commit, there are two existing layouts for the Atreus board, and neither use the KEYMAP() function.
2016-07-19 17:33:10 -05:00
Joshua T 377bcb00fb Added Gaming layer and removed Dvorak
Also added tap/hold functions on central keys
2016-07-19 17:01:21 -05:00
Robert Dale 9c26498f49 added Midi On/Off; Enter is actually transparent 2016-07-19 08:43:41 -04:00
Robert Dale 47223ebee4 Corrected the ascii layout to match the coded layout 2016-07-19 08:00:03 -04:00
Toni 5cd6d607fc changed ctrl back to enter. "j" interfered with my vimming 2016-07-19 09:17:31 +02:00
Toni 1988c180e3 small cosmetic change 2016-07-19 09:16:55 +02:00
Christopher Browne 82f768e6c0 Notes about changes 2016-07-18 16:07:00 -04:00
Toni 4b32a161d0 renamed keymap 2016-07-18 10:50:45 +02:00
Toni 36242d5ac5 reduced makefile size. not so much needed due to "inheritance" 2016-07-18 10:50:19 +02:00
Gergely Nagy 53eb36c085 ergodox_ez: Update my keymap to v1.3
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>
2016-07-18 08:57:30 +02:00
Will Wolff-Myren 3c4620bf81 Update readme.md
* Markdown cleanup
2016-07-17 15:08:04 -07:00
Will Wolff-Myren 8fb4074578 Update readme.md
* Updated layout images, json from Keyboard Layout Designer
* Added links to Keyboard Layout Designer templates.
* Added images of TECK, Kinesis layouts.
2016-07-17 15:04:50 -07:00
Will Wolff-Myren ea2b1670f6 Update description comment. 2016-07-17 14:56:37 -07:00
Will Wolff-Myren 5bf40bfb36 [MEDIA]: Remove Power, Sleep, Mail, MyComp
I kept hitting these on accident while attempting to move the cursor or
mouse. =P
2016-07-17 14:19:22 -07:00
Will Wolff-Myren ecc0fce210 [BASE]: Meh, Hyper now have symbols on both sides
Left: MEH_T(KC_BSLS),ALL_T(KC_SLSH)
Right: ALL_T(KC_LBRC),MEH_T(KC_RBRC)
2016-07-17 14:16:31 -07:00
Toni 11bf8355cf new modifier "J" is crtl 2016-07-17 23:13:49 +02:00
Will Wolff-Myren e9453b3fdc Update Base Layer comment to match new layout. 2016-07-17 14:08:22 -07:00
Will Wolff-Myren 11f8d167ec [BASE]: KC_MINS -> KC_GRV 2016-07-17 14:07:14 -07:00
Will Wolff-Myren e900c39669 RSpec: KC_EQL -> KC_MINS 2016-07-17 14:01:41 -07:00
Will Wolff-Myren 973ea2f917 LSpec: KC_GRV -> KC_EQL 2016-07-17 13:58:43 -07:00
Toni db7aa91e76 helper file for me to stay up-to-date with master 2016-07-17 15:10:14 +02:00
Toni de96513ff2 changes needed for a ISO satan PCB including a split right-shift key 2016-07-17 14:57:56 +02:00
Seth Chandler f6aeaac5b5 update more non-existent readmes for QMK.fm 2016-07-17 03:53:34 -04:00
Seth Chandler 0a2653bac8 update broken link 2016-07-17 03:38:53 -04:00
Seth Chandler 38508180c7 update readmes in certain directories to work with qmk.fm 2016-07-17 03:24:00 -04:00
Seth Chandler 6289332759 add custom makefile for sethbc keymap 2016-07-16 23:52:02 -04:00
Seth Chandler f954223749 update makefile to default to no virtual dip switches 2016-07-16 23:51:27 -04:00
Jonathan Lucas 2877b858d3 Fix erroneous character
Must have been keeb testing :)
2016-07-16 20:38:55 -07:00
Jonathan Lucas f13f48a35e Added CMD60 keymap 2016-07-16 20:24:14 -07:00
Joshua T 243ae75256 Added default layer switch QWERTY to Colemak 2016-07-15 18:02:23 -05:00
Joshua T 77377e2784 Fixed a merge conflict 2016-07-15 17:44:39 -05:00
Christopher Browne ba0d81f270 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-15 11:19:52 -04:00
Joshua T 42843d9b62 Merge remote-tracking branch 'upstream/master' 2016-07-15 01:01:19 -05:00
Will Wolff-Myren 76469ebbcf Replaced ordinary-media.{png|json} with new media layout 2016-07-14 01:22:15 -07:00
Will Wolff-Myren 1b776f0f33 Replaced ordinary-symbol.{png|json} with new base layout. 2016-07-14 01:03:45 -07:00
Will Wolff-Myren b587245430 Replaced ordinary-base.{png|json} with new base layout. 2016-07-14 00:39:01 -07:00
Will Wolff-Myren 825aead3bd Replaced readme.md with stub
(incl. reference to original layout)
2016-07-14 00:38:00 -07:00
Joshua T 92e7291ad7 Corrected merge conflict 2016-07-13 22:41:02 -05:00
Joshua T f90d89458c Created replicaJunction keymaps. 2016-07-13 22:37:34 -05:00
Will Wolff-Myren 8f3cdea357 Created "teckinesis" keymap folder
(Based on "ordinary" keymap by Nicholas Keene)
2016-07-13 13:17:55 -07:00
Joshua Colbeck 68ceffe53e Merge pull request #2 from jackhumbert/master
Pull from upstream
2016-07-12 23:14:30 -05:00
Christopher Browne f4fbfe6e54 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-12 11:57:15 -04:00
Christopher Browne 477ed703c8 I did not like Space Cadet paren; it jumps in in way too many extra cases 2016-07-12 11:57:05 -04:00
Joshua T 32725dae5b Created replicaJunction keymaps. 2016-07-11 17:49:12 -05:00
Jack Humbert a998a48673 Merge pull request #477 from Smilliam/master
Canceling Space Cadet state with opposite shift key
2016-07-11 09:14:43 -04:00
Jack Humbert 076de6fa75 Merge pull request #506 from stanleylai/master
Added my custom keymap for Satan
2016-07-11 09:14:11 -04:00
Ruiqi Mao cb0e102adb fixed clueboard LED pin assignments and matrix documentation 2016-07-11 01:18:35 -07:00
Smilliam 5e58e2281a amended extraneous file edits 2016-07-10 19:10:00 -07:00
Smilliam b12fe6abb2 Made rollover behavior for space cadet optional 2016-07-10 19:04:01 -07:00
Stanley Lai 753cbee5c0 Added my custom keymap for Satan 2016-07-10 12:07:56 -07:00
Max Whittingham df958a2dbc Update keymap.c 2016-07-09 18:58:16 -05:00
Max Whittingham 1ab527a4db Cleaning up repo 2016-07-09 03:20:58 -05:00
TerryMathews 4decdd2b18 Merge pull request #1 from jackhumbert/master
Catch up with jack's master
2016-07-09 16:46:00 -04:00
TerryMathews 979a0d25f0 Establish Poker clone keymap for Satan
Maps all of the side-print legends on the stock Poker II keycaps that
are feasible (doesn't support repeat rate toggling, Pmode recording).
2016-07-09 16:42:26 -04:00
Jack Humbert b6e47f7a5f Merge pull request #494 from robbiegill/master
Port support for hhkb-jp from tmk
2016-07-08 08:35:24 -04:00
TerryMathews 564c743aa0 Fix a function mismatch that was causing LEDs to not properly initialize
See #430. Name of function being called at init was updated to
led_init_ports(), but the call itself wasn't renamed.
2016-07-08 03:40:05 -04:00
Robbie Gill 66ffb1cb3a port missing support for hhkb-jp from tmk 2016-07-07 21:03:20 -07:00
TerryMathews e2ec45a755 Fix cluepad and planck 2016-07-07 23:57:11 -04:00
TerryMathews ccfa7351ad Fix compile error on Clueboard 2016-07-07 23:50:04 -04:00
TerryMathews 50c686587e Create keycodes for RGB control functions
Moves RGB controls out of the macro function and assigns them their own
keycodes:
RGB_TOG (toggle on/off)
RGB_MOD (mode step)
RGB_HUI (increase hue)
RGB_HUD (decrease hue)
RGB_SAI (increase saturation)
RGB_SAD (decrease saturation)
RGB_VAI (increase brightness)
RGB_VAD (decrease brightness)
2016-07-07 23:34:33 -04:00
Fred Sundvik 0bfb608615 Remove unhandled KC_BTLD, RESET should be used instead 2016-07-07 19:56:55 +03:00
Jack Humbert 57e08eb8ba updates rgblight implementation, makes non-timer stuff compatible with audio 2016-07-07 11:33:34 -04:00
Christopher Browne 97dfbd1afc Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-07 11:13:22 -04:00
Jack Humbert ad43d450ca Merge pull request #490 from fredizzimo/integrate_visualizer
Integrate visualizer for ChibiOS and Infinity Ergodox
2016-07-07 09:59:33 -04:00
Fred Sundvik caedec92d2 Move the visualizer_user file to keymap folder
Also rename it to visualizer.c
2016-07-07 14:42:16 +03:00
Fred Sundvik aaac254ebc Delete lcd_backlight_hal.c
The functionality can now be found in the infinity_erogodox.c file
instead.
2016-07-07 14:29:53 +03:00
Fred Sundvik 07d0d5cbe4 Makefile fixes and update of Visualizer 2016-07-07 12:46:10 +03:00
Fred Sundvik 9772e697a0 Add Infinity Ergodox display drivers 2016-07-07 12:45:34 +03:00
Josh Colbeck ac978a50a2 Merge branch 'master' of https://github.com/Skrymir/qmk_firmware 2016-07-06 23:38:58 -05:00
Jack Humbert a4bf46f9b1 default keymap, reset sorted out for now, added serial to makefile 2016-07-06 22:48:19 -04:00
Josh Colbeck 5ed673d82d Changed layer switching to momentary
corrected macro
2016-07-06 20:24:57 -05:00
Jack Humbert c88207884b Merge branch 'master' into lets-split-support 2016-07-06 18:05:50 -04:00
Fred Sundvik 70797bb8f2 Makefile changes and files to compile Visualizer 2016-07-07 00:20:20 +03:00
Fred Sundvik a7e3e4e652 Add serial_link compilation to Infinity Ergodox 2016-07-06 16:06:53 +03:00
Jack Humbert eb6e17be6f adds eep, removes usbconfig.h 2016-07-06 09:04:04 -04:00
Jack Humbert 3577e26fd9 fix/annotate wait_us lines 2016-07-06 00:24:31 -04:00
Jack Humbert cb410729e6 remove uno_slave for now, even though it's freakin cool 2016-07-05 23:56:42 -04:00
Jack Humbert dd2522ba8b add options to config.h 2016-07-05 23:52:18 -04:00
Jack Humbert 22ad6459b1 Merge branch 'master' into lets-split-support 2016-07-05 23:40:58 -04:00
Jack Humbert ce01f88c43 images, docks, clean-up [skip ci] 2016-07-05 23:40:54 -04:00
Jack Humbert d707738616 i2c working 2016-07-05 23:27:10 -04:00
Jack Humbert 96f44e1202 one half working 2016-07-05 18:36:02 -04:00
Jack Humbert 7d28d6a7bc Merge pull request #480 from fredizzimo/add_infinity_ergodox
Add infinity ergodox
2016-07-05 13:12:01 -04:00
Fred Sundvik b4cd0cfd15 Infinity Ergodox - Add matrix.c and led.c 2016-07-05 16:50:30 +03:00
Fred Sundvik 74847a84f8 First version of Infinity Ergodox
Mostly just adding the files from the fredizzimo repository. Still
needs some fixing until it works
2016-07-05 16:45:29 +03:00
Fred Sundvik cf6cd15920 Fix typo in teensy_lc_onkey.h 2016-07-05 15:54:59 +03:00
Fred Sundvik 6e4f2e18e6 Don't include common_config.h for ChibiOS test 2016-07-05 15:53:40 +03:00
Fred Sundvik 0a040a89e8 Move ChibiOS test board and ld
Move the ChibiOS test subproject board and ld files to the kebyoard
folder, so that the build system can find them
2016-07-05 15:34:35 +03:00
Fred Sundvik b11657d1c8 Suprojects for ChibiOS testing 2016-07-05 14:56:34 +03:00
Josh Colbeck 74d848c942 Merge remote-tracking branch 'jackhumbert/master' into patch-1 2016-07-04 22:44:26 -05:00
Jack Humbert 94d3159d9d correct break/return order for planck and preonic defaults 2016-07-04 22:06:22 -04:00
Josh Colbeck a5fb2b58a5 Merge remote-tracking branch 'jackhumbert/master' into patch-1 2016-07-04 15:41:58 -05:00
Josh Colbeck 497b92c3bd Added macro and readme
macros to for often used eclipse shortcuts
2016-07-04 15:22:13 -05:00
Josh Colbeck 1650adf29a Added new keymap 2016-07-04 12:00:06 -05:00
Christopher Browne 2e1cfaf73f Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-07-04 12:32:08 -04:00
Jack Humbert 86a7b060ef Adds wait to i2c (debounce) 2016-07-04 12:13:41 -04:00
Jack Humbert eafaba6b53 Improves debounce 2016-07-04 12:01:10 -04:00
Josh Colbeck 62a92a71d0 Revert "Changed layout of left hand main layer"
This reverts commit 8149924399.
2016-07-03 21:50:04 -05:00
Joshua Colbeck 8149924399 Changed layout of left hand main layer 2016-07-03 12:24:44 -05:00
Olivier 703dc26853 Merge https://github.com/jackhumbert/qmk_firmware 2016-07-03 16:58:09 +02:00
Olivier 82edc37238 Move Escape and Insert keys, Escape is now easier to reach (useful for vi). Change the layer switching used to keep a bepo layout on US keyboards. 2016-07-03 16:44:57 +02:00
Olivier 6d195dc60c Add a Makefile for the keymap to disable command mode (to keep the keyboard from going into command mode when both Shift keys are hold at the same time) and to allow issuing a simple "make" in the keymap folder to compile it. 2016-07-03 16:27:08 +02:00
Olivier 9aceaaed4c Replace the "Ctrl+Alt+Fx" macro I was using to switch terminals without moving hands by a numeric layer switch key like on the left half, for consistency. 2016-07-03 15:51:55 +02:00
Olivier 17a3dbc159 Integrate mouse keys into function layer, delete mouse layer. 2016-07-03 14:38:03 +02:00
Richard f4febd2cf7 Fix other KC60 Keymap Makefiles so they compile properly 2016-07-03 13:49:10 +12:00
Richard 54209dc672 Add my keymap to KC60 2016-07-03 13:44:24 +12:00
Seth Chandler 27354ae877 add HHKB support to satan (#470)
* add HHKB support

* fix indentation
2016-07-01 23:50:51 -04:00
fredizzimo 4d4f7684e6 Add ChibiOS support for QMK (#465)
* Modularity and gcc warnings fixes.

* Add ChibiOS support (USB stack + support files).

* Make usb_main more USB_DRIVER #define independent.

* Move chibios to tool.

* Implement jump-to-bootloader.

* Small updates.

* Fix bootloader-jump compiling.

* Move AVR specific sleep_led.c into avr.

* Add basic sleep_led for chibios.

* Update chibios README.

* NKRO fixes.

* Rename some Makefile defines.

* Move STM32 bootloader address config to separate .h file.

* Add ARM Teensies bootloader code.

* Fix chibios/usb_main GET_REPORT handing.

* Add missing #include to keymap.c.

* Make bootmagic.c code portable (_delay_ms -> wait_ms).

* Move declaration of keymap_config.

Should really not declare variables in .h files - since it's included
in different .c files, a proper linker then complains that the same
variable is declared more than once (once for each .c file that the
offending .h is included in).

* Add eeprom support for chibios/kinetis.

* Rename chibios example keyboard.

* Move chibios/cortex selection to local Makefiles.

* Chibios: use WFI in idle. WIP suspend stuff.

* ChibiOS/kinetis: sending remote wakeup.

* ChibiOS/STM32: send remote wakeup.

* Fix report size of boot protocol.

* Fix drop key stroke

Keyboard report should be checked if its transfer finishs successfully.
Otherwise key stroke can be missing when other key event occurs
before the last report transfer is done.

Boot protocol 10ms interval probably causes this problem in case
it receives key events in a row within the period. NKRO protocol
suffers less or nothing due to its interval 1ms.

* Chibios/usb_main: rename a variable for clarity.

* Add correct chibios/bootloader_jump for infinity KB.

* ChibiOS: make reset request more CMSISy.

* Chibios: Add breathing sleep LED on Kinetis MCUs.

* ChibiOS: Update infinity bootloader code to match updated ChibiOS.

* ChibiOS: prettify/document sleep_led code.

* Chibios: Remove the wait in the main loop.

* Add maple mini code.

* Do timeout when writing to CONSOLE EP queue.

Fixes TMK bug #266.

* Chibios: add 'core/protocol' to the makefiles' search path.

* Chibios: Update to new USB API.

* Chibios: add more guards for transmitting (fix a deadlock bug).

* Add update for chibios in README

* Chibios: Fix a HardFault bug (wait after start).

* Chibios: cleanup usb_main code.

* Chibios: Revert common.mk change (fix AVR linking problem).

* core: Fix chibios user compile options

Compile options can be defined in project Makefile such as UDEFS, UADEFS, UINCDIR, ULIBDIR and ULIBS.

* Sysv format for ChibiOS arm-none-eabi-size

Some new patches to ChibiOS puts heap as it's own section. So the
berkeley format is now useless, as the heap will be included in the
BSS report. The sysv format displays the bss size correctly.

* Fix hard-coded path of CHIBIOS

* Add support for new version of ChibiOS and Contrib

The Kinetis support has moved to a separate Contrib repository in
the newest version of Chibios. There has also been some structure
changes. So this adds support for those, while maintaining back-
wards compability.

* Update ChibiOS instructions

* Chibios: implement sleep LED for STM32.

* Chibios: Update the main chibios README.

* Chibios: fix STM32_BOOTLOADER_ADDRESS name.

* Chibios: make the default bootloader_jump redefinable (weak).

* Chibios: disable LTO (link-time optimisation).

With LTO enabled, sometimes things fail for mysterious reasons
(e.g. bootloader jump on WF with LEDs enabled), just because the
linker optimisation is too aggressive.

* Chibios: add default location for chibios-contrib.

* ChibiOS: update mk to match chibios/master.

* ChibiOS: update instructions.md.

* Add chibi_onekey example.

* Add comments to chibi_onekey Makefile.

* Rename some Makefile defines.

* Move STM32 bootloader address config to separate .h file.

* Rename chibios example keyboard.

* Move chibios/cortex selection to local Makefiles.

* Add Teensy LC onekey example.

* Chibios: use WFI in idle. WIP suspend stuff.

* Update chibi/teensy instructions.

* Update chibios/Teensy instructions.

* Add infinity_chibios

* Add keymap_hasu.c

* Infinity_chibios: select correct bootloader_jump.

* Infinity_chibios: improve comments.

* Add generic STM32F103C8T6 example.

* Add maple mini code.

* STM32F103x fixes.

* Add maple mini pinout pic.

* Chibios: updates for 3.0.4 git.

* Chibios: rename example stm32_onekey -> stm32_f072_onekey.

* Chibios: add makefiles for Teensy 3.x examples.

* Chibios: update Teensy 3.x instructions.

* Chibios: Tsy LC is cortex-m0plus.

* Chibios: add more guards for transmitting (fix a deadlock bug).

* Change README for chibios

* Chibios: update examples to current chibios git.

Match the changes in mainline chibios:
 - update chconf.h
 - update supplied ld scripts structure
 - update Teensy instructions (switch to official
    chibios and introduce contrib)

* Add ChibiOS and ChibiOS-Contrib submodules

Also fix the makefile path for them.

* Moves chibios keyboards to keyboards folder

* First version of ChibiOS compilation

Only the stm32_f072_onkey keyboard is ported at the moment. It
compiles, but still doesn't link.

* More chibios fixes

It now compiles without warnings and links

* Move the teensy_lc_onekey to the keyboards folder

* Clean up the make file rule structure

* Remove keymap_fn_to_action

* Update more ChibiOS keyboards to QMK

Most of them does not compile at the moment though.

* Use older version of Chibios libraries

The newest ones have problems with compilation

* Remove USB_UNCONFIGURED event

It isn't present in the older version of ChibiOS

* Fix the infinity_chibios compilation

* Fix potentially uninitialized variable

* Add missing include

* Fix the ChibiOS makefile

* Fix some Chibios keyboard compilation

* Revert the rules.mk file back to master version

* Combine the chibios and AVR makefiles

With just the required overrides in the respective platform
specific one.

* Slight makefile restrucuring

Platform specific compiler options

* Move avr specific targets out of the main rules

* Fix ChibiOS objcopy

The ChibiOS objcopy needs different parameters, so the parameters
are moved to the corresponding platform rule file

* Fix the objcopy for real this time

The comands were moved around, so chibios used avr and the ohter
way around.

Also change the objsize output format

* Fix the thumb flags

* Fix the infinity hasu keymap

* Per platform cpp flags

* Add gcc-arm-none-eabi package to travis

* Add arm-none-eabi-newlib to travis

* Fix the name of the libnewlib-arm-none-eabi lib

* Fix the ChibiOS paths

So that they are properly relative, and builds don't generate
extra folders

* Fix the board path of stm32_f103_onekey

* Only consider folders with Makefiles as subproject
2016-07-01 10:04:53 -04:00
Christopher Browne 44a5f7630f Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-30 12:38:48 -04:00
Robbie Gill bfd673fbae initial version of handwired/fivethirteen (#462) 2016-06-30 09:13:08 -04:00
TerryMathews fbf697b9ff Fix CAPS_LED logic in Satan (#461)
Needed to invert for proper operation. Previous code had LED on when off
and vice versa.
2016-06-29 22:33:09 -04:00
Jack Humbert 2d80eee6b8 test handwired boards 2016-06-29 21:21:02 -04:00
Jack Humbert ba6fb23f07 adds handwire and onekey example 2016-06-29 20:21:05 -04:00
Jack Humbert 7db2ec1509 updates planck experimental, width of color output 2016-06-29 18:47:53 -04:00
Jack Humbert 197f152dee adds random base64 character generator 2016-06-29 18:29:20 -04:00
Jack Humbert 65faab3b89 Moves features to their own files (process_*), adds tap dance feature (#460)
* 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
2016-06-29 17:49:41 -04:00
Jack Humbert 215c2119af Implements subprojects and updates projects for this (#459)
* 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]

* disable power up for now

* config files updates

* makefile updates

* .h file updates, config tuning

* disable audio for yang
2016-06-29 16:21:41 -04:00
Christopher Browne c9f509f016 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-28 14:46:50 -04:00
Anand Babu (AB) Periasamy 57066b1246 zoom and undo keys for ab's planck keymap (#446) 2016-06-27 09:51:12 -04:00
Anand Babu (AB) Periasamy 7712d55215 zoom and undo keys 2016-06-26 20:24:43 -07:00
Jack Humbert e5d1e4b8ce Preonic keymap update 2016-06-26 16:16:21 -04:00
Jack Humbert 0058c33815 updates preonic default layout 2016-06-26 14:20:57 -04:00
Jack Humbert 00dcac7270 updates planck macros to keycodes, prototype fn_actions 2016-06-26 14:08:11 -04:00
Anand Babu (AB) Periasamy 0314620d26 Swap up and down on ab's layout to match default (#441) 2016-06-24 13:43:12 -04:00
Christopher Browne 4d79e22438 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-24 12:19:34 -04:00
Erez Zukerman 40bfc7231e Merge pull request #440 from abperiasamy/ergo-ab-swap-up-down
Swap up and down keys to match default layout
2016-06-24 08:57:06 -04:00
Erez Zukerman d2fc24d2a0 Merge pull request #438 from tkuichooseyou/master
Added tkuichooseyou keymap; for vim and macOS users
2016-06-24 08:56:01 -04:00
Anand Babu (AB) Periasamy 512a68c0ec Swap up and down to match default layout 2016-06-23 20:17:04 -07:00
Jack Humbert b68b722325 updates ez's matrix to spec 2016-06-23 23:14:21 -04:00
Jack Humbert 13bb6b4b7f Backlight abstraction and other changes (#439)
* redoes matrix pins, abstracts backlight code for B5,6,7

* slimming down keyboard stuff, backlight breathing implemented

* don't call backlight init when no pin

* cleans up user/kb/quantum calls, keyboard files

* fix pvc atomic

* replaces CHANNEL with correct var in breathing

* removes .hexs, updates readmes, updates template

* cleans-up clueboards, readmes to lowercase

* updates readme
2016-06-23 22:18:20 -04:00
Peter ba116ceb49 Add OS specific layers that can be switched with macros (#436) 2016-06-23 20:06:13 -04:00
Teddy Ku b9d29cc355
Added tkuichooseyou keymap; for vim and OSX users 2016-06-23 15:09:04 -04:00
Christopher Browne a4bdb0ac0e Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-23 11:34:50 -04:00
Anand Babu (AB) Periasamy bab6a8fde5 AB's practical planck keymap (#435) 2016-06-22 23:36:30 -04:00
Jack & Erez 7e584439ee Updates overall readme 2016-06-22 23:24:47 -04:00
Jack & Erez 2443234555 Adds a Readme for the keyboards subdirectory 2016-06-22 23:17:15 -04:00
Christopher Browne 0cd017d485 Use Space Cadet parens on LSFT 2016-06-22 16:51:25 -04:00
Christopher Browne b0caf32741 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-22 11:26:26 -04:00
Gergely Nagy 2278956412 ergodox_ez: Update the algernon keymap to v1.2
Noticeable changes since the last pull request:

* The forced NKRO mode can be easily toggled off at compile-time, to
  make the firmware compatible with certain operating systems.
* The `:;` key has changed behaviour: to access the `;` symbol, the key
  needs to be double-tapped, instead of shifted.
* The `=` and `\` keys were swapped, `=` moved to the home row, on both
  the **base** and the **experimental** layers.
* The arrow and navigation keys were redone, they are now more
  accessible, but the navigation keys require an extra tap to access.
* The **Emacs** layer is gone, replaced by a simplified
  **navigation and media** layer.
* `LEAD v` types the firmware version, and the keymap version.
* On the **experimental** layer, the `L` and `Q`, and the `K` and `G`
  keys were swapped.
* The **Steno** layer gained a few more `#` and `*` keys, to make it
  easier on my fingers.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-06-22 08:41:38 +02:00
Jack Humbert 649b33d778 Renames keyboard folder to keyboards, adds couple of tmk's fixes (#432)
* fixes from tmk's repo

* rename keyboard to keyboards
2016-06-21 22:39:54 -04:00