Commit Graph

2116 Commits (a226255c0b34656b6bd1e3ff3d899929eb964a70)

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Erez Zukerman d06e940a17 [Erez & Jack] Removes keyboards which are not active on qmk 2016-05-24 23:55:29 -04:00
Erez Zukerman 8bc69afc63 [Erez & Jack] Optimizes shift_interrupted array 2016-05-24 23:48:46 -04:00
Erez Zukerman 1237025963 [Erez & Jack] Packages Space Cadet shifts into keycodes 2016-05-24 23:43:58 -04:00
Erez Zukerman f4a426a0b1 [Erez & Jack] Documents new Leader key functionality 2016-05-24 22:37:38 -04:00
Jack Humbert 287eb7ad14 Converted audio play functions to *_user (#349)
* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs

* Usability tweaks

* TWEAE

* nightly

added extra kcs to keymap common

* turned on Plank audio

* Added backlight breathing to atomic

* reverted accidental merge

* Added music and audio toggles to Quantum.c

* Redid the audio callbacks

* Adjusted default planck layout to use the user tone naming

* tabs to spaces

* Rewrote the ALL recipe to allow for faster parallel make

* tabs to spaces

* Renamed custom event functions to be 'startup_user' and 'shutdown_user'. Also moved the prototypes around.

* Tweaked pvc atomic layout to work with the pvc planck.

* updates midi scale calling
2016-05-24 11:56:53 -04:00
Eric Tang 1ae6011cef Clean up #343's code (#348) 2016-05-24 11:44:40 -04:00
Jack Humbert 897f5b2f9d updates midi in play_note to better octave 2016-05-23 23:44:36 -04:00
Eric Tang aaa758f1d3 Optimize matrix scanning (#343) 2016-05-23 23:42:21 -04:00
Peter d66aa0abf9 adds petereichinger's planck keymap (#340)
* Add custom keymap

* A little readme and remove old layout comments
2016-05-20 11:14:08 -04:00
Erez Zukerman ed349f0c3d Merge pull request #324 from Bubblepoint/master
Add adnw/k_o_y layout
2016-05-19 15:54:16 -04:00
purpleP 0275d444d7 fixed small bug with AUDIO_ENABLED (#339) 2016-05-19 08:36:28 -04:00
Jack Humbert b732b79b49 adapts unicode to quantum.c (#333)
* Unicode

to have unicode input you need to:

- set your OS input method to UNICODE if needed
- enable unicode in your makefile
- copy the action_function from
keyboard/planck/keymaps/unicode/unicode.c to your keymap.c
set the target OS method in your keymap.c: void matrix_init_user() {
set_unicode_mode(UC_OSX); } you can then switch when you want with:
set_unicode_mode(UC_OSX); set_unicode_mode(UC_LNX);
set_unicode_mode(UC_WIN);
put some unicode codes in your keymap like so: UC(0x0061)
I did change the bit mask in quantum/keymap_common.c and .h
I’m afraid we will need uint32 to get a total support for all unicode
tables or relocate the handler as @mbarkhau did.

* rearranges keycode values, hooks-up unicode

* removes extra lalt ref

* adds unicode shortcuts and example
2016-05-18 23:47:16 -04:00
Jack Humbert bf545061f2 outputs size when make dfuing 2016-05-18 23:16:33 -04:00
Jack Humbert 0428214b90 adds music and audio toggles (#337)
* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs

* Usability tweaks

* TWEAE

* nightly

added extra kcs to keymap common

* turned on Plank audio

* Added backlight breathing to atomic

* reverted accidental merge

* Added music and audio toggles to Quantum.c

* Redid the audio callbacks

* music/audio_on_user
2016-05-18 23:14:00 -04:00
heartsekai 465aabe11d Added Swiss-German keymap. (#335) 2016-05-18 15:22:04 -04:00
Jack Humbert fe9b1482fd adds KC_NUBS, KC_NUHS and shifted versions to default keymaps 2016-05-17 22:17:23 -04:00
Jack Humbert 2425fd295a fixes default planck keymap 2016-05-16 23:08:16 -04:00
Jacob Bilger b79400e0e9 Folders for each keymap.c file (#332)
* Add folders to keymaps

* test

* test
2016-05-15 01:22:51 -04:00
Jack Humbert e2aa980ad5 cleans up default keymaps (olkb) 2016-05-15 01:07:48 -04:00
Jack Humbert fde477a927 updates midi functionality (#331)
* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* adds music sequencer functionality

* implements audio/music functions in quantum.c

* splits up process_action to allow independent processing of actions

* moves midi stuff to quantum.c

* adds additional scales for midi
2016-05-15 00:51:06 -04:00
Jack Humbert bf5c2ccee5 splits process_action up to handle records separately (#329)
* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* adds music sequencer functionality

* implements audio/music functions in quantum.c

* splits up process_action to allow independent processing of actions

* merging?
2016-05-15 00:47:25 -04:00
Jack Humbert 15719f3574 adds a sequencer to the music mode (#330)
* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* adds music sequencer functionality

* implements audio/music functions in quantum.c

* Merge branch 'master' into process-record
2016-05-15 00:40:59 -04:00
Erez Zukerman 1a8c0dd22d Leader key implementation (#326)
* implements leader key for planck experimental

* allows override of leader timeout

* adds ability to use the leader key in seq

* fixes leader keycode

* adds chording prototype

* fixes keycode detection

* moves music mode to quantum.c

* disables chording by default

* updates process_action functions to return bool
2016-05-15 00:27:32 -04:00
Erez Zukerman 79d26f331a Adds explanatory note re history of TMK and QMK 2016-05-14 22:07:16 -04:00
Jacob Bilger c7d2c79d34 adds Bilger321's planck keymap 2016-05-14 21:11:33 -04:00
Tobias Matt 26e315a6bb readme added 2016-05-14 10:04:14 +02:00