CHG: experimenting with 'lf sim' It does send a signal now but...

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 549feff0bb25e82ee230d0163b65d9bba29bb97b..a2c12803a864d667c66912e54a4110dc59f138a0 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -182,9 +182,7 @@ static int ReadAdc(int ch)
 
 int AvgAdc(int ch) // was static - merlok
 {
-       int i;
-       int a = 0;
-
+       int i, a = 0;
        for(i = 0; i < 32; ++i)
                a += ReadAdc(ch);
 
@@ -1052,22 +1050,18 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_SIMULATE_TAG_LEGIC_RF:
                        LegicRfSimulate(c->arg[0], c->arg[1], c->arg[2]);
                        break;
-
                case CMD_WRITER_LEGIC_RF:
-                       LegicRfWriter( c->arg[0], c->arg[1], c->arg[2]);
+                       LegicRfWriter( c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
                        break;
-
-               case CMD_RAW_WRITER_LEGIC_RF:
-                       LegicRfRawWriter(c->arg[0], c->arg[1], c->arg[2]);
-                       break;
-
                case CMD_READER_LEGIC_RF:
                        LegicRfReader(c->arg[0], c->arg[1], c->arg[2]);
-                       break;
-                       
+                       break;                  
                case CMD_LEGIC_INFO:
                        LegicRfInfo();
                        break;
+               case CMD_LEGIC_ESET:
+                       LegicEMemSet(c->arg[0], c->arg[1], c->d.asBytes);
+                       break;
 #endif
 
 #ifdef WITH_ISO14443b
@@ -1196,7 +1190,6 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_MIFARE_DESFIRE:
                        MifareSendCommand(c->arg[0], c->arg[1], c->d.asBytes);
                        break;
-
                case CMD_MIFARE_COLLECT_NONCES:
                        break;
 #endif
@@ -1227,7 +1220,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                case CMD_READER_ICLASS_REPLAY:
                    ReaderIClass_Replay(c->arg[0], c->d.asBytes);
                        break;
-       case CMD_ICLASS_EML_MEMSET:
+               case CMD_ICLASS_EML_MEMSET:
                        emlSet(c->d.asBytes,c->arg[0], c->arg[1]);
                        break;
                case CMD_ICLASS_WRITEBLOCK:
@@ -1291,6 +1284,12 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        break;
                }
                case CMD_DOWNLOADED_SIM_SAMPLES_125K: {
+                       // iceman; since changing fpga_bitstreams clears bigbuff, Its better to call it before.
+                       // to be able to use this one for uploading data to device not only for LF, I use c->arg[1] 
+                       if ( c->arg[1] == 0 )
+                               FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+                       else 
+                               FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
                        uint8_t *b = BigBuf_get_addr();
                        memcpy( b + c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);
                        cmd_send(CMD_ACK,0,0,0,0,0);