ADD: started with adding a "LS" command that lists the commands without the help...

diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 0528039944bb63f561ea2af8bd0756657e5d345a..daa219cea399520b889554b8f2a874146c452ed7 100644 (file)
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -1007,7 +1007,7 @@ void iso14443b_setup() {
     LED_D_ON();
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX | FPGA_HF_READER_TX_SHALLOW_MOD);
        
     LED_D_ON();
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX | FPGA_HF_READER_TX_SHALLOW_MOD);
        

-       SpinDelay(100);
+       //SpinDelay(100);

 
        // Start the timer
        //StartCountSspClk();
 
        // Start the timer
        //StartCountSspClk();

diff --git a/client/cmdhf.c b/client/cmdhf.c
index d7a52f6b3531bf09839cb60352c07cd7e9896260..91743c465102eba7872c5e911722186fbcff5e6b 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -225,7 +225,10 @@ void annotateIso7816(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
        }
        // R-block (ack)
        else if ( ((cmd[0] & 0xD0) == 0x80) && ( cmdsize > 2) ) {
        }
        // R-block (ack)
        else if ( ((cmd[0] & 0xD0) == 0x80) && ( cmdsize > 2) ) {

-               snprintf(exp, size, "R-block");
+               if ( (cmd[0] & 0x10) == 0 ) 
+                       snprintf(exp, size, "R-block ACK");
+               else
+                       snprintf(exp, size, "R-block NACK");

        }
        // I-block
        else {
        }
        // I-block
        else {

diff --git a/client/cmdmain.c b/client/cmdmain.c
index 2bb76d7b02919553b53a32bb424c4b3c459481b8..377fdc2ce4e399cea3087968489415ce18550df7 100644 (file)
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -33,6 +33,7 @@ unsigned int current_command = CMD_UNKNOWN;
 static int CmdHelp(const char *Cmd);
 static int CmdQuit(const char *Cmd);
 static int CmdRev(const char *Cmd);
 static int CmdHelp(const char *Cmd);
 static int CmdQuit(const char *Cmd);
 static int CmdRev(const char *Cmd);

+static int CmdLS(const char *Cmd);

 
 //For storing command that are received from the device
 static UsbCommand cmdBuffer[CMD_BUFFER_SIZE];
 
 //For storing command that are received from the device
 static UsbCommand cmdBuffer[CMD_BUFFER_SIZE];


@@ -44,11 +45,12 @@ static int cmd_tail;//Starts as 0
 static command_t CommandTable[] = 
 {
        {"help",        CmdHelp,        1, "This help. Use '<command> help' for details of a particular command."},
 static command_t CommandTable[] = 
 {
        {"help",        CmdHelp,        1, "This help. Use '<command> help' for details of a particular command."},

+       {"ls",          CmdLS,          1, "list commands"},

        {"data",        CmdData,        1, "{ Plot window / data buffer manipulation... }"},
        {"hf",          CmdHF,          1, "{ High Frequency commands... }"},
        {"hw",          CmdHW,          1, "{ Hardware commands... }"},
        {"lf",          CmdLF,          1, "{ Low Frequency commands... }"},
        {"data",        CmdData,        1, "{ Plot window / data buffer manipulation... }"},
        {"hf",          CmdHF,          1, "{ High Frequency commands... }"},
        {"hw",          CmdHW,          1, "{ Hardware commands... }"},
        {"lf",          CmdLF,          1, "{ Low Frequency commands... }"},

-  {"reveng",CmdRev,   1, "Crc calculations from the software reveng1-30"},
+       {"reveng",      CmdRev,         1, "Crc calculations from the software reveng 1.30"},

        {"script",      CmdScript,      1, "{ Scripting commands }"},
        {"quit",        CmdQuit,        1, "Exit program"},
        {"exit",        CmdQuit,        1, "Exit program"},
        {"script",      CmdScript,      1, "{ Scripting commands }"},
        {"quit",        CmdQuit,        1, "Exit program"},
        {"exit",        CmdQuit,        1, "Exit program"},


@@ -64,6 +66,10 @@ int CmdHelp(const char *Cmd)
   CmdsHelp(CommandTable);
   return 0;
 }
   CmdsHelp(CommandTable);
   return 0;
 }

+int CmdLS(const char *Cmd){
+       CmdsLS(CommandTable);
+       return 0;
+}

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

diff --git a/client/cmdparser.c b/client/cmdparser.c
index 6910e86a535b7fd8154a9e1a94acfa4cc5583650..ae67466aab557bff38020b57712f0b836d96868a 100644 (file)
--- a/client/cmdparser.c
+++ b/client/cmdparser.c
@@ -28,6 +28,18 @@ void CmdsHelp(const command_t Commands[])
   }
 }
 
   }
 }
 

+void CmdsLS(const command_t Commands[])
+{
+  if (Commands[0].Name == NULL) return;
+  int i = 0;
+  while (Commands[i].Name)
+  {
+    if (!offline || Commands[i].Offline)
+       PrintAndLog("%-16s", Commands[i].Name);
+    ++i;
+  }
+}
+

 void CmdsParse(const command_t Commands[], const char *Cmd)
 {
   if(strcmp( Cmd, "XX_internal_command_dump_XX") == 0)
 void CmdsParse(const command_t Commands[], const char *Cmd)
 {
   if(strcmp( Cmd, "XX_internal_command_dump_XX") == 0)

diff --git a/client/cmdparser.h b/client/cmdparser.h
index b7997eccec61e14fa3a285b50574b1bd0887de57..34db902cc9676dbc236c49fa176618100476ade1 100644 (file)
--- a/client/cmdparser.h
+++ b/client/cmdparser.h
@@ -23,6 +23,8 @@ typedef struct command_s
 
 // Print help for each command in the command array
 void CmdsHelp(const command_t Commands[]);
 
 // Print help for each command in the command array
 void CmdsHelp(const command_t Commands[]);

+// Print each command in the command array without help
+void CmdsLS(const command_t Commands[]);

 // Parse a command line
 void CmdsParse(const command_t Commands[], const char *Cmd);
 void dumpCommandsRecursive(const command_t cmds[], int markdown);
 // Parse a command line
 void CmdsParse(const command_t Commands[], const char *Cmd);
 void dumpCommandsRecursive(const command_t cmds[], int markdown);