diff options
| author | Joel Challis <git@zvecr.com> | 2021-07-28 12:01:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-28 12:01:23 +0100 |
| commit | 03d258c2226959480fc3ead1568ca2fe8ba37c59 (patch) | |
| tree | 6a5f05f6017ec01ea68883749bc5af0e558a51cf /quantum/sequencer/tests | |
| parent | c52c69d45f180e8ab677be4707ea2c8180a14254 (diff) | |
| download | qmk_firmware-03d258c2226959480fc3ead1568ca2fe8ba37c59.tar.gz qmk_firmware-03d258c2226959480fc3ead1568ca2fe8ba37c59.zip | |
matrix_scan_x -> x_task (#13748)
Diffstat (limited to 'quantum/sequencer/tests')
| -rw-r--r-- | quantum/sequencer/tests/sequencer_tests.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/quantum/sequencer/tests/sequencer_tests.cpp b/quantum/sequencer/tests/sequencer_tests.cpp index e81984e5b..290605a52 100644 --- a/quantum/sequencer/tests/sequencer_tests.cpp +++ b/quantum/sequencer/tests/sequencer_tests.cpp | |||
| @@ -386,7 +386,7 @@ void setUpMatrixScanSequencerTest(void) { | |||
| 386 | TEST_F(SequencerTest, TestMatrixScanSequencerShouldAttackFirstTrackOfFirstStep) { | 386 | TEST_F(SequencerTest, TestMatrixScanSequencerShouldAttackFirstTrackOfFirstStep) { |
| 387 | setUpMatrixScanSequencerTest(); | 387 | setUpMatrixScanSequencerTest(); |
| 388 | 388 | ||
| 389 | matrix_scan_sequencer(); | 389 | sequencer_task(); |
| 390 | EXPECT_EQ(last_noteon, MI_C); | 390 | EXPECT_EQ(last_noteon, MI_C); |
| 391 | EXPECT_EQ(last_noteoff, 0); | 391 | EXPECT_EQ(last_noteoff, 0); |
| 392 | } | 392 | } |
| @@ -394,7 +394,7 @@ TEST_F(SequencerTest, TestMatrixScanSequencerShouldAttackFirstTrackOfFirstStep) | |||
| 394 | TEST_F(SequencerTest, TestMatrixScanSequencerShouldAttackSecondTrackAfterFirstTrackOfFirstStep) { | 394 | TEST_F(SequencerTest, TestMatrixScanSequencerShouldAttackSecondTrackAfterFirstTrackOfFirstStep) { |
| 395 | setUpMatrixScanSequencerTest(); | 395 | setUpMatrixScanSequencerTest(); |
| 396 | 396 | ||
| 397 | matrix_scan_sequencer(); | 397 | sequencer_task(); |
| 398 | EXPECT_EQ(sequencer_internal_state.current_step, 0); | 398 | EXPECT_EQ(sequencer_internal_state.current_step, 0); |
| 399 | EXPECT_EQ(sequencer_internal_state.current_track, 1); | 399 | EXPECT_EQ(sequencer_internal_state.current_track, 1); |
| 400 | EXPECT_EQ(sequencer_internal_state.phase, SEQUENCER_PHASE_ATTACK); | 400 | EXPECT_EQ(sequencer_internal_state.phase, SEQUENCER_PHASE_ATTACK); |
| @@ -409,7 +409,7 @@ TEST_F(SequencerTest, TestMatrixScanSequencerShouldNotAttackInactiveTrackFirstSt | |||
| 409 | // Wait some time after the first track has been attacked | 409 | // Wait some time after the first track has been attacked |
| 410 | advance_time(SEQUENCER_TRACK_THROTTLE); | 410 | advance_time(SEQUENCER_TRACK_THROTTLE); |
| 411 | 411 | ||
| 412 | matrix_scan_sequencer(); | 412 | sequencer_task(); |
| 413 | EXPECT_EQ(last_noteon, 0); | 413 | EXPECT_EQ(last_noteon, 0); |
| 414 | EXPECT_EQ(last_noteoff, 0); | 414 | EXPECT_EQ(last_noteoff, 0); |
| 415 | } | 415 | } |
| @@ -423,7 +423,7 @@ TEST_F(SequencerTest, TestMatrixScanSequencerShouldAttackThirdTrackAfterSecondTr | |||
| 423 | // Wait some time after the second track has been attacked | 423 | // Wait some time after the second track has been attacked |
| 424 | advance_time(2 * SEQUENCER_TRACK_THROTTLE); | 424 | advance_time(2 * SEQUENCER_TRACK_THROTTLE); |
| 425 | 425 | ||
| 426 | matrix_scan_sequencer(); | 426 | sequencer_task(); |
| 427 | EXPECT_EQ(sequencer_internal_state.current_step, 0); | 427 | EXPECT_EQ(sequencer_internal_state.current_step, 0); |
| 428 | EXPECT_EQ(sequencer_internal_state.current_track, 2); | 428 | EXPECT_EQ(sequencer_internal_state.current_track, 2); |
| 429 | EXPECT_EQ(sequencer_internal_state.phase, SEQUENCER_PHASE_ATTACK); | 429 | EXPECT_EQ(sequencer_internal_state.phase, SEQUENCER_PHASE_ATTACK); |
| @@ -438,7 +438,7 @@ TEST_F(SequencerTest, TestMatrixScanSequencerShouldEnterReleasePhaseAfterLastTra | |||
| 438 | // Wait until all notes have been attacked | 438 | // Wait until all notes have been attacked |
| 439 | advance_time((SEQUENCER_TRACKS - 1) * SEQUENCER_TRACK_THROTTLE); | 439 | advance_time((SEQUENCER_TRACKS - 1) * SEQUENCER_TRACK_THROTTLE); |
| 440 | 440 | ||
| 441 | matrix_scan_sequencer(); | 441 | sequencer_task(); |
| 442 | EXPECT_EQ(last_noteon, 0); | 442 | EXPECT_EQ(last_noteon, 0); |
| 443 | EXPECT_EQ(last_noteoff, 0); | 443 | EXPECT_EQ(last_noteoff, 0); |
| 444 | EXPECT_EQ(sequencer_internal_state.current_step, 0); | 444 | EXPECT_EQ(sequencer_internal_state.current_step, 0); |
| @@ -458,7 +458,7 @@ TEST_F(SequencerTest, TestMatrixScanSequencerShouldReleaseBackwards) { | |||
| 458 | // + the release timeout | 458 | // + the release timeout |
| 459 | advance_time(SEQUENCER_PHASE_RELEASE_TIMEOUT); | 459 | advance_time(SEQUENCER_PHASE_RELEASE_TIMEOUT); |
| 460 | 460 | ||
| 461 | matrix_scan_sequencer(); | 461 | sequencer_task(); |
| 462 | EXPECT_EQ(sequencer_internal_state.current_step, 0); | 462 | EXPECT_EQ(sequencer_internal_state.current_step, 0); |
| 463 | EXPECT_EQ(sequencer_internal_state.current_track, SEQUENCER_TRACKS - 2); | 463 | EXPECT_EQ(sequencer_internal_state.current_track, SEQUENCER_TRACKS - 2); |
| 464 | EXPECT_EQ(sequencer_internal_state.phase, SEQUENCER_PHASE_RELEASE); | 464 | EXPECT_EQ(sequencer_internal_state.phase, SEQUENCER_PHASE_RELEASE); |
| @@ -476,7 +476,7 @@ TEST_F(SequencerTest, TestMatrixScanSequencerShouldNotReleaseInactiveTrackFirstS | |||
| 476 | // + the release timeout | 476 | // + the release timeout |
| 477 | advance_time(SEQUENCER_PHASE_RELEASE_TIMEOUT); | 477 | advance_time(SEQUENCER_PHASE_RELEASE_TIMEOUT); |
| 478 | 478 | ||
| 479 | matrix_scan_sequencer(); | 479 | sequencer_task(); |
| 480 | EXPECT_EQ(last_noteon, 0); | 480 | EXPECT_EQ(last_noteon, 0); |
| 481 | EXPECT_EQ(last_noteoff, 0); | 481 | EXPECT_EQ(last_noteoff, 0); |
| 482 | } | 482 | } |
| @@ -495,7 +495,7 @@ TEST_F(SequencerTest, TestMatrixScanSequencerShouldReleaseFirstTrackFirstStep) { | |||
| 495 | // + all the other notes have been released | 495 | // + all the other notes have been released |
| 496 | advance_time((SEQUENCER_TRACKS - 1) * SEQUENCER_TRACK_THROTTLE); | 496 | advance_time((SEQUENCER_TRACKS - 1) * SEQUENCER_TRACK_THROTTLE); |
| 497 | 497 | ||
| 498 | matrix_scan_sequencer(); | 498 | sequencer_task(); |
| 499 | EXPECT_EQ(last_noteon, 0); | 499 | EXPECT_EQ(last_noteon, 0); |
| 500 | EXPECT_EQ(last_noteoff, MI_C); | 500 | EXPECT_EQ(last_noteoff, MI_C); |
| 501 | } | 501 | } |
| @@ -514,7 +514,7 @@ TEST_F(SequencerTest, TestMatrixScanSequencerShouldEnterPausePhaseAfterRelease) | |||
| 514 | // + all the other notes have been released | 514 | // + all the other notes have been released |
| 515 | advance_time((SEQUENCER_TRACKS - 1) * SEQUENCER_TRACK_THROTTLE); | 515 | advance_time((SEQUENCER_TRACKS - 1) * SEQUENCER_TRACK_THROTTLE); |
| 516 | 516 | ||
| 517 | matrix_scan_sequencer(); | 517 | sequencer_task(); |
| 518 | EXPECT_EQ(sequencer_internal_state.current_step, 0); | 518 | EXPECT_EQ(sequencer_internal_state.current_step, 0); |
| 519 | EXPECT_EQ(sequencer_internal_state.current_track, 0); | 519 | EXPECT_EQ(sequencer_internal_state.current_track, 0); |
| 520 | EXPECT_EQ(sequencer_internal_state.phase, SEQUENCER_PHASE_PAUSE); | 520 | EXPECT_EQ(sequencer_internal_state.phase, SEQUENCER_PHASE_PAUSE); |
| @@ -536,7 +536,7 @@ TEST_F(SequencerTest, TestMatrixScanSequencerShouldProcessFirstTrackOfSecondStep | |||
| 536 | // + the step duration (one 16th at tempo=120 lasts 125ms) | 536 | // + the step duration (one 16th at tempo=120 lasts 125ms) |
| 537 | advance_time(125); | 537 | advance_time(125); |
| 538 | 538 | ||
| 539 | matrix_scan_sequencer(); | 539 | sequencer_task(); |
| 540 | EXPECT_EQ(sequencer_internal_state.current_step, 1); | 540 | EXPECT_EQ(sequencer_internal_state.current_step, 1); |
| 541 | EXPECT_EQ(sequencer_internal_state.current_track, 1); | 541 | EXPECT_EQ(sequencer_internal_state.current_track, 1); |
| 542 | EXPECT_EQ(sequencer_internal_state.phase, SEQUENCER_PHASE_ATTACK); | 542 | EXPECT_EQ(sequencer_internal_state.phase, SEQUENCER_PHASE_ATTACK); |
| @@ -548,7 +548,7 @@ TEST_F(SequencerTest, TestMatrixScanSequencerShouldProcessSecondTrackTooEarly) { | |||
| 548 | sequencer_internal_state.current_step = 2; | 548 | sequencer_internal_state.current_step = 2; |
| 549 | sequencer_internal_state.current_track = 1; | 549 | sequencer_internal_state.current_track = 1; |
| 550 | 550 | ||
| 551 | matrix_scan_sequencer(); | 551 | sequencer_task(); |
| 552 | EXPECT_EQ(last_noteon, 0); | 552 | EXPECT_EQ(last_noteon, 0); |
| 553 | EXPECT_EQ(last_noteoff, 0); | 553 | EXPECT_EQ(last_noteoff, 0); |
| 554 | } | 554 | } |
| @@ -562,7 +562,7 @@ TEST_F(SequencerTest, TestMatrixScanSequencerShouldProcessSecondTrackOnTime) { | |||
| 562 | // Wait until first track has been attacked | 562 | // Wait until first track has been attacked |
| 563 | advance_time(SEQUENCER_TRACK_THROTTLE); | 563 | advance_time(SEQUENCER_TRACK_THROTTLE); |
| 564 | 564 | ||
| 565 | matrix_scan_sequencer(); | 565 | sequencer_task(); |
| 566 | EXPECT_EQ(last_noteon, MI_D); | 566 | EXPECT_EQ(last_noteon, MI_D); |
| 567 | EXPECT_EQ(last_noteoff, 0); | 567 | EXPECT_EQ(last_noteoff, 0); |
| 568 | } | 568 | } |
| @@ -583,7 +583,7 @@ TEST_F(SequencerTest, TestMatrixScanSequencerShouldLoopOnceSequenceIsOver) { | |||
| 583 | // + the step duration (one 16th at tempo=120 lasts 125ms) | 583 | // + the step duration (one 16th at tempo=120 lasts 125ms) |
| 584 | advance_time(125); | 584 | advance_time(125); |
| 585 | 585 | ||
| 586 | matrix_scan_sequencer(); | 586 | sequencer_task(); |
| 587 | EXPECT_EQ(sequencer_internal_state.current_step, 0); | 587 | EXPECT_EQ(sequencer_internal_state.current_step, 0); |
| 588 | EXPECT_EQ(sequencer_internal_state.current_track, 1); | 588 | EXPECT_EQ(sequencer_internal_state.current_track, 1); |
| 589 | EXPECT_EQ(sequencer_internal_state.phase, SEQUENCER_PHASE_ATTACK); | 589 | EXPECT_EQ(sequencer_internal_state.phase, SEQUENCER_PHASE_ATTACK); |
