X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/316493876a7783c9f195eb81a2d5e4212e4b9476..b828a4e16818697605d57f2600cbb815c5ce5e7e:/client/cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index 1d491f5f..ece0810d 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -524,7 +524,6 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 	int clk = 0;
 	int maxErr = 100;
 	int maxLen = 0;
-	uint8_t askAmp = 0;
 	char amp = param_getchar(Cmd, 0);
 	uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
 	sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &amp);
@@ -537,12 +536,15 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 		invert=1;
 		clk=0;
 	}
-	if (amp == 'a' || amp == 'A') askAmp=1; 
 	size_t BitLen = getFromGraphBuf(BitStream);
 	if (g_debugMode) PrintAndLog("DEBUG: Bitlen from grphbuff: %d", BitLen);
 	if (BitLen<255) return 0;
 	if (maxLen<BitLen && maxLen != 0) BitLen = maxLen;
 	int foundclk = 0;
+	//amp before ST check
+	if (amp == 'a' || amp == 'A') {
+		askAmp(BitStream, BitLen); 
+	}
 	bool st = false;
 	if (*stCheck) st = DetectST(BitStream, &BitLen, &foundclk);
 	if (st) {
@@ -550,7 +552,7 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
 		clk = (clk == 0) ? foundclk : clk;
 		if (verbose || g_debugMode) PrintAndLog("\nFound Sequence Terminator");
 	}
-	int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, askAmp, askType);
+	int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, 0, askType);
 	if (errCnt<0 || BitLen<16){  //if fatal error (or -1)
 		if (g_debugMode) PrintAndLog("DEBUG: no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk);
 		return 0;
@@ -592,7 +594,7 @@ int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) {
 int Cmdaskmandemod(const char *Cmd)
 {
 	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_am();
+	if (strlen(Cmd) > 45 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_am();
 
 	bool st = TRUE;
 	if (Cmd[0]=='s') 
@@ -1152,7 +1154,7 @@ int FSKrawDemod(const char *Cmd, bool verbose)
 int CmdFSKrawdemod(const char *Cmd)
 {
 	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_fs();
+	if (strlen(Cmd) > 20 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_fs();
 
 	return FSKrawDemod(Cmd, TRUE);
 }
@@ -2001,7 +2003,7 @@ int NRZrawDemod(const char *Cmd, bool verbose)
 int CmdNRZrawDemod(const char *Cmd)
 {
 	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_nr();
+	if (strlen(Cmd) > 16 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_nr();
 
 	return NRZrawDemod(Cmd, TRUE);
 }
@@ -2014,7 +2016,7 @@ int CmdPSK1rawDemod(const char *Cmd)
 {
 	int ans;
 	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_p1();
+	if (strlen(Cmd) > 16 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_p1();
 
 	ans = PSKDemod(Cmd, TRUE);
 	//output
@@ -2034,7 +2036,7 @@ int CmdPSK2rawDemod(const char *Cmd)
 {
 	int ans = 0;
 	char cmdp = param_getchar(Cmd, 0);
-	if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H')	return usage_data_rawdemod_p2();
+	if (strlen(Cmd) > 16 || cmdp == 'h' || cmdp == 'H')	return usage_data_rawdemod_p2();
 
 	ans = PSKDemod(Cmd, TRUE);
 	if (!ans){
@@ -2055,7 +2057,7 @@ int CmdRawDemod(const char *Cmd)
 	char cmdp2 = Cmd[1];
 	int ans = 0;
 
-	if (strlen(Cmd) > 20 || cmdp == 'h' || cmdp == 'H' || strlen(Cmd) < 2)
+	if (strlen(Cmd) > 35 || cmdp == 'h' || cmdp == 'H' || strlen(Cmd) < 2)
 		return usage_data_rawdemod();
 
 	if (cmdp == 'f' && cmdp2 == 's')
@@ -2316,10 +2318,9 @@ int CmdLoad(const char *Cmd)
 		GraphBuffer[GraphTraceLen] = atoi(line);
 		GraphTraceLen++;
 	}
-	if (f) {
+	if (f)
 		fclose(f);
-		f = NULL;
-	}
+
 	PrintAndLog("loaded %d samples", GraphTraceLen);
 	RepaintGraphWindow();
 	return 0;
@@ -2392,10 +2393,9 @@ int CmdSave(const char *Cmd)
 	for (int i = 0; i < GraphTraceLen; i++)
 		fprintf(f, "%d\n", GraphBuffer[i]);
 
-	if (f) {
+	if (f)
 		fclose(f);
-		f = NULL;
-	}
+
 	PrintAndLog("saved to '%s'", Cmd);
 	return 0;
 }