summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add filler to make layering clearer;Christopher Browne2016-06-212-7/+10
| | | | KC_TRNS gets used a lot; have the blank _______ mnemonic for it
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-2179-7711/+7318
|\
| * updates all config.h and Makefiles to correct references, textJack Humbert2016-06-2158-2110/+102
| |
| * Added stanleylai's personal keymap (#420)Stanley Lai2016-06-2112-3323/+5024
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added WS2812 support for KC60 * Reorganized WS2812 support into its own keymap * Fixed relative link in README * Moved WS2812 mention in README to the bottom * Fixed titling in WS2812 README * Reverted KC60 Makefile and default keymap back * Moved RGB specific config.h to ws2812 keymap folder * Added my personal keymap * Updated compiled hex * Reverted KC60 files to 3f6fac47 before pull request #419
| * Fresh hes for experimental layoutJack & Erez2016-06-201-1119/+1032
| |
| * [Jack & Erez] Fixes Space Cadet right shiftJack & Erez2016-06-202-5/+5
| |
| * Adapts experimental layout file formatErez Zukerman2016-06-202-2/+7
| |
| * Adds compiled default firmwareErez Zukerman2016-06-201-1157/+1152
| |
| * [Jack & Erez] Adds dedicated Version keyErez Zukerman2016-06-201-5/+3
| |
| * [Jack & Erez] Tweaks makefile for sanityErez Zukerman2016-06-201-7/+7
| |
| * Removes .gitattributesErez Zukerman2016-06-201-2/+0
| |
| * [Erez & Jack] Updates build guideErez Zukerman2016-06-202-21/+26
| |
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-205206-2308010/+6111
|\|
| * endline normalisation, treat .hex as bin, updates kc60 hex filesJack Humbert2016-06-193-3316/+3321
| |
| * Added WS2812 support for KC60 (#419)Stanley Lai2016-06-1914-1458/+3792
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added WS2812 support for KC60 * Reorganized WS2812 support into its own keymap * Fixed relative link in README * Moved WS2812 mention in README to the bottom * Fixed titling in WS2812 README * Reverted KC60 Makefile and default keymap back * Moved RGB specific config.h to ws2812 keymap folder
| * Add quick version of the all-* makefile targets (#417)fredizzimo2016-06-182-7/+16
| |
| * Cleans up quantum/keymap situation, removes extra lufa folders (#416)Jack Humbert2016-06-185186-2306512/+2207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sorts out keycodes * move midi around * remove mbed * replaces keymap with qmk/keymap_common * fixes keymap.h * keymap, config, quantum rearrange * removes unneeded lufa stuff
| * allow overriding of TARGETJack Humbert2016-06-171-1/+1
| |
| * adds power_up to quantum's matrix fileJack Humbert2016-06-171-0/+24
| |
| * prevents ergodox_ez from waking up machine (#375)Jack Humbert2016-06-171-0/+19
| |
| * addresses #369Jack Humbert2016-06-172-8/+24
| |
| * fix for parent folders with spaces (#403)Jack Humbert2016-06-171-2/+3
| |
| * removes extra dfu erase (#415)Eric Tang2016-06-171-29/+27
| |
| * Sample of using build info to generate keystrokes (#412)Christopher Browne2016-06-166-1603/+1595
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * More documentation * Saving crontab for user on host * Restructuring in keeping with recent changes to conventions * Simplify submitting my fave cbbrowne keystroke by using SEND_STRING() * Local change, not apropos to have in this repo * Simplify logic; no need to return so much * Add in a version key * Add docs * Split build date into a separate DEFINE * Ensure there is a value even if not working within a git repo * Should not include the compiled code in the repo * compiled.hex files should not be included in the repo; they represent generated compiled code * Fix spelling in comment * Remove more generated files * Add rule to ignore contents of .build directories; their contents are generated * Revert removals of compiled files
* | Revert removals of compiled filesChristopher Browne2016-06-1628-1/+39270
| |
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-161-14/+20
|\|
| * correctly test to see if awk existsJack Humbert2016-06-161-1/+1
| |
| * make awk optional (uses cat)Jack Humbert2016-06-161-14/+20
| |
* | Add rule to ignore contents of .build directories; their contents are generatedChristopher Browne2016-06-151-0/+1
| |
* | Remove more generated filesChristopher Browne2016-06-151-1645/+0
| |
* | Fix spelling in commentChristopher Browne2016-06-151-2/+2
| |
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-155-14/+1159
|\|
| * updates experimental planck keymap, adds basic layoutJack Humbert2016-06-156-1593/+2754
| |
* | compiled.hex files should not be included in the repo; they represent ↵Christopher Browne2016-06-1526-37625/+0
| | | | | | | | generated compiled code
* | Should not include the compiled code in the repoChristopher Browne2016-06-151-0/+1
| |
* | Ensure there is a value even if not working within a git repoChristopher Browne2016-06-151-1/+1
| |
* | Split build date into a separate DEFINEChristopher Browne2016-06-152-4/+4
| |
* | Add docsChristopher Browne2016-06-151-1/+2
| |
* | Add in a version keyChristopher Browne2016-06-151-2/+8
| |
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-1528-2764/+5339
|\|
| * Update the ergodox-ez/algernon keymap (#409)Gergely Nagy2016-06-1411-1353/+373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compared to the previous version, the following noteworthy changes have been made to the keymap: * The keyboard starts in NKRO mode, bootmagic and other things are disabled. * A STENO layer was added, to be used with Plover. * An experimental layout was added, something halfway between Dvorak and Capewell-Dvorak. A work in progress. * `LEAD y` types \o/. * Some keys on the BASE layer have been moved around: - `?` moved to the left pinky, left of `Q`. - `=` shifted one row down, but `F11` stayed where it was. - `-` on the left half was replaced by `Tab`. - `Tab`'s original position is taken by a `Media Next`/`Media Prev` key. - `:` now inputs `;` when shifted. * `ESC` cancels the **HUN** layer too, not just modifiers. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
| * Makefile: Add QMK_VERSION & co to OPT_DEFS (#408)Gergely Nagy2016-06-141-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the keyboard and keymap built, along with the QMK firmware's git hash (or a timestamp), to OPT_DEFS. That, in turn, allows keymaps to make use of these information, and do whatever they want with it. For example, one could print them on `LEADER v` like this: ```c SEQ_ONE_KEY (KC_V) { SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); } ``` This addresses #366. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
| * Add sgoodwin keymap for the KC60 (#410)Samuel Goodwin2016-06-144-1410/+2920
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't save the ctags file in the repo. * Initial support for the KC60 board. Only 5x5 working so far. * Rename because this isn't the same KC60 as others. * Add in some generic layout. Pins seem to be in the right order except the 6th column spews gibberish. * Don't need this for now. * Move this to some other folder. * Trying again to start over. * Don't need to start over because I figured out why the 'broken' stuff wasn't working. * Attempt to enable backlighting. It's on on pin B7 like other boards. * Fix last port changes and fix LED control in keymap. * Trying some other LED code. * Bootloader needs to be bigger. Disabling backlight for now. * Simplify LED code while I try to figure it out. * Turn back on backlighting. * Backlighting works now. Just need to get levels or breathing working. * Trying to allow for turning off the LEDs before I get to brightness levels. * The missing link: need to run the init_ports function for LEDs to work properly. * Removing breathing stuff since it bricks the board. * Clean up default layer. * Cleanup keymap, KC60 doesn't support a 5th right bottom-row button. * Add in the keymap I want for now. * Back to escape by default. * Move my personal keymap to the new place for keymaps. * Add the version number for clarity.
| * adds support for GH60 Satan keyboard (#407)TerryMathews2016-06-1312-0/+2040
| | | | | | | | | | | | | | | | | | * adds support for GH60 Satan keyboard ANSI 125 layout, capslock and backlight implemented, support for WS2812LED strip included * added Phantom and GH60 Satan to travis
| * Renaming planck/cbbrowne in keeping with recent naming conventions (#405)Christopher Browne2016-06-137-1501/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * More documentation * Saving crontab for user on host * Restructuring in keeping with recent changes to conventions * Simplify submitting my fave cbbrowne keystroke by using SEND_STRING() * Local change, not apropos to have in this repo * Simplify logic; no need to return so much
* | Simplify logic; no need to return so muchChristopher Browne2016-06-131-3/+0
| |
* | Local change, not apropos to have in this repoChristopher Browne2016-06-131-25/+0
| |
* | Simplify submitting my fave cbbrowne keystroke by using SEND_STRING()Christopher Browne2016-06-132-1/+4
| |
* | Restructuring in keeping with recent changes to conventionsChristopher Browne2016-06-137-1505/+81
| |
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-06-13516-72516/+143035
|\|