1
0
Fork 0
Commit graph

1177 commits

Author SHA1 Message Date
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
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
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
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
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
Eric Tang
6955719075 Move LED strip initialization (#397) 2016-06-12 18:01:55 -04:00
Jack Humbert
d9e4dad0a8 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
2016-06-11 13:31:31 -04:00
Erez Zukerman
a5d638ad30 Merge pull request #364 from techtomas/techtomas
Rearranged the layer toggles and keys.
2016-06-07 21:18:32 -04:00
Thomas Anderson
623466e340 Updated readme to fix a typo and list out hotkey shortcuts 2016-06-07 13:38:37 -07:00
Erez Zukerman
2fda55ba54 Merge pull request #384 from gid0/master
Merge ErgoDox bepo layout changes.
2016-06-06 23:22:52 -04:00
Erez Zukerman
408c9e159b Adds Python script to util directory for easier discoverability 2016-06-06 21:47:57 -04:00
Olivier
cd906f24b1 Spellchecking. 2016-06-06 15:23:40 +02:00
Olivier
a62a0480d0 Add some more function keys (vol up / down, mute, undo, cut, copy, paste). 2016-06-06 15:18:42 +02:00
Olivier
edf4266839 Add basic README file. 2016-06-05 21:42:25 +02:00
Jack Humbert
3e3a07fc97 adds planck keymap readme 2016-06-05 11:21:37 -04:00
Olivier
4d59d57e64 Move keys and especially TAB more like on a TypeMatrix 2020 keyboard. Add a left SHIFT key. 2016-06-04 20:14:34 +02:00
Olivier
e0762e0ad9 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 ! 2016-06-04 18:52:22 +02:00
Jack Humbert
b36e532b5e cleans up folder structure
* consolidates docs
* deletes converter/
* updates .md references (most)
2016-06-04 00:10:47 -04:00
Olivier
a4796ba36a Update prebuilt firmware with code from latest pull. 2016-06-02 23:51:06 +02:00
Jack Humbert
4635b44533 new line/tab in send_string 2016-06-01 23:00:55 -04:00
IBNobody
f3086b57e6 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
2016-06-01 21:41:51 -04:00
Erez Zukerman
0457ed4880 Merge pull request #297 from gid0/master
Add an ErgoDox bépo layout.
2016-06-01 08:21:04 -04:00
Erez Zukerman
56939b1518 Merge pull request #367 from waveform80/fix-unselect-rows-prototype
Squash the prototype compiler warning
2016-05-31 23:42:54 -04:00
Erez Zukerman
0c4085dd53 Merge pull request #368 from waveform80/daves-layout-readme
Added a README and minor tweaks for "dave" KEYMAP
2016-05-31 23:42:11 -04:00
Erez Zukerman
bae92b2a10 Merge pull request #356 from johgh/master
ergodox_ez: added dvorak_spanish layout
2016-05-31 23:18:16 -04: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
jorge
314d21c746 ergodox_ez: added dvorak_spanish layout 2016-05-30 19:40:16 +02: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
Jack Humbert
de57799530 brings alps64 up-to-date (needs testing) 2016-05-28 11:56:06 -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
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
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
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