#ifdef out the calls to the ISO15693/14443/14443a functions so that the -D on the...

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index fb501304aceafb2eb61608b1287901ffd7a7f74a..828926f12dbfa4201e3ca539b05389e3f6cb3b2a 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -541,57 +541,77 @@ void UsbPacketReceived(BYTE *packet, int len)
                        ModThenAcquireRawAdcSamples125k(c->ext1,c->ext2,c->ext3,c->d.asBytes);\r
                        break;\r
 \r
                        ModThenAcquireRawAdcSamples125k(c->ext1,c->ext2,c->ext3,c->d.asBytes);\r
                        break;\r
 \r

+#ifdef WITH_ISO15693\r

                case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693:\r
                        AcquireRawAdcSamplesIso15693();\r
                        break;\r
                case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693:\r
                        AcquireRawAdcSamplesIso15693();\r
                        break;\r

+#endif\r

 \r
                case CMD_BUFF_CLEAR:\r
                        BufferClear();\r
                        break;\r
 \r
 \r
                case CMD_BUFF_CLEAR:\r
                        BufferClear();\r
                        break;\r
 \r

+#ifdef WITH_ISO15693\r

                case CMD_READER_ISO_15693:\r
                        ReaderIso15693(c->ext1);\r
                        break;\r
                case CMD_READER_ISO_15693:\r
                        ReaderIso15693(c->ext1);\r
                        break;\r

+#endif\r

 \r
                case CMD_READER_LEGIC_RF:\r
                        LegicRfReader();\r
                        break;\r
 \r
 \r
                case CMD_READER_LEGIC_RF:\r
                        LegicRfReader();\r
                        break;\r
 \r

+#ifdef WITH_ISO15693\r

                case CMD_SIMTAG_ISO_15693:\r
                        SimTagIso15693(c->ext1);\r
                        break;\r
                case CMD_SIMTAG_ISO_15693:\r
                        SimTagIso15693(c->ext1);\r
                        break;\r

+#endif\r

 \r
 \r

+#ifdef WITH_ISO14443b\r

                case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443:\r
                        AcquireRawAdcSamplesIso14443(c->ext1);\r
                        break;\r
                case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443:\r
                        AcquireRawAdcSamplesIso14443(c->ext1);\r
                        break;\r

+#endif\r

 \r
 \r

+#ifdef WITH_ISO14443b\r

                case CMD_READ_SRI512_TAG:\r
                        ReadSRI512Iso14443(c->ext1);\r
                        break;\r
                case CMD_READ_SRI512_TAG:\r
                        ReadSRI512Iso14443(c->ext1);\r
                        break;\r

+#endif\r

 \r
 \r

+#ifdef WITH_ISO14443a\r

                case CMD_READER_ISO_14443a:\r
                        ReaderIso14443a(c->ext1);\r
                        break;\r
                case CMD_READER_ISO_14443a:\r
                        ReaderIso14443a(c->ext1);\r
                        break;\r

+#endif\r

 \r
 \r

+#ifdef WITH_ISO14443b\r

                case CMD_SNOOP_ISO_14443:\r
                        SnoopIso14443();\r
                        break;\r
                case CMD_SNOOP_ISO_14443:\r
                        SnoopIso14443();\r
                        break;\r

+#endif\r

 \r
 \r

+#ifdef WITH_ISO14443a\r

                case CMD_SNOOP_ISO_14443a:\r
                        SnoopIso14443a();\r
                        break;\r
                case CMD_SNOOP_ISO_14443a:\r
                        SnoopIso14443a();\r
                        break;\r

+#endif\r

 \r
                case CMD_SIMULATE_TAG_HF_LISTEN:\r
                        SimulateTagHfListen();\r
                        break;\r
 \r
 \r
                case CMD_SIMULATE_TAG_HF_LISTEN:\r
                        SimulateTagHfListen();\r
                        break;\r
 \r

+#ifdef WITH_ISO14443b\r

                case CMD_SIMULATE_TAG_ISO_14443:\r
                        SimulateIso14443Tag();\r
                        break;\r
                case CMD_SIMULATE_TAG_ISO_14443:\r
                        SimulateIso14443Tag();\r
                        break;\r

+#endif\r

                \r
                \r

+#ifdef WITH_ISO14443a\r

                case CMD_SIMULATE_TAG_ISO_14443a:\r
                        SimulateIso14443aTag(c->ext1, c->ext2);  // ## Simulate iso14443a tag - pass tag type & UID\r
                        break;\r
                case CMD_SIMULATE_TAG_ISO_14443a:\r
                        SimulateIso14443aTag(c->ext1, c->ext2);  // ## Simulate iso14443a tag - pass tag type & UID\r
                        break;\r

+#endif\r

 \r
                case CMD_SIMULATE_TAG_LEGIC_RF:\r
                        LegicRfSimulate();\r
 \r
                case CMD_SIMULATE_TAG_LEGIC_RF:\r
                        LegicRfSimulate();\r