include/RFID.h

@@ -30,15 +30,7 @@ struct uidNode {
 
 class RFID {
 public:
-	/***
-	 * Use the main SPI port and NFC chip select by default, but allow choosing
-	 * an alternate chip select and/or SPI bus if needed to allow multiple
-	 * RFID readers in parallel.
-	 */
-	explicit RFID(const uint8_t chipSelect = pin_NFC1_CS, SPIClass &spiBus = SPI) :
-		driverPin(chipSelect), driverSpi(driverPin, spiBus),
-		mfrc(driverSpi), comData{}, sd(SD) {};
-
+	RFID() : comData{}, sd(SD) {};
 	void init();
 	/***
 	 * Check if any new tags are present or have left. Only one event is reported
@@ -62,9 +54,9 @@ private:
 	uidNode* activeTags = nullptr;
 	uidNode* nextFreeTagSlot = activeTagsArray;
 
-	MFRC522DriverPinSimple driverPin;
-	MFRC522DriverSPI driverSpi;
-	MFRC522 mfrc;
+	MFRC522DriverPinSimple driverPin{pin_NFC1_CS};
+	MFRC522DriverSPI driverSpi{driverPin};
+	MFRC522 mfrc{driverSpi};
 
 	/*
 	 * Array used to read and write blocks to the tags. Blocks are 16 bytes but

src/main.cpp

@@ -68,13 +68,12 @@ __attribute__((noreturn)) int main() {
 
 		tagEvent = rfid.checkTags();
 		if (tagEvent) {
+			tagEvent = 4;
 			Com::sendFigUpdate(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);
-			}
+			/* Start the audio first because of the possible WAV parsing delay. */
+			speaker.playNewSound(tagEvent);
+			lcd.startNewAnim(tagEvent);
+
 		}
 
 		/* TODO: Drop delay, WFE+timer interrupt(s) ? */