refactor: tml_Rx

ElectronicCats · Nov 19, 2024 · afe1a87 · afe1a87
1 parent 3c79dd4
commit afe1a87
Showing 1 changed file with 37 additions and 10 deletions.
diff --git a/dev/test_nci2_pn7160_send_receive/test_nci2_pn7160_send_receive.ino b/dev/test_nci2_pn7160_send_receive/test_nci2_pn7160_send_receive.ino
@@ -97,21 +97,48 @@ Status tml_Tx(uint8_t *pBuff, uint16_t buffLen) {
 }
 
 Status tml_Rx(uint8_t *pBuff, uint16_t buffLen, uint16_t *pBytesRead) {
-    Wire.requestFrom(I2C_ADDRESS, buffLen);
-    uint16_t bytesRead = 0;
-
-    while (Wire.available() > 0 && bytesRead < buffLen) {
-        pBuff[bytesRead++] = Wire.read();
+    Wire.requestFrom(I2C_ADDRESS, 3);
+    uint16_t headerRead = 0;
+    while (Wire.available() > 0 && headerRead < 3) {
+        pBuff[headerRead++] = Wire.read();
     }
-
-    if (bytesRead == 0) {
+    if (headerRead != 3) {
         return ERROR;
     }
-
-    *pBytesRead = bytesRead;
+    uint16_t totalLength = pBuff[2] + 3;
+    if (totalLength > buffLen) {
+        return ERROR;
+    }
+    if (pBuff[2] > 0) {
+        Wire.requestFrom(I2C_ADDRESS, pBuff[2]);
+        uint16_t dataRead = 0;
+        while (Wire.available() > 0 && dataRead < pBuff[2]) {
+            pBuff[3 + dataRead++] = Wire.read();
+        }
+        if (dataRead != pBuff[2]) {
+            return ERROR;
+        }
+    }
+    *pBytesRead = totalLength;
     return SUCCESS;
 }
 
+//Status tml_Rx(uint8_t *pBuff, uint16_t buffLen, uint16_t *pBytesRead) {
+//    Wire.requestFrom(I2C_ADDRESS, buffLen);
+//    uint16_t bytesRead = 0;
+//
+//    while (Wire.available() > 0 && bytesRead < buffLen) {
+//        pBuff[bytesRead++] = Wire.read();
+//    }
+//
+//    if (bytesRead == 0) {
+//        return ERROR;
+//    }
+//
+//    *pBytesRead = bytesRead;
+//    return SUCCESS;
+//}
+
 Status tml_WaitForRx(uint32_t timeout) {
     if (timeout == 0) {
         while (digitalRead(IRQ_PIN) == LOW);
@@ -250,7 +277,7 @@ static bool NxpNci_CheckDevPres(void)
           gNfcController_fw_version[0] = Answer[9];
           gNfcController_fw_version[1] = Answer[10];
           gNfcController_fw_version[2] = Answer[11];
-          Serial.println("Dispositivo NFC encontrado y listo.");
+          Serial.println("Dispositivo NFC encontrado");
           Serial.print("Versión de firmware: ");
           Serial.print(gNfcController_fw_version[0], HEX);
           Serial.print(".");