summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #433 from algernon/ergodox-ez/algernonErez Zukerman2016-06-2211-331/+351
|\ | | | | ergodox_ez: Update the algernon keymap to v1.2
| * ergodox_ez: Update the algernon keymap to v1.2Gergely Nagy2016-06-2211-331/+351
|/ | | | | | | | | | | | | | | | | | | | | | 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>
* increase leader seq size to 5Jack Humbert2016-06-212-5/+9
|
* Renames keyboard folder to keyboards, adds couple of tmk's fixes (#432)Jack Humbert2016-06-21545-15315/+1752
| | | | | | * fixes from tmk's repo * rename keyboard to keyboards
* adds backlight levels to the satan keyboard (#431)Jack Humbert2016-06-215-1561/+1604
| | | | | | | | * enable 4 levels * remove breathing stuff * update channels, comments, hex
* adds fuse settings for atmega32u4, fixes keymap_extras includesJack Humbert2016-06-2114-12/+22
|
* Warning reductions (#430)Jack Humbert2016-06-2155-23923/+23760
| | | Warning reductions
* Change base box to avoid breakage in Arch box (#429)dragon7882016-06-211-2/+2
| | | I haven't had a chance to update the Arch base box in a while so using the Ubuntu one is far more likely to succeed for a new user (I did test that box recently as I traded my ErgoDox EZ to a friend and needed to reprogram it for him).
* Fix the make all-keyboards command (#422)fredizzimo2016-06-211-9/+26
| | | | | Unfortunately the supported targets, like "quick", "all", "clean", and so on has to be repeated two extra times, but this is the best I can do with my makefile skills.
* reduces rgblight warnings, integrates completely (#428)Jack Humbert2016-06-216-8/+11
|
* 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
|
* 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
* correctly test to see if awk existsJack Humbert2016-06-161-1/+1
|
* make awk optional (uses cat)Jack Humbert2016-06-161-14/+20
|
* updates experimental planck keymap, adds basic layoutJack Humbert2016-06-156-1593/+2754
|
* 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
* adds support for Phantom TKL keyboard (#399)TerryMathews2016-06-129-0/+1979
| | | | ANSI 125 layout, capslock and scrolllock implemented, support for WS2812LED strip included.
* Move LED strip initialization (#397)Eric Tang2016-06-126-33/+18
|
* change to relative paths instead of absoluteJack Humbert2016-06-121-3/+6
|
* no more cc error on windowsJack Humbert2016-06-111-2/+2
|
* Makefile redo & other features (#395)Jack Humbert2016-06-11317-67511/+135658
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * .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
* Merge pull request #364 from techtomas/techtomasErez Zukerman2016-06-073-664/+701
|\ | | | | Rearranged the layer toggles and keys.
| * Updated readme to fix a typo and list out hotkey shortcutsThomas Anderson2016-06-071-4/+14
| |
| * Rearranged the layer toggles and keys.Thomas Anderson2016-05-303-664/+691
| | | | | | | | Moved the layer toggles to be in more comfortable locations for my typing. Also expanded the use of the media layer (now called APP) and enhanced the text navigation on the control layer
* | Add support for vagrant-docker (#389)Aron Griffis2016-06-072-89/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | fix HID_RI_LOGICAL_MAXIMUM value (#388)Masahiro Wakame2016-06-071-1/+1
| |
* | Merge pull request #384 from gid0/masterErez Zukerman2016-06-064-1293/+1285
|\ \ | | | | | | Merge ErgoDox bepo layout changes.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 00:15:17 +0000