65faab3b89
* 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
216 lines
5.5 KiB
C
216 lines
5.5 KiB
C
/*
|
|
Copyright 2011 Jun Wako <wakojun@gmail.com>
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
/*
|
|
* scan matrix
|
|
*/
|
|
#include <stdint.h>
|
|
#include <stdbool.h>
|
|
#include <util/delay.h>
|
|
#include "print.h"
|
|
#include "debug.h"
|
|
#include "util.h"
|
|
#include "timer.h"
|
|
#include "matrix.h"
|
|
#include "hhkb_avr.h"
|
|
#include <avr/wdt.h>
|
|
#include "suspend.h"
|
|
#include "lufa.h"
|
|
|
|
|
|
// matrix power saving
|
|
#define MATRIX_POWER_SAVE 10000
|
|
static uint32_t matrix_last_modified = 0;
|
|
|
|
// matrix state buffer(1:on, 0:off)
|
|
static matrix_row_t *matrix;
|
|
static matrix_row_t *matrix_prev;
|
|
static matrix_row_t _matrix0[MATRIX_ROWS];
|
|
static matrix_row_t _matrix1[MATRIX_ROWS];
|
|
|
|
|
|
inline
|
|
uint8_t matrix_rows(void)
|
|
{
|
|
return MATRIX_ROWS;
|
|
}
|
|
|
|
inline
|
|
uint8_t matrix_cols(void)
|
|
{
|
|
return MATRIX_COLS;
|
|
}
|
|
|
|
void matrix_init(void)
|
|
{
|
|
#ifdef DEBUG
|
|
debug_enable = true;
|
|
debug_keyboard = true;
|
|
#endif
|
|
|
|
KEY_INIT();
|
|
|
|
// initialize matrix state: all keys off
|
|
for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00;
|
|
for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00;
|
|
matrix = _matrix0;
|
|
matrix_prev = _matrix1;
|
|
}
|
|
|
|
__attribute__ ((weak))
|
|
void matrix_scan_user(void) {
|
|
}
|
|
|
|
void matrix_scan_kb(void) {
|
|
matrix_scan_user();
|
|
}
|
|
|
|
uint8_t matrix_scan(void)
|
|
{
|
|
uint8_t *tmp;
|
|
|
|
tmp = matrix_prev;
|
|
matrix_prev = matrix;
|
|
matrix = tmp;
|
|
|
|
// power on
|
|
if (!KEY_POWER_STATE()) KEY_POWER_ON();
|
|
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
|
|
for (uint8_t col = 0; col < MATRIX_COLS; col++) {
|
|
KEY_SELECT(row, col);
|
|
_delay_us(5);
|
|
|
|
// Not sure this is needed. This just emulates HHKB controller's behaviour.
|
|
if (matrix_prev[row] & (1<<col)) {
|
|
KEY_PREV_ON();
|
|
}
|
|
_delay_us(10);
|
|
|
|
// NOTE: KEY_STATE is valid only in 20us after KEY_ENABLE.
|
|
// If V-USB interrupts in this section we could lose 40us or so
|
|
// and would read invalid value from KEY_STATE.
|
|
uint8_t last = TIMER_RAW;
|
|
|
|
KEY_ENABLE();
|
|
|
|
// Wait for KEY_STATE outputs its value.
|
|
// 1us was ok on one HHKB, but not worked on another.
|
|
// no wait doesn't work on Teensy++ with pro(1us works)
|
|
// no wait does work on tmk PCB(8MHz) with pro2
|
|
// 1us wait does work on both of above
|
|
// 1us wait doesn't work on tmk(16MHz)
|
|
// 5us wait does work on tmk(16MHz)
|
|
// 5us wait does work on tmk(16MHz/2)
|
|
// 5us wait does work on tmk(8MHz)
|
|
// 10us wait does work on Teensy++ with pro
|
|
// 10us wait does work on 328p+iwrap with pro
|
|
// 10us wait doesn't work on tmk PCB(8MHz) with pro2(very lagged scan)
|
|
_delay_us(5);
|
|
|
|
if (KEY_STATE()) {
|
|
matrix[row] &= ~(1<<col);
|
|
} else {
|
|
matrix[row] |= (1<<col);
|
|
}
|
|
|
|
// Ignore if this code region execution time elapses more than 20us.
|
|
// MEMO: 20[us] * (TIMER_RAW_FREQ / 1000000)[count per us]
|
|
// MEMO: then change above using this rule: a/(b/c) = a*1/(b/c) = a*(c/b)
|
|
if (TIMER_DIFF_RAW(TIMER_RAW, last) > 20/(1000000/TIMER_RAW_FREQ)) {
|
|
matrix[row] = matrix_prev[row];
|
|
}
|
|
|
|
_delay_us(5);
|
|
KEY_PREV_OFF();
|
|
KEY_UNABLE();
|
|
|
|
// NOTE: KEY_STATE keep its state in 20us after KEY_ENABLE.
|
|
// This takes 25us or more to make sure KEY_STATE returns to idle state.
|
|
#ifdef HHKB_JP
|
|
// Looks like JP needs faster scan due to its twice larger matrix
|
|
// or it can drop keys in fast key typing
|
|
_delay_us(30);
|
|
#else
|
|
_delay_us(75);
|
|
#endif
|
|
}
|
|
if (matrix[row] ^ matrix_prev[row]) matrix_last_modified = timer_read32();
|
|
}
|
|
// power off
|
|
if (KEY_POWER_STATE() &&
|
|
(USB_DeviceState == DEVICE_STATE_Suspended ||
|
|
USB_DeviceState == DEVICE_STATE_Unattached ) &&
|
|
timer_elapsed32(matrix_last_modified) > MATRIX_POWER_SAVE) {
|
|
KEY_POWER_OFF();
|
|
suspend_power_down();
|
|
}
|
|
|
|
matrix_scan_quantum();
|
|
|
|
return 1;
|
|
}
|
|
|
|
bool matrix_is_modified(void)
|
|
{
|
|
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
|
if (matrix[i] != matrix_prev[i])
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
inline
|
|
bool matrix_has_ghost(void)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
inline
|
|
bool matrix_is_on(uint8_t row, uint8_t col)
|
|
{
|
|
return (matrix[row] & (1<<col));
|
|
}
|
|
|
|
inline
|
|
matrix_row_t matrix_get_row(uint8_t row)
|
|
{
|
|
return matrix[row];
|
|
}
|
|
|
|
void matrix_print(void)
|
|
{
|
|
print("\nr/c 01234567\n");
|
|
for (uint8_t row = 0; row < matrix_rows(); row++) {
|
|
xprintf("%02X: %08b\n", row, bitrev(matrix_get_row(row)));
|
|
}
|
|
}
|
|
|
|
uint8_t matrix_key_count(void) {
|
|
uint8_t count = 0;
|
|
for (int8_t r = MATRIX_ROWS - 1; r >= 0; --r) {
|
|
count += bitpop16(matrix_get_row(r));
|
|
}
|
|
return count;
|
|
}
|
|
|
|
void matrix_power_up(void) {
|
|
KEY_POWER_ON();
|
|
}
|
|
void matrix_power_down(void) {
|
|
KEY_POWER_OFF();
|
|
}
|