Commit graph

2257 commits

Author SHA1 Message Date
Christopher Browne
0cd017d485 Use Space Cadet parens on LSFT 2016-06-22 16:51:25 -04:00
Christopher Browne
7eee1526bd Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-22 16:42:58 -04:00
Jack Humbert
935f0de55d well that didn't work 2016-06-22 14:33:59 -04:00
Jack Humbert
56bb5b51bc adds author block to readme 2016-06-22 14:30:47 -04:00
Christopher Browne
b0caf32741 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-22 11:26:26 -04:00
Erez Zukerman
8c1bfdf0bd Merge pull request #433 from algernon/ergodox-ez/algernon
ergodox_ez: Update the algernon keymap to v1.2
2016-06-22 09:01:51 -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
98f0807359 increase leader seq size to 5 2016-06-21 22:55:54 -04: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
Jack Humbert
464c8e274f adds backlight levels to the satan keyboard (#431)
* enable 4 levels

* remove breathing stuff

* update channels, comments, hex
2016-06-21 22:09:41 -04:00
Jack Humbert
e329729d3a adds fuse settings for atmega32u4, fixes keymap_extras includes 2016-06-21 18:32:28 -04:00
Christopher Browne
ee3c7892ad Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-06-21 17:54:12 -04:00
Jack Humbert
1a0bac8bcc Warning reductions (#430)
Warning reductions
2016-06-21 17:42:29 -04:00
dragon788
758a8c64e9 Change base box to avoid breakage in Arch box (#429)
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).
2016-06-21 15:29:54 -04:00
fredizzimo
a69d002506 Fix the make all-keyboards command (#422)
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.
2016-06-21 13:31:26 -04:00
Christopher Browne
2d31481008 More notes 2016-06-21 12:55:24 -04:00
Jack Humbert
80c8705419 reduces rgblight warnings, integrates completely (#428) 2016-06-21 12:53:21 -04:00
Christopher Browne
28942b3ba7 Improve docs a bit 2016-06-21 12:45:38 -04:00
Christopher Browne
f404124c26 Add filler to make layering clearer;
KC_TRNS gets used a lot; have the blank _______ mnemonic for it
2016-06-21 12:36:26 -04:00
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