ADD: added a comment about the Q5, which I think is wrong in these commands. Needs...

diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index c453a31204946c7a32462b849bbe94e690ff9117..7af8dec2bef089755c1207edd12e96af891194bd 100644 (file)
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -28,8 +28,9 @@ int usage_lf_awid_fskdemod(void) {
        PrintAndLog("By default, values are printed and logged until the button is pressed or another USB command is issued.");
        PrintAndLog("If the [1] option is provided, reader mode is exited after reading a single AWID card.");
        PrintAndLog("");
-       PrintAndLog("Usage:  lf awid fskdemod [1]");
+       PrintAndLog("Usage:  lf awid fskdemod [h] [1]");
        PrintAndLog("Options :");
+       PrintAndLog("      h :  This help");    
        PrintAndLog("      1 : (optional) stop after reading a single card");
        PrintAndLog("");
        PrintAndLog("Samples");
@@ -42,11 +43,12 @@ int usage_lf_awid_sim(void) {
        PrintAndLog("Enables simulation of AWID card with specified facility-code and card number.");
        PrintAndLog("Simulation runs until the button is pressed or another USB command is issued.");
        PrintAndLog("");
-       PrintAndLog("Usage:  lf awid sim <format> <facility-code> <card-number>");
+       PrintAndLog("Usage:  lf awid sim [h] <format> <facility-code> <card-number>");
        PrintAndLog("Options :");
-       PrintAndLog("  <format>        :  format length 26|50");
+       PrintAndLog("                h :  This help");  
+       PrintAndLog("         <format> :  format length 26|50");
        PrintAndLog("  <facility-code> :  8|16bit value facility code");
-       PrintAndLog("  <card number>   :  16|32-bit value card number");
+       PrintAndLog("    <card number> :  16|32-bit value card number");
        PrintAndLog("");
        PrintAndLog("Samples");
        PrintAndLog("       lf awid sim 26 224 1337");
@@ -58,12 +60,13 @@ int usage_lf_awid_clone(void) {
        PrintAndLog("Enables cloning of AWID card with specified facility-code and card number onto T55x7.");
        PrintAndLog("The T55x7 must be on the antenna when issuing this command.  T55x7 blocks are calculated and printed in the process.");
        PrintAndLog("");
-       PrintAndLog("Usage:  lf awid clone <format> <facility-code> <card-number>");
+       PrintAndLog("Usage:  lf awid clone [h] <format> <facility-code> <card-number> [Q5]");
        PrintAndLog("Options :");
-       PrintAndLog("  <format>        :  format length 26|50");
+       PrintAndLog("                h :  This help");  
+       PrintAndLog("         <format> :  format length 26|50");
        PrintAndLog("  <facility-code> :  8|16bit value facility code");
-       PrintAndLog("  <card number>   :  16|32-bit value card number");
-       PrintAndLog("  Q5              :  optional - clone to Q5 (T5555) instead of T55x7 chip");
+       PrintAndLog("    <card number> :  16|32-bit value card number");
+       PrintAndLog("               Q5 :  optional - clone to Q5 (T5555) instead of T55x7 chip");
        PrintAndLog("");
        PrintAndLog("Samples");
        PrintAndLog("       lf awid clone 26 224 1337");
@@ -75,9 +78,10 @@ int usage_lf_awid_brute(void){
        PrintAndLog("Enables bruteforce of AWID reader with specified facility-code.");
        PrintAndLog("This is a incremental attack against reader.");
        PrintAndLog("");
-       PrintAndLog("Usage:  lf awid brute <format> <facility-code>");
+       PrintAndLog("Usage:  lf awid brute [h] <format> <facility-code>");
        PrintAndLog("Options :");
-       PrintAndLog("  <format>        :  format length 26|50");
+       PrintAndLog("                h :  This help");
+       PrintAndLog("         <format> :  format length 26|50");
        PrintAndLog("  <facility-code> :  8|16bit value facility code");
        PrintAndLog("");
        PrintAndLog("Samples");
@@ -226,6 +230,7 @@ int CmdAWIDClone(const char *Cmd) {
        }
        
        if (param_getchar(Cmd, 4) == 'Q' || param_getchar(Cmd, 4) == 'q')
+               //t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
                blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | 50<<T5555_BITRATE_SHIFT | 3<<T5555_MAXBLOCK_SHIFT;
 
        if ( !getAWIDBits(fmtlen, fc, cn, bs)) {

diff --git a/client/cmdlfguard.c b/client/cmdlfguard.c
index 686ada278d702e65b2e4101f3ddaf6df016ee601..a6bc5e87f85bd22e235bb347a5339574e9d14c3d 100644 (file)
--- a/client/cmdlfguard.c
+++ b/client/cmdlfguard.c
@@ -140,6 +140,7 @@ int CmdGuardClone(const char *Cmd) {
        uint32_t blocks[5] = {T55x7_MODULATION_BIPHASE | T55x7_BITRATE_RF_64 | 3<<T55x7_MAXBLOCK_SHIFT, 0, 0, 0, 0};
        
 //     if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
+       //t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
 //             blocks[0] = T5555_MODULATION_FSK2 | 50<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT;
 
        if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_guard_clone();

diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index b5aba2f864854d01fe3826b6f1ce587b70bf130f..d9e5d48a4bd296f3634faca1cb869b470994e113 100644 (file)
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -197,6 +197,7 @@ int CmdLFNedapClone(const char *Cmd) {
        blocks[0] = T55x7_MODULATION_BIPHASE | T55x7_BITRATE_RF_64 | 4<<T55x7_MAXBLOCK_SHIFT;
 
        if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
+               //t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
                blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | 64<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT;
 
        blocks[1] = bytebits_to_byte(bs,32);

diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 51756c4f5ba1e5aa35a22444eeea432437ae2b17..829e2e6f5bbc91ae152cf294a079dac66a4b9c1c 100644 (file)
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -170,6 +170,7 @@ int CmdPrescoClone(const char *Cmd) {
        if (GetWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_clone();
 
        if (Q5)
+               //t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
                blocks[0] = T5555_MODULATION_MANCHESTER | 32<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT | T5555_ST_TERMINATOR;
 
        if ((sitecode & 0xFF) != sitecode) {

diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 1a7dbffb01982492c62e490c17245a820faa8708..cf8b2b44cb4077c408aa32b73c290e1cef7eb293 100644 (file)
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -103,6 +103,7 @@ int CmdPyramidClone(const char *Cmd) {
        blocks[0] = T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 4<<T55x7_MAXBLOCK_SHIFT;
 
        if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
+               //t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
                blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | 50<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT;
 
        blocks[1] = bytebits_to_byte(bs,32);