Skip to content

refactor(#159): rename sendSpoolDetectedMessage → sendOpenPrintTagMessage #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sjordan0228 merged 1 commit into from
Apr 18, 2026
Merged

refactor(#159): rename sendSpoolDetectedMessage → sendOpenPrintTagMessage #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/NFCManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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;
}
Expand Down Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -1618,7 +1618,7 @@ bool NFCManager::writeRawTag() {
currentSpool.kind = TagKind::OpenPrintTag;
lastSeenValid = false;
addToRecentSpools();
sendSpoolDetectedMessage();
sendOpenPrintTagMessage();
xSemaphoreGive(tagMutex);

rawWritePending_ = false;
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -2071,7 +2071,7 @@ bool NFCManager::executeWrite(const NFCWriteRequest& request) {
currentSpool.kind = TagKind::OpenPrintTag;
lastSeenValid = false;
addToRecentSpools();
sendSpoolDetectedMessage();
sendOpenPrintTagMessage();
xSemaphoreGive(tagMutex);
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/NFCManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down