CHG: fiddled with the headerfiles... and makefile... Tried to make them behave...

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 967dc4af8ba6db3fe0d9bb8d6cb2c54d997e1c29..43131428df70bcc7e8d7df52263a3c23bf278d50 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -294,12 +294,11 @@ int CmdIndalaDemod(const char *Cmd)
                        count = 0;
                }
        }
                        count = 0;
                }
        }

+       if ( rawbit<1 ) return 0;

 
 

-       if ( rawbit>0 ){
+       if (g_debugMode) {

                PrintAndLog("Recovered %d raw bits, expected: %d", rawbit, GraphTraceLen/32);
                PrintAndLog("worst metric (0=best..7=worst): %d at pos %d", worst, worstPos);
                PrintAndLog("Recovered %d raw bits, expected: %d", rawbit, GraphTraceLen/32);
                PrintAndLog("worst metric (0=best..7=worst): %d at pos %d", worst, worstPos);

-       } else {
-               return 0;

        }
 
        // Finding the start of a UID
        }
 
        // Finding the start of a UID


@@ -327,15 +326,14 @@ int CmdIndalaDemod(const char *Cmd)
        }
   
        if (start == rawbit - uidlen + 1) {
        }
   
        if (start == rawbit - uidlen + 1) {

-               PrintAndLog("nothing to wait for");
+               if (g_debugMode) PrintAndLog("nothing to wait for");

                return 0;
        }
 
        // Inverting signal if needed
        if (first == 1) {
                return 0;
        }
 
        // Inverting signal if needed
        if (first == 1) {

-               for (i = start; i < rawbit; i++) {
+               for (i = start; i < rawbit; i++)

                        rawbits[i] = !rawbits[i];
                        rawbits[i] = !rawbits[i];

-               }

        }
 
        // Dumping UID
        }
 
        // Dumping UID


@@ -414,7 +412,7 @@ int CmdIndalaDemod(const char *Cmd)
                times += 1;
        }
 
                times += 1;
        }
 

-       PrintAndLog("Occurrences: %d (expected %d)", times, (rawbit - start) / uidlen);
+       if (g_debugMode) PrintAndLog("Occurrences: %d (expected %d)", times, (rawbit - start) / uidlen);

 
        // Remodulating for tag cloning
        // HACK: 2015-01-04 this will have an impact on our new way of seening lf commands (demod) 
 
        // Remodulating for tag cloning
        // HACK: 2015-01-04 this will have an impact on our new way of seening lf commands (demod) 


@@ -604,16 +602,16 @@ int CmdLFSim(const char *Cmd) {
        for (i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
                UsbCommand c = {CMD_DOWNLOADED_SIM_SAMPLES_125K, {i, 0, 0}};
 
        for (i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
                UsbCommand c = {CMD_DOWNLOADED_SIM_SAMPLES_125K, {i, 0, 0}};
 

-               for (j = 0; j < USB_CMD_DATA_SIZE; j++) {
+               for (j = 0; j < USB_CMD_DATA_SIZE; j++)

                        c.d.asBytes[j] = GraphBuffer[i+j];
                        c.d.asBytes[j] = GraphBuffer[i+j];

-               }
+

                clearCommandBuffer();
                SendCommand(&c);
                WaitForResponse(CMD_ACK, NULL);
                printf(".");
        }
 
                clearCommandBuffer();
                SendCommand(&c);
                WaitForResponse(CMD_ACK, NULL);
                printf(".");
        }
 

-       PrintAndLog("Starting to simulate");
+       PrintAndLog("Simulating");

 
        UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}};
        clearCommandBuffer();
 
        UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}};
        clearCommandBuffer();


@@ -1089,6 +1087,11 @@ int CmdLFfind(const char *Cmd) {
                PrintAndLog("\nValid NexWatch ID Found!");
                return 1;
        }
                PrintAndLog("\nValid NexWatch ID Found!");
                return 1;
        }

+       ans=CmdPSKIdteck("");
+       if (ans>0) {
+               PrintAndLog("\nValid Idteck ID Found!");
+               return 1;
+       }

        ans=CmdJablotronDemod("");
        if (ans>0) {
                PrintAndLog("\nValid Jablotron ID Found!");
        ans=CmdJablotronDemod("");
        if (ans>0) {
                PrintAndLog("\nValid Jablotron ID Found!");


@@ -1116,6 +1119,12 @@ int CmdLFfind(const char *Cmd) {
        }
        // TIdemod?
        
        }
        // TIdemod?
        

+       if (!offline && (cmdp != '1')){
+               ans=CmdLFHitagReader("26");
+               if (ans==0) {
+                       return 1;
+               }
+       }

 
        PrintAndLog("\nNo Known Tags Found!\n");
        if (testRaw=='u' || testRaw=='U'){
 
        PrintAndLog("\nNo Known Tags Found!\n");
        if (testRaw=='u' || testRaw=='U'){