HitagS Improvements (#721)

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index d8e78be15eca8b6f67e6772beec889909329be89..c09a299ce1f32e9cb11fec9c57a30d14ca115ee2 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -8,19 +8,21 @@
 // Low frequency commands
 //-----------------------------------------------------------------------------
 
 // Low frequency commands
 //-----------------------------------------------------------------------------
 

+#include "cmdlf.h"
+

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>

-#include "proxmark3.h"
-#include "cmdlf.h"
+#include <stdbool.h>
+#include <stdint.h>
+#include "comms.h"

 #include "lfdemod.h"     // for psk2TOpsk1
 #include "util.h"        // for parsing cli command utils
 #include "ui.h"          // for show graph controls
 #include "graph.h"       // for graph data
 #include "cmdparser.h"   // for getting cli commands included in cmdmain.h
 #include "cmdmain.h"     // for sending cmds to device
 #include "lfdemod.h"     // for psk2TOpsk1
 #include "util.h"        // for parsing cli command utils
 #include "ui.h"          // for show graph controls
 #include "graph.h"       // for graph data
 #include "cmdparser.h"   // for getting cli commands included in cmdmain.h
 #include "cmdmain.h"     // for sending cmds to device

-#include "data.h"        // for GetFromBigBuf

 #include "cmddata.h"     // for `lf search`
 #include "cmdlfawid.h"   // for awid menu
 #include "cmdlfem4x.h"   // for em4x menu
 #include "cmddata.h"     // for `lf search`
 #include "cmdlfawid.h"   // for awid menu
 #include "cmdlfem4x.h"   // for em4x menu


@@ -38,6 +40,12 @@
 #include "cmdlfindala.h" // for indala menu
 #include "cmdlfgproxii.h"// for gproxii menu
 #include "cmdlffdx.h"    // for fdx-b menu
 #include "cmdlfindala.h" // for indala menu
 #include "cmdlfgproxii.h"// for gproxii menu
 #include "cmdlffdx.h"    // for fdx-b menu

+#include "cmdlfparadox.h"// for paradox menu
+#include "cmdlfnexwatch.h"//for nexwatch menu
+#include "cmdlfjablotron.h" //for jablotron menu
+#include "cmdlfnoralsy.h"// for noralsy menu
+#include "cmdlfsecurakey.h"//for securakey menu
+#include "cmdlfpac.h"    // for pac menu

 
 bool g_lf_threshold_set = false;
 static int CmdHelp(const char *Cmd);
 
 bool g_lf_threshold_set = false;
 static int CmdHelp(const char *Cmd);


@@ -46,26 +54,24 @@ static int CmdHelp(const char *Cmd);
 
 int usage_lf_cmdread(void)
 {
 
 int usage_lf_cmdread(void)
 {

-       PrintAndLog("Usage: lf cmdread d <delay period> z <zero period> o <one period> c <cmdbytes> [H] ");
+       PrintAndLog("Usage: lf cmdread d <delay period> z <zero period> o <one period> c <cmdbytes> ");

        PrintAndLog("Options:        ");
        PrintAndLog("       h             This help");
        PrintAndLog("Options:        ");
        PrintAndLog("       h             This help");

-       PrintAndLog("       L             Low frequency (125 KHz)");
-       PrintAndLog("       H             High frequency (134 KHz)");
-       PrintAndLog("       d <delay>     delay OFF period");
-       PrintAndLog("       z <zero>      time period ZERO");
-       PrintAndLog("       o <one>       time period ONE");
+       PrintAndLog("       d <delay>     delay OFF period between bits (0 for bitbang mode)");
+       PrintAndLog("       z <zero>      time period ZERO (antenna off in bitbang mode)");
+       PrintAndLog("       o <one>       time period ONE (antenna on in bitbang mode)");

        PrintAndLog("       c <cmd>       Command bytes");
        PrintAndLog("       ************* All periods in microseconds");
        PrintAndLog("       c <cmd>       Command bytes");
        PrintAndLog("       ************* All periods in microseconds");

+       PrintAndLog("       ************* Use lf config to configure options.");

        PrintAndLog("Examples:");
        PrintAndLog("      lf cmdread d 80 z 100 o 200 c 11000");
        PrintAndLog("Examples:");
        PrintAndLog("      lf cmdread d 80 z 100 o 200 c 11000");

-       PrintAndLog("      lf cmdread d 80 z 100 o 100 c 11000 H");
+       PrintAndLog("      lf cmdread d 80 z 100 o 100 c 11000");

        return 0;
 }
 
 /* send a command before reading */
 int CmdLFCommandRead(const char *Cmd)
 {
        return 0;
 }
 
 /* send a command before reading */
 int CmdLFCommandRead(const char *Cmd)
 {

-       static char dummy[3] = {0x20,0x00,0x00};

        UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K};
        bool errors = false;
        //uint8_t divisor = 95; //125khz
        UsbCommand c = {CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K};
        bool errors = false;
        //uint8_t divisor = 95; //125khz


@@ -76,16 +82,8 @@ int CmdLFCommandRead(const char *Cmd)
                {
                case 'h':
                        return usage_lf_cmdread();
                {
                case 'h':
                        return usage_lf_cmdread();

-               case 'H':
-                       //divisor = 88;
-                       dummy[1]='h';
-                       cmdp++;
-                       break;
-               case 'L':
-                       cmdp++;
-                       break;

                case 'c':
                case 'c':

-                       param_getstr(Cmd, cmdp+1, (char *)&c.d.asBytes);
+                       param_getstr(Cmd, cmdp+1, (char *)&c.d.asBytes, sizeof(c.d.asBytes));

                        cmdp+=2;
                        break;
                case 'd':
                        cmdp+=2;
                        break;
                case 'd':


@@ -113,11 +111,13 @@ int CmdLFCommandRead(const char *Cmd)
        //Validations
        if(errors) return usage_lf_cmdread();
        
        //Validations
        if(errors) return usage_lf_cmdread();
        

-       // in case they specified 'H'
-       strcpy((char *)&c.d.asBytes + strlen((char *)c.d.asBytes), dummy);
-

        clearCommandBuffer();
        SendCommand(&c);
        clearCommandBuffer();
        SendCommand(&c);

+
+       WaitForResponse(CMD_ACK,NULL);
+       getSamples(0, true);
+
+

        return 0;
 }
 
        return 0;
 }
 


@@ -206,7 +206,7 @@ int usage_lf_read(void)
        PrintAndLog("Options:        ");
        PrintAndLog("       h            This help");
        PrintAndLog("       s            silent run no printout");
        PrintAndLog("Options:        ");
        PrintAndLog("       h            This help");
        PrintAndLog("       s            silent run no printout");

-       PrintAndLog("This function takes no arguments. ");
+       PrintAndLog("       [# samples]  # samples to collect (optional)");     

        PrintAndLog("Use 'lf config' to set parameters.");
        return 0;
 }
        PrintAndLog("Use 'lf config' to set parameters.");
        return 0;
 }


@@ -326,29 +326,42 @@ int CmdLFSetConfig(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 

+bool lf_read(bool silent, uint32_t samples) {
+       if (IsOffline()) return false;
+       UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {silent,samples,0}};
+       clearCommandBuffer();
+       //And ship it to device
+       SendCommand(&c);
+
+       UsbCommand resp;
+       if (g_lf_threshold_set) {
+               WaitForResponse(CMD_ACK,&resp);
+       } else {
+               if ( !WaitForResponseTimeout(CMD_ACK,&resp,2500) ) {
+                       PrintAndLog("command execution time out");
+                       return false;
+               }
+       }
+       // resp.arg[0] is bits read not bytes read.
+       getSamples(resp.arg[0]/8, silent);
+
+       return true;
+}
+

 int CmdLFRead(const char *Cmd)
 {
 int CmdLFRead(const char *Cmd)
 {

-       if (offline) return 0;

        uint8_t cmdp = 0;
        uint8_t cmdp = 0;

-       bool arg1 = false;
+       bool silent = false;

        if (param_getchar(Cmd, cmdp) == 'h')
        {
                return usage_lf_read();
        }
        if (param_getchar(Cmd, cmdp) == 'h')
        {
                return usage_lf_read();
        }

-       if (param_getchar(Cmd, cmdp) == 's') arg1 = true; //suppress print
-       //And ship it to device
-       UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {arg1,0,0}};
-       clearCommandBuffer();
-       SendCommand(&c);
-       if (g_lf_threshold_set) {
-               WaitForResponse(CMD_ACK,NULL);
-       } else {
-               if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
-                       PrintAndLog("command execution time out");
-                       return 1;
-               }
+       if (param_getchar(Cmd, cmdp) == 's') {
+               silent = true; //suppress print
+               cmdp++;

        }
        }

-       return 0;
+       uint32_t samples = param_get32ex(Cmd, cmdp, 0, 10);
+       return lf_read(silent, samples);

 }
 
 int CmdLFSnoop(const char *Cmd)
 }
 
 int CmdLFSnoop(const char *Cmd)


@@ -363,6 +376,8 @@ int CmdLFSnoop(const char *Cmd)
        clearCommandBuffer();
        SendCommand(&c);
        WaitForResponse(CMD_ACK,NULL);
        clearCommandBuffer();
        SendCommand(&c);
        WaitForResponse(CMD_ACK,NULL);

+       getSamples(0, true);
+

        return 0;
 }
 
        return 0;
 }
 


@@ -387,14 +402,13 @@ int CmdLFSim(const char *Cmd)
 
        sscanf(Cmd, "%i", &gap);
 
 
        sscanf(Cmd, "%i", &gap);
 

-       // convert to bitstream if necessary 
-
+       // convert to bitstream if necessary

        ChkBitstream(Cmd);
 
        //can send only 512 bits at a time (1 byte sent per bit...)
        printf("Sending [%d bytes]", GraphTraceLen);
        for (i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
        ChkBitstream(Cmd);
 
        //can send only 512 bits at a time (1 byte sent per bit...)
        printf("Sending [%d bytes]", GraphTraceLen);
        for (i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {

-               UsbCommand c={CMD_DOWNLOADED_SIM_SAMPLES_125K, {i, 0, 0}};
+               UsbCommand c = {CMD_DOWNLOADED_SIM_SAMPLES_125K, {i, 0, 0}};

 
                for (j = 0; j < USB_CMD_DATA_SIZE; j++) {
                        c.d.asBytes[j] = GraphBuffer[i+j];
 
                for (j = 0; j < USB_CMD_DATA_SIZE; j++) {
                        c.d.asBytes[j] = GraphBuffer[i+j];


@@ -469,7 +483,7 @@ int CmdLFfskSim(const char *Cmd)
        uint8_t fcHigh=0, fcLow=0, clk=0;
        uint8_t invert=0;
        bool errors = false;
        uint8_t fcHigh=0, fcLow=0, clk=0;
        uint8_t invert=0;
        bool errors = false;

-       char hexData[32] = {0x00}; // store entered hex data
+       char hexData[64] = {0x00}; // store entered hex data

        uint8_t data[255] = {0x00}; 
        int dataLen = 0;
        uint8_t cmdp = 0;
        uint8_t data[255] = {0x00}; 
        int dataLen = 0;
        uint8_t cmdp = 0;


@@ -500,7 +514,7 @@ int CmdLFfskSim(const char *Cmd)
                //  cmdp++;
                //  break;
                case 'd':
                //  cmdp++;
                //  break;
                case 'd':

-                       dataLen = param_getstr(Cmd, cmdp+1, hexData);
+                       dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));

                        if (dataLen==0) {
                                errors=true; 
                        } else {
                        if (dataLen==0) {
                                errors=true; 
                        } else {


@@ -527,10 +541,10 @@ int CmdLFfskSim(const char *Cmd)
        {
                return usage_lf_simfsk();
        }
        {
                return usage_lf_simfsk();
        }

-
+       int firstClockEdge = 0;

        if (dataLen == 0){ //using DemodBuffer 
                if (clk==0 || fcHigh==0 || fcLow==0){ //manual settings must set them all
        if (dataLen == 0){ //using DemodBuffer 
                if (clk==0 || fcHigh==0 || fcLow==0){ //manual settings must set them all

-                       uint8_t ans = fskClocks(&fcHigh, &fcLow, &clk, 0);
+                       uint8_t ans = fskClocks(&fcHigh, &fcLow, &clk, 0, &firstClockEdge);

                        if (ans==0){
                                if (!fcHigh) fcHigh=10;
                                if (!fcLow) fcLow=8;
                        if (ans==0){
                                if (!fcHigh) fcHigh=10;
                                if (!fcLow) fcLow=8;


@@ -571,7 +585,7 @@ int CmdLFaskSim(const char *Cmd)
        uint8_t encoding = 1, separator = 0;
        uint8_t clk=0, invert=0;
        bool errors = false;
        uint8_t encoding = 1, separator = 0;
        uint8_t clk=0, invert=0;
        bool errors = false;

-       char hexData[32] = {0x00}; 
+       char hexData[64] = {0x00}; 

        uint8_t data[255]= {0x00}; // store entered hex data
        int dataLen = 0;
        uint8_t cmdp = 0;
        uint8_t data[255]= {0x00}; // store entered hex data
        int dataLen = 0;
        uint8_t cmdp = 0;


@@ -606,7 +620,7 @@ int CmdLFaskSim(const char *Cmd)
                        cmdp++;
                        break;
                case 'd':
                        cmdp++;
                        break;
                case 'd':

-                       dataLen = param_getstr(Cmd, cmdp+1, hexData);
+                       dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));

                        if (dataLen==0) {
                                errors=true; 
                        } else {
                        if (dataLen==0) {
                                errors=true; 
                        } else {


@@ -665,7 +679,7 @@ int CmdLFpskSim(const char *Cmd)
        uint8_t carrier=0, clk=0;
        uint8_t invert=0;
        bool errors = false;
        uint8_t carrier=0, clk=0;
        uint8_t invert=0;
        bool errors = false;

-       char hexData[32] = {0x00}; // store entered hex data
+       char hexData[64] = {0x00}; // store entered hex data

        uint8_t data[255] = {0x00}; 
        int dataLen = 0;
        uint8_t cmdp = 0;
        uint8_t data[255] = {0x00}; 
        int dataLen = 0;
        uint8_t cmdp = 0;


@@ -701,7 +715,7 @@ int CmdLFpskSim(const char *Cmd)
                        cmdp++;
                        break;
                case 'd':
                        cmdp++;
                        break;
                case 'd':

-                       dataLen = param_getstr(Cmd, cmdp+1, hexData);
+                       dataLen = param_getstr(Cmd, cmdp+1, hexData, sizeof(hexData));

                        if (dataLen==0) {
                                errors=true; 
                        } else {
                        if (dataLen==0) {
                                errors=true; 
                        } else {


@@ -856,18 +870,28 @@ int CmdVchDemod(const char *Cmd)
 int CheckChipType(char cmdp) {
        uint32_t wordData = 0;
 
 int CheckChipType(char cmdp) {
        uint32_t wordData = 0;
 

+       if (IsOffline() || cmdp == '1') return 0;
+
+       save_restoreGB(GRAPH_SAVE);
+       save_restoreDB(GRAPH_SAVE);

        //check for em4x05/em4x69 chips first
        //check for em4x05/em4x69 chips first

-       save_restoreGB(1);
-       if ((!offline && (cmdp != '1')) && EM4x05Block0Test(&wordData)) {
+       if (EM4x05Block0Test(&wordData)) {

                PrintAndLog("\nValid EM4x05/EM4x69 Chip Found\nTry lf em 4x05... commands\n");
                PrintAndLog("\nValid EM4x05/EM4x69 Chip Found\nTry lf em 4x05... commands\n");

-               save_restoreGB(0);
+               save_restoreGB(GRAPH_RESTORE);
+               save_restoreDB(GRAPH_RESTORE);

                return 1;
        }
 
                return 1;
        }
 

-       //TODO check for t55xx chip...
-
-       save_restoreGB(0);
-       return 1;
+       //check for t55xx chip...
+       if (tryDetectP1(true)) {
+               PrintAndLog("\nValid T55xx Chip Found\nTry lf t55xx ... commands\n");
+               save_restoreGB(GRAPH_RESTORE);
+               save_restoreDB(GRAPH_RESTORE);
+               return 1;               
+       }
+       save_restoreGB(GRAPH_RESTORE);
+       save_restoreDB(GRAPH_RESTORE);
+       return 0;

 }
 
 //by marshmellow
 }
 
 //by marshmellow


@@ -891,9 +915,8 @@ int CmdLFfind(const char *Cmd)
                return 0;
        }
 
                return 0;
        }
 

-       if (!offline && (cmdp != '1')){
-               CmdLFRead("s");
-               getSamples("30000",false);
+       if (!IsOffline() && (cmdp != '1')) {
+               lf_read(true, 30000);

        } else if (GraphTraceLen < minLength) {
                PrintAndLog("Data in Graphbuffer was too small.");
                return 0;
        } else if (GraphTraceLen < minLength) {
                PrintAndLog("Data in Graphbuffer was too small.");
                return 0;


@@ -908,25 +931,28 @@ int CmdLFfind(const char *Cmd)
        // only run if graphbuffer is just noise as it should be for hitag/cotag
        if (graphJustNoise(GraphBuffer, testLen)) {
                // only run these tests if we are in online mode 
        // only run if graphbuffer is just noise as it should be for hitag/cotag
        if (graphJustNoise(GraphBuffer, testLen)) {
                // only run these tests if we are in online mode 

-               if (!offline && (cmdp != '1')) {
+               if (!IsOffline() && (cmdp != '1')) {

                        // test for em4x05 in reader talk first mode.
                        if (EM4x05Block0Test(&wordData)) {
                                PrintAndLog("\nValid EM4x05/EM4x69 Chip Found\nUse lf em 4x05readword/dump commands to read\n");
                                return 1;
                        }
                        // test for em4x05 in reader talk first mode.
                        if (EM4x05Block0Test(&wordData)) {
                                PrintAndLog("\nValid EM4x05/EM4x69 Chip Found\nUse lf em 4x05readword/dump commands to read\n");
                                return 1;
                        }

-                       ans=CmdLFHitagReader("26");
+                       ans=CmdLFHitagReader("26"); // 26 = RHT2F_UID_ONLY

                        if (ans==0) {
                                return 1;
                        }
                        ans=CmdCOTAGRead("");
                        if (ans==0) {
                                return 1;
                        }
                        ans=CmdCOTAGRead("");

-                       if (ans>0){
+                       if (ans>0) {

                                PrintAndLog("\nValid COTAG ID Found!");
                                return 1;
                        }
                }
                                PrintAndLog("\nValid COTAG ID Found!");
                                return 1;
                        }
                }

+               PrintAndLog("\nNo Data Found! - maybe not an LF tag?\n");

                return 0;
        }
 
                return 0;
        }
 

+       // TODO test for modulation then only test formats that use that modulation
+

        ans=CmdFSKdemodIO("");
        if (ans>0) {
                PrintAndLog("\nValid IO Prox ID Found!");
        ans=CmdFSKdemodIO("");
        if (ans>0) {
                PrintAndLog("\nValid IO Prox ID Found!");


@@ -975,25 +1001,43 @@ int CmdLFfind(const char *Cmd)
                return CheckChipType(cmdp);
        }
 
                return CheckChipType(cmdp);
        }
 

-       ans=CmdFdxDemod("");
+       ans=CmdFdxDemod(""); //biphase

        if (ans>0) {
                PrintAndLog("\nValid FDX-B ID Found!");
                return CheckChipType(cmdp);
        }
 
        if (ans>0) {
                PrintAndLog("\nValid FDX-B ID Found!");
                return CheckChipType(cmdp);
        }
 

-       ans=EM4x50Read("", false);
+       ans=EM4x50Read("", false); //ask

        if (ans>0) {
                PrintAndLog("\nValid EM4x50 ID Found!");
                return 1;
        if (ans>0) {
                PrintAndLog("\nValid EM4x50 ID Found!");
                return 1;

-       }       
+       }
+
+       ans=CmdJablotronDemod("");
+       if (ans>0) {
+               PrintAndLog("\nValid Jablotron ID Found!");
+               return CheckChipType(cmdp);
+       }
+
+       ans=CmdNoralsyDemod("");
+       if (ans>0) {
+               PrintAndLog("\nValid Noralsy ID Found!");
+               return CheckChipType(cmdp);
+       }
+
+       ans=CmdSecurakeyDemod("");
+       if (ans>0) {
+               PrintAndLog("\nValid Securakey ID Found!");
+               return CheckChipType(cmdp);
+       }

 
        ans=CmdVikingDemod("");
        if (ans>0) {
                PrintAndLog("\nValid Viking ID Found!");
                return CheckChipType(cmdp);
 
        ans=CmdVikingDemod("");
        if (ans>0) {
                PrintAndLog("\nValid Viking ID Found!");
                return CheckChipType(cmdp);

-       }       
+       }

 
 

-       ans=CmdIndalaDecode("");
+       ans=CmdIndalaDecode(""); //psk

        if (ans>0) {
                PrintAndLog("\nValid Indala ID Found!");
                return CheckChipType(cmdp);
        if (ans>0) {
                PrintAndLog("\nValid Indala ID Found!");
                return CheckChipType(cmdp);


@@ -1005,19 +1049,25 @@ int CmdLFfind(const char *Cmd)
                return CheckChipType(cmdp);
        }
 
                return CheckChipType(cmdp);
        }
 

+       ans=CmdPacDemod("");
+       if (ans>0) {
+               PrintAndLog("\nValid PAC/Stanley ID Found!");
+               return CheckChipType(cmdp);             
+       }
+

        PrintAndLog("\nNo Known Tags Found!\n");
        PrintAndLog("\nNo Known Tags Found!\n");

-       if (testRaw=='u' || testRaw=='U'){
-               ans=CheckChipType(cmdp);
+       if (testRaw=='u' || testRaw=='U') {
+               //ans=CheckChipType(cmdp);

                //test unknown tag formats (raw mode)0
                PrintAndLog("\nChecking for Unknown tags:\n");
                //test unknown tag formats (raw mode)0
                PrintAndLog("\nChecking for Unknown tags:\n");

-               ans=AutoCorrelate(4000, false, false);
+               ans=AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, 4000, false, false);

                if (ans > 0) PrintAndLog("Possible Auto Correlation of %d repeating samples",ans);
                ans=GetFskClock("",false,false); 
                if (ans > 0) PrintAndLog("Possible Auto Correlation of %d repeating samples",ans);
                ans=GetFskClock("",false,false); 

-               if (ans != 0){ //fsk
+               if (ans != 0) { //fsk

                        ans=FSKrawDemod("",true);
                        if (ans>0) {
                                PrintAndLog("\nUnknown FSK Modulated Tag Found!");
                        ans=FSKrawDemod("",true);
                        if (ans>0) {
                                PrintAndLog("\nUnknown FSK Modulated Tag Found!");

-                               return 1;
+                               return CheckChipType(cmdp);

                        }
                }
                bool st = true;
                        }
                }
                bool st = true;


@@ -1025,15 +1075,16 @@ int CmdLFfind(const char *Cmd)
                if (ans>0) {
                        PrintAndLog("\nUnknown ASK Modulated and Manchester encoded Tag Found!");
                        PrintAndLog("\nif it does not look right it could instead be ASK/Biphase - try 'data rawdemod ab'");
                if (ans>0) {
                        PrintAndLog("\nUnknown ASK Modulated and Manchester encoded Tag Found!");
                        PrintAndLog("\nif it does not look right it could instead be ASK/Biphase - try 'data rawdemod ab'");

-                       return 1;
+                       return CheckChipType(cmdp);

                }
                ans=CmdPSK1rawDemod("");
                if (ans>0) {
                        PrintAndLog("Possible unknown PSK1 Modulated Tag Found above!\n\nCould also be PSK2 - try 'data rawdemod p2'");
                        PrintAndLog("\nCould also be PSK3 - [currently not supported]");
                }
                ans=CmdPSK1rawDemod("");
                if (ans>0) {
                        PrintAndLog("Possible unknown PSK1 Modulated Tag Found above!\n\nCould also be PSK2 - try 'data rawdemod p2'");
                        PrintAndLog("\nCould also be PSK3 - [currently not supported]");

-                       PrintAndLog("\nCould also be NRZ - try 'data nrzrawdemod");
-                       return 1;
+                       PrintAndLog("\nCould also be NRZ - try 'data rawdemod nr'");
+                       return CheckChipType(cmdp);

                }
                }

+               ans = CheckChipType(cmdp);

                PrintAndLog("\nNo Data Found!\n");
        }
        return 0;
                PrintAndLog("\nNo Data Found!\n");
        }
        return 0;


@@ -1051,9 +1102,15 @@ static command_t CommandTable[] =
        {"hitag",       CmdLFHitag,         1, "{ Hitag CHIPs...             }"},
        {"io",          CmdLFIO,            1, "{ ioProx RFIDs...            }"},
        {"indala",      CmdLFINDALA,        1, "{ Indala RFIDs...            }"},
        {"hitag",       CmdLFHitag,         1, "{ Hitag CHIPs...             }"},
        {"io",          CmdLFIO,            1, "{ ioProx RFIDs...            }"},
        {"indala",      CmdLFINDALA,        1, "{ Indala RFIDs...            }"},

+       {"jablotron",   CmdLFJablotron,     1, "{ Jablotron RFIDs...         }"},
+       {"nexwatch",    CmdLFNexWatch,      1, "{ NexWatch RFIDs...          }"},
+       {"noralsy",     CmdLFNoralsy,       1, "{ Noralsy RFIDs...           }"},
+       {"pac",         CmdLFPac,           1, "{ PAC/Stanley RFIDs...       }"},
+       {"paradox",     CmdLFParadox,       1, "{ Paradox RFIDs...           }"},

        {"presco",      CmdLFPresco,        1, "{ Presco RFIDs...            }"},
        {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 CHIPs...           }"},
        {"pyramid",     CmdLFPyramid,       1, "{ Farpointe/Pyramid RFIDs... }"},
        {"presco",      CmdLFPresco,        1, "{ Presco RFIDs...            }"},
        {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 CHIPs...           }"},
        {"pyramid",     CmdLFPyramid,       1, "{ Farpointe/Pyramid RFIDs... }"},

+       {"securakey",   CmdLFSecurakey,     1, "{ Securakey RFIDs...         }"},

        {"t55xx",       CmdLFT55XX,         1, "{ T55xx CHIPs...             }"},
        {"ti",          CmdLFTI,            1, "{ TI CHIPs...                }"},
        {"viking",      CmdLFViking,        1, "{ Viking RFIDs...            }"},
        {"t55xx",       CmdLFT55XX,         1, "{ T55xx CHIPs...             }"},
        {"ti",          CmdLFTI,            1, "{ TI CHIPs...                }"},
        {"viking",      CmdLFViking,        1, "{ Viking RFIDs...            }"},