Merge pull request #32 from marshmellow42/master

[proxmark3-svn] / client / proxmark3.c

diff --git a/client/proxmark3.c b/client/proxmark3.c
index e40b4defe38d7dee1d3b4d48a4c1b3ae6360b615..bf0f3817f5223c9c3f798f21e817ba67216b7e3e 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));
@@ -46,7 +47,11 @@ void SendCommand(UsbCommand *c) {
       PrintAndLog("Sending bytes to proxmark failed - offline");
       return;
     }
-
+  /**
+       The while-loop below causes hangups at times, when the pm3 unit is unresponsive
+       or disconnected. The main console thread is alive, but comm thread just spins here.
+       Not good.../holiman
+       **/
   while(txcmd_pending);
   txcmd = *c;
   txcmd_pending = true;
@@ -206,39 +211,22 @@ static void *main_loop(void *targ) {
   return NULL;
 }
 
-#define DUMPHELP(cmd) \
-  do { \
-    printf("%s\n", cmd); \
-    printf("---------------------------------------------\n"); \
-    CommandReceived(cmd); \
-    printf("\n"); \
-  } while (0)
+//static void dumpHelp(char  *parent, ...)
+//{
+//  printf("## %s\n\n", parent);
+//  CommandReceived(parent);
+//  
+//  printf("\n");
+//}
 
-static void dumphelp()
+static void dumpAllHelp(int markdown)
 {
-  offline=2;
-  printf("\n------------PROXMARK3 HELP DUMP--------------\n");
-  printf("Some commands are available only if a Proxmark is actually connected,\n");
-  printf("Those commands are flagged with \"@\" in front of their description.\n");
+  printf("\n%sProxmark3 command dump%s\n\n",markdown?"# ":"",markdown?"":"\n======================");
+  printf("Some commands are available only if a Proxmark is actually connected.%s\n",markdown?"  ":"");
+  printf("Check column \"offline\" for their availability.\n");
   printf("\n");
-  DUMPHELP("help");
-  DUMPHELP("data help");
-  DUMPHELP("hf help");
-  DUMPHELP("hf 14a help");
-  DUMPHELP("hf 14b help");
-  DUMPHELP("hf 15 help");
-  DUMPHELP("hf epa help");
-  DUMPHELP("hf legic help");
-  DUMPHELP("hf iclass help");
-  DUMPHELP("hf mf help");
-  DUMPHELP("hw help");
-  DUMPHELP("lf help");
-  DUMPHELP("lf em4x help");
-  DUMPHELP("lf hid help");
-  DUMPHELP("lf ti help");
-  DUMPHELP("lf hitag help");
-  DUMPHELP("lf pcf7931 help");
-  DUMPHELP("lf t55xx help");
+  command_t *cmds = getTopLevelCommandTable();
+  dumpCommandsRecursive(cmds, markdown);
 }
 
 int main(int argc, char* argv[]) {
@@ -249,14 +237,18 @@ int main(int argc, char* argv[]) {
                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");
+               printf("markdown:   %s -m\n\n", argv[0]);
+               printf("\tDump all interactive help at once in markdown syntax\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]);
-               offline = 2;
-               dumphelp();
+               dumpAllHelp(0);
+               return 0;
+       }
+       if (strcmp(argv[1], "-m") == 0) {
+               dumpAllHelp(1);
                return 0;
        }
        // Make sure to initialize