iso15: add support for slow and 2SC to GetIso15693AnswerFromTag()

Allow running raw iso15 cmd expecting slow and/or dual subcarriers
answers. E.g. sending slow 2SC inventory ("hf 15 raw -c -d 250100") is
now working.

armsrc/iclass.c

@@ -1264,7 +1264,7 @@ static bool iclass_send_cmd_with_retries(uint8_t *cmd, size_t cmdsize, uint8_t *
             return true;
         }
 
-        if (expected_size == GetIso15693AnswerFromTag(resp, max_resp_size, timeout, eof_time)) {
+        if (expected_size == GetIso15693AnswerFromTag(resp, max_resp_size, timeout, eof_time, false, true)) {
             return true;
         }
     }
@@ -1296,7 +1296,7 @@ static bool select_iclass_tag_ex(picopass_hdr_t *hdr, bool use_credit_key, uint3
     // wakeup
     uint32_t start_time = GetCountSspClk();
     iclass_send_as_reader(act_all, 1, &start_time, eof_time);
-    int len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_ACTALL, eof_time);
+    int len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_ACTALL, eof_time, false, true);
     if (len < 0)
         return false;
 
@@ -1305,7 +1305,7 @@ static bool select_iclass_tag_ex(picopass_hdr_t *hdr, bool use_credit_key, uint3
     iclass_send_as_reader(identify, 1, &start_time, eof_time);
 
     // expect a 10-byte response here, 8 byte anticollision-CSN and 2 byte CRC
-    len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time);
+    len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time, false, true);
     if (len != 10)
         return false;
 
@@ -1317,7 +1317,7 @@ static bool select_iclass_tag_ex(picopass_hdr_t *hdr, bool use_credit_key, uint3
     iclass_send_as_reader(select, sizeof(select), &start_time, eof_time);
 
     // expect a 10-byte response here, 8 byte CSN and 2 byte CRC
-    len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time);
+    len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time, false, true);
     if (len != 10)
         return false;
 
@@ -1329,7 +1329,7 @@ static bool select_iclass_tag_ex(picopass_hdr_t *hdr, bool use_credit_key, uint3
     iclass_send_as_reader(read_conf, sizeof(read_conf), &start_time, eof_time);
 
     // expect a 8-byte response here
-    len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time);
+    len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time, false, true);
     if (len != 10)
         return false;
 
@@ -1347,7 +1347,7 @@ static bool select_iclass_tag_ex(picopass_hdr_t *hdr, bool use_credit_key, uint3
         iclass_send_as_reader(read_aia, sizeof(read_aia), &start_time, eof_time);
 
         // expect a 10-byte response here
-        len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time);
+        len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time, false, true);
         if (len != 10)
             return false;
 
@@ -1361,7 +1361,7 @@ static bool select_iclass_tag_ex(picopass_hdr_t *hdr, bool use_credit_key, uint3
         iclass_send_as_reader(read_check_cc, sizeof(read_check_cc), &start_time, eof_time);
 
         // expect a 8-byte response here
-        len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time);
+        len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time, false, true);
         if (len != 8)
             return false;
 
@@ -1383,7 +1383,7 @@ static bool select_iclass_tag_ex(picopass_hdr_t *hdr, bool use_credit_key, uint3
         iclass_send_as_reader(read_aia, sizeof(read_aia), &start_time, eof_time);
 
         // expect a 10-byte response here
-        len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time);
+        len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time, false, true);
         if (len != 10)
             return false;
 
@@ -1870,7 +1870,7 @@ void iClass_WriteBlock(uint8_t *msg) {
             return;
         } else {
 
-            if (GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_UPDATE, &eof_time) == 10) {
+            if (GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_UPDATE, &eof_time, false, true) == 10) {
                 res = true;
                 break;
             }

armsrc/iso15693.c

@@ -967,20 +967,27 @@ static int RAMFUNC Handle15693FSKSamplesFromTag(uint8_t freq, DecodeTagFSK_t *De
 /*
  *  Receive and decode the tag response, also log to tracebuffer
  */
-int GetIso15693AnswerFromTag(uint8_t *response, uint16_t max_len, uint16_t timeout, uint32_t *eof_time) {
+int GetIso15693AnswerFromTag(uint8_t *response, uint16_t max_len, uint16_t timeout, uint32_t *eof_time, bool fsk, bool recv_speed) {
 
     int samples = 0, ret = 0;
 
     // the Decoder data structure
     DecodeTag_t dtm = { 0 };
     DecodeTag_t *dt = &dtm;
+
+    DecodeTagFSK_t dtfm = { 0 };
+    DecodeTagFSK_t *dtf = &dtfm;
+
+    if (!fsk)
         DecodeTagInit(dt, response, max_len);
+    else
+        DecodeTagFSKInit(dtf, response, max_len);
 
     // wait for last transfer to complete
     while (!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXEMPTY));
 
     // And put the FPGA in the appropriate mode
-    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_SUBCARRIER_424_KHZ | FPGA_HF_READER_MODE_RECEIVE_AMPLITUDE);
+    FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_2SUBCARRIERS_424_484_KHZ | FPGA_HF_READER_MODE_RECEIVE_AMPLITUDE);
 
     // Setup and start DMA.
     FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER);
@@ -1036,7 +1043,8 @@ int GetIso15693AnswerFromTag(uint8_t *response, uint16_t max_len, uint16_t timeo
             }
         }
 
-        if (Handle15693SamplesFromTag(tagdata, dt, true)) {
+        if (!fsk) {
+            if (Handle15693SamplesFromTag(tagdata & 0x3FFF, dt, recv_speed)) {
 
                 *eof_time = dma_start_time + (samples * 16) - DELAY_TAG_TO_ARM; // end of EOF
 
@@ -1055,16 +1063,38 @@ int GetIso15693AnswerFromTag(uint8_t *response, uint16_t max_len, uint16_t timeo
                 ret = -3;
                 break;
             }
+        }
+        else {
+            if (Handle15693FSKSamplesFromTag(tagdata >> 14, dtf, recv_speed)) {
 
+                *eof_time = dma_start_time + (samples * 16) - DELAY_TAG_TO_ARM; // end of EOF
+
+                if (dtf->lastBit == SOF) {
+                    *eof_time -= (8 * 16); // needed 8 additional samples to confirm single SOF (iCLASS)
+                }
+                if (dtf->len > dtf->max_len) {
+                    ret = -2; // buffer overflow
+                    Dbprintf("overflow (%d > %d", dtf->len, dtf->max_len);
+                }
+                break;
+            }
+
+            // timeout
+            if (samples > timeout && dtf->state < STATE_FSK_RECEIVING_DATA_484) {
+                ret = -3;
+                break;
+            }
+        }
     }
 
     FpgaDisableSscDma();
     FpgaDisableTracing();
 
-    uint32_t sof_time = *eof_time
+    uint32_t sof_time = *eof_time - (32 * 16);  // time for SOF transfer
-                        - (dt->len * 8 * 8 * 16) // time for byte transfers
+
-                        - (32 * 16)  // time for SOF transfer
+    if (!fsk) {
-                        - (dt->lastBit != SOF_PART2 ? (32 * 16) : 0); // time for EOF transfer
+        sof_time -= (dt->len * 8 * 8 * 16) // time for byte transfers
+                    + (dt->lastBit != SOF_PART2 ? (32 * 16) : 0); // time for EOF transfer
 
         if (g_dbglevel >= DBG_EXTENDED) {
             Dbprintf("samples = %d, ret = %d, Decoder: state = %d, lastBit = %d, len = %d, bitCount = %d, posCount = %d, maxlen = %u",
@@ -1079,13 +1109,36 @@ int GetIso15693AnswerFromTag(uint8_t *response, uint16_t max_len, uint16_t timeo
                 );
             Dbprintf("timing: sof_time = %d, eof_time = %d", (sof_time * 4), (*eof_time * 4));
         }
+    }
+    else {
+        sof_time -= (dtf->len * 8 * 8 * 16) // time for byte transfers
+                    + (dtf->lastBit != SOF ? (32 * 16) : 0); // time for EOF transfer
+
+        if (g_dbglevel >= DBG_EXTENDED) {
+            Dbprintf("samples = %d, ret = %d, FSK Decoder: state = %d, lastBit = %d, len = %d, bitCount = %d, count = %d, maxlen = %u",
+                     samples,
+                     ret,
+                     dtf->state,
+                     dtf->lastBit,
+                     dtf->len,
+                     dtf->bitCount,
+                     dtf->count,
+                     dtf->max_len
+                );
+            Dbprintf("timing: sof_time = %d, eof_time = %d", (sof_time * 4), (*eof_time * 4));
+        }
+    }
 
     if (ret < 0) {
         return ret;
     }
 
+    if (!fsk) {
         LogTrace_ISO15693(dt->output, dt->len, (sof_time * 4), (*eof_time * 4), NULL, false);
         return dt->len;
+    }
+    LogTrace_ISO15693(dtf->output, dtf->len, (sof_time * 4), (*eof_time * 4), NULL, false);
+    return dtf->len;
 }
 
 
@@ -1869,6 +1922,9 @@ int SendDataTag(uint8_t *send, int sendlen, bool init, bool speed_fast, uint8_t
         start_time = GetCountSspClk();
     }
 
+    bool fsk = send[0] & ISO15_REQ_SUBCARRIER_TWO;
+	bool recv_speed = send[0] & ISO15_REQ_DATARATE_HIGH;
+
     if (speed_fast) {
         // high speed (1 out of 4)
         CodeIso15693AsReader(send, sendlen);
@@ -1889,13 +1945,13 @@ int SendDataTag(uint8_t *send, int sendlen, bool init, bool speed_fast, uint8_t
         *eof_time = start_time + 32 * ((8 * ts->max) - 4); // subtract the 4 padding bits after EOF
         LogTrace_ISO15693(send, sendlen, (start_time * 4), (*eof_time * 4), NULL, true);
         if (recv != NULL) {
-            res = GetIso15693AnswerFromTag(recv, max_recv_len, timeout, eof_time);
+            res = GetIso15693AnswerFromTag(recv, max_recv_len, timeout, eof_time, fsk, recv_speed);
         }
     }
     return res;
 }
 
-int SendDataTagEOF(uint8_t *recv, uint16_t max_recv_len, uint32_t start_time, uint16_t timeout, uint32_t *eof_time) {
+int SendDataTagEOF(uint8_t *recv, uint16_t max_recv_len, uint32_t start_time, uint16_t timeout, uint32_t *eof_time, bool fsk, bool recv_speed) {
 
     CodeIso15693AsReaderEOF();
     tosend_t *ts = get_tosend();
@@ -1905,7 +1961,7 @@ int SendDataTagEOF(uint8_t *recv, uint16_t max_recv_len, uint32_t start_time, ui
 
     int res = 0;
     if (recv != NULL) {
-        res = GetIso15693AnswerFromTag(recv, max_recv_len, timeout, eof_time);
+        res = GetIso15693AnswerFromTag(recv, max_recv_len, timeout, eof_time, fsk, recv_speed);
     }
     return res;
 }
@@ -2335,10 +2391,13 @@ void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint
         reply_mix(CMD_ACK, recvlen, 0, 0, NULL, 0);
     } else {
 
+        bool fsk = data[0] & ISO15_REQ_SUBCARRIER_TWO;
+        bool recv_speed = data[0] & ISO15_REQ_DATARATE_HIGH;
+
         // send a single EOF to get the tag response
         if (request_answer) {
             start_time = eof_time + DELAY_ISO15693_VICC_TO_VCD_READER;
-            recvlen = SendDataTagEOF((recv ? recvbuf : NULL), sizeof(recvbuf), start_time, ISO15693_READER_TIMEOUT, &eof_time);
+            recvlen = SendDataTagEOF((recv ? recvbuf : NULL), sizeof(recvbuf), start_time, ISO15693_READER_TIMEOUT, &eof_time, fsk, recv_speed);
         }
 
         if (recv) {

armsrc/iso15693.h

@@ -41,7 +41,7 @@ void CodeIso15693AsTag(const uint8_t *cmd, size_t len);
 void TransmitTo15693Reader(const uint8_t *cmd, size_t len, uint32_t *start_time, uint32_t slot_time, bool slow);
 int GetIso15693CommandFromReader(uint8_t *received, size_t max_len, uint32_t *eof_time);
 void TransmitTo15693Tag(const uint8_t *cmd, int len, uint32_t *start_time);
-int GetIso15693AnswerFromTag(uint8_t *response, uint16_t max_len, uint16_t timeout, uint32_t *eof_time);
+int GetIso15693AnswerFromTag(uint8_t *response, uint16_t max_len, uint16_t timeout, uint32_t *eof_time, bool fsk, bool recv_speed);
 
 //void RecordRawAdcSamplesIso15693(void);
 void AcquireRawAdcSamplesIso15693(void);
@@ -55,7 +55,7 @@ void SniffIso15693(uint8_t jam_search_len, uint8_t *jam_search_string, bool icla
 int SendDataTag(uint8_t *send, int sendlen, bool init, bool speed_fast, uint8_t *recv,
                 uint16_t max_recv_len, uint32_t start_time, uint16_t timeout, uint32_t *eof_time);
 
-int SendDataTagEOF(uint8_t *recv, uint16_t max_recv_len, uint32_t start_time, uint16_t timeout, uint32_t *eof_time);
+int SendDataTagEOF(uint8_t *recv, uint16_t max_recv_len, uint32_t start_time, uint16_t timeout, uint32_t *eof_time, bool fsk, bool recv_speed);
 
 void SetTag15693Uid(const uint8_t *uid);