-#define FPGA_CMD_SET_EDGE_DETECT_THRESHOLD FPGA_CMD_SET_USER_BYTE1
-#define FPGA_LF_EDGE_DETECT_READER_FIELD (1<<0)
-#define FPGA_LF_EDGE_DETECT_TOGGLE_MODE (1<<1)
-// Options for the HF reader, tx to tag
-#define FPGA_HF_READER_TX_SHALLOW_MOD (1<<0)
-// Options for the HF reader, correlating against rx from tag
-#define FPGA_HF_READER_RX_XCORR_848_KHZ (1<<0)
-#define FPGA_HF_READER_RX_XCORR_SNOOP (1<<1)
+#define FPGA_CMD_SET_EDGE_DETECT_THRESHOLD FPGA_CMD_SET_USER_BYTE1
+#define FPGA_LF_EDGE_DETECT_READER_FIELD (1<<0)
+#define FPGA_LF_EDGE_DETECT_TOGGLE_MODE (1<<1)
+
+// Options for the HF reader
+#define FPGA_HF_READER_MODE_RECEIVE_IQ (0<<0)
+#define FPGA_HF_READER_MODE_RECEIVE_AMPLITUDE (1<<0)
+#define FPGA_HF_READER_MODE_RECEIVE_PHASE (2<<0)
+#define FPGA_HF_READER_MODE_SEND_FULL_MOD (3<<0)
+#define FPGA_HF_READER_MODE_SEND_SHALLOW_MOD (4<<0)
+#define FPGA_HF_READER_MODE_SNOOP_IQ (5<<0)
+#define FPGA_HF_READER_MODE_SNOOP_AMPLITUDE (6<<0)
+#define FPGA_HF_READER_MODE_SNOOP_PHASE (7<<0)
+
+#define FPGA_HF_READER_SUBCARRIER_848_KHZ (0<<3)
+#define FPGA_HF_READER_SUBCARRIER_424_KHZ (1<<3)
+#define FPGA_HF_READER_SUBCARRIER_212_KHZ (2<<3)
+