fixed windows compile

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index c109960093c513f4665740cc76420cce82b32065..77640d9d8a15e0ce754e39d59efa4a23e6a56f76 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1,3 +1,13 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Data and Graph commands
+//-----------------------------------------------------------------------------
+

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>


@@ -378,6 +388,8 @@ int CmdFSKdemod(const char *Cmd)
 int CmdGrid(const char *Cmd)
 {
   sscanf(Cmd, "%i %i", &PlotGridX, &PlotGridY);
 int CmdGrid(const char *Cmd)
 {
   sscanf(Cmd, "%i %i", &PlotGridX, &PlotGridY);

+  PlotGridXdefault= PlotGridX;
+  PlotGridYdefault= PlotGridY;

   RepaintGraphWindow();
   return 0;
 }
   RepaintGraphWindow();
   return 0;
 }


@@ -476,9 +488,9 @@ int CmdSamples(const char *Cmd)
 
 int CmdLoad(const char *Cmd)
 {
 
 int CmdLoad(const char *Cmd)
 {

-  FILE *f = fopen(Cmd + 1, "r");
+  FILE *f = fopen(Cmd, "r");

   if (!f) {
   if (!f) {

-    PrintAndLog("couldn't open '%s'", Cmd + 1);
+    PrintAndLog("couldn't open '%s'", Cmd);

     return 0;
   }
 
     return 0;
   }
 


@@ -524,7 +536,7 @@ int CmdManchesterDemod(const char *Cmd)
   int i, j, invert= 0;
   int bit;
   int clock;
   int i, j, invert= 0;
   int bit;
   int clock;

-  int lastval;
+  int lastval = 0;

   int low = 0;
   int high = 0;
   int hithigh, hitlow, first;
   int low = 0;
   int high = 0;
   int hithigh, hitlow, first;


@@ -538,6 +550,7 @@ int CmdManchesterDemod(const char *Cmd)
   {
     PrintAndLog("Inverting output");
     invert = 1;
   {
     PrintAndLog("Inverting output");
     invert = 1;

+    ++Cmd;

     do
       ++Cmd;
     while(*Cmd == ' '); // in case a 2nd argument was given
     do
       ++Cmd;
     while(*Cmd == ' '); // in case a 2nd argument was given


@@ -550,7 +563,7 @@ int CmdManchesterDemod(const char *Cmd)
 
   /* But it does not work if compiling on WIndows: therefore we just allocate a */
   /* large array */
 
   /* But it does not work if compiling on WIndows: therefore we just allocate a */
   /* large array */

-  int BitStream[MAX_GRAPH_TRACE_LEN];
+  uint8_t BitStream[MAX_GRAPH_TRACE_LEN];

 
   /* Detect high and lows */
   for (i = 0; i < GraphTraceLen; i++)
 
   /* Detect high and lows */
   for (i = 0; i < GraphTraceLen; i++)


@@ -863,11 +876,11 @@ static command_t CommandTable[] =
   {"mandemod",      CmdManchesterDemod, 1, "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"},
   {"manmod",        CmdManchesterMod,   1, "[clock rate] -- Manchester modulate a binary stream"},
   {"norm",          CmdNorm,            1, "Normalize max/min to +/-500"},
   {"mandemod",      CmdManchesterDemod, 1, "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"},
   {"manmod",        CmdManchesterMod,   1, "[clock rate] -- Manchester modulate a binary stream"},
   {"norm",          CmdNorm,            1, "Normalize max/min to +/-500"},

-  {"plot",          CmdPlot,            1, "Show graph window"},
+  {"plot",          CmdPlot,            1, "Show graph window (hit 'h' in window for keystroke help)"},

   {"samples",       CmdSamples,         0, "[128 - 16000] -- Get raw samples for graph window"},
   {"save",          CmdSave,            1, "<filename> -- Save trace (from graph window)"},
   {"scale",         CmdScale,           1, "<int> -- Set cursor display scale"},
   {"samples",       CmdSamples,         0, "[128 - 16000] -- Get raw samples for graph window"},
   {"save",          CmdSave,            1, "<filename> -- Save trace (from graph window)"},
   {"scale",         CmdScale,           1, "<int> -- Set cursor display scale"},

-  {"threshold",     CmdThreshold,       1, "Maximize/minimize every value in the graph window depending on threshold"},
+  {"threshold",     CmdThreshold,       1, "<threshold> -- Maximize/minimize every value in the graph window depending on threshold"},

   {"zerocrossings", CmdZerocrossings,   1, "Count time between zero-crossings"},
   {NULL, NULL, 0, NULL}
 };
   {"zerocrossings", CmdZerocrossings,   1, "Count time between zero-crossings"},
   {NULL, NULL, 0, NULL}
 };