1
0
Fork 0
forked from forks/qmk_firmware
Commit graph

10772 commits

Author SHA1 Message Date
Christopher Browne a6e109caa1 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-21 12:30:17 -04:00
Jack Humbert a8375fa15a updates all config.h and Makefiles to correct references, text 2016-06-21 10:21:43 -04:00
Stanley Lai c976c03547 Added stanleylai's personal keymap (#420)
* 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
2016-06-21 00:49:54 -04:00
Jack & Erez 650e77c657 Fresh hes for experimental layout 2016-06-20 22:37:31 -04:00
Jack & Erez 76076db725 [Jack & Erez] Fixes Space Cadet right shift 2016-06-20 22:36:36 -04:00
Erez Zukerman f77df7e356 Adapts experimental layout file format 2016-06-20 22:27:17 -04:00
Erez Zukerman eda5e84164 Adds compiled default firmware 2016-06-20 22:00:51 -04:00
Erez Zukerman b85d2f2988 [Jack & Erez] Adds dedicated Version key 2016-06-20 21:59:20 -04:00
Erez Zukerman 881eb8d5f3 [Jack & Erez] Tweaks makefile for sanity 2016-06-20 21:58:58 -04:00
Erez Zukerman 5961de0ce2 Removes .gitattributes 2016-06-20 21:47:04 -04:00
Erez Zukerman cebe08fcd3 [Erez & Jack] Updates build guide 2016-06-20 21:44:37 -04:00
Christopher Browne f6d1ce7863 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-20 12:20:52 -04:00
Jack Humbert 44e098ef2d endline normalisation, treat .hex as bin, updates kc60 hex files 2016-06-19 23:41:10 -04:00
Stanley Lai 3302258abd Added WS2812 support for KC60 (#419)
* 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-19 23:29:42 -04:00
fredizzimo 3f6fac4721 Add quick version of the all-* makefile targets (#417) 2016-06-18 18:09:21 -04:00
Jack Humbert db32864ce7 Cleans up quantum/keymap situation, removes extra lufa folders (#416)
* 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-18 14:30:24 -04:00
Jack Humbert 1923cffd41 allow overriding of TARGET 2016-06-17 22:50:41 -04:00
Jack Humbert 008c8d54a0 adds power_up to quantum's matrix file 2016-06-17 22:09:59 -04:00
Jack Humbert de326d078d prevents ergodox_ez from waking up machine (#375) 2016-06-17 22:06:58 -04:00
Jack Humbert b70248fa21 addresses #369 2016-06-17 21:42:59 -04:00
Jack Humbert c4ea06d255 fix for parent folders with spaces (#403) 2016-06-17 21:10:17 -04:00
Eric Tang e175b8d56f removes extra dfu erase (#415) 2016-06-17 20:25:58 -04:00
Christopher Browne 2cf26915e3 Sample of using build info to generate keystrokes (#412)
* 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-16 17:16:51 -04:00
Christopher Browne f566125c6e Revert removals of compiled files 2016-06-16 16:51:19 -04:00
Christopher Browne b2cc1ff0de Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-16 16:43:27 -04:00
Jack Humbert 91b469d88f correctly test to see if awk exists 2016-06-16 15:48:54 -04:00
Jack Humbert 33e83aaaca make awk optional (uses cat) 2016-06-16 10:42:00 -04:00
Christopher Browne ce1742a31f Add rule to ignore contents of .build directories; their contents are generated 2016-06-15 18:42:30 -04:00
Christopher Browne e7b50feee4 Remove more generated files 2016-06-15 18:42:05 -04:00
Christopher Browne 39cde91475 Fix spelling in comment 2016-06-15 18:39:57 -04:00
Christopher Browne 10fe3f001b Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-15 18:38:30 -04:00
Christopher Browne 6d485b0ecd compiled.hex files should not be included in the repo; they represent generated compiled code 2016-06-15 18:35:38 -04:00
Christopher Browne 6e0270b52f Should not include the compiled code in the repo 2016-06-15 18:34:47 -04:00
Christopher Browne 90d0576355 Ensure there is a value even if not working within a git repo 2016-06-15 18:29:27 -04:00
Jack Humbert 77d083ed98 updates experimental planck keymap, adds basic layout 2016-06-15 15:43:40 -04:00
Christopher Browne bb0e0c7eba Split build date into a separate DEFINE 2016-06-15 11:36:27 -04:00
Christopher Browne 4e1bc2d298 Add docs 2016-06-15 11:25:08 -04:00
Christopher Browne 211ebe8734 Add in a version key 2016-06-15 11:19:51 -04:00
Christopher Browne e32b0960af Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-15 11:13:29 -04:00
Gergely Nagy 1d1ced53c7 Update the ergodox-ez/algernon keymap (#409)
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-14 11:28:54 -04:00
Gergely Nagy 4815b97add Makefile: Add QMK_VERSION & co to OPT_DEFS (#408)
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-14 11:26:42 -04:00
Samuel Goodwin fad5a57156 Add sgoodwin keymap for the KC60 (#410)
* 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-14 11:21:55 -04:00
TerryMathews 1c5a6733ff adds support for GH60 Satan keyboard (#407)
* 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-13 21:59:22 -04:00
Christopher Browne 498455403e Renaming planck/cbbrowne in keeping with recent naming conventions (#405)
* 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-13 19:06:32 -04:00
Christopher Browne c5a034f984 Simplify logic; no need to return so much 2016-06-13 17:59:26 -04:00
Christopher Browne de2f95bc6f Local change, not apropos to have in this repo 2016-06-13 17:33:26 -04:00
Christopher Browne 2fe06e4ef5 Simplify submitting my fave cbbrowne keystroke by using SEND_STRING() 2016-06-13 17:22:45 -04:00
Christopher Browne 3fe26d47a6 Restructuring in keeping with recent changes to conventions 2016-06-13 16:27:33 -04:00
Christopher Browne dc9bf78f2b Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-13 16:06:03 -04:00
TerryMathews 25d4772754 adds support for Phantom TKL keyboard (#399)
ANSI 125 layout, capslock and scrolllock implemented, support for
WS2812LED strip included.
2016-06-12 22:26:47 -04:00