-#define CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693 0x0300
-#define CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443 0x0301
-#define CMD_READ_SRI512_TAG 0x0303
-#define CMD_READ_SRIX4K_TAG 0x0304
-#define CMD_READER_ISO_15693 0x0310
-#define CMD_SIMTAG_ISO_15693 0x0311
-#define CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693 0x0312
-#define CMD_ISO_15693_COMMAND 0x0313
-#define CMD_ISO_15693_COMMAND_DONE 0x0314
-#define CMD_ISO_15693_FIND_AFI 0x0315
-#define CMD_ISO_15693_DEBUG 0x0316
-#define CMD_SIMULATE_TAG_HF_LISTEN 0x0380
-#define CMD_SIMULATE_TAG_ISO_14443 0x0381
-#define CMD_SNOOP_ISO_14443 0x0382
-#define CMD_SNOOP_ISO_14443a 0x0383
-#define CMD_SIMULATE_TAG_ISO_14443a 0x0384
-#define CMD_READER_ISO_14443a 0x0385
-#define CMD_SIMULATE_TAG_LEGIC_RF 0x0387
-#define CMD_READER_LEGIC_RF 0x0388
-#define CMD_WRITER_LEGIC_RF 0x0399
-
-#define CMD_SNOOP_ICLASS 0x0392
+#define CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693 0x0300
+#define CMD_READ_SRI_TAG 0x0303
+#define CMD_ISO_14443B_COMMAND 0x0305
+#define CMD_READER_ISO_15693 0x0310
+#define CMD_SIMTAG_ISO_15693 0x0311
+#define CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693 0x0312
+#define CMD_ISO_15693_COMMAND 0x0313
+#define CMD_ISO_15693_COMMAND_DONE 0x0314
+#define CMD_ISO_15693_FIND_AFI 0x0315
+#define CMD_ISO_15693_DEBUG 0x0316
+#define CMD_LF_SNOOP_RAW_ADC_SAMPLES 0x0317
+
+// For Hitag2 transponders
+#define CMD_SNOOP_HITAG 0x0370
+#define CMD_SIMULATE_HITAG 0x0371
+#define CMD_READER_HITAG 0x0372
+
+// For HitagS
+#define CMD_TEST_HITAGS_TRACES 0x0367
+#define CMD_SIMULATE_HITAG_S 0x0368
+#define CMD_READ_HITAG_S 0x0373
+#define CMD_WR_HITAG_S 0x0375
+#define CMD_EMU_HITAG_S 0x0376
+
+
+#define CMD_SIMULATE_TAG_ISO_14443B 0x0381
+#define CMD_SNOOP_ISO_14443B 0x0382
+#define CMD_SNOOP_ISO_14443a 0x0383
+#define CMD_SIMULATE_TAG_ISO_14443a 0x0384
+#define CMD_READER_ISO_14443a 0x0385
+#define CMD_RAW_WRITER_LEGIC_RF 0x0386
+#define CMD_SIMULATE_TAG_LEGIC_RF 0x0387
+#define CMD_READER_LEGIC_RF 0x0388
+#define CMD_WRITER_LEGIC_RF 0x0389
+
+#define CMD_EPA_PACE_COLLECT_NONCE 0x038A
+#define CMD_EPA_PACE_REPLAY 0x038B
+
+#define CMD_LEGIC_INFO 0x03BC
+#define CMD_LEGIC_ESET 0x03BD
+#define CMD_LEGIC_EGET 0x03BE
+
+#define CMD_ICLASS_READCHECK 0x038F
+#define CMD_ICLASS_CLONE 0x0390
+#define CMD_ICLASS_DUMP 0x0391
+#define CMD_SNOOP_ICLASS 0x0392
+#define CMD_SIMULATE_TAG_ICLASS 0x0393
+#define CMD_READER_ICLASS 0x0394
+#define CMD_READER_ICLASS_REPLAY 0x0395
+#define CMD_ICLASS_READBLOCK 0x0396
+#define CMD_ICLASS_WRITEBLOCK 0x0397
+#define CMD_ICLASS_EML_MEMSET 0x0398
+#define CMD_ICLASS_AUTHENTICATION 0x0399