Fix Tune Samples (broken in commit 12/31 by me)

[proxmark3-svn] / client / cmdmain.c

diff --git a/client/cmdmain.c b/client/cmdmain.c
index 7f34d54396b690963d78fd71926d7c68ae817124..b2723490535c46040a22b05cdb91febd69079806 100644 (file)
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -24,11 +24,13 @@
 #include "cmdlf.h"
 #include "cmdmain.h"
 #include "util.h"
 #include "cmdlf.h"
 #include "cmdmain.h"
 #include "util.h"

+#include "cmdscript.h"
+

 
 unsigned int current_command = CMD_UNKNOWN;
 
 unsigned int current_command = CMD_UNKNOWN;

-unsigned int received_command = CMD_UNKNOWN;
-UsbCommand current_response;
-UsbCommand current_response_user;
+//unsigned int received_command = CMD_UNKNOWN;
+//UsbCommand current_response;
+//UsbCommand current_response_user;

 
 static int CmdHelp(const char *Cmd);
 static int CmdQuit(const char *Cmd);
 
 static int CmdHelp(const char *Cmd);
 static int CmdQuit(const char *Cmd);


@@ -39,20 +41,25 @@ static UsbCommand cmdBuffer[CMD_BUFFER_SIZE];
 //Points to the next empty position to write to
 static int cmd_head;//Starts as 0
 //Points to the position of the last unread command
 //Points to the next empty position to write to
 static int cmd_head;//Starts as 0
 //Points to the position of the last unread command

-static int cmd_tail = -1;//Starts as -1
+static int cmd_tail;//Starts as 0

 
 static command_t CommandTable[] = 
 {
 
 static command_t CommandTable[] = 
 {

-  {"help",  CmdHelp,  1, "This help. Use '<command> help' for details of the following commands:\n"},
+  {"help",  CmdHelp,  1, "This help. Use '<command> help' for details of a particular command."},

   {"data",  CmdData,  1, "{ Plot window / data buffer manipulation... }"},
   {"data",  CmdData,  1, "{ Plot window / data buffer manipulation... }"},

-  {"exit",  CmdQuit,  1, "Exit program"},

   {"hf",    CmdHF,    1, "{ HF commands... }"},
   {"hw",    CmdHW,    1, "{ Hardware commands... }"},
   {"lf",    CmdLF,    1, "{ LF commands... }"},
   {"hf",    CmdHF,    1, "{ HF commands... }"},
   {"hw",    CmdHW,    1, "{ Hardware commands... }"},
   {"lf",    CmdLF,    1, "{ LF commands... }"},

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

   {NULL, NULL, 0, NULL}
 };
 
   {NULL, NULL, 0, NULL}
 };
 

+command_t* getTopLevelCommandTable()
+{
+  return CommandTable;
+}

 int CmdHelp(const char *Cmd)
 {
   CmdsHelp(CommandTable);
 int CmdHelp(const char *Cmd)
 {
   CmdsHelp(CommandTable);


@@ -64,6 +71,58 @@ int CmdQuit(const char *Cmd)
   exit(0);
   return 0;
 }
   exit(0);
   return 0;
 }

+/**
+ * @brief This method should be called when sending a new command to the pm3. In case any old
+ *  responses from previous commands are stored in the buffer, a call to this method should clear them.
+ *  A better method could have been to have explicit command-ACKS, so we can know which ACK goes to which
+ *  operation. Right now we'll just have to live with this.
+ */
+void clearCommandBuffer()
+{
+    //This is a very simple operation
+    cmd_tail = cmd_head;
+}
+
+/**
+ * @brief storeCommand stores a USB command in a circular buffer
+ * @param UC
+ */
+void storeCommand(UsbCommand *command)
+{
+    if( ( cmd_head+1) % CMD_BUFFER_SIZE == cmd_tail)
+    {
+        //If these two are equal, we're about to overwrite in the
+        // circular buffer.
+        PrintAndLog("WARNING: Command buffer about to overwrite command! This needs to be fixed!");
+    }
+    //Store the command at the 'head' location
+    UsbCommand* destination = &cmdBuffer[cmd_head];
+    memcpy(destination, command, sizeof(UsbCommand));
+
+    cmd_head = (cmd_head +1) % CMD_BUFFER_SIZE; //increment head and wrap
+
+}
+/**
+ * @brief getCommand gets a command from an internal circular buffer.
+ * @param response location to write command
+ * @return 1 if response was returned, 0 if nothing has been received
+ */
+int getCommand(UsbCommand* response)
+{
+    //If head == tail, there's nothing to read, or if we just got initialized
+    if(cmd_head == cmd_tail){
+        return 0;
+    }
+    //Pick out the next unread command
+    UsbCommand* last_unread = &cmdBuffer[cmd_tail];
+    memcpy(response, last_unread, sizeof(UsbCommand));
+    //Increment tail - this is a circular buffer, so modulo buffer size
+    cmd_tail = (cmd_tail +1 ) % CMD_BUFFER_SIZE;
+
+    return 1;
+
+}
+

 /**
  * Waits for a certain response type. This method waits for a maximum of
  * ms_timeout milliseconds for a specified response command.
 /**
  * Waits for a certain response type. This method waits for a maximum of
  * ms_timeout milliseconds for a specified response command.


@@ -74,13 +133,23 @@ int CmdQuit(const char *Cmd)
  * @return true if command was returned, otherwise false
  */
 bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
  * @return true if command was returned, otherwise false
  */
 bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {

+  
+  UsbCommand resp;
+
+  if (response == NULL) {
+    response = &resp;
+  }

 
   // Wait until the command is received
   for(size_t dm_seconds=0; dm_seconds < ms_timeout/10; dm_seconds++) {
 
 
   // Wait until the command is received
   for(size_t dm_seconds=0; dm_seconds < ms_timeout/10; dm_seconds++) {
 

-      if(getCommand(response) && response->cmd == cmd){
+      while(getCommand(response))
+      {
+          if(response->cmd == cmd){

           //We got what we expected
           return true;
           //We got what we expected
           return true;

+          }
+

       }
         msleep(10); // XXX ugh
         if (dm_seconds == 200) { // Two seconds elapsed
       }
         msleep(10); // XXX ugh
         if (dm_seconds == 200) { // Two seconds elapsed


@@ -137,28 +206,28 @@ void UsbCommandReceived(UsbCommand *UC)
       return;
     } break;
 
       return;
     } break;
 

-    case CMD_MEASURED_ANTENNA_TUNING: {
-      int peakv, peakf;
-      int vLf125, vLf134, vHf;
-      vLf125 = UC->arg[0] & 0xffff;
-      vLf134 = UC->arg[0] >> 16;
-      vHf = UC->arg[1] & 0xffff;;
-      peakf = UC->arg[2] & 0xffff;
-      peakv = UC->arg[2] >> 16;
-      PrintAndLog("");
-      PrintAndLog("# LF antenna: %5.2f V @   125.00 kHz", vLf125/1000.0);
-      PrintAndLog("# LF antenna: %5.2f V @   134.00 kHz", vLf134/1000.0);
-      PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1));
-      PrintAndLog("# HF antenna: %5.2f V @    13.56 MHz", vHf/1000.0);
-      if (peakv<2000)
-        PrintAndLog("# Your LF antenna is unusable.");
-      else if (peakv<10000)
-        PrintAndLog("# Your LF antenna is marginal.");
-      if (vHf<2000)
-        PrintAndLog("# Your HF antenna is unusable.");
-      else if (vHf<5000)
-        PrintAndLog("# Your HF antenna is marginal.");
-    } break;
+    // case CMD_MEASURED_ANTENNA_TUNING: {
+      // int peakv, peakf;
+      // int vLf125, vLf134, vHf;
+      // vLf125 = UC->arg[0] & 0xffff;
+      // vLf134 = UC->arg[0] >> 16;
+      // vHf = UC->arg[1] & 0xffff;;
+      // peakf = UC->arg[2] & 0xffff;
+      // peakv = UC->arg[2] >> 16;
+      // PrintAndLog("");
+      // PrintAndLog("# LF antenna: %5.2f V @   125.00 kHz", vLf125/1000.0);
+      // PrintAndLog("# LF antenna: %5.2f V @   134.00 kHz", vLf134/1000.0);
+      // PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1));
+      // PrintAndLog("# HF antenna: %5.2f V @    13.56 MHz", vHf/1000.0);
+      // if (peakv<2000)
+        // PrintAndLog("# Your LF antenna is unusable.");
+      // else if (peakv<10000)
+        // PrintAndLog("# Your LF antenna is marginal.");
+      // if (vHf<2000)
+        // PrintAndLog("# Your HF antenna is unusable.");
+      // else if (vHf<5000)
+        // PrintAndLog("# Your HF antenna is marginal.");
+    // } break;

       
     case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K: {
 //      printf("received samples: ");
       
     case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K: {
 //      printf("received samples: ");


@@ -175,6 +244,7 @@ void UsbCommandReceived(UsbCommand *UC)
 
     default: {
       // Maybe it's a response
 
     default: {
       // Maybe it's a response

+      /*

       switch(current_command) {
         case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: {
           if (UC->cmd != CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K) {
       switch(current_command) {
         case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: {
           if (UC->cmd != CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K) {


@@ -186,67 +256,17 @@ void UsbCommandReceived(UsbCommand *UC)
           memcpy(sample_buf+UC->arg[0],UC->d.asBytes,48);
           sample_buf_len += 48;
 //          for(i=0; i<48; i++) sample_buf[i] = UC->d.asBytes[i];
           memcpy(sample_buf+UC->arg[0],UC->d.asBytes,48);
           sample_buf_len += 48;
 //          for(i=0; i<48; i++) sample_buf[i] = UC->d.asBytes[i];

-          received_command = UC->cmd;
+          //received_command = UC->cmd;

         } break;
 
         default: {
         } break;
         } break;
 
         default: {
         } break;

-      }
-    } break;
+      }*/
+    }
+      break;

   }
 
   storeCommand(UC);
 
 }
   }
 
   storeCommand(UC);
 
 }

-/**
- * @brief storeCommand stores a USB command in a circular buffer
- * @param UC
- */
-void storeCommand(UsbCommand *command)
-{
-    if(cmd_head == cmd_tail)
-    {
-        //If these two are equal, we're about to overwrite in the
-        // circular buffer.
-        PrintAndLog("WARNING: Command buffer about to overwrite command! This needs to be fixed!");
-    }
-    //Store the command at the 'head' location
-    UsbCommand* destination = &cmdBuffer[cmd_head];
-    memcpy(destination, command, sizeof(UsbCommand));
-
-    //Also, if cmd_tail is still -1 because the buffer was
-    // previously empty, set it to head
-    if(cmd_tail < 0) {
-        cmd_tail = cmd_head;
-    }
-
-    cmd_head++; //increment head
-    cmd_head %= CMD_BUFFER_SIZE;//wrap around
-
-}
-/**
- * @brief getCommand gets a command from an internal circular buffer.
- * @param response location to write command
- * @return 1 if response was returned, 0 if nothing has been received
- */
-int getCommand(UsbCommand* response)
-{
-    //If head == tail, there's nothing to read, or if we just got initialized
-    if(cmd_head == cmd_tail || cmd_tail == -1){
-        return 0;
-    }
-    //Pick out the next unread command
-    UsbCommand* last_unread = &cmdBuffer[cmd_tail];
-    memcpy(response, last_unread, sizeof(UsbCommand));
-    //Increment tail - this is a circular buffer, so modulo buffer size
-    cmd_tail = (cmd_tail +1 ) % CMD_BUFFER_SIZE;
-    //In order to detect when the buffer overwrites itself, we set the
-    // tail to -1 whenever it 'catches up' with head : this means the buffer is empty.
-    // Otherwise, head==tail could mean both: either empty or full.
-    if(cmd_tail == cmd_head){
-        cmd_tail = -1 ;
-    }

 
 

-    return 1;
-
-}