From: marshmellow42 Date: Fri, 31 Mar 2017 03:12:22 +0000 (-0400) Subject: Merge pull request #264 from qweenwasabi/master X-Git-Tag: v3.0.0~21 X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/b642ce7ab58f1f91dc2edc04fbe6f2bf4f8b9afd?hp=425b6c0eb0837e24af3e479e34ecca55224e7955 Merge pull request #264 from qweenwasabi/master Update README.txt --- diff --git a/client/cmddata.c b/client/cmddata.c index ef1229c2..0595dffa 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -22,8 +22,6 @@ #include "cmdparser.h"// already included in cmdmain.h #include "usb_cmd.h" // already included in cmdmain.h and proxmark3.h #include "lfdemod.h" // for demod code -#include "crc.h" // for pyramid checksum maxim -#include "crc16.h" // for FDXB demod checksum #include "loclass/cipherutils.h" // for decimating samples in getsamples #include "cmdlfem4x.h"// for em410x demod @@ -1298,9 +1296,9 @@ int CmdMtrim(const char *Cmd) { if (start > GraphTraceLen || stop > GraphTraceLen || start > stop) return 0; start++; //leave start position sample - GraphTraceLen -= stop - start; + GraphTraceLen = stop - start; for (int i = 0; i < GraphTraceLen; i++) { - GraphBuffer[start+i] = GraphBuffer[stop+i]; + GraphBuffer[i] = GraphBuffer[start+i]; } return 0; }