From 47bdcfcb6c722deb17ebc99e88c1cfebb77354e6 Mon Sep 17 00:00:00 2001
From: Shane Jordan <shane@linuxgangster.org>
Date: Thu, 16 Apr 2026 14:58:08 -0500
Subject: [PATCH] =?UTF-8?q?refactor(#159):=20rename=20sendSpoolDetectedMes?=
 =?UTF-8?q?sage=20=E2=86=92=20sendOpenPrintTagMessage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The function is OpenPrintTag-specific (uses opt_get_* CBOR accessors and
sets tag_format = "OpenPrintTag"). The old name implied it handled any
spool-detection event, which made multi-format support harder to reason
about. Rename clarifies scope ahead of per-format sender functions.

Mechanical rename: 1 declaration + 1 definition + 9 call sites (all in
NFCManager.{h,cpp}). No behavior change. Builds clean on esp32s3zero
and esp32dev.
---
 src/NFCManager.cpp | 20 ++++++++++----------
 src/NFCManager.h   |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/NFCManager.cpp b/src/NFCManager.cpp
index 0dd0c56..7dee3c0 100644
--- a/src/NFCManager.cpp
+++ b/src/NFCManager.cpp
@@ -689,7 +689,7 @@ bool NFCManager::readAndParseTag(uint8_t* uid, uint8_t uid_length) {
 
     Serial.printf("NFCManager: Parsed spool %s\n", currentSpool.spool_id);
 
-    sendSpoolDetectedMessage();
+    sendOpenPrintTagMessage();
 
     // Update dedup state
     memcpy(lastSeenUid, uid, uid_length);
@@ -801,7 +801,7 @@ bool NFCManager::formatNewSpool() {
 
                 if (queueEmpty) {
                     // No batched writes - send SpoolDetected immediately
-                    sendSpoolDetectedMessage();
+                    sendOpenPrintTagMessage();
                     Serial.println("NFCManager: formatNewSpool() complete - verified (queue empty, sent SpoolDetected)");
                 } else {
                     // Batched writes pending - set suppression flag
@@ -845,7 +845,7 @@ bool NFCManager::formatNewSpool() {
 
     if (queueEmpty) {
         // No batched writes - send SpoolDetected immediately
-        sendSpoolDetectedMessage();
+        sendOpenPrintTagMessage();
         Serial.println("NFCManager: formatNewSpool() complete - unverified (queue empty, sent SpoolDetected)");
     } else {
         // Batched writes pending - set suppression flag
@@ -859,7 +859,7 @@ bool NFCManager::formatNewSpool() {
     return true;
 }
 
-void NFCManager::sendSpoolDetectedMessage(bool suppress_spoolman_sync) {
+void NFCManager::sendOpenPrintTagMessage(bool suppress_spoolman_sync) {
     if (!currentSpool.tag_data_valid) {
         return;
     }
@@ -1535,9 +1535,9 @@ void NFCManager::processWriteQueue() {
             suppressReDetectionUid_[0] = '\0';
             batchHadSuppressSync_ = false;
 
-            // Send SpoolDetected under mutex — sendSpoolDetectedMessage reads currentSpool.tag_data
+            // Send SpoolDetected under mutex — sendOpenPrintTagMessage reads currentSpool.tag_data
             if (xSemaphoreTake(tagMutex, pdMS_TO_TICKS(100)) == pdTRUE) {
-                sendSpoolDetectedMessage(hadSuppressSync);
+                sendOpenPrintTagMessage(hadSuppressSync);
                 xSemaphoreGive(tagMutex);
             }
         }
@@ -1585,7 +1585,7 @@ bool NFCManager::writeRawTag() {
                 currentSpool.kind = TagKind::OpenPrintTag;
                 lastSeenValid = false;  // Force re-detection on next scan
                 addToRecentSpools();
-                sendSpoolDetectedMessage();
+                sendOpenPrintTagMessage();
                 xSemaphoreGive(tagMutex);
 
                 rawWritePending_ = false;
@@ -1618,7 +1618,7 @@ bool NFCManager::writeRawTag() {
     currentSpool.kind = TagKind::OpenPrintTag;
     lastSeenValid = false;
     addToRecentSpools();
-    sendSpoolDetectedMessage();
+    sendOpenPrintTagMessage();
     xSemaphoreGive(tagMutex);
 
     rawWritePending_ = false;
@@ -1964,7 +1964,7 @@ bool NFCManager::executeAtomicWrite(const NFCWriteRequest& request) {
     currentSpool.blank_tag_present = false;
     currentSpool.kind = TagKind::OpenPrintTag;
     addToRecentSpools();
-    sendSpoolDetectedMessage();
+    sendOpenPrintTagMessage();
     xSemaphoreGive(tagMutex);
 
     Serial.println("NFCManager: WRITE_ATOMIC complete");
@@ -2071,7 +2071,7 @@ bool NFCManager::executeWrite(const NFCWriteRequest& request) {
                 currentSpool.kind = TagKind::OpenPrintTag;
                 lastSeenValid = false;
                 addToRecentSpools();
-                sendSpoolDetectedMessage();
+                sendOpenPrintTagMessage();
                 xSemaphoreGive(tagMutex);
                 return true;
             }
diff --git a/src/NFCManager.h b/src/NFCManager.h
index 6c21748..b6602df 100644
--- a/src/NFCManager.h
+++ b/src/NFCManager.h
@@ -130,7 +130,7 @@ class NFCManager {
                               uint8_t* outBuf, uint16_t outBufSize);
     bool formatNewSpool();
     TagScanResult classifyTag(const uint8_t* uid, uint8_t uid_length);
-    void sendSpoolDetectedMessage(bool suppress_spoolman_sync = false);
+    void sendOpenPrintTagMessage(bool suppress_spoolman_sync = false);
     void sendBlankTagMessage();
     void sendGenericTagMessage();
     void sendTigerTagMessage(const TigerTagData& tt);