merge 'lfsamples' and 'hfsamples' into 'samples'

diff --git a/client/cmddata.c b/client/cmddata.c
index e3a8c54cc485eaf384c59c0e16543a2c24458a27..71ef6752493490badf96c226d21a03524b574515 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -429,30 +429,6 @@ int CmdHexsamples(const char *Cmd)
   return 0;
 }
 
   return 0;
 }
 

-int CmdHFSamples(const char *Cmd)
-{
-  int cnt = 0;
-  int n = strtol(Cmd, NULL, 0);
-
-  if(n == 0) {
-    n = 1000;
-  } else {
-    n/= 4;
-  }
-
-  for (int i = 0; i < n; i += 12) {
-    UsbCommand c = {CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K, {i, 0, 0}};
-    SendCommand(&c);
-    WaitForResponse(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K);
-    for (int j = 0; j < 48; ++j) {
-      GraphBuffer[cnt++] = (int)(sample_buf[j]);
-    }
-  }
-  GraphTraceLen = cnt;
-  RepaintGraphWindow();
-  return 0;
-}
-

 int CmdHide(const char *Cmd)
 {
   HideGraphWindow();
 int CmdHide(const char *Cmd)
 {
   HideGraphWindow();


@@ -474,7 +450,7 @@ int CmdHpf(const char *Cmd)
   return 0;
 }
 
   return 0;
 }
 

-int CmdLFSamples(const char *Cmd)
+int CmdSamples(const char *Cmd)

 {
   int cnt = 0;
   int n;
 {
   int cnt = 0;
   int n;


@@ -880,10 +856,9 @@ static command_t CommandTable[] =
   {"fskdemod",      CmdFSKdemod,        1, "Demodulate graph window as a HID FSK"},
   {"grid",          CmdGrid,            1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
   {"hexsamples",    CmdHexsamples,      0, "<blocks> [<offset>] -- Dump big buffer as hex bytes"},  
   {"fskdemod",      CmdFSKdemod,        1, "Demodulate graph window as a HID FSK"},
   {"grid",          CmdGrid,            1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
   {"hexsamples",    CmdHexsamples,      0, "<blocks> [<offset>] -- Dump big buffer as hex bytes"},  

-  {"hfsamples",     CmdHFSamples,       0, "[nb of samples] Get raw samples for HF tag"},

   {"hide",          CmdHide,            1, "Hide graph window"},
   {"hpf",           CmdHpf,             1, "Remove DC offset from trace"},
   {"hide",          CmdHide,            1, "Hide graph window"},
   {"hpf",           CmdHpf,             1, "Remove DC offset from trace"},

-  {"lfsamples",     CmdLFSamples,       0, "[128 - 16000] -- Get raw samples for LF tag"},
+  {"samples",       CmdSamples,         0, "[128 - 16000] -- Get raw samples for graph window"},

   {"load",          CmdLoad,            1, "<filename> -- Load trace (to graph window"},
   {"ltrim",         CmdLtrim,           1, "<samples> -- Trim samples from left of trace"},
   {"mandemod",      CmdManchesterDemod, 1, "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"},
   {"load",          CmdLoad,            1, "<filename> -- Load trace (to graph window"},
   {"ltrim",         CmdLtrim,           1, "<samples> -- Trim samples from left of trace"},
   {"mandemod",      CmdManchesterDemod, 1, "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"},

diff --git a/client/cmddata.h b/client/cmddata.h
index fd40df1ed4d0af5c41d6865b0eba2a7efd7e5665..8bcad6af5d44feb3db4365b65d950dd94adcb273 100644 (file)
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -14,10 +14,9 @@ int CmdDetectClockRate(const char *Cmd);
 int CmdFSKdemod(const char *Cmd);
 int CmdGrid(const char *Cmd);
 int CmdHexsamples(const char *Cmd);
 int CmdFSKdemod(const char *Cmd);
 int CmdGrid(const char *Cmd);
 int CmdHexsamples(const char *Cmd);

-int CmdHFSamples(const char *Cmd);

 int CmdHide(const char *Cmd);
 int CmdHpf(const char *Cmd);
 int CmdHide(const char *Cmd);
 int CmdHpf(const char *Cmd);

-int CmdLFSamples(const char *Cmd);
+int CmdSamples(const char *Cmd);

 int CmdLoad(const char *Cmd);
 int CmdLtrim(const char *Cmd);
 int CmdManchesterDemod(const char *Cmd);
 int CmdLoad(const char *Cmd);
 int CmdLtrim(const char *Cmd);
 int CmdManchesterDemod(const char *Cmd);