alpha
/
Kaleidoscope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1030 from gedankenexperimenter/timeout-check-fix

Browse Source
pull/1041/head
Jesse Vincent 4 years ago committed by GitHub
parent 290103d533 ed3b9205c5
commit cf826188a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 19 additions and 38 deletions
Show Stats Download Patch File Download Diff File

2
src/kaleidoscope/Runtime.h
Unescape View File

@ -124,7 +124,7 @@ class Runtime_ {
static bool hasTimeExpired(_Timestamp start_time, _Timeout ttl) { static bool hasTimeExpired(_Timestamp start_time, _Timeout ttl) {
_Timestamp current_time = millis_at_cycle_start_; _Timestamp current_time = millis_at_cycle_start_;
_Timestamp elapsed_time = current_time - start_time; _Timestamp elapsed_time = current_time - start_time;
return (elapsed_time > ttl); return (elapsed_time >= ttl);
} }
EventHandlerResult onFocusEvent(const char *command) { EventHandlerResult onFocusEvent(const char *command) {

3
tests/issues/806/test.ktest
Unescape View File

@ -11,9 +11,8 @@ RUN 5 ms
PRESS TD_0 PRESS TD_0
RUN 1 cycle RUN 1 cycle
RUN 25 ms # timeout is 25 ms
RUN 1 cycle RUN 25 ms # timeout is 25 ms
EXPECT keyboard-report Key_A # The report should contain only `A` EXPECT keyboard-report Key_A # The report should contain only `A`
RUN 20 ms RUN 20 ms

24
tests/issues/922/test.ktest
Unescape View File

@ -16,12 +16,12 @@ RUN 4 ms
RELEASE TD_0 RELEASE TD_0
RUN 5 ms RUN 5 ms
RELEASE TD_1 RELEASE TD_1
RUN 16 ms # timeout = 25ms RUN 15 ms # timeout = 25ms
RUN 1 cycle RUN 1 cycle
EXPECT keyboard-report Key_A, Key_B # TD_1 should time out, yielding `B` EXPECT keyboard-report Key_A, Key_B # TD_1 should time out, yielding `B`
EXPECT keyboard-report Key_B # TD_0 should be released EXPECT keyboard-report Key_B # TD_0 should be released
EXPECT keyboard-report empty # Empty report after TD_1 timeout EXPECT keyboard-report empty # Empty report after TD_1 timeout
RUN 13 ms # t = 50ms RUN 14 ms # t = 50ms
RUN 5 ms RUN 5 ms
PRESS TD_0 PRESS TD_0
@ -33,12 +33,12 @@ RUN 4 ms
RELEASE TD_0 RELEASE TD_0
RUN 5 ms RUN 5 ms
RELEASE TD_1 RELEASE TD_1
RUN 16 ms # timeout = 25ms RUN 15 ms # timeout = 25ms
RUN 1 cycle RUN 1 cycle
EXPECT keyboard-report Key_A, Key_B # TD_1 should time out, yielding `B` EXPECT keyboard-report Key_A, Key_B # TD_1 should time out, yielding `B`
EXPECT keyboard-report Key_B # TD_0 should be released EXPECT keyboard-report Key_B # TD_0 should be released
EXPECT keyboard-report empty # Empty report after TD_1 timeout EXPECT keyboard-report empty # Empty report after TD_1 timeout
RUN 13 ms # t = 100ms RUN 14 ms # t = 100ms
# ============================================================================== # ==============================================================================
NAME TapDance to TapDance rollover right to left NAME TapDance to TapDance rollover right to left
@ -53,12 +53,12 @@ RUN 4 ms
RELEASE TD_1 RELEASE TD_1
RUN 5 ms RUN 5 ms
RELEASE TD_0 RELEASE TD_0
RUN 16 ms # timeout = 25ms RUN 15 ms # timeout = 25ms
RUN 1 cycle RUN 1 cycle
EXPECT keyboard-report Key_B, Key_A # TD_0 should time out, yielding `A` EXPECT keyboard-report Key_B, Key_A # TD_0 should time out, yielding `A`
EXPECT keyboard-report Key_A # TD_1 should be released EXPECT keyboard-report Key_A # TD_1 should be released
EXPECT keyboard-report empty # Empty report after TD_1 timeout EXPECT keyboard-report empty # Empty report after TD_1 timeout
RUN 13 ms # t = 150ms RUN 14 ms # t = 150ms
RUN 5 ms RUN 5 ms
PRESS TD_1 PRESS TD_1
@ -70,12 +70,12 @@ RUN 4 ms
RELEASE TD_1 RELEASE TD_1
RUN 5 ms RUN 5 ms
RELEASE TD_0 RELEASE TD_0
RUN 16 ms # timeout = 25ms RUN 15 ms # timeout = 25ms
RUN 1 cycle RUN 1 cycle
EXPECT keyboard-report Key_B, Key_A # TD_0 should time out, yielding `A` EXPECT keyboard-report Key_B, Key_A # TD_0 should time out, yielding `A`
EXPECT keyboard-report Key_A # TD_1 should be released EXPECT keyboard-report Key_A # TD_1 should be released
EXPECT keyboard-report empty # Empty report after TD_1 timeout EXPECT keyboard-report empty # Empty report after TD_1 timeout
RUN 13 ms # t = 200ms RUN 14 ms # t = 200ms
# ============================================================================== # ==============================================================================
NAME TapDance to TapDance rollover back and forth NAME TapDance to TapDance rollover back and forth
@ -90,12 +90,12 @@ RUN 4 ms
RELEASE TD_0 RELEASE TD_0
RUN 5 ms RUN 5 ms
RELEASE TD_1 RELEASE TD_1
RUN 16 ms # timeout = 25ms RUN 15 ms # timeout = 25ms
RUN 1 cycle RUN 1 cycle
EXPECT keyboard-report Key_A, Key_B # TD_1 should time out, yielding `B` EXPECT keyboard-report Key_A, Key_B # TD_1 should time out, yielding `B`
EXPECT keyboard-report Key_B # TD_0 should be released EXPECT keyboard-report Key_B # TD_0 should be released
EXPECT keyboard-report empty # Empty report after TD_1 timeout EXPECT keyboard-report empty # Empty report after TD_1 timeout
RUN 13 ms # t = 250ms RUN 14 ms # t = 250ms
RUN 5 ms RUN 5 ms
PRESS TD_1 PRESS TD_1
@ -107,9 +107,9 @@ RUN 4 ms
RELEASE TD_1 RELEASE TD_1
RUN 5 ms RUN 5 ms
RELEASE TD_0 RELEASE TD_0
RUN 16 ms # timeout = 25ms RUN 15 ms # timeout = 25ms
RUN 1 cycle RUN 1 cycle
EXPECT keyboard-report Key_B, Key_A # TD_0 should time out, yielding `A` EXPECT keyboard-report Key_B, Key_A # TD_0 should time out, yielding `A`
EXPECT keyboard-report Key_A # TD_1 should be released EXPECT keyboard-report Key_A # TD_1 should be released
EXPECT keyboard-report empty # Empty report after TD_1 timeout EXPECT keyboard-report empty # Empty report after TD_1 timeout
RUN 13 ms # t = 300ms RUN 14 ms # t = 300ms

1
tests/issues/970/test.ktest
Unescape View File

@ -18,7 +18,6 @@ RUN 65536 ms
PRESS A PRESS A
RUN 1 cycle RUN 1 cycle
RUN 200 ms # hold timeout is 200 ms RUN 200 ms # hold timeout is 200 ms
RUN 1 ms
EXPECT keyboard-report Key_LeftGui # Report should contain only `LeftGui` EXPECT keyboard-report Key_LeftGui # Report should contain only `LeftGui`
RUN 10 ms RUN 10 ms

3
tests/plugins/MagicCombo/basic/test.ktest
Unescape View File

@ -14,8 +14,7 @@ RUN 5 ms
PRESS MC0 PRESS MC0
RUN 10 ms RUN 10 ms
# With MagicCombo.min_interval set to 20(ms), we need to wait that long before # With MagicCombo.min_interval set to 20(ms), we need to wait that long before
# it will trigger, plus one. # it will trigger.
RUN 1 ms
EXPECT keyboard-report Key_A # The report should contain only `A` EXPECT keyboard-report Key_A # The report should contain only `A`
EXPECT keyboard-report empty # Report should be empty EXPECT keyboard-report empty # Report should be empty
RUN 5 ms RUN 5 ms

1
tests/plugins/OneShot/basic/test.ktest
Unescape View File

@ -15,7 +15,6 @@ EXPECT keyboard-report Key_LeftShift # The report should contain `shift`
RUN 5 ms RUN 5 ms
RELEASE OS_shift RELEASE OS_shift
RUN 45 ms RUN 45 ms
RUN 1 cycle
EXPECT keyboard-report empty # Report should be empty EXPECT keyboard-report empty # Report should be empty
# ============================================================================== # ==============================================================================

6
tests/plugins/Qukeys/TapRepeat/test.ktest
Unescape View File

@ -26,7 +26,7 @@ RUN 1 cycle
EXPECT keyboard-report empty # Report should be empty EXPECT keyboard-report empty # Report should be empty
EXPECT keyboard-report Key_A # Report should contain only A EXPECT keyboard-report Key_A # Report should contain only A
RUN 16 ms RUN 15 ms
EXPECT keyboard-report empty # Report should be empty EXPECT keyboard-report empty # Report should be empty
RUN 100 ms RUN 100 ms
@ -68,7 +68,7 @@ RUN 1 cycle
EXPECT keyboard-report empty # Report should be empty EXPECT keyboard-report empty # Report should be empty
EXPECT keyboard-report Key_J # Report should contain only J EXPECT keyboard-report Key_J # Report should contain only J
RUN 16 ms RUN 15 ms
EXPECT keyboard-report empty # Report should be empty EXPECT keyboard-report empty # Report should be empty
RUN 100 ms RUN 100 ms
@ -110,7 +110,7 @@ RUN 1 cycle
EXPECT keyboard-report empty # Report should be empty EXPECT keyboard-report empty # Report should be empty
EXPECT keyboard-report Key_B # Report should contain only B EXPECT keyboard-report Key_B # Report should contain only B
RUN 16 ms RUN 15 ms
EXPECT keyboard-report empty # Report should be empty EXPECT keyboard-report empty # Report should be empty
RUN 100 ms RUN 100 ms

3
tests/plugins/SpaceCadet/basic/test.ktest
Unescape View File

@ -28,7 +28,6 @@ PRESS LSHIFT
RUN 1 cycle RUN 1 cycle
RUN 10 ms RUN 10 ms
RUN 1 cycle
EXPECT keyboard-report Key_LeftShift # Report should contain `shift` (0xE1) EXPECT keyboard-report Key_LeftShift # Report should contain `shift` (0xE1)
RUN 5 ms RUN 5 ms
@ -45,7 +44,6 @@ PRESS RSHIFT
RUN 1 cycle RUN 1 cycle
RUN 20 ms RUN 20 ms
RUN 1 cycle
EXPECT keyboard-report Key_RightShift # Report should contain `shift` (0xE5) EXPECT keyboard-report Key_RightShift # Report should contain `shift` (0xE5)
RUN 5 ms RUN 5 ms
@ -112,7 +110,6 @@ RUN 1 cycle
EXPECT keyboard-report Key_LeftShift # Report should contain `shift` (0xE1) EXPECT keyboard-report Key_LeftShift # Report should contain `shift` (0xE1)
RUN 20 ms RUN 20 ms
RUN 1 cycle
EXPECT keyboard-report Key_LeftShift Key_RightShift # Report should contain both `shift` keycodes (0xE1, 0xE5) EXPECT keyboard-report Key_LeftShift Key_RightShift # Report should contain both `shift` keycodes (0xE1, 0xE5)
RUN 5 ms RUN 5 ms

4
tests/plugins/TapDance/basic/test.ktest
Unescape View File

@ -46,8 +46,6 @@ RUN 5 ms
RELEASE TD_0 RELEASE TD_0
RUN 20 ms # Timeout = 25ms RUN 20 ms # Timeout = 25ms
RUN 1 cycle
EXPECT keyboard-report Key_B # The report should contain `B` EXPECT keyboard-report Key_B # The report should contain `B`
EXPECT keyboard-report empty # Report should be empty EXPECT keyboard-report empty # Report should be empty
@ -91,8 +89,6 @@ RUN 10 ms
PRESS TD_0 PRESS TD_0
RUN 1 cycle RUN 1 cycle
RUN 25 ms RUN 25 ms
RUN 1 cycle
EXPECT keyboard-report Key_B # The report should contain `B` EXPECT keyboard-report Key_B # The report should contain `B`
RUN 10 ms RUN 10 ms

10
tests/plugins/Turbo/basic/test.ktest
Unescape View File

@ -35,28 +35,22 @@ EXPECT keyboard-report Key_A # report should contain `A` (0x04)
RUN 4 ms RUN 4 ms
PRESS TURBO PRESS TURBO
RUN 1 cycle RUN 1 cycle
RUN 1 ms
EXPECT keyboard-report empty # report should be empty EXPECT keyboard-report empty # report should be empty
EXPECT keyboard-report Key_A # report should contain `A` (0x04) EXPECT keyboard-report Key_A # report should contain `A` (0x04)
RUN 10 ms RUN 10 ms
RUN 1 ms
EXPECT keyboard-report empty # report should be empty EXPECT keyboard-report empty # report should be empty
EXPECT keyboard-report Key_A # report should contain `A` (0x04) EXPECT keyboard-report Key_A # report should contain `A` (0x04)
RUN 10 ms RUN 10 ms
RUN 1 ms
EXPECT keyboard-report empty # report should be empty EXPECT keyboard-report empty # report should be empty
EXPECT keyboard-report Key_A # report should contain `A` (0x04) EXPECT keyboard-report Key_A # report should contain `A` (0x04)
RUN 10 ms RUN 10 ms
RUN 1 ms
EXPECT keyboard-report empty # report should be empty EXPECT keyboard-report empty # report should be empty
EXPECT keyboard-report Key_A # report should contain `A` (0x04) EXPECT keyboard-report Key_A # report should contain `A` (0x04)
RUN 10 ms RUN 10 ms
RUN 1 ms
EXPECT keyboard-report empty # report should be empty EXPECT keyboard-report empty # report should be empty
EXPECT keyboard-report Key_A # report should contain `A` (0x04) EXPECT keyboard-report Key_A # report should contain `A` (0x04)
@ -88,13 +82,11 @@ PRESS A
RUN 1 cycle RUN 1 cycle
EXPECT keyboard-report Key_A # report should contain `A` (0x04) EXPECT keyboard-report Key_A # report should contain `A` (0x04)
RUN 7 ms RUN 5 ms
RUN 1 ms
EXPECT keyboard-report empty # report should be empty EXPECT keyboard-report empty # report should be empty
EXPECT keyboard-report Key_A # report should contain `A` (0x04) EXPECT keyboard-report Key_A # report should contain `A` (0x04)
RUN 10 ms RUN 10 ms
RUN 1 ms
EXPECT keyboard-report empty # report should be empty EXPECT keyboard-report empty # report should be empty
EXPECT keyboard-report Key_A # report should contain `A` (0x04) EXPECT keyboard-report Key_A # report should contain `A` (0x04)

Write Preview
Loading…
Cancel
Save