]>
git.donarmstrong.com Git - qmk_firmware.git/log
Christopher Browne [Wed, 22 Jun 2016 15:26:26 +0000 (11:26 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Erez Zukerman [Wed, 22 Jun 2016 13:01:51 +0000 (09:01 -0400)]
Merge pull request #433 from algernon/ergodox-ez/algernon
ergodox_ez: Update the algernon keymap to v1.2
Gergely Nagy [Wed, 22 Jun 2016 06:37:00 +0000 (08:37 +0200)]
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>
Jack Humbert [Wed, 22 Jun 2016 02:55:54 +0000 (22:55 -0400)]
increase leader seq size to 5
Jack Humbert [Wed, 22 Jun 2016 02:39:54 +0000 (22:39 -0400)]
Renames keyboard folder to keyboards, adds couple of tmk's fixes (#432)
* fixes from tmk's repo
* rename keyboard to keyboards
Jack Humbert [Wed, 22 Jun 2016 02:09:41 +0000 (22:09 -0400)]
adds backlight levels to the satan keyboard (#431)
* enable 4 levels
* remove breathing stuff
* update channels, comments, hex
Jack Humbert [Tue, 21 Jun 2016 22:32:28 +0000 (18:32 -0400)]
adds fuse settings for atmega32u4, fixes keymap_extras includes
Christopher Browne [Tue, 21 Jun 2016 21:54:12 +0000 (17:54 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Jack Humbert [Tue, 21 Jun 2016 21:42:29 +0000 (17:42 -0400)]
Warning reductions (#430)
Warning reductions
dragon788 [Tue, 21 Jun 2016 19:29:54 +0000 (14:29 -0500)]
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).
fredizzimo [Tue, 21 Jun 2016 17:31:26 +0000 (20:31 +0300)]
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.
Christopher Browne [Tue, 21 Jun 2016 16:55:24 +0000 (12:55 -0400)]
More notes
Jack Humbert [Tue, 21 Jun 2016 16:53:21 +0000 (12:53 -0400)]
reduces rgblight warnings, integrates completely (#428)
Christopher Browne [Tue, 21 Jun 2016 16:45:38 +0000 (12:45 -0400)]
Improve docs a bit
Christopher Browne [Tue, 21 Jun 2016 16:36:26 +0000 (12:36 -0400)]
Add filler to make layering clearer;
KC_TRNS gets used a lot; have the blank _______ mnemonic for it
Christopher Browne [Tue, 21 Jun 2016 16:30:17 +0000 (12:30 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Jack Humbert [Tue, 21 Jun 2016 14:21:43 +0000 (10:21 -0400)]
updates all config.h and Makefiles to correct references, text
Stanley Lai [Tue, 21 Jun 2016 04:49:54 +0000 (21:49 -0700)]
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
Jack & Erez [Tue, 21 Jun 2016 02:37:31 +0000 (22:37 -0400)]
Fresh hes for experimental layout
Jack & Erez [Tue, 21 Jun 2016 02:36:36 +0000 (22:36 -0400)]
[Jack & Erez] Fixes Space Cadet right shift
Erez Zukerman [Tue, 21 Jun 2016 02:27:17 +0000 (22:27 -0400)]
Adapts experimental layout file format
Erez Zukerman [Tue, 21 Jun 2016 02:00:51 +0000 (22:00 -0400)]
Adds compiled default firmware
Erez Zukerman [Tue, 21 Jun 2016 01:59:20 +0000 (21:59 -0400)]
[Jack & Erez] Adds dedicated Version key
Erez Zukerman [Tue, 21 Jun 2016 01:58:58 +0000 (21:58 -0400)]
[Jack & Erez] Tweaks makefile for sanity
Erez Zukerman [Tue, 21 Jun 2016 01:47:04 +0000 (21:47 -0400)]
Removes .gitattributes
Erez Zukerman [Tue, 21 Jun 2016 01:44:37 +0000 (21:44 -0400)]
[Erez & Jack] Updates build guide
Christopher Browne [Mon, 20 Jun 2016 16:20:52 +0000 (12:20 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Jack Humbert [Mon, 20 Jun 2016 03:41:10 +0000 (23:41 -0400)]
endline normalisation, treat .hex as bin, updates kc60 hex files
Stanley Lai [Mon, 20 Jun 2016 03:29:42 +0000 (20:29 -0700)]
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
fredizzimo [Sat, 18 Jun 2016 22:09:21 +0000 (01:09 +0300)]
Add quick version of the all-* makefile targets (#417)
Jack Humbert [Sat, 18 Jun 2016 18:30:24 +0000 (14:30 -0400)]
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
Jack Humbert [Sat, 18 Jun 2016 02:50:41 +0000 (22:50 -0400)]
allow overriding of TARGET
Jack Humbert [Sat, 18 Jun 2016 02:09:59 +0000 (22:09 -0400)]
adds power_up to quantum's matrix file
Jack Humbert [Sat, 18 Jun 2016 02:06:58 +0000 (22:06 -0400)]
prevents ergodox_ez from waking up machine (#375)
Jack Humbert [Sat, 18 Jun 2016 01:42:59 +0000 (21:42 -0400)]
addresses #369
Jack Humbert [Sat, 18 Jun 2016 01:10:17 +0000 (21:10 -0400)]
fix for parent folders with spaces (#403)
Eric Tang [Sat, 18 Jun 2016 00:25:58 +0000 (17:25 -0700)]
removes extra dfu erase (#415)
Christopher Browne [Thu, 16 Jun 2016 21:16:51 +0000 (17:16 -0400)]
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
Christopher Browne [Thu, 16 Jun 2016 20:51:19 +0000 (16:51 -0400)]
Revert removals of compiled files
Christopher Browne [Thu, 16 Jun 2016 20:43:27 +0000 (16:43 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Jack Humbert [Thu, 16 Jun 2016 19:48:54 +0000 (15:48 -0400)]
correctly test to see if awk exists
Jack Humbert [Thu, 16 Jun 2016 14:42:00 +0000 (10:42 -0400)]
make awk optional (uses cat)
Christopher Browne [Wed, 15 Jun 2016 22:42:30 +0000 (18:42 -0400)]
Add rule to ignore contents of .build directories; their contents are generated
Christopher Browne [Wed, 15 Jun 2016 22:42:05 +0000 (18:42 -0400)]
Remove more generated files
Christopher Browne [Wed, 15 Jun 2016 22:39:57 +0000 (18:39 -0400)]
Fix spelling in comment
Christopher Browne [Wed, 15 Jun 2016 22:38:30 +0000 (18:38 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Christopher Browne [Wed, 15 Jun 2016 22:35:38 +0000 (18:35 -0400)]
compiled.hex files should not be included in the repo; they represent generated compiled code
Christopher Browne [Wed, 15 Jun 2016 22:34:47 +0000 (18:34 -0400)]
Should not include the compiled code in the repo
Christopher Browne [Wed, 15 Jun 2016 22:29:27 +0000 (18:29 -0400)]
Ensure there is a value even if not working within a git repo
Jack Humbert [Wed, 15 Jun 2016 19:43:40 +0000 (15:43 -0400)]
updates experimental planck keymap, adds basic layout
Christopher Browne [Wed, 15 Jun 2016 15:36:27 +0000 (11:36 -0400)]
Split build date into a separate DEFINE
Christopher Browne [Wed, 15 Jun 2016 15:25:08 +0000 (11:25 -0400)]
Add docs
Christopher Browne [Wed, 15 Jun 2016 15:19:51 +0000 (11:19 -0400)]
Add in a version key
Christopher Browne [Wed, 15 Jun 2016 15:13:29 +0000 (11:13 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Gergely Nagy [Tue, 14 Jun 2016 15:28:54 +0000 (17:28 +0200)]
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>
Gergely Nagy [Tue, 14 Jun 2016 15:26:42 +0000 (17:26 +0200)]
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>
Samuel Goodwin [Tue, 14 Jun 2016 15:21:55 +0000 (17:21 +0200)]
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.
TerryMathews [Tue, 14 Jun 2016 01:59:22 +0000 (21:59 -0400)]
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
Christopher Browne [Mon, 13 Jun 2016 23:06:32 +0000 (19:06 -0400)]
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
Christopher Browne [Mon, 13 Jun 2016 21:59:26 +0000 (17:59 -0400)]
Simplify logic; no need to return so much
Christopher Browne [Mon, 13 Jun 2016 21:33:26 +0000 (17:33 -0400)]
Local change, not apropos to have in this repo
Christopher Browne [Mon, 13 Jun 2016 21:22:45 +0000 (17:22 -0400)]
Simplify submitting my fave cbbrowne keystroke by using SEND_STRING()
Christopher Browne [Mon, 13 Jun 2016 20:27:33 +0000 (16:27 -0400)]
Restructuring in keeping with recent changes to conventions
Christopher Browne [Mon, 13 Jun 2016 20:06:03 +0000 (16:06 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
TerryMathews [Mon, 13 Jun 2016 02:26:47 +0000 (22:26 -0400)]
adds support for Phantom TKL keyboard (#399)
ANSI 125 layout, capslock and scrolllock implemented, support for
WS2812LED strip included.
Eric Tang [Sun, 12 Jun 2016 22:01:55 +0000 (15:01 -0700)]
Move LED strip initialization (#397)
Jack Humbert [Sun, 12 Jun 2016 19:55:05 +0000 (15:55 -0400)]
change to relative paths instead of absolute
Jack Humbert [Sun, 12 Jun 2016 02:54:34 +0000 (22:54 -0400)]
no more cc error on windows
Jack Humbert [Sat, 11 Jun 2016 17:31:31 +0000 (13:31 -0400)]
Makefile redo & other features (#395)
* .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
Erez Zukerman [Wed, 8 Jun 2016 01:18:32 +0000 (21:18 -0400)]
Merge pull request #364 from techtomas/techtomas
Rearranged the layer toggles and keys.
Thomas Anderson [Tue, 7 Jun 2016 20:38:37 +0000 (13:38 -0700)]
Updated readme to fix a typo and list out hotkey shortcuts
Aron Griffis [Tue, 7 Jun 2016 16:41:55 +0000 (12:41 -0400)]
Add support for vagrant-docker (#389)
* 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
Masahiro Wakame [Tue, 7 Jun 2016 15:30:15 +0000 (00:30 +0900)]
fix HID_RI_LOGICAL_MAXIMUM value (#388)
Erez Zukerman [Tue, 7 Jun 2016 03:22:52 +0000 (23:22 -0400)]
Merge pull request #384 from gid0/master
Merge ErgoDox bepo layout changes.
Jack Humbert [Tue, 7 Jun 2016 01:54:21 +0000 (21:54 -0400)]
Update HAND_WIRE.md
Eric Tang [Tue, 7 Jun 2016 01:53:37 +0000 (18:53 -0700)]
Fix hand wiring guide (#387)
* Fix broken link
* Fix incoherent sentence
Erez Zukerman [Tue, 7 Jun 2016 01:47:57 +0000 (21:47 -0400)]
Adds Python script to util directory for easier discoverability
TuxForLife [Mon, 6 Jun 2016 14:42:41 +0000 (07:42 -0700)]
Tiny typo (#386)
Olivier [Mon, 6 Jun 2016 13:23:40 +0000 (15:23 +0200)]
Spellchecking.
Olivier [Mon, 6 Jun 2016 13:18:42 +0000 (15:18 +0200)]
Add some more function keys (vol up / down, mute, undo, cut, copy, paste).
Olivier [Sun, 5 Jun 2016 19:42:25 +0000 (21:42 +0200)]
Add basic README file.
Jack Humbert [Sun, 5 Jun 2016 15:21:37 +0000 (11:21 -0400)]
adds planck keymap readme
Jack Humbert [Sun, 5 Jun 2016 15:19:17 +0000 (11:19 -0400)]
updates the hand-wiring guide
Olivier [Sat, 4 Jun 2016 18:14:34 +0000 (20:14 +0200)]
Move keys and especially TAB more like on a TypeMatrix 2020 keyboard. Add a left SHIFT key.
Jack Humbert [Sat, 4 Jun 2016 17:30:11 +0000 (13:30 -0400)]
corrects vagrant script path from @
b46f343
Jack Humbert [Sat, 4 Jun 2016 17:24:25 +0000 (13:24 -0400)]
updates vagrant script path
Jack Humbert [Sat, 4 Jun 2016 17:18:15 +0000 (13:18 -0400)]
makes vagrant usable again
Olivier [Sat, 4 Jun 2016 16:52:22 +0000 (18:52 +0200)]
Merged the function and navigation layers. Give access to it with both thumbs. Now you can up / down / page up / page down with only one hand !
Jack Humbert [Sat, 4 Jun 2016 04:10:47 +0000 (00:10 -0400)]
cleans up folder structure
* consolidates docs
* deletes converter/
* updates .md references (most)
Noah Andrews [Sat, 4 Jun 2016 02:42:51 +0000 (22:42 -0400)]
Add missing elevate.exe file (#377)
* Stops explorer.exe from being started with admin privilieges
* added missing elevate.exe file
Eric Tang [Fri, 3 Jun 2016 19:48:40 +0000 (12:48 -0700)]
Improve string sending (#376)
Olivier [Thu, 2 Jun 2016 21:51:06 +0000 (23:51 +0200)]
Update prebuilt firmware with code from latest pull.
Jack Humbert [Thu, 2 Jun 2016 18:23:01 +0000 (14:23 -0400)]
adds travis badge
Daniel Svensson [Thu, 2 Jun 2016 18:17:19 +0000 (20:17 +0200)]
Add a Travis recipe. (#374)
Noah Andrews [Thu, 2 Jun 2016 17:00:44 +0000 (13:00 -0400)]
Stops explorer.exe from being started with admin privilieges (#373)
Jack Humbert [Thu, 2 Jun 2016 03:00:55 +0000 (23:00 -0400)]
new line/tab in send_string
Jack Humbert [Thu, 2 Jun 2016 02:49:55 +0000 (22:49 -0400)]
adds send_string functionality (string macros)
IBNobody [Thu, 2 Jun 2016 01:41:51 +0000 (20:41 -0500)]
Submitting ArrowPad, A QMK-based 21/24 key keypad (#372)
* Created arrow pad, a QMK based numpad designed for heavy text editing
* Enabled backlighting, numlock indicator, and forced nkro for arrowpad
* WIP Arrowpad 21
* WIP Arrowpad 21
* Combined Arrow Pad 21 and 24
* Combined Arrow Pad 21 and 24
* Removed 21 folder
Jack Humbert [Wed, 1 Jun 2016 20:57:12 +0000 (16:57 -0400)]
removes stray paren
Erez Zukerman [Wed, 1 Jun 2016 12:21:04 +0000 (08:21 -0400)]
Merge pull request #297 from gid0/master
Add an ErgoDox bépo layout.