From 4fdff6c9ec9bd6bc3b3eb39b4a0ec0bb5c18db63 Mon Sep 17 00:00:00 2001 From: Michael Richters Date: Tue, 17 Nov 2020 17:50:23 -0600 Subject: [PATCH] Add testcase for TapDance issue #980 Signed-off-by: Michael Richters --- tests/issues/980/980.ino | 85 ++++++++++++++++++++++++++++++++++++ tests/issues/980/common.h | 27 ++++++++++++ tests/issues/980/sketch.json | 6 +++ tests/issues/980/test.ktest | 69 +++++++++++++++++++++++++++++ 4 files changed, 187 insertions(+) create mode 100644 tests/issues/980/980.ino create mode 100644 tests/issues/980/common.h create mode 100644 tests/issues/980/sketch.json create mode 100644 tests/issues/980/test.ktest diff --git a/tests/issues/980/980.ino b/tests/issues/980/980.ino new file mode 100644 index 00000000..2d51e094 --- /dev/null +++ b/tests/issues/980/980.ino @@ -0,0 +1,85 @@ +/* -*- mode: c++ -*- + * Copyright (C) 2020 Keyboard.io, Inc. + * + * 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, version 3. + * + * 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 . + */ + +#include +#include + +#include "./common.h" + +#undef min +#undef max +#include + +// *INDENT-OFF* +KEYMAPS( + [0] = KEYMAP_STACKED + ( + Key_X, ___, ___, ___, ___, ___, ___, + TD(0), ___, ___, ___, ___, ___, ___, + LockLayer(1), ___, ___, ___, ___, ___, + ___, ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, + ___, + + ___, ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, + ___ + ), + [1] = KEYMAP_STACKED + ( + Key_Y, ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, + ___, + + ___, ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, ___, ___, ___, + ___, ___, ___, ___, + ___ + ), +) +// *INDENT-ON* + +void tapDanceAction(uint8_t tap_dance_index, + KeyAddr key_addr, + uint8_t tap_count, + kaleidoscope::plugin::TapDance::ActionType tap_dance_action) { + switch (tap_dance_index) { + case 0: + return tapDanceActionKeys(tap_count, tap_dance_action, + Key_A, LockLayer(1)); + default: + break; + } +} + +KALEIDOSCOPE_INIT_PLUGINS(TapDance); + +void setup() { + Kaleidoscope.setup(); + TapDance.time_out = 25; +} + +void loop() { + Kaleidoscope.loop(); +} diff --git a/tests/issues/980/common.h b/tests/issues/980/common.h new file mode 100644 index 00000000..dcfcc35b --- /dev/null +++ b/tests/issues/980/common.h @@ -0,0 +1,27 @@ +// -*- mode: c++ -*- + +/* Kaleidoscope - Firmware for computer input devices + * Copyright (C) 2020 Keyboard.io, Inc. + * + * 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, version 3. + * + * 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 . + */ + +#pragma once + +#include + +namespace kaleidoscope { +namespace testing { + +} // namespace testing +} // namespace kaleidoscope diff --git a/tests/issues/980/sketch.json b/tests/issues/980/sketch.json new file mode 100644 index 00000000..43dc4c7e --- /dev/null +++ b/tests/issues/980/sketch.json @@ -0,0 +1,6 @@ +{ + "cpu": { + "fqbn": "keyboardio:virtual:model01", + "port": "" + } +} \ No newline at end of file diff --git a/tests/issues/980/test.ktest b/tests/issues/980/test.ktest new file mode 100644 index 00000000..d695aa5a --- /dev/null +++ b/tests/issues/980/test.ktest @@ -0,0 +1,69 @@ +VERSION 1 + +KEYSWITCH X 0 0 +KEYSWITCH TD_0 1 0 +KEYSWITCH LL_1 2 0 + +# ============================================================================== +NAME TapDance issue 980 no overlap + +RUN 5 ms + +PRESS TD_0 +RUN 5 ms +RELEASE TD_0 +RUN 10 ms + +PRESS TD_0 +RUN 5 ms + +RELEASE TD_0 +RUN 5 ms + +PRESS X +RUN 2 cycles +EXPECT keyboard-report Key_Y # The key should be mapped from layer 1 (Y), not layer 0 (X) +RUN 5 ms + +RELEASE X +RUN 1 cycle +EXPECT keyboard-report empty # The report should be empty +RUN 5 ms + +PRESS LL_1 +RUN 1 cycle + +RELEASE LL_1 +RUN 1 cycle + +# ============================================================================== +NAME TapDance issue 980 rollover + +RUN 5 ms + +PRESS TD_0 +RUN 5 ms +RELEASE TD_0 +RUN 10 ms + +PRESS TD_0 +RUN 5 ms + +PRESS X +RUN 2 cycles +EXPECT keyboard-report Key_Y # The key should be mapped from layer 1 (Y), not layer 0 (X) +RUN 5 ms + +RELEASE TD_0 +RUN 5 ms + +RELEASE X +RUN 1 cycle +EXPECT keyboard-report empty # The report should be empty +RUN 5 ms + +PRESS LL_1 +RUN 1 cycle + +RELEASE LL_1 +RUN 1 cycle