]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - armsrc/appmain.c
ADD: @marshmellows fixes
[proxmark3-svn] / armsrc / appmain.c
index f3136fa06cd38336f1f3ddd7b160c86b3a9cc2fa..9490a8115894d53ffe17872798e69d3488106f6e 100644 (file)
@@ -691,8 +691,9 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        WriteTItag(c->arg[0],c->arg[1],c->arg[2]);
                        break;
                case CMD_SIMULATE_TAG_125K:
-                       SimulateTagLowFrequency(c->arg[0], c->arg[1], 0);
-                       //SimulateTagLowFrequencyA(c->arg[0], c->arg[1]);
+                       LED_A_ON();
+                       SimulateTagLowFrequency(c->arg[0], c->arg[1], 1);
+                       LED_A_OFF();
                        break;
                case CMD_LF_SIMULATE_BIDIR:
                        SimulateTagLowFrequencyBidir(c->arg[0], c->arg[1]);
@@ -834,17 +835,12 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        MifareUC_Auth2(c->arg[0],c->d.asBytes);
                        break;
                case CMD_MIFAREU_READCARD:
-                       MifareUReadCard(c->arg[0], c->arg[1], c->d.asBytes);
-            break;
                case CMD_MIFAREUC_READCARD:
-                       MifareUReadCard(c->arg[0], c->arg[1], c->d.asBytes);
+                       MifareUReadCard(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
                        break;          
                case CMD_MIFAREUC_SETPWD: 
                        MifareUSetPwd(c->arg[0], c->d.asBytes);
                        break;
-               //case CMD_MIFAREU_SETUID: 
-                       //MifareUSetUid(c->arg[0], c->d.asBytes);
-                       //break;                
                case CMD_MIFARE_READSC:
                        MifareReadSector(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
                        break;
@@ -919,6 +915,9 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        MifareSendCommand(c->arg[0], c->arg[1], c->d.asBytes);
                        break;
 
+               case CMD_MIFARE_COLLECT_NONCES:
+                       MifareCollectNonces(c->arg[0], c->arg[1]);
+                       break;
 #endif
 
 #ifdef WITH_ICLASS
Impressum, Datenschutz