Fix description in help dump

[proxmark3-svn] / client / proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index 102e03f72473ec0004028a522eb0c0ca4018e5ae..3b30b3cb5e6e09d3847326ef51845fc8d879007d 100644 (file)
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -23,6 +23,8 @@
 #include "uart.h"
 #include "ui.h"
 #include "sleep.h"
+#include "cmdparser.h"
+#include "cmdmain.h"
 
 // a global mutex to prevent interlaced printing from different threads
 pthread_mutex_t print_lock;
@@ -31,7 +33,6 @@ static serial_port sp;
 static UsbCommand txcmd;
 volatile static bool txcmd_pending = false;
 
-
 void SendCommand(UsbCommand *c) {
 #if 0
   printf("Sending %d bytes\n", sizeof(UsbCommand));
@@ -41,6 +42,12 @@ void SendCommand(UsbCommand *c) {
     ERR("Sending command failed, previous command is still pending");
   }
 */
+  if(offline)
+    {
+      PrintAndLog("Sending bytes to proxmark failed - offline");
+      return;
+    }
+
   while(txcmd_pending);
   txcmd = *c;
   txcmd_pending = true;
@@ -200,15 +207,44 @@ static void *main_loop(void *targ) {
   return NULL;
 }
 
+//static void dumpHelp(char  *parent, ...)
+//{
+//  printf("## %s\n\n", parent);
+//  CommandReceived(parent);
+//  
+//  printf("\n");
+//}
+
+static void dumpAllHelp()
+{
+  offline=3;
+  printf("\n# Proxmark3 command dump\n\n");
+  printf("Some commands are available only if a Proxmark is actually connected.\n");
+  printf("Check column \"offline\" for their availability.\n");
+  printf("\n");
+  command_t *cmds = getTopLevelCommandTable();
+
+  dumpCommandsRecursive(cmds);
+
+}
+
 int main(int argc, char* argv[]) {
        srand(time(0));
   
        if (argc < 2) {
                printf("syntax: %s <port>\n\n",argv[0]);
                printf("\tLinux example:'%s /dev/ttyACM0'\n\n", argv[0]);
+    printf("help:   %s -h\n\n", argv[0]);
+    printf("\tDump all interactive help at once\n");
                return 1;
        }
   
+  if (strcmp(argv[1], "-h") == 0) {
+    printf("syntax: %s <port>\n\n",argv[0]);
+    printf("\tLinux example:'%s /dev/ttyACM0'\n\n", argv[0]);
+    dumpAllHelp();
+    return 0;
+  }  
        // Make sure to initialize
        struct main_loop_arg marg = {
                .usb_present = 0,