From 18296244ba47f53f5229589db0e849f518a92747 Mon Sep 17 00:00:00 2001 From: meshya Date: Mon, 6 Jan 2025 12:31:12 +0330 Subject: [PATCH 1/5] try 0 --- .vscode/arduino.json | 3 +++ src/MFRC522Extended.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 .vscode/arduino.json diff --git a/.vscode/arduino.json b/.vscode/arduino.json new file mode 100644 index 00000000..f80675cc --- /dev/null +++ b/.vscode/arduino.json @@ -0,0 +1,3 @@ +{ + "port": "/dev/ttyS1" +} \ No newline at end of file diff --git a/src/MFRC522Extended.cpp b/src/MFRC522Extended.cpp index da603ab7..649ad0a8 100644 --- a/src/MFRC522Extended.cpp +++ b/src/MFRC522Extended.cpp @@ -800,7 +800,7 @@ MFRC522::StatusCode MFRC522Extended::TCL_Transceive(TagInfo *tag, byte *sendData } // Do we have data to send? - if (sendData && (sendLen > 0)) { + if (sendData != nullptr && (sendLen > 0x00)) { out.inf.size = sendLen; out.inf.data = sendData; } else { From cfddccbcf7bdd9a45e81fe777bd504369025b06c Mon Sep 17 00:00:00 2001 From: meshya Date: Mon, 6 Jan 2025 12:41:16 +0330 Subject: [PATCH 2/5] try 1 --- src/MFRC522Extended.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MFRC522Extended.cpp b/src/MFRC522Extended.cpp index 649ad0a8..9c18b2d4 100644 --- a/src/MFRC522Extended.cpp +++ b/src/MFRC522Extended.cpp @@ -821,7 +821,7 @@ MFRC522::StatusCode MFRC522Extended::TCL_Transceive(TagInfo *tag, byte *sendData // Swap block number on success tag->blockNumber = !tag->blockNumber; - if (backData && (backLen > 0)) { + if (backData && (*backLen > 0)) { if (*backLen < in.inf.size) return STATUS_NO_ROOM; @@ -844,7 +844,7 @@ MFRC522::StatusCode MFRC522Extended::TCL_Transceive(TagInfo *tag, byte *sendData if (result != STATUS_OK) return result; - if (backData && (backLen > 0)) { + if (backData && (*backLen > 0)) { if ((*backLen + ackDataSize) > totalBackLen) return STATUS_NO_ROOM; From afbaf72b99d24c01cff6339cbd4d95cdc04e572c Mon Sep 17 00:00:00 2001 From: meshya Date: Mon, 6 Jan 2025 12:49:22 +0330 Subject: [PATCH 3/5] reset unnecessary changes --- src/MFRC522Extended.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MFRC522Extended.cpp b/src/MFRC522Extended.cpp index 9c18b2d4..5ab783bc 100644 --- a/src/MFRC522Extended.cpp +++ b/src/MFRC522Extended.cpp @@ -800,7 +800,7 @@ MFRC522::StatusCode MFRC522Extended::TCL_Transceive(TagInfo *tag, byte *sendData } // Do we have data to send? - if (sendData != nullptr && (sendLen > 0x00)) { + if (sendData && (sendLen > 0)) { out.inf.size = sendLen; out.inf.data = sendData; } else { From 6bd6b01babd94967ed5deb077f4d4914672753c0 Mon Sep 17 00:00:00 2001 From: meshya Date: Mon, 6 Jan 2025 12:57:58 +0330 Subject: [PATCH 4/5] Update MFRC522Extended.cpp --- src/MFRC522Extended.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MFRC522Extended.cpp b/src/MFRC522Extended.cpp index 5ab783bc..3a34ad56 100644 --- a/src/MFRC522Extended.cpp +++ b/src/MFRC522Extended.cpp @@ -821,7 +821,7 @@ MFRC522::StatusCode MFRC522Extended::TCL_Transceive(TagInfo *tag, byte *sendData // Swap block number on success tag->blockNumber = !tag->blockNumber; - if (backData && (*backLen > 0)) { + if (backData && backLen && (*backLen > 0)) { if (*backLen < in.inf.size) return STATUS_NO_ROOM; @@ -844,7 +844,7 @@ MFRC522::StatusCode MFRC522Extended::TCL_Transceive(TagInfo *tag, byte *sendData if (result != STATUS_OK) return result; - if (backData && (*backLen > 0)) { + if (backData && backLen &&(*backLen > 0)) { if ((*backLen + ackDataSize) > totalBackLen) return STATUS_NO_ROOM; From c03381ee2b4b26fd8d365518039b628d674b3a39 Mon Sep 17 00:00:00 2001 From: meshya Date: Fri, 10 Jan 2025 15:22:09 +0330 Subject: [PATCH 5/5] Delete .vscode/arduino.json --- .vscode/arduino.json | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .vscode/arduino.json diff --git a/.vscode/arduino.json b/.vscode/arduino.json deleted file mode 100644 index f80675cc..00000000 --- a/.vscode/arduino.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "port": "/dev/ttyS1" -} \ No newline at end of file