Commit Graph

4101 Commits

Author SHA1 Message Date
Nathan Sharfi
6428069eb7 zweihander-osx: Use power instead of eject
KC_EJCT isn't the OS X Eject key and won't restart your computer.
2016-05-31 16:45:22 -07:00
Nathan Sharfi
7b8857a368 zweihander-osx: use eject instead of power
https://support.apple.com/en-us/HT201236 says that ⌃⌘⏏ will quit all apps and then restart your Mac; ⌃⌘-power will shut things down in an…ungraceful fashion.

I reboot into Windows fairly frequently; I'd rather have the nice behavior at my fingertips, not the rude one.
2016-05-31 16:15:35 -07:00
Nathan Sharfi
a226255c0b Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2016-05-31 15:22:45 -07:00
Hartmut Goebel
cea4b9a4bb Update to Makefile an ergodox readme (#365)
* Autodetect teensy-loader-cli over teensy_loader_cli.

Some distributions (e.g. Arch Linux, Guix) install teensy_loader_cli
as teensy-loader-cli. Use this one if it is installed.

* Update ergodox_ez/readme.md

- Mention Linux distris providing teensy-loader-cli
- Mention `make teensy ...`
2016-05-31 10:03:04 -04:00
Dave Jones
5e926d7b07 Added a README and minor tweaks 2016-05-31 14:30:36 +01:00
Dave Jones
4ae86e6ff7 Squash the prototype compiler warning
unselect_rows declared with no parameter list; requires (void) to
prevent compiler warning
2016-05-31 14:18:40 +01:00
Thomas Anderson
0755322a90 Rearranged the layer toggles and keys.
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
2016-05-30 23:45:55 -07:00
Nathan Sharfi
222e8f031c Merge branch 'master' of github.com:jackhumbert/qmk_firmware 2016-05-30 15:45:17 -07:00
Nathan Sharfi
13810e4822 zweihander: Add :, disable sleep LED waves 2016-05-30 15:44:59 -07:00
jorge
b32731b698 Merge branch 'master' of https://github.com/johgh/qmk_firmware 2016-05-30 19:41:29 +02:00
jorge
314d21c746 ergodox_ez: added dvorak_spanish layout 2016-05-30 19:40:16 +02:00
Fred Sundvik
489288f674 Add a nicer sine based gradient for the LEDs 2016-05-29 21:59:27 +03:00
Erez Zukerman
8ee9be11de Merge pull request #353 from algernon/ergodox-ez/algernon
My layout for the ErgoDox EZ
2016-05-29 13:53:29 -04:00
Samuel Goodwin
478a18d237 Add support for the KC60 v2.0 2015-09-12 (#360)
* 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.
2016-05-29 13:18:01 -04:00
Fred Sundvik
0c3189055f Make LED visualization times configurable 2016-05-29 17:42:32 +03:00
Daniel Svensson
b85dd60397 Fix build errors (#359)
* brings gh60 up-to-date (needs testing)

* brings hhkb up-to-date (needs testing)

* brings jd45 up-to-date (needs testing)
2016-05-29 10:39:27 -04:00
Erez Zukerman
536ad6813a Corrects a backtick 2016-05-28 20:51:25 -04:00
Erez Zukerman
d7ed882d2a Corrects links 2016-05-28 20:50:24 -04:00
Erez Zukerman
8497a45134 Adds a roadmap to the intro section of the docs 2016-05-28 20:48:20 -04:00
Fred Sundvik
9c955145f5 Fix emulator #ifdef check 2016-05-29 02:08:46 +03:00
Jack Humbert
a53bc24c4d makes .SILENT (less verbose) by default - override with VERBOSE=1
also took out some @echo newlines to make things a bit cleaner
2016-05-28 15:33:08 -04:00
Jack Humbert
17977a7e24 process_record implementation (non-breaking for process_action ATM) 2016-05-28 15:22:30 -04:00
Jack Humbert
38987d4c15 updates quantum template to prevent backlight conflicts 2016-05-28 12:05:17 -04:00
Jack Humbert
de57799530 brings alps64 up-to-date (needs testing) 2016-05-28 11:56:06 -04:00
Fred Sundvik
4d7e4a4780 Don't include lcd_backlight_hal for emulator 2016-05-28 11:13:08 +03:00
jorge
f20e17a19e ergodox_ez: added dvorak_spanish layout 2016-05-28 09:57:25 +02:00
Nathan Sharfi
e7e83b1f18 zweihander-osx: Add =, :, juggle Home/End 2016-05-27 18:41:16 -07:00
Nathan Sharfi
861f0f78e1 zweihander-osx: Bump ALFRED_LEAD_TIME to 250ms 2016-05-26 15:08:01 -07:00
Jack Humbert
209ee3cd05 removes duplicate double quote and odd whitespace 2016-05-26 17:14:01 -04:00
Christopher Browne
d649ab3433 Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware 2016-05-26 15:17:00 -04:00
Gergely Nagy
9ff10ab1db ergodox_ez/algernon: Add a HEX file
Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-05-26 15:31:25 +02:00
Gergely Nagy
c764480b95 ergodox_ez/algernon: New layout.
This is a squashed up version of the layout I have been working on for
the past month or so. Based on Dvorak, with a lot of unconventional
stuff thrown in for good measures.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-05-26 15:27:11 +02:00
Erez Zukerman
89f0472b9e Merge pull request #352 from algernon/ergodox-ez/supercoder
ergodox_ez: Add a SuperCoder keymap
2016-05-26 08:40:20 -04:00
Gergely Nagy
037b3f0ddf ergodox_ez: Add a SuperCoder keymap
Inspired by @faxm0dem, and the SuperCoder 2000 "keyboard".

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2016-05-26 14:13:20 +02:00
Mazin Bokhari
ac02b0f397 Fix formatting 2016-05-26 02:17:07 -05:00
Mazin Bokhari
733596d800 Fix formatting 2016-05-26 02:12:57 -05:00
Erez Zukerman
5501f231d4 Merge pull request #351 from adiabatic/master
Add KC_DQUO ("); update Zweihander
2016-05-25 21:41:18 -04:00
Nathan Sharfi
376403276b Add single and double quotes to numpad layer
…as well as recover from a bunch of Git user errors.
2016-05-25 18:13:00 -07:00
Nathan Sharfi
9d6debd9b2 Add double quote for everyone; update Zweihander 2016-05-25 17:25:04 -07:00
Mazin Bokhari
66f9cdd041 Change bottom keycluster keys to be alt temporarily until a more permanent solution is though up... although you just now lost your arrow keys, so idk what to do about that tomorrow lol 2016-05-25 01:43:06 -05:00
Mazin Bokhari
59dc19940a Add notes 2016-05-25 01:31:57 -05:00
Mazin Bokhari
fbbd32376b Add gui macro to bksp and tab (second outter-most keys) on both thumb clusters 2016-05-25 01:25:09 -05:00
Mazin Bokhari
09e172f56a Tap then hold built-in functionality actually overrides the ctrl/alt/etc. macros 2016-05-25 01:21:29 -05:00
Mazin Bokhari
03aeb40516 Change mouse clicks to j and k 2016-05-25 01:19:30 -05:00
Mazin Bokhari
fd44d1cb39 Update layout viz 2016-05-25 01:09:18 -05:00
Mazin Bokhari
5486b9e80e Add todo: windows and nix layers 2016-05-25 00:58:08 -05:00
Mazin Bokhari
fbbfb3cbad Add todo: override holding macro functionlity 2016-05-25 00:51:16 -05:00
Mazin Bokhari
514a7038b1 Add ctrl macro to spc and ent on thumb cluster (outter-most keys_) 2016-05-25 00:46:43 -05:00
Mazin Bokhari
0b68db4e43 Change rr3c1 from quotes/gui to quotes/ctl 2016-05-25 00:42:58 -05:00
Mazin Bokhari
3b0fd160df Change r3c1 from backspace to esc/control 2016-05-25 00:38:25 -05:00