2016-05-15 06:27:32 +02:00
|
|
|
#include "quantum.h"
|
|
|
|
|
|
|
|
|
|
__attribute__ ((weak))
|
|
|
|
|
bool process_action_kb(keyrecord_t *record) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2016-05-28 21:22:30 +02:00
|
|
|
__attribute__ ((weak))
|
|
|
|
|
bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
|
|
|
|
|
return process_record_user(keycode, record);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
__attribute__ ((weak))
|
|
|
|
|
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2016-06-18 03:42:59 +02:00
|
|
|
// Shift / paren setup
|
|
|
|
|
|
|
|
|
|
#ifndef LSPO_KEY
|
|
|
|
|
#define LSPO_KEY KC_9
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef RSPC_KEY
|
|
|
|
|
#define RSPC_KEY KC_0
|
|
|
|
|
#endif
|
|
|
|
|
|
2016-05-25 05:48:46 +02:00
|
|
|
static bool shift_interrupted[2] = {0, 0};
|
2016-05-25 05:27:59 +02:00
|
|
|
|
2016-05-15 06:47:25 +02:00
|
|
|
bool process_record_quantum(keyrecord_t *record) {
|
2016-05-15 06:27:32 +02:00
|
|
|
|
|
|
|
|
/* This gets the keycode from the key pressed */
|
|
|
|
|
keypos_t key = record->event.key;
|
|
|
|
|
uint16_t keycode;
|
|
|
|
|
|
|
|
|
|
#if !defined(NO_ACTION_LAYER) && defined(PREVENT_STUCK_MODIFIERS)
|
|
|
|
|
uint8_t layer;
|
|
|
|
|
|
|
|
|
|
if (record->event.pressed) {
|
|
|
|
|
layer = layer_switch_get_layer(key);
|
|
|
|
|
update_source_layers_cache(key, layer);
|
|
|
|
|
} else {
|
|
|
|
|
layer = read_source_layers_cache(key);
|
|
|
|
|
}
|
|
|
|
|
keycode = keymap_key_to_keycode(layer, key);
|
|
|
|
|
#else
|
|
|
|
|
keycode = keymap_key_to_keycode(layer_switch_get_layer(key), key);
|
|
|
|
|
#endif
|
|
|
|
|
|
2016-05-15 06:47:25 +02:00
|
|
|
// This is how you use actions here
|
|
|
|
|
// if (keycode == KC_LEAD) {
|
|
|
|
|
// action_t action;
|
|
|
|
|
// action.code = ACTION_DEFAULT_LAYER_SET(0);
|
|
|
|
|
// process_action(record, action);
|
|
|
|
|
// return false;
|
|
|
|
|
// }
|
|
|
|
|
|
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
2016-06-29 23:49:41 +02:00
|
|
|
if (!(
|
|
|
|
|
process_record_kb(keycode, record) &&
|
2016-05-15 06:51:06 +02:00
|
|
|
#ifdef MIDI_ENABLE
|
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
2016-06-29 23:49:41 +02:00
|
|
|
process_midi(keycode, record) &&
|
2016-05-15 06:51:06 +02:00
|
|
|
#endif
|
2016-05-15 06:27:32 +02:00
|
|
|
#ifdef AUDIO_ENABLE
|
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
2016-06-29 23:49:41 +02:00
|
|
|
process_music(keycode, record) &&
|
2016-05-15 06:27:32 +02:00
|
|
|
#endif
|
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
2016-06-29 23:49:41 +02:00
|
|
|
#ifdef TAP_DANCE_ENABLE
|
|
|
|
|
process_tap_dance(keycode, record) &&
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef DISABLE_LEADER
|
|
|
|
|
process_leader(keycode, record) &&
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef DISABLE_CHORDING
|
|
|
|
|
process_chording(keycode, record) &&
|
|
|
|
|
#endif
|
|
|
|
|
#ifdef UNICODE_ENABLE
|
|
|
|
|
process_unicode(keycode, record) &&
|
|
|
|
|
#endif
|
|
|
|
|
true)) {
|
|
|
|
|
return false;
|
2016-05-19 05:47:16 +02:00
|
|
|
}
|
|
|
|
|
|
2016-06-18 03:42:59 +02:00
|
|
|
// Shift / paren setup
|
|
|
|
|
|
2016-05-25 05:27:59 +02:00
|
|
|
switch(keycode) {
|
2016-06-18 20:30:24 +02:00
|
|
|
case RESET:
|
|
|
|
|
if (record->event.pressed) {
|
|
|
|
|
clear_keyboard();
|
|
|
|
|
#ifdef AUDIO_ENABLE
|
|
|
|
|
stop_all_notes();
|
|
|
|
|
shutdown_user();
|
|
|
|
|
#endif
|
Add ChibiOS support for QMK (#465)
* Modularity and gcc warnings fixes.
* Add ChibiOS support (USB stack + support files).
* Make usb_main more USB_DRIVER #define independent.
* Move chibios to tool.
* Implement jump-to-bootloader.
* Small updates.
* Fix bootloader-jump compiling.
* Move AVR specific sleep_led.c into avr.
* Add basic sleep_led for chibios.
* Update chibios README.
* NKRO fixes.
* Rename some Makefile defines.
* Move STM32 bootloader address config to separate .h file.
* Add ARM Teensies bootloader code.
* Fix chibios/usb_main GET_REPORT handing.
* Add missing #include to keymap.c.
* Make bootmagic.c code portable (_delay_ms -> wait_ms).
* Move declaration of keymap_config.
Should really not declare variables in .h files - since it's included
in different .c files, a proper linker then complains that the same
variable is declared more than once (once for each .c file that the
offending .h is included in).
* Add eeprom support for chibios/kinetis.
* Rename chibios example keyboard.
* Move chibios/cortex selection to local Makefiles.
* Chibios: use WFI in idle. WIP suspend stuff.
* ChibiOS/kinetis: sending remote wakeup.
* ChibiOS/STM32: send remote wakeup.
* Fix report size of boot protocol.
* Fix drop key stroke
Keyboard report should be checked if its transfer finishs successfully.
Otherwise key stroke can be missing when other key event occurs
before the last report transfer is done.
Boot protocol 10ms interval probably causes this problem in case
it receives key events in a row within the period. NKRO protocol
suffers less or nothing due to its interval 1ms.
* Chibios/usb_main: rename a variable for clarity.
* Add correct chibios/bootloader_jump for infinity KB.
* ChibiOS: make reset request more CMSISy.
* Chibios: Add breathing sleep LED on Kinetis MCUs.
* ChibiOS: Update infinity bootloader code to match updated ChibiOS.
* ChibiOS: prettify/document sleep_led code.
* Chibios: Remove the wait in the main loop.
* Add maple mini code.
* Do timeout when writing to CONSOLE EP queue.
Fixes TMK bug #266.
* Chibios: add 'core/protocol' to the makefiles' search path.
* Chibios: Update to new USB API.
* Chibios: add more guards for transmitting (fix a deadlock bug).
* Add update for chibios in README
* Chibios: Fix a HardFault bug (wait after start).
* Chibios: cleanup usb_main code.
* Chibios: Revert common.mk change (fix AVR linking problem).
* core: Fix chibios user compile options
Compile options can be defined in project Makefile such as UDEFS, UADEFS, UINCDIR, ULIBDIR and ULIBS.
* Sysv format for ChibiOS arm-none-eabi-size
Some new patches to ChibiOS puts heap as it's own section. So the
berkeley format is now useless, as the heap will be included in the
BSS report. The sysv format displays the bss size correctly.
* Fix hard-coded path of CHIBIOS
* Add support for new version of ChibiOS and Contrib
The Kinetis support has moved to a separate Contrib repository in
the newest version of Chibios. There has also been some structure
changes. So this adds support for those, while maintaining back-
wards compability.
* Update ChibiOS instructions
* Chibios: implement sleep LED for STM32.
* Chibios: Update the main chibios README.
* Chibios: fix STM32_BOOTLOADER_ADDRESS name.
* Chibios: make the default bootloader_jump redefinable (weak).
* Chibios: disable LTO (link-time optimisation).
With LTO enabled, sometimes things fail for mysterious reasons
(e.g. bootloader jump on WF with LEDs enabled), just because the
linker optimisation is too aggressive.
* Chibios: add default location for chibios-contrib.
* ChibiOS: update mk to match chibios/master.
* ChibiOS: update instructions.md.
* Add chibi_onekey example.
* Add comments to chibi_onekey Makefile.
* Rename some Makefile defines.
* Move STM32 bootloader address config to separate .h file.
* Rename chibios example keyboard.
* Move chibios/cortex selection to local Makefiles.
* Add Teensy LC onekey example.
* Chibios: use WFI in idle. WIP suspend stuff.
* Update chibi/teensy instructions.
* Update chibios/Teensy instructions.
* Add infinity_chibios
* Add keymap_hasu.c
* Infinity_chibios: select correct bootloader_jump.
* Infinity_chibios: improve comments.
* Add generic STM32F103C8T6 example.
* Add maple mini code.
* STM32F103x fixes.
* Add maple mini pinout pic.
* Chibios: updates for 3.0.4 git.
* Chibios: rename example stm32_onekey -> stm32_f072_onekey.
* Chibios: add makefiles for Teensy 3.x examples.
* Chibios: update Teensy 3.x instructions.
* Chibios: Tsy LC is cortex-m0plus.
* Chibios: add more guards for transmitting (fix a deadlock bug).
* Change README for chibios
* Chibios: update examples to current chibios git.
Match the changes in mainline chibios:
- update chconf.h
- update supplied ld scripts structure
- update Teensy instructions (switch to official
chibios and introduce contrib)
* Add ChibiOS and ChibiOS-Contrib submodules
Also fix the makefile path for them.
* Moves chibios keyboards to keyboards folder
* First version of ChibiOS compilation
Only the stm32_f072_onkey keyboard is ported at the moment. It
compiles, but still doesn't link.
* More chibios fixes
It now compiles without warnings and links
* Move the teensy_lc_onekey to the keyboards folder
* Clean up the make file rule structure
* Remove keymap_fn_to_action
* Update more ChibiOS keyboards to QMK
Most of them does not compile at the moment though.
* Use older version of Chibios libraries
The newest ones have problems with compilation
* Remove USB_UNCONFIGURED event
It isn't present in the older version of ChibiOS
* Fix the infinity_chibios compilation
* Fix potentially uninitialized variable
* Add missing include
* Fix the ChibiOS makefile
* Fix some Chibios keyboard compilation
* Revert the rules.mk file back to master version
* Combine the chibios and AVR makefiles
With just the required overrides in the respective platform
specific one.
* Slight makefile restrucuring
Platform specific compiler options
* Move avr specific targets out of the main rules
* Fix ChibiOS objcopy
The ChibiOS objcopy needs different parameters, so the parameters
are moved to the corresponding platform rule file
* Fix the objcopy for real this time
The comands were moved around, so chibios used avr and the ohter
way around.
Also change the objsize output format
* Fix the thumb flags
* Fix the infinity hasu keymap
* Per platform cpp flags
* Add gcc-arm-none-eabi package to travis
* Add arm-none-eabi-newlib to travis
* Fix the name of the libnewlib-arm-none-eabi lib
* Fix the ChibiOS paths
So that they are properly relative, and builds don't generate
extra folders
* Fix the board path of stm32_f103_onekey
* Only consider folders with Makefiles as subproject
2016-07-01 16:04:53 +02:00
|
|
|
wait_ms(250);
|
2016-07-07 04:48:19 +02:00
|
|
|
#ifdef CATERINA_BOOTLOADER
|
2016-06-18 20:30:24 +02:00
|
|
|
*(uint16_t *)0x0800 = 0x7777; // these two are a-star-specific
|
|
|
|
|
#endif
|
|
|
|
|
bootloader_jump();
|
|
|
|
|
}
|
2016-07-08 09:32:28 +02:00
|
|
|
return false;
|
2016-06-18 20:30:24 +02:00
|
|
|
break;
|
|
|
|
|
case DEBUG:
|
|
|
|
|
if (record->event.pressed) {
|
|
|
|
|
print("\nDEBUG: enabled.\n");
|
|
|
|
|
debug_enable = true;
|
|
|
|
|
}
|
2016-07-08 09:32:28 +02:00
|
|
|
return false;
|
2016-06-18 20:30:24 +02:00
|
|
|
break;
|
2016-07-08 05:34:33 +02:00
|
|
|
#ifdef RGBLIGHT_ENABLE
|
|
|
|
|
case RGB_TOG:
|
|
|
|
|
if (record->event.pressed) {
|
|
|
|
|
rgblight_toggle();
|
2016-07-08 09:32:28 +02:00
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
break;
|
2016-07-08 05:34:33 +02:00
|
|
|
case RGB_MOD:
|
|
|
|
|
if (record->event.pressed) {
|
|
|
|
|
rgblight_step();
|
2016-07-08 09:32:28 +02:00
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
break;
|
2016-07-08 05:34:33 +02:00
|
|
|
case RGB_HUI:
|
|
|
|
|
if (record->event.pressed) {
|
|
|
|
|
rgblight_increase_hue();
|
2016-07-08 09:32:28 +02:00
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
break;
|
2016-07-08 05:34:33 +02:00
|
|
|
case RGB_HUD:
|
|
|
|
|
if (record->event.pressed) {
|
|
|
|
|
rgblight_decrease_hue();
|
2016-07-08 09:32:28 +02:00
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
break;
|
2016-07-08 05:34:33 +02:00
|
|
|
case RGB_SAI:
|
|
|
|
|
if (record->event.pressed) {
|
|
|
|
|
rgblight_increase_sat();
|
2016-07-08 09:32:28 +02:00
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
break;
|
2016-07-08 05:34:33 +02:00
|
|
|
case RGB_SAD:
|
|
|
|
|
if (record->event.pressed) {
|
|
|
|
|
rgblight_decrease_sat();
|
2016-07-08 09:32:28 +02:00
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
break;
|
2016-07-08 05:34:33 +02:00
|
|
|
case RGB_VAI:
|
|
|
|
|
if (record->event.pressed) {
|
|
|
|
|
rgblight_increase_val();
|
2016-07-08 09:32:28 +02:00
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
break;
|
2016-07-08 05:34:33 +02:00
|
|
|
case RGB_VAD:
|
|
|
|
|
if (record->event.pressed) {
|
|
|
|
|
rgblight_decrease_val();
|
2016-07-08 09:32:28 +02:00
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
break;
|
2016-07-08 05:34:33 +02:00
|
|
|
#endif
|
2016-06-18 20:30:24 +02:00
|
|
|
case MAGIC_SWAP_CONTROL_CAPSLOCK ... MAGIC_UNSWAP_ALT_GUI:
|
|
|
|
|
if (record->event.pressed) {
|
|
|
|
|
// MAGIC actions (BOOTMAGIC without the boot)
|
|
|
|
|
if (!eeconfig_is_enabled()) {
|
|
|
|
|
eeconfig_init();
|
|
|
|
|
}
|
|
|
|
|
/* keymap config */
|
|
|
|
|
keymap_config.raw = eeconfig_read_keymap();
|
|
|
|
|
if (keycode == MAGIC_SWAP_CONTROL_CAPSLOCK) {
|
|
|
|
|
keymap_config.swap_control_capslock = 1;
|
|
|
|
|
} else if (keycode == MAGIC_CAPSLOCK_TO_CONTROL) {
|
|
|
|
|
keymap_config.capslock_to_control = 1;
|
|
|
|
|
} else if (keycode == MAGIC_SWAP_LALT_LGUI) {
|
|
|
|
|
keymap_config.swap_lalt_lgui = 1;
|
|
|
|
|
} else if (keycode == MAGIC_SWAP_RALT_RGUI) {
|
|
|
|
|
keymap_config.swap_ralt_rgui = 1;
|
|
|
|
|
} else if (keycode == MAGIC_NO_GUI) {
|
|
|
|
|
keymap_config.no_gui = 1;
|
|
|
|
|
} else if (keycode == MAGIC_SWAP_GRAVE_ESC) {
|
|
|
|
|
keymap_config.swap_grave_esc = 1;
|
|
|
|
|
} else if (keycode == MAGIC_SWAP_BACKSLASH_BACKSPACE) {
|
|
|
|
|
keymap_config.swap_backslash_backspace = 1;
|
|
|
|
|
} else if (keycode == MAGIC_HOST_NKRO) {
|
|
|
|
|
keymap_config.nkro = 1;
|
|
|
|
|
} else if (keycode == MAGIC_SWAP_ALT_GUI) {
|
|
|
|
|
keymap_config.swap_lalt_lgui = 1;
|
|
|
|
|
keymap_config.swap_ralt_rgui = 1;
|
|
|
|
|
}
|
|
|
|
|
/* UNs */
|
|
|
|
|
else if (keycode == MAGIC_UNSWAP_CONTROL_CAPSLOCK) {
|
|
|
|
|
keymap_config.swap_control_capslock = 0;
|
|
|
|
|
} else if (keycode == MAGIC_UNCAPSLOCK_TO_CONTROL) {
|
|
|
|
|
keymap_config.capslock_to_control = 0;
|
|
|
|
|
} else if (keycode == MAGIC_UNSWAP_LALT_LGUI) {
|
|
|
|
|
keymap_config.swap_lalt_lgui = 0;
|
|
|
|
|
} else if (keycode == MAGIC_UNSWAP_RALT_RGUI) {
|
|
|
|
|
keymap_config.swap_ralt_rgui = 0;
|
|
|
|
|
} else if (keycode == MAGIC_UNNO_GUI) {
|
|
|
|
|
keymap_config.no_gui = 0;
|
|
|
|
|
} else if (keycode == MAGIC_UNSWAP_GRAVE_ESC) {
|
|
|
|
|
keymap_config.swap_grave_esc = 0;
|
|
|
|
|
} else if (keycode == MAGIC_UNSWAP_BACKSLASH_BACKSPACE) {
|
|
|
|
|
keymap_config.swap_backslash_backspace = 0;
|
|
|
|
|
} else if (keycode == MAGIC_UNHOST_NKRO) {
|
|
|
|
|
keymap_config.nkro = 0;
|
|
|
|
|
} else if (keycode == MAGIC_UNSWAP_ALT_GUI) {
|
|
|
|
|
keymap_config.swap_lalt_lgui = 0;
|
|
|
|
|
keymap_config.swap_ralt_rgui = 0;
|
|
|
|
|
}
|
|
|
|
|
eeconfig_update_keymap(keymap_config.raw);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
break;
|
2016-05-25 05:27:59 +02:00
|
|
|
case KC_LSPO: {
|
2016-06-18 20:30:24 +02:00
|
|
|
if (record->event.pressed) {
|
|
|
|
|
shift_interrupted[0] = false;
|
2016-06-21 04:36:36 +02:00
|
|
|
register_mods(MOD_BIT(KC_LSFT));
|
2016-06-18 20:30:24 +02:00
|
|
|
}
|
|
|
|
|
else {
|
2016-07-11 04:04:01 +02:00
|
|
|
#ifdef DISABLE_SPACE_CADET_ROLLOVER
|
|
|
|
|
if (get_mods() & MOD_BIT(KC_RSFT)) {
|
|
|
|
|
shift_interrupted[0] = true;
|
|
|
|
|
shift_interrupted[1] = true;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2016-06-18 20:30:24 +02:00
|
|
|
if (!shift_interrupted[0]) {
|
|
|
|
|
register_code(LSPO_KEY);
|
|
|
|
|
unregister_code(LSPO_KEY);
|
|
|
|
|
}
|
2016-06-21 04:36:36 +02:00
|
|
|
unregister_mods(MOD_BIT(KC_LSFT));
|
2016-06-18 20:30:24 +02:00
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2016-05-25 05:27:59 +02:00
|
|
|
|
|
|
|
|
case KC_RSPC: {
|
2016-06-18 20:30:24 +02:00
|
|
|
if (record->event.pressed) {
|
|
|
|
|
shift_interrupted[1] = false;
|
2016-06-21 04:36:36 +02:00
|
|
|
register_mods(MOD_BIT(KC_RSFT));
|
2016-06-18 20:30:24 +02:00
|
|
|
}
|
|
|
|
|
else {
|
2016-07-11 04:04:01 +02:00
|
|
|
#ifdef DISABLE_SPACE_CADET_ROLLOVER
|
|
|
|
|
if (get_mods() & MOD_BIT(KC_LSFT)) {
|
|
|
|
|
shift_interrupted[0] = true;
|
|
|
|
|
shift_interrupted[1] = true;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2016-06-18 20:30:24 +02:00
|
|
|
if (!shift_interrupted[1]) {
|
|
|
|
|
register_code(RSPC_KEY);
|
|
|
|
|
unregister_code(RSPC_KEY);
|
|
|
|
|
}
|
2016-06-21 04:36:36 +02:00
|
|
|
unregister_mods(MOD_BIT(KC_RSFT));
|
2016-06-18 20:30:24 +02:00
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2016-05-25 05:27:59 +02:00
|
|
|
default: {
|
2016-06-18 20:30:24 +02:00
|
|
|
shift_interrupted[0] = true;
|
|
|
|
|
shift_interrupted[1] = true;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2016-05-25 05:27:59 +02:00
|
|
|
}
|
|
|
|
|
|
2016-05-15 06:27:32 +02:00
|
|
|
return process_action_kb(record);
|
|
|
|
|
}
|
|
|
|
|
|
2016-06-03 21:48:40 +02:00
|
|
|
const bool ascii_to_qwerty_shift_lut[0x80] PROGMEM = {
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 1, 1, 1, 1, 1, 1, 0,
|
|
|
|
|
1, 1, 1, 1, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 1, 0, 1, 0, 1, 1,
|
|
|
|
|
1, 1, 1, 1, 1, 1, 1, 1,
|
|
|
|
|
1, 1, 1, 1, 1, 1, 1, 1,
|
|
|
|
|
1, 1, 1, 1, 1, 1, 1, 1,
|
|
|
|
|
1, 1, 1, 0, 0, 0, 1, 1,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 1, 1, 1, 1, 0
|
2016-06-02 04:49:55 +02:00
|
|
|
};
|
|
|
|
|
|
2016-06-03 21:48:40 +02:00
|
|
|
const uint8_t ascii_to_qwerty_keycode_lut[0x80] PROGMEM = {
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
KC_BSPC, KC_TAB, KC_ENT, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, KC_ESC, 0, 0, 0, 0,
|
|
|
|
|
KC_SPC, KC_1, KC_QUOT, KC_3, KC_4, KC_5, KC_7, KC_QUOT,
|
|
|
|
|
KC_9, KC_0, KC_8, KC_EQL, KC_COMM, KC_MINS, KC_DOT, KC_SLSH,
|
|
|
|
|
KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7,
|
|
|
|
|
KC_8, KC_9, KC_SCLN, KC_SCLN, KC_COMM, KC_EQL, KC_DOT, KC_SLSH,
|
|
|
|
|
KC_2, KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G,
|
|
|
|
|
KC_H, KC_I, KC_J, KC_K, KC_L, KC_M, KC_N, KC_O,
|
|
|
|
|
KC_P, KC_Q, KC_R, KC_S, KC_T, KC_U, KC_V, KC_W,
|
|
|
|
|
KC_X, KC_Y, KC_Z, KC_LBRC, KC_BSLS, KC_RBRC, KC_6, KC_MINS,
|
|
|
|
|
KC_GRV, KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G,
|
|
|
|
|
KC_H, KC_I, KC_J, KC_K, KC_L, KC_M, KC_N, KC_O,
|
|
|
|
|
KC_P, KC_Q, KC_R, KC_S, KC_T, KC_U, KC_V, KC_W,
|
|
|
|
|
KC_X, KC_Y, KC_Z, KC_LBRC, KC_BSLS, KC_RBRC, KC_GRV, KC_DEL
|
2016-06-02 04:49:55 +02:00
|
|
|
};
|
|
|
|
|
|
2016-06-03 21:48:40 +02:00
|
|
|
/* for users whose OSes are set to Colemak */
|
|
|
|
|
#if 0
|
|
|
|
|
#include "keymap_colemak.h"
|
|
|
|
|
|
|
|
|
|
const bool ascii_to_colemak_shift_lut[0x80] PROGMEM = {
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 1, 1, 1, 1, 1, 1, 0,
|
|
|
|
|
1, 1, 1, 1, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 1, 0, 1, 0, 1, 1,
|
|
|
|
|
1, 1, 1, 1, 1, 1, 1, 1,
|
|
|
|
|
1, 1, 1, 1, 1, 1, 1, 1,
|
|
|
|
|
1, 1, 1, 1, 1, 1, 1, 1,
|
|
|
|
|
1, 1, 1, 0, 0, 0, 1, 1,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 1, 1, 1, 1, 0
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const uint8_t ascii_to_colemak_keycode_lut[0x80] PROGMEM = {
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
KC_BSPC, KC_TAB, KC_ENT, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, KC_ESC, 0, 0, 0, 0,
|
|
|
|
|
KC_SPC, KC_1, KC_QUOT, KC_3, KC_4, KC_5, KC_7, KC_QUOT,
|
|
|
|
|
KC_9, KC_0, KC_8, KC_EQL, KC_COMM, KC_MINS, KC_DOT, KC_SLSH,
|
|
|
|
|
KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7,
|
|
|
|
|
KC_8, KC_9, CM_SCLN, CM_SCLN, KC_COMM, KC_EQL, KC_DOT, KC_SLSH,
|
|
|
|
|
KC_2, CM_A, CM_B, CM_C, CM_D, CM_E, CM_F, CM_G,
|
|
|
|
|
CM_H, CM_I, CM_J, CM_K, CM_L, CM_M, CM_N, CM_O,
|
|
|
|
|
CM_P, CM_Q, CM_R, CM_S, CM_T, CM_U, CM_V, CM_W,
|
|
|
|
|
CM_X, CM_Y, CM_Z, KC_LBRC, KC_BSLS, KC_RBRC, KC_6, KC_MINS,
|
|
|
|
|
KC_GRV, CM_A, CM_B, CM_C, CM_D, CM_E, CM_F, CM_G,
|
|
|
|
|
CM_H, CM_I, CM_J, CM_K, CM_L, CM_M, CM_N, CM_O,
|
|
|
|
|
CM_P, CM_Q, CM_R, CM_S, CM_T, CM_U, CM_V, CM_W,
|
|
|
|
|
CM_X, CM_Y, CM_Z, KC_LBRC, KC_BSLS, KC_RBRC, KC_GRV, KC_DEL
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
void send_string(const char *str) {
|
|
|
|
|
while (1) {
|
|
|
|
|
uint8_t keycode;
|
|
|
|
|
uint8_t ascii_code = pgm_read_byte(str);
|
|
|
|
|
if (!ascii_code) break;
|
|
|
|
|
keycode = pgm_read_byte(&ascii_to_qwerty_keycode_lut[ascii_code]);
|
|
|
|
|
if (pgm_read_byte(&ascii_to_qwerty_shift_lut[ascii_code])) {
|
|
|
|
|
register_code(KC_LSFT);
|
|
|
|
|
register_code(keycode);
|
|
|
|
|
unregister_code(keycode);
|
|
|
|
|
unregister_code(KC_LSFT);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
register_code(keycode);
|
|
|
|
|
unregister_code(keycode);
|
|
|
|
|
}
|
|
|
|
|
++str;
|
2016-06-02 04:49:55 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-06-18 20:30:24 +02:00
|
|
|
void update_tri_layer(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
|
|
|
|
|
if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
|
|
|
|
|
layer_on(layer3);
|
|
|
|
|
} else {
|
|
|
|
|
layer_off(layer3);
|
|
|
|
|
}
|
|
|
|
|
}
|
2016-06-02 04:49:55 +02:00
|
|
|
|
2016-06-30 00:29:20 +02:00
|
|
|
void tap_random_base64(void) {
|
2016-06-30 00:35:29 +02:00
|
|
|
#if defined(__AVR_ATmega32U4__)
|
|
|
|
|
uint8_t key = (TCNT0 + TCNT1 + TCNT3 + TCNT4) % 64;
|
|
|
|
|
#else
|
|
|
|
|
uint8_t key = rand() % 64;
|
|
|
|
|
#endif
|
2016-06-30 00:29:20 +02:00
|
|
|
switch (key) {
|
|
|
|
|
case 0 ... 25:
|
|
|
|
|
register_code(KC_LSFT);
|
|
|
|
|
register_code(key + KC_A);
|
|
|
|
|
unregister_code(key + KC_A);
|
|
|
|
|
unregister_code(KC_LSFT);
|
|
|
|
|
break;
|
|
|
|
|
case 26 ... 51:
|
|
|
|
|
register_code(key - 26 + KC_A);
|
|
|
|
|
unregister_code(key - 26 + KC_A);
|
|
|
|
|
break;
|
|
|
|
|
case 52:
|
|
|
|
|
register_code(KC_0);
|
|
|
|
|
unregister_code(KC_0);
|
|
|
|
|
break;
|
|
|
|
|
case 53 ... 61:
|
|
|
|
|
register_code(key - 53 + KC_1);
|
|
|
|
|
unregister_code(key - 53 + KC_1);
|
|
|
|
|
break;
|
|
|
|
|
case 62:
|
|
|
|
|
register_code(KC_LSFT);
|
|
|
|
|
register_code(KC_EQL);
|
|
|
|
|
unregister_code(KC_EQL);
|
|
|
|
|
unregister_code(KC_LSFT);
|
|
|
|
|
break;
|
|
|
|
|
case 63:
|
|
|
|
|
register_code(KC_SLSH);
|
|
|
|
|
unregister_code(KC_SLSH);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-05-15 06:27:32 +02:00
|
|
|
void matrix_init_quantum() {
|
2016-06-24 04:18:20 +02:00
|
|
|
#ifdef BACKLIGHT_ENABLE
|
|
|
|
|
backlight_init_ports();
|
|
|
|
|
#endif
|
2016-05-15 06:27:32 +02:00
|
|
|
matrix_init_kb();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void matrix_scan_quantum() {
|
2016-05-15 06:40:59 +02:00
|
|
|
#ifdef AUDIO_ENABLE
|
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
2016-06-29 23:49:41 +02:00
|
|
|
matrix_scan_music();
|
2016-05-15 06:40:59 +02:00
|
|
|
#endif
|
2016-05-15 06:51:06 +02:00
|
|
|
|
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
2016-06-29 23:49:41 +02:00
|
|
|
#ifdef TAP_DANCE_ENABLE
|
|
|
|
|
matrix_scan_tap_dance();
|
|
|
|
|
#endif
|
2016-05-15 06:27:32 +02:00
|
|
|
matrix_scan_kb();
|
2016-05-19 05:14:00 +02:00
|
|
|
}
|
2016-06-24 04:18:20 +02:00
|
|
|
|
|
|
|
|
#if defined(BACKLIGHT_ENABLE) && defined(BACKLIGHT_PIN)
|
|
|
|
|
|
|
|
|
|
static const uint8_t backlight_pin = BACKLIGHT_PIN;
|
|
|
|
|
|
|
|
|
|
#if BACKLIGHT_PIN == B7
|
|
|
|
|
# define COM1x1 COM1C1
|
|
|
|
|
# define OCR1x OCR1C
|
|
|
|
|
#elif BACKLIGHT_PIN == B6
|
|
|
|
|
# define COM1x1 COM1B1
|
|
|
|
|
# define OCR1x OCR1B
|
|
|
|
|
#elif BACKLIGHT_PIN == B5
|
|
|
|
|
# define COM1x1 COM1A1
|
|
|
|
|
# define OCR1x OCR1A
|
|
|
|
|
#else
|
|
|
|
|
# error "Backlight pin not supported - use B5, B6, or B7"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
__attribute__ ((weak))
|
|
|
|
|
void backlight_init_ports(void)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
// Setup backlight pin as output and output low.
|
|
|
|
|
// DDRx |= n
|
|
|
|
|
_SFR_IO8((backlight_pin >> 4) + 1) |= _BV(backlight_pin & 0xF);
|
|
|
|
|
// PORTx &= ~n
|
|
|
|
|
_SFR_IO8((backlight_pin >> 4) + 2) &= ~_BV(backlight_pin & 0xF);
|
|
|
|
|
|
|
|
|
|
// Use full 16-bit resolution.
|
|
|
|
|
ICR1 = 0xFFFF;
|
|
|
|
|
|
|
|
|
|
// I could write a wall of text here to explain... but TL;DW
|
|
|
|
|
// Go read the ATmega32u4 datasheet.
|
|
|
|
|
// And this: http://blog.saikoled.com/post/43165849837/secret-konami-cheat-code-to-high-resolution-pwm-on
|
|
|
|
|
|
|
|
|
|
// Pin PB7 = OCR1C (Timer 1, Channel C)
|
|
|
|
|
// Compare Output Mode = Clear on compare match, Channel C = COM1C1=1 COM1C0=0
|
|
|
|
|
// (i.e. start high, go low when counter matches.)
|
|
|
|
|
// WGM Mode 14 (Fast PWM) = WGM13=1 WGM12=1 WGM11=1 WGM10=0
|
|
|
|
|
// Clock Select = clk/1 (no prescaling) = CS12=0 CS11=0 CS10=1
|
|
|
|
|
|
|
|
|
|
TCCR1A = _BV(COM1x1) | _BV(WGM11); // = 0b00001010;
|
|
|
|
|
TCCR1B = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001;
|
|
|
|
|
|
|
|
|
|
backlight_init();
|
|
|
|
|
#ifdef BACKLIGHT_BREATHING
|
|
|
|
|
breathing_defaults();
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
__attribute__ ((weak))
|
|
|
|
|
void backlight_set(uint8_t level)
|
|
|
|
|
{
|
|
|
|
|
// Prevent backlight blink on lowest level
|
|
|
|
|
// PORTx &= ~n
|
|
|
|
|
_SFR_IO8((backlight_pin >> 4) + 2) &= ~_BV(backlight_pin & 0xF);
|
|
|
|
|
|
|
|
|
|
if ( level == 0 ) {
|
|
|
|
|
// Turn off PWM control on backlight pin, revert to output low.
|
|
|
|
|
TCCR1A &= ~(_BV(COM1x1));
|
|
|
|
|
OCR1x = 0x0;
|
|
|
|
|
} else if ( level == BACKLIGHT_LEVELS ) {
|
|
|
|
|
// Turn on PWM control of backlight pin
|
|
|
|
|
TCCR1A |= _BV(COM1x1);
|
|
|
|
|
// Set the brightness
|
|
|
|
|
OCR1x = 0xFFFF;
|
|
|
|
|
} else {
|
|
|
|
|
// Turn on PWM control of backlight pin
|
|
|
|
|
TCCR1A |= _BV(COM1x1);
|
|
|
|
|
// Set the brightness
|
|
|
|
|
OCR1x = 0xFFFF >> ((BACKLIGHT_LEVELS - level) * ((BACKLIGHT_LEVELS + 1) / 2));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef BACKLIGHT_BREATHING
|
|
|
|
|
breathing_intensity_default();
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef BACKLIGHT_BREATHING
|
|
|
|
|
|
|
|
|
|
#define BREATHING_NO_HALT 0
|
|
|
|
|
#define BREATHING_HALT_OFF 1
|
|
|
|
|
#define BREATHING_HALT_ON 2
|
|
|
|
|
|
|
|
|
|
static uint8_t breath_intensity;
|
|
|
|
|
static uint8_t breath_speed;
|
|
|
|
|
static uint16_t breathing_index;
|
|
|
|
|
static uint8_t breathing_halt;
|
|
|
|
|
|
|
|
|
|
void breathing_enable(void)
|
|
|
|
|
{
|
|
|
|
|
if (get_backlight_level() == 0)
|
|
|
|
|
{
|
|
|
|
|
breathing_index = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
// Set breathing_index to be at the midpoint (brightest point)
|
|
|
|
|
breathing_index = 0x20 << breath_speed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
breathing_halt = BREATHING_NO_HALT;
|
|
|
|
|
|
|
|
|
|
// Enable breathing interrupt
|
|
|
|
|
TIMSK1 |= _BV(OCIE1A);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void breathing_pulse(void)
|
|
|
|
|
{
|
|
|
|
|
if (get_backlight_level() == 0)
|
|
|
|
|
{
|
|
|
|
|
breathing_index = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
// Set breathing_index to be at the midpoint + 1 (brightest point)
|
|
|
|
|
breathing_index = 0x21 << breath_speed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
breathing_halt = BREATHING_HALT_ON;
|
|
|
|
|
|
|
|
|
|
// Enable breathing interrupt
|
|
|
|
|
TIMSK1 |= _BV(OCIE1A);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void breathing_disable(void)
|
|
|
|
|
{
|
|
|
|
|
// Disable breathing interrupt
|
|
|
|
|
TIMSK1 &= ~_BV(OCIE1A);
|
|
|
|
|
backlight_set(get_backlight_level());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void breathing_self_disable(void)
|
|
|
|
|
{
|
|
|
|
|
if (get_backlight_level() == 0)
|
|
|
|
|
{
|
|
|
|
|
breathing_halt = BREATHING_HALT_OFF;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
breathing_halt = BREATHING_HALT_ON;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//backlight_set(get_backlight_level());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void breathing_toggle(void)
|
|
|
|
|
{
|
|
|
|
|
if (!is_breathing())
|
|
|
|
|
{
|
|
|
|
|
if (get_backlight_level() == 0)
|
|
|
|
|
{
|
|
|
|
|
breathing_index = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
// Set breathing_index to be at the midpoint + 1 (brightest point)
|
|
|
|
|
breathing_index = 0x21 << breath_speed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
breathing_halt = BREATHING_NO_HALT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Toggle breathing interrupt
|
|
|
|
|
TIMSK1 ^= _BV(OCIE1A);
|
|
|
|
|
|
|
|
|
|
// Restore backlight level
|
|
|
|
|
if (!is_breathing())
|
|
|
|
|
{
|
|
|
|
|
backlight_set(get_backlight_level());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool is_breathing(void)
|
|
|
|
|
{
|
|
|
|
|
return (TIMSK1 && _BV(OCIE1A));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void breathing_intensity_default(void)
|
|
|
|
|
{
|
|
|
|
|
//breath_intensity = (uint8_t)((uint16_t)100 * (uint16_t)get_backlight_level() / (uint16_t)BACKLIGHT_LEVELS);
|
|
|
|
|
breath_intensity = ((BACKLIGHT_LEVELS - get_backlight_level()) * ((BACKLIGHT_LEVELS + 1) / 2));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void breathing_intensity_set(uint8_t value)
|
|
|
|
|
{
|
|
|
|
|
breath_intensity = value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void breathing_speed_default(void)
|
|
|
|
|
{
|
|
|
|
|
breath_speed = 4;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void breathing_speed_set(uint8_t value)
|
|
|
|
|
{
|
|
|
|
|
bool is_breathing_now = is_breathing();
|
|
|
|
|
uint8_t old_breath_speed = breath_speed;
|
|
|
|
|
|
|
|
|
|
if (is_breathing_now)
|
|
|
|
|
{
|
|
|
|
|
// Disable breathing interrupt
|
|
|
|
|
TIMSK1 &= ~_BV(OCIE1A);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
breath_speed = value;
|
|
|
|
|
|
|
|
|
|
if (is_breathing_now)
|
|
|
|
|
{
|
|
|
|
|
// Adjust index to account for new speed
|
|
|
|
|
breathing_index = (( (uint8_t)( (breathing_index) >> old_breath_speed ) ) & 0x3F) << breath_speed;
|
|
|
|
|
|
|
|
|
|
// Enable breathing interrupt
|
|
|
|
|
TIMSK1 |= _BV(OCIE1A);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void breathing_speed_inc(uint8_t value)
|
|
|
|
|
{
|
|
|
|
|
if ((uint16_t)(breath_speed - value) > 10 )
|
|
|
|
|
{
|
|
|
|
|
breathing_speed_set(0);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
breathing_speed_set(breath_speed - value);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void breathing_speed_dec(uint8_t value)
|
|
|
|
|
{
|
|
|
|
|
if ((uint16_t)(breath_speed + value) > 10 )
|
|
|
|
|
{
|
|
|
|
|
breathing_speed_set(10);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
breathing_speed_set(breath_speed + value);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void breathing_defaults(void)
|
|
|
|
|
{
|
|
|
|
|
breathing_intensity_default();
|
|
|
|
|
breathing_speed_default();
|
|
|
|
|
breathing_halt = BREATHING_NO_HALT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Breathing Sleep LED brighness(PWM On period) table
|
|
|
|
|
* (64[steps] * 4[duration]) / 64[PWM periods/s] = 4 second breath cycle
|
|
|
|
|
*
|
|
|
|
|
* http://www.wolframalpha.com/input/?i=%28sin%28+x%2F64*pi%29**8+*+255%2C+x%3D0+to+63
|
|
|
|
|
* (0..63).each {|x| p ((sin(x/64.0*PI)**8)*255).to_i }
|
|
|
|
|
*/
|
|
|
|
|
static const uint8_t breathing_table[64] PROGMEM = {
|
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 4, 6, 10,
|
|
|
|
|
15, 23, 32, 44, 58, 74, 93, 113, 135, 157, 179, 199, 218, 233, 245, 252,
|
|
|
|
|
255, 252, 245, 233, 218, 199, 179, 157, 135, 113, 93, 74, 58, 44, 32, 23,
|
|
|
|
|
15, 10, 6, 4, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
ISR(TIMER1_COMPA_vect)
|
|
|
|
|
{
|
|
|
|
|
// OCR1x = (pgm_read_byte(&breathing_table[ ( (uint8_t)( (breathing_index++) >> breath_speed ) ) & 0x3F ] )) * breath_intensity;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
uint8_t local_index = ( (uint8_t)( (breathing_index++) >> breath_speed ) ) & 0x3F;
|
|
|
|
|
|
|
|
|
|
if (((breathing_halt == BREATHING_HALT_ON) && (local_index == 0x20)) || ((breathing_halt == BREATHING_HALT_OFF) && (local_index == 0x3F)))
|
|
|
|
|
{
|
|
|
|
|
// Disable breathing interrupt
|
|
|
|
|
TIMSK1 &= ~_BV(OCIE1A);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
OCR1x = (uint16_t)(((uint16_t)pgm_read_byte(&breathing_table[local_index]) * 257)) >> breath_intensity;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#endif // breathing
|
|
|
|
|
|
|
|
|
|
#else // backlight
|
|
|
|
|
|
|
|
|
|
__attribute__ ((weak))
|
|
|
|
|
void backlight_init_ports(void)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
__attribute__ ((weak))
|
|
|
|
|
void backlight_set(uint8_t level)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif // backlight
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
__attribute__ ((weak))
|
|
|
|
|
void led_set_user(uint8_t usb_led) {
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
__attribute__ ((weak))
|
|
|
|
|
void led_set_kb(uint8_t usb_led) {
|
|
|
|
|
led_set_user(usb_led);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
__attribute__ ((weak))
|
|
|
|
|
void led_init_ports(void)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
__attribute__ ((weak))
|
|
|
|
|
void led_set(uint8_t usb_led)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
// Example LED Code
|
|
|
|
|
//
|
|
|
|
|
// // Using PE6 Caps Lock LED
|
|
|
|
|
// if (usb_led & (1<<USB_LED_CAPS_LOCK))
|
|
|
|
|
// {
|
|
|
|
|
// // Output high.
|
|
|
|
|
// DDRE |= (1<<6);
|
|
|
|
|
// PORTE |= (1<<6);
|
|
|
|
|
// }
|
|
|
|
|
// else
|
|
|
|
|
// {
|
|
|
|
|
// // Output low.
|
|
|
|
|
// DDRE &= ~(1<<6);
|
|
|
|
|
// PORTE &= ~(1<<6);
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
led_set_kb(usb_led);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2016-05-24 17:56:53 +02:00
|
|
|
//------------------------------------------------------------------------------
|
2016-06-03 21:48:40 +02:00
|
|
|
// Override these functions in your keymap file to play different tunes on
|
2016-05-24 17:56:53 +02:00
|
|
|
// different events such as startup and bootloader jump
|
|
|
|
|
|
|
|
|
|
__attribute__ ((weak))
|
|
|
|
|
void startup_user() {}
|
|
|
|
|
|
|
|
|
|
__attribute__ ((weak))
|
|
|
|
|
void shutdown_user() {}
|
|
|
|
|
|
2016-05-25 05:27:59 +02:00
|
|
|
//------------------------------------------------------------------------------
|
