]> git.donarmstrong.com Git - qmk_firmware.git/log
qmk_firmware.git
7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Christopher Browne [Thu, 30 Jun 2016 16:38:48 +0000 (12:38 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agoTest all subprojects with travis (#464)
Jack Humbert [Thu, 30 Jun 2016 13:51:45 +0000 (09:51 -0400)]
Test all subprojects with travis (#464)

* tests all subprojects

* too many paren

7 years agoinitial version of handwired/fivethirteen (#462)
Robbie Gill [Thu, 30 Jun 2016 13:13:08 +0000 (06:13 -0700)]
initial version of handwired/fivethirteen (#462)

7 years agoFix CAPS_LED logic in Satan (#461)
TerryMathews [Thu, 30 Jun 2016 02:33:09 +0000 (22:33 -0400)]
Fix CAPS_LED logic in Satan (#461)

Needed to invert for proper operation. Previous code had LED on when off
and vice versa.

7 years agotest handwired boards
Jack Humbert [Thu, 30 Jun 2016 01:21:02 +0000 (21:21 -0400)]
test handwired boards

7 years agoadds handwire and onekey example
Jack Humbert [Thu, 30 Jun 2016 00:21:05 +0000 (20:21 -0400)]
adds handwire and onekey example

7 years agoupdates planck experimental, width of color output
Jack Humbert [Wed, 29 Jun 2016 22:47:53 +0000 (18:47 -0400)]
updates planck experimental, width of color output

7 years agogets rid of rand warning [skip ci]
Jack Humbert [Wed, 29 Jun 2016 22:36:52 +0000 (18:36 -0400)]
gets rid of rand warning [skip ci]

7 years agorand supports other chips
Jack Humbert [Wed, 29 Jun 2016 22:35:29 +0000 (18:35 -0400)]
rand supports other chips

7 years agoadds random base64 character generator
Jack Humbert [Wed, 29 Jun 2016 22:29:20 +0000 (18:29 -0400)]
adds random base64 character generator

7 years agoMoves features to their own files (process_*), adds tap dance feature (#460)
Jack Humbert [Wed, 29 Jun 2016 21:49:41 +0000 (17:49 -0400)]
Moves features to their own files (process_*), adds tap dance feature (#460)

* non-working commit

* working

* subprojects implemented for planck

* pass a subproject variable through to c

* consolidates clueboard revisions

* thanks for letting me know about conflicts..

* turn off audio for yang's

* corrects starting paths for subprojects

* messing around with travis

* semicolon

* travis script

* travis script

* script for travis

* correct directory (probably), amend files to commit

* remove origin before adding

* git pull, correct syntax

* git checkout

* git pull origin branch

* where are we?

* where are we?

* merging

* force things to happen

* adds commit message, adds add

* rebase, no commit message

* rebase branch

* idk!

* try just pull

* fetch - merge

* specify repo branch

* checkout

* goddammit

* merge? idk

* pls

* after all

* don't split up keyboards

* syntax

* adds quick for all-keyboards

* trying out new script

* script update

* lowercase

* all keyboards

* stop replacing compiled.hex automatically

* adds if statement

* skip automated build branches

* forces push to automated build branch

* throw an add in there

* upstream?

* adds AUTOGEN

* ignore all .hex files again

* testing out new repo

* global ident

* generate script, keyboard_keymap.hex

* skip generation for now, print pandoc info, submodule update

* try trusty

* and sudo

* try generate

* updates subprojects to keyboards

* no idea

* updates to keyboards

* cleans up clueboard stuff

* setup to use local readme

* updates cluepad, planck experimental

* remove extra led.c [ci skip]

* audio and midi moved over to separate files

* chording, leader, unicode separated

* consolidate each [skip ci]

* correct include

* quantum: Add a tap dance feature (#451)

* quantum: Add a tap dance feature

With this feature one can specify keys that behave differently, based on
the amount of times they have been tapped, and when interrupted, they
get handled before the interrupter.

To make it clear how this is different from `ACTION_FUNCTION_TAP`, lets
explore a certain setup! We want one key to send `Space` on single tap,
but `Enter` on double-tap.

With `ACTION_FUNCTION_TAP`, it is quite a rain-dance to set this up, and
has the problem that when the sequence is interrupted, the interrupting
key will be send first. Thus, `SPC a` will result in `a SPC` being sent,
if they are typed within `TAPPING_TERM`. With the tap dance feature,
that'll come out as `SPC a`, correctly.

The implementation hooks into two parts of the system, to achieve this:
into `process_record_quantum()`, and the matrix scan. We need the latter
to be able to time out a tap sequence even when a key is not being
pressed, so `SPC` alone will time out and register after `TAPPING_TERM`
time.

But lets start with how to use it, first!

First, you will need `TAP_DANCE_ENABLE=yes` in your `Makefile`, because
the feature is disabled by default. This adds a little less than 1k to
the firmware size. Next, you will want to define some tap-dance keys,
which is easiest to do with the `TD()` macro, that - similar to `F()`,
takes a number, which will later be used as an index into the
`tap_dance_actions` array.

This array specifies what actions shall be taken when a tap-dance key is
in action. Currently, there are two possible options:

* `ACTION_TAP_DANCE_DOUBLE(kc1, kc2)`: Sends the `kc1` keycode when
  tapped once, `kc2` otherwise.
* `ACTION_TAP_DANCE_FN(fn)`: Calls the specified function - defined in
  the user keymap - with the current state of the tap-dance action.

The first option is enough for a lot of cases, that just want dual
roles. For example, `ACTION_TAP_DANCE(KC_SPC, KC_ENT)` will result in
`Space` being sent on single-tap, `Enter` otherwise.

And that's the bulk of it!

Do note, however, that this implementation does have some consequences:
keys do not register until either they reach the tapping ceiling, or
they time out. This means that if you hold the key, nothing happens, no
repeat, no nothing. It is possible to detect held state, and register an
action then too, but that's not implemented yet. Keys also unregister
immediately after being registered, so you can't even hold the second
tap. This is intentional, to be consistent.

And now, on to the explanation of how it works!

The main entry point is `process_tap_dance()`, called from
`process_record_quantum()`, which is run for every keypress, and our
handler gets to run early. This function checks whether the key pressed
is a tap-dance key. If it is not, and a tap-dance was in action, we
handle that first, and enqueue the newly pressed key. If it is a
tap-dance key, then we check if it is the same as the already active
one (if there's one active, that is). If it is not, we fire off the old
one first, then register the new one. If it was the same, we increment
the counter and the timer.

This means that you have `TAPPING_TERM` time to tap the key again, you
do not have to input all the taps within that timeframe. This allows for
longer tap counts, with minimal impact on responsiveness.

Our next stop is `matrix_scan_tap_dance()`. This handles the timeout of
tap-dance keys.

For the sake of flexibility, tap-dance actions can be either a pair of
keycodes, or a user function. The latter allows one to handle higher tap
counts, or do extra things, like blink the LEDs, fiddle with the
backlighting, and so on. This is accomplished by using an union, and
some clever macros.

In the end, lets see a full example!

```c
enum {
 CT_SE = 0,
 CT_CLN,
 CT_EGG
};

/* Have the above three on the keymap, TD(CT_SE), etc... */

void dance_cln (qk_tap_dance_state_t *state) {
  if (state->count == 1) {
    register_code (KC_RSFT);
    register_code (KC_SCLN);
    unregister_code (KC_SCLN);
    unregister_code (KC_RSFT);
  } else {
    register_code (KC_SCLN);
    unregister_code (KC_SCLN);
    reset_tap_dance (state);
  }
}

void dance_egg (qk_tap_dance_state_t *state) {
  if (state->count >= 100) {
    SEND_STRING ("Safety dance!");
    reset_tap_dance (state);
  }
}

const qk_tap_dance_action_t tap_dance_actions[] = {
  [CT_SE]  = ACTION_TAP_DANCE_DOUBLE (KC_SPC, KC_ENT)
 ,[CT_CLN] = ACTION_TAP_DANCE_FN (dance_cln)
 ,[CT_EGG] = ACTION_TAP_DANCE_FN (dance_egg)
};
```

This addresses #426.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* hhkb: Fix the build with the new tap-dance feature

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* tap_dance: Move process_tap_dance further down

Process the tap dance stuff after midi and audio, because those don't
process keycodes, but row/col positions.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* tap_dance: Use conditionals instead of dummy functions

To be consistent with how the rest of the quantum features are
implemented, use ifdefs instead of dummy functions.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
* Merge branch 'master' into quantum-keypress-process

# Conflicts:
# Makefile
# keyboards/planck/rev3/config.h
# keyboards/planck/rev4/config.h

* update build script

7 years agoImplements subprojects and updates projects for this (#459)
Jack Humbert [Wed, 29 Jun 2016 20:21:41 +0000 (16:21 -0400)]
Implements subprojects and updates projects for this (#459)

* non-working commit

* working

* subprojects implemented for planck

* pass a subproject variable through to c

* consolidates clueboard revisions

* thanks for letting me know about conflicts..

* turn off audio for yang's

* corrects starting paths for subprojects

* messing around with travis

* semicolon

* travis script

* travis script

* script for travis

* correct directory (probably), amend files to commit

* remove origin before adding

* git pull, correct syntax

* git checkout

* git pull origin branch

* where are we?

* where are we?

* merging

* force things to happen

* adds commit message, adds add

* rebase, no commit message

* rebase branch

* idk!

* try just pull

* fetch - merge

* specify repo branch

* checkout

* goddammit

* merge? idk

* pls

* after all

* don't split up keyboards

* syntax

* adds quick for all-keyboards

* trying out new script

* script update

* lowercase

* all keyboards

* stop replacing compiled.hex automatically

* adds if statement

* skip automated build branches

* forces push to automated build branch

* throw an add in there

* upstream?

* adds AUTOGEN

* ignore all .hex files again

* testing out new repo

* global ident

* generate script, keyboard_keymap.hex

* skip generation for now, print pandoc info, submodule update

* try trusty

* and sudo

* try generate

* updates subprojects to keyboards

* no idea

* updates to keyboards

* cleans up clueboard stuff

* setup to use local readme

* updates cluepad, planck experimental

* remove extra led.c [ci skip]

* disable power up for now

* config files updates

* makefile updates

* .h file updates, config tuning

* disable audio for yang

7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Christopher Browne [Tue, 28 Jun 2016 18:46:50 +0000 (14:46 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agoMerge pull request #453 from NoahAndrews/update-docs
Jack Humbert [Mon, 27 Jun 2016 18:32:55 +0000 (14:32 -0400)]
Merge pull request #453 from NoahAndrews/update-docs

7 years agoUpdate readme to direct people to using the MHV AVR Shell
Noah Andrews [Mon, 27 Jun 2016 18:00:48 +0000 (14:00 -0400)]
Update readme to direct people to using the MHV AVR Shell

7 years agoLong overdue fixes and improvements to environment setup scripts (#448)
Noah Andrews [Mon, 27 Jun 2016 13:52:01 +0000 (09:52 -0400)]
Long overdue fixes and improvements to environment setup scripts (#448)

* Update setup script 1 for new folder structure

* Improve script 1 output

* Launch elevate if run without admin privileges

* Improve MinGW error message

* Improvements and fixes to second script

* Log elevate output in first script

7 years agozoom and undo keys for ab's planck keymap (#446)
Anand Babu (AB) Periasamy [Mon, 27 Jun 2016 13:51:12 +0000 (06:51 -0700)]
zoom and undo keys for ab's planck keymap (#446)

7 years agoMerge pull request #447 from abperiasamy/ergo-browser-zoom
Erez Zukerman [Mon, 27 Jun 2016 13:01:51 +0000 (09:01 -0400)]
Merge pull request #447 from abperiasamy/ergo-browser-zoom

zoom and undo keys for ab's beginners ergodox-ez keymap

7 years agozoom and undo keys
Anand Babu (AB) Periasamy [Mon, 27 Jun 2016 03:23:16 +0000 (20:23 -0700)]
zoom and undo keys

7 years agoPreonic keymap update
Jack Humbert [Sun, 26 Jun 2016 20:16:21 +0000 (16:16 -0400)]
Preonic keymap update

7 years agoupdates preonic default layout
Jack Humbert [Sun, 26 Jun 2016 18:20:57 +0000 (14:20 -0400)]
updates preonic default layout

7 years agoupdates planck macros to keycodes, prototype fn_actions
Jack Humbert [Sun, 26 Jun 2016 18:08:11 +0000 (14:08 -0400)]
updates planck macros to keycodes, prototype fn_actions

7 years agoSwap up and down on ab's layout to match default (#441)
Anand Babu (AB) Periasamy [Fri, 24 Jun 2016 17:43:12 +0000 (10:43 -0700)]
Swap up and down on ab's layout to match default (#441)

7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Christopher Browne [Fri, 24 Jun 2016 16:19:34 +0000 (12:19 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agoMerge pull request #440 from abperiasamy/ergo-ab-swap-up-down
Erez Zukerman [Fri, 24 Jun 2016 12:57:06 +0000 (08:57 -0400)]
Merge pull request #440 from abperiasamy/ergo-ab-swap-up-down

Swap up and down keys to match default layout

7 years agoMerge pull request #438 from tkuichooseyou/master
Erez Zukerman [Fri, 24 Jun 2016 12:56:01 +0000 (08:56 -0400)]
Merge pull request #438 from tkuichooseyou/master

Added tkuichooseyou keymap; for vim and macOS users

7 years agoSwap up and down to match default layout
Anand Babu (AB) Periasamy [Fri, 24 Jun 2016 03:14:52 +0000 (20:14 -0700)]
Swap up and down to match default layout

7 years agoupdates ez's matrix to spec
Jack Humbert [Fri, 24 Jun 2016 03:14:21 +0000 (23:14 -0400)]
updates ez's matrix to spec

7 years agoBacklight abstraction and other changes (#439)
Jack Humbert [Fri, 24 Jun 2016 02:18:20 +0000 (22:18 -0400)]
Backlight abstraction and other changes (#439)

* redoes matrix pins, abstracts backlight code for B5,6,7

* slimming down keyboard stuff, backlight breathing implemented

* don't call backlight init when no pin

* cleans up user/kb/quantum calls, keyboard files

* fix pvc atomic

* replaces CHANNEL with correct var in breathing

* removes .hexs, updates readmes, updates template

* cleans-up clueboards, readmes to lowercase

* updates readme

7 years agoAdd OS specific layers that can be switched with macros (#436)
Peter [Fri, 24 Jun 2016 00:06:13 +0000 (02:06 +0200)]
Add OS specific layers that can be switched with macros (#436)

7 years agoAdded tkuichooseyou keymap; for vim and OSX users
Teddy Ku [Thu, 23 Jun 2016 19:09:04 +0000 (15:09 -0400)]
Added tkuichooseyou keymap; for vim and OSX users

7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Christopher Browne [Thu, 23 Jun 2016 15:34:50 +0000 (11:34 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agoAB's practical planck keymap (#435)
Anand Babu (AB) Periasamy [Thu, 23 Jun 2016 03:36:30 +0000 (20:36 -0700)]
AB's practical planck keymap (#435)

7 years agoUpdates overall readme
Jack & Erez [Thu, 23 Jun 2016 03:24:47 +0000 (23:24 -0400)]
Updates overall readme

7 years agoAdds a Readme for the keyboards subdirectory
Jack & Erez [Thu, 23 Jun 2016 03:17:15 +0000 (23:17 -0400)]
Adds a Readme for the keyboards subdirectory

7 years agoUse Space Cadet parens on LSFT
Christopher Browne [Wed, 22 Jun 2016 20:51:25 +0000 (16:51 -0400)]
Use Space Cadet parens on LSFT

7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Christopher Browne [Wed, 22 Jun 2016 20:42:58 +0000 (16:42 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agowell that didn't work
Jack Humbert [Wed, 22 Jun 2016 18:33:59 +0000 (14:33 -0400)]
well that didn't work

7 years agoadds author block to readme
Jack Humbert [Wed, 22 Jun 2016 18:30:47 +0000 (14:30 -0400)]
adds author block to readme

7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Christopher Browne [Wed, 22 Jun 2016 15:26:26 +0000 (11:26 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agoMerge pull request #433 from algernon/ergodox-ez/algernon
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

7 years agoergodox_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>
7 years agoincrease leader seq size to 5
Jack Humbert [Wed, 22 Jun 2016 02:55:54 +0000 (22:55 -0400)]
increase leader seq size to 5

7 years agoRenames keyboard folder to keyboards, adds couple of tmk's fixes (#432)
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

7 years agoadds backlight levels to the satan keyboard (#431)
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

7 years agoadds fuse settings for atmega32u4, fixes keymap_extras includes
Jack Humbert [Tue, 21 Jun 2016 22:32:28 +0000 (18:32 -0400)]
adds fuse settings for atmega32u4, fixes keymap_extras includes

7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Christopher Browne [Tue, 21 Jun 2016 21:54:12 +0000 (17:54 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agoWarning reductions (#430)
Jack Humbert [Tue, 21 Jun 2016 21:42:29 +0000 (17:42 -0400)]
Warning reductions (#430)

Warning reductions

7 years agoChange base box to avoid breakage in Arch box (#429)
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).

7 years agoFix the make all-keyboards command (#422)
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.

7 years agoMore notes
Christopher Browne [Tue, 21 Jun 2016 16:55:24 +0000 (12:55 -0400)]
More notes

7 years agoreduces rgblight warnings, integrates completely (#428)
Jack Humbert [Tue, 21 Jun 2016 16:53:21 +0000 (12:53 -0400)]
reduces rgblight warnings, integrates completely (#428)

7 years agoImprove docs a bit
Christopher Browne [Tue, 21 Jun 2016 16:45:38 +0000 (12:45 -0400)]
Improve docs a bit

7 years agoAdd filler to make layering clearer;
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

7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Christopher Browne [Tue, 21 Jun 2016 16:30:17 +0000 (12:30 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agoupdates all config.h and Makefiles to correct references, text
Jack Humbert [Tue, 21 Jun 2016 14:21:43 +0000 (10:21 -0400)]
updates all config.h and Makefiles to correct references, text

7 years agoAdded stanleylai's personal keymap (#420)
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

7 years agoFresh hes for experimental layout
Jack & Erez [Tue, 21 Jun 2016 02:37:31 +0000 (22:37 -0400)]
Fresh hes for experimental layout

7 years ago[Jack & Erez] Fixes Space Cadet right shift
Jack & Erez [Tue, 21 Jun 2016 02:36:36 +0000 (22:36 -0400)]
[Jack & Erez] Fixes Space Cadet right shift

7 years agoAdapts experimental layout file format
Erez Zukerman [Tue, 21 Jun 2016 02:27:17 +0000 (22:27 -0400)]
Adapts experimental layout file format

7 years agoAdds compiled default firmware
Erez Zukerman [Tue, 21 Jun 2016 02:00:51 +0000 (22:00 -0400)]
Adds compiled default firmware

7 years ago[Jack & Erez] Adds dedicated Version key
Erez Zukerman [Tue, 21 Jun 2016 01:59:20 +0000 (21:59 -0400)]
[Jack & Erez] Adds dedicated Version key

7 years ago[Jack & Erez] Tweaks makefile for sanity
Erez Zukerman [Tue, 21 Jun 2016 01:58:58 +0000 (21:58 -0400)]
[Jack & Erez] Tweaks makefile for sanity

7 years agoRemoves .gitattributes
Erez Zukerman [Tue, 21 Jun 2016 01:47:04 +0000 (21:47 -0400)]
Removes .gitattributes

7 years ago[Erez & Jack] Updates build guide
Erez Zukerman [Tue, 21 Jun 2016 01:44:37 +0000 (21:44 -0400)]
[Erez & Jack] Updates build guide

7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Christopher Browne [Mon, 20 Jun 2016 16:20:52 +0000 (12:20 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agoendline normalisation, treat .hex as bin, updates kc60 hex files
Jack Humbert [Mon, 20 Jun 2016 03:41:10 +0000 (23:41 -0400)]
endline normalisation, treat .hex as bin, updates kc60 hex files

7 years agoAdded WS2812 support for KC60 (#419)
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

7 years agoAdd quick version of the all-* makefile targets (#417)
fredizzimo [Sat, 18 Jun 2016 22:09:21 +0000 (01:09 +0300)]
Add quick version of the all-* makefile targets (#417)

7 years agoCleans up quantum/keymap situation, removes extra lufa folders (#416)
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

7 years agoallow overriding of TARGET
Jack Humbert [Sat, 18 Jun 2016 02:50:41 +0000 (22:50 -0400)]
allow overriding of TARGET

7 years agoadds power_up to quantum's matrix file
Jack Humbert [Sat, 18 Jun 2016 02:09:59 +0000 (22:09 -0400)]
adds power_up to quantum's matrix file

7 years agoprevents ergodox_ez from waking up machine (#375)
Jack Humbert [Sat, 18 Jun 2016 02:06:58 +0000 (22:06 -0400)]
prevents ergodox_ez from waking up machine (#375)

7 years agoaddresses #369
Jack Humbert [Sat, 18 Jun 2016 01:42:59 +0000 (21:42 -0400)]
addresses #369

7 years agofix for parent folders with spaces (#403)
Jack Humbert [Sat, 18 Jun 2016 01:10:17 +0000 (21:10 -0400)]
fix for parent folders with spaces (#403)

7 years agoremoves extra dfu erase (#415)
Eric Tang [Sat, 18 Jun 2016 00:25:58 +0000 (17:25 -0700)]
removes extra dfu erase (#415)

7 years agoSample of using build info to generate keystrokes (#412)
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

7 years agoRevert removals of compiled files
Christopher Browne [Thu, 16 Jun 2016 20:51:19 +0000 (16:51 -0400)]
Revert removals of compiled files

7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Christopher Browne [Thu, 16 Jun 2016 20:43:27 +0000 (16:43 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agocorrectly test to see if awk exists
Jack Humbert [Thu, 16 Jun 2016 19:48:54 +0000 (15:48 -0400)]
correctly test to see if awk exists

7 years agomake awk optional (uses cat)
Jack Humbert [Thu, 16 Jun 2016 14:42:00 +0000 (10:42 -0400)]
make awk optional (uses cat)

7 years agoAdd rule to ignore contents of .build directories; their contents are generated
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

7 years agoRemove more generated files
Christopher Browne [Wed, 15 Jun 2016 22:42:05 +0000 (18:42 -0400)]
Remove more generated files

7 years agoFix spelling in comment
Christopher Browne [Wed, 15 Jun 2016 22:39:57 +0000 (18:39 -0400)]
Fix spelling in comment

7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Christopher Browne [Wed, 15 Jun 2016 22:38:30 +0000 (18:38 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agocompiled.hex files should not be included in the repo; they represent generated compi...
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

7 years agoShould not include the compiled code in the repo
Christopher Browne [Wed, 15 Jun 2016 22:34:47 +0000 (18:34 -0400)]
Should not include the compiled code in the repo

7 years agoEnsure there is a value even if not working within a git 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

7 years agoupdates experimental planck keymap, adds basic layout
Jack Humbert [Wed, 15 Jun 2016 19:43:40 +0000 (15:43 -0400)]
updates experimental planck keymap, adds basic layout

7 years agoSplit build date into a separate DEFINE
Christopher Browne [Wed, 15 Jun 2016 15:36:27 +0000 (11:36 -0400)]
Split build date into a separate DEFINE

7 years agoAdd docs
Christopher Browne [Wed, 15 Jun 2016 15:25:08 +0000 (11:25 -0400)]
Add docs

7 years agoAdd in a version key
Christopher Browne [Wed, 15 Jun 2016 15:19:51 +0000 (11:19 -0400)]
Add in a version key

7 years agoMerge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Christopher Browne [Wed, 15 Jun 2016 15:13:29 +0000 (11:13 -0400)]
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

7 years agoUpdate the ergodox-ez/algernon keymap (#409)
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>
7 years agoMakefile: Add QMK_VERSION & co to OPT_DEFS (#408)
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>
7 years agoAdd sgoodwin keymap for the KC60 (#410)
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.

7 years agoadds support for GH60 Satan keyboard (#407)
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

7 years agoRenaming planck/cbbrowne in keeping with recent naming conventions (#405)
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

7 years agoSimplify 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

7 years agoLocal change, not apropos to have in this repo
Christopher Browne [Mon, 13 Jun 2016 21:33:26 +0000 (17:33 -0400)]
Local change, not apropos to have in this repo