summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-06-20Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne
2016-06-19endline normalisation, treat .hex as bin, updates kc60 hex filesJack Humbert
2016-06-19Added WS2812 support for KC60 (#419)Stanley Lai
* 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
2016-06-18Add quick version of the all-* makefile targets (#417)fredizzimo
2016-06-18Cleans up quantum/keymap situation, removes extra lufa folders (#416)Jack Humbert
* 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
2016-06-17allow overriding of TARGETJack Humbert
2016-06-17adds power_up to quantum's matrix fileJack Humbert
2016-06-17prevents ergodox_ez from waking up machine (#375)Jack Humbert
2016-06-17addresses #369Jack Humbert
2016-06-17fix for parent folders with spaces (#403)Jack Humbert
2016-06-17removes extra dfu erase (#415)Eric Tang
2016-06-16Sample of using build info to generate keystrokes (#412)Christopher Browne
* 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
2016-06-16Revert removals of compiled filesChristopher Browne
2016-06-16Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne
2016-06-16correctly test to see if awk existsJack Humbert
2016-06-16make awk optional (uses cat)Jack Humbert
2016-06-15Add rule to ignore contents of .build directories; their contents are generatedChristopher Browne
2016-06-15Remove more generated filesChristopher Browne
2016-06-15Fix spelling in commentChristopher Browne
2016-06-15Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne
2016-06-15compiled.hex files should not be included in the repo; they represent ↵Christopher Browne
generated compiled code
2016-06-15Should not include the compiled code in the repoChristopher Browne
2016-06-15Ensure there is a value even if not working within a git repoChristopher Browne
2016-06-15updates experimental planck keymap, adds basic layoutJack Humbert
2016-06-15Split build date into a separate DEFINEChristopher Browne
2016-06-15Add docsChristopher Browne
2016-06-15Add in a version keyChristopher Browne
2016-06-15Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne
2016-06-14Update the ergodox-ez/algernon keymap (#409)Gergely Nagy
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>
2016-06-14Makefile: Add QMK_VERSION & co to OPT_DEFS (#408)Gergely Nagy
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>
2016-06-14Add sgoodwin keymap for the KC60 (#410)Samuel Goodwin
* 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.
2016-06-13adds support for GH60 Satan keyboard (#407)TerryMathews
* 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
2016-06-13Renaming planck/cbbrowne in keeping with recent naming conventions (#405)Christopher Browne
* 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
2016-06-13Simplify logic; no need to return so muchChristopher Browne
2016-06-13Local change, not apropos to have in this repoChristopher Browne
2016-06-13Simplify submitting my fave cbbrowne keystroke by using SEND_STRING()Christopher Browne
2016-06-13Restructuring in keeping with recent changes to conventionsChristopher Browne
2016-06-13Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne
2016-06-12adds support for Phantom TKL keyboard (#399)TerryMathews
ANSI 125 layout, capslock and scrolllock implemented, support for WS2812LED strip included.
2016-06-12Move LED strip initialization (#397)Eric Tang
2016-06-12change to relative paths instead of absoluteJack Humbert
2016-06-11no more cc error on windowsJack Humbert
2016-06-11Makefile redo & other features (#395)Jack Humbert
* .build containment implemented * no destructive variable setting - builds in either folder * make from 3 places * cleans before each build * make from root with keyboard=keyboard, keymap=keymap * make from keyboard/keyboard with keymap=keymap * make from keymaps/keymap * only implemented on planck * adds color diag to avr-gcc * makefiles for all plancks, clean-up * quick build-all makefile for plancks * reformatting of make output (colors) * color toggle, tmk path corrections * correct if statement for color * move config.h to main makefile, updates preonic, atomic * format update, all keyboards targets * makefile optional for build all target, alps and arrow_pad updated * alps updated * make planck default, trying out travis recipe for all-keyboards * all-keymaps target, different travis recipe * updates alps64 * updates keyboards to new format * updates clue* projects * all projects updated, specialise EZ .hex, let .hex through * updates travis * automatically find root, keyboard, keymap * silent echo, cleaned-up mass make output * updates all keyboards' .hex files except EZ * Rename Bantam44.c to bantam44.c * Rename Bantam44.h to bantam44.h * nananana * adds six key keyboard * does same to ez as rest * updates send_string example * brings ergodox_ez up to date * updates template/new project script * adds sixkeyboard * adds readme for sixkeyboard * adds sixkeyboard to travis * filenames, gitignore mess * define clock prescaler stuff manually * make quick, size test example * documentation and dfu-no-build
2016-06-07Merge pull request #364 from techtomas/techtomasErez Zukerman
Rearranged the layer toggles and keys.
2016-06-07Updated readme to fix a typo and list out hotkey shortcutsThomas Anderson
2016-06-07Add support for vagrant-docker (#389)Aron Griffis
* clean trailing ws in Vagrantfile and util/avr_setup.sh * replace triple quotes with heredoc. Ruby doesn't have triple quotes; that's a Python thing. This was just being parsed as multiple strings concatenated. * add docker support to Vagrantfile * make wants to find dfu-programmer in vagrant guest
2016-06-07fix HID_RI_LOGICAL_MAXIMUM value (#388)Masahiro Wakame
2016-06-06Merge pull request #384 from gid0/masterErez Zukerman
Merge ErgoDox bepo layout changes.
2016-06-06Update HAND_WIRE.mdJack Humbert
2016-06-06Fix hand wiring guide (#387)Eric Tang
* Fix broken link * Fix incoherent sentence