From a438cb13d4f9f53fc9dc68a89f69968fba0b7290 Mon Sep 17 00:00:00 2001 From: Teo-CD Date: Sun, 17 Dec 2023 21:53:36 +0000 Subject: [PATCH] Only play effects on arrival, use real tag Remove the overide of the tag value used for testing. We don't plan yet on playing effects when a tag leaves, so avoid playing the effects twice and only do so when arriving. --- src/main.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index c09771e..3b5902f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -68,12 +68,13 @@ __attribute__((noreturn)) int main() { tagEvent = rfid.checkTags(); if (tagEvent) { - tagEvent = 4; Com::sendFigUpdate(tagEvent); - /* Start the audio first because of the possible WAV parsing delay. */ - speaker.playNewSound(tagEvent); - lcd.startNewAnim(tagEvent); - + /* Currently, we only play effects when placing a new figurine. */ + if (!isIdGone(tagEvent)) { + /* Start the audio first as WAV parsing might delay playback. */ + speaker.playNewSound(tagEvent); + lcd.startNewAnim(tagEvent); + } } /* TODO: Drop delay, WFE+timer interrupt(s) ? */