git.zerfleddert.de Git - proxmark3-svn/blobdiff

diff --git a/client/cmddata.c b/client/cmddata.c

index 1f548284826fb65b8fd430742ce09b5405a3305b..8f93ba1753ea42e780f4f6b28835be5c6d6537ac 100644 (file)

--- a/client/cmddata.c

+++ b/client/cmddata.c

@@ -8,15 +8,15 @@

// Data and Graph commands

//-----------------------------------------------------------------------------

+#include "cmddata.h"

+

#include <stdio.h> // also included in util.h

#include <string.h> // also included in util.h

#include <inttypes.h>

#include <limits.h> // for CmdNorm INT_MIN && INT_MAX

-#include "data.h" // also included in util.h

-#include "cmddata.h"

#include "util.h"

#include "cmdmain.h"

-#include "proxmark3.h"

+#include "comms.h"

#include "ui.h" // for show graph controls

#include "graph.h" // for graph data

#include "cmdparser.h"// already included in cmdmain.h

@@ -367,18 +367,20 @@ int Cmdmandecoderaw(const char *Cmd)

return 1;

}

-//by marshmellow

-//biphase decode

-//take 01 or 10 = 0 and 11 or 00 = 1

-//takes 2 arguments "offset" default = 0 if 1 it will shift the decode by one bit

-// and "invert" default = 0 if 1 it will invert output

-// the argument offset allows us to manually shift if the output is incorrect - [EDIT: now auto detects]

+/**

+ * @author marshmellow

+ * biphase decode

+ * decdoes 01 or 10 to 0 and 11 or 00 to 1

+ * param offset adjust start position

+ * param invert invert output

+ * param maxErr maximum tolerated errors

+ */

int CmdBiphaseDecodeRaw(const char *Cmd)

{

size_t size=0;

int offset=0, invert=0, maxErr=20, errCnt=0;

char cmdp = param_getchar(Cmd, 0);

- if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') {

+ if (strlen(Cmd) > 7 || cmdp == 'h' || cmdp == 'H') {

PrintAndLog("Usage: data biphaserawdecode [offset] [invert] [maxErr]");

PrintAndLog(" Converts 10 or 01 to 1 and 11 or 00 to 0");

PrintAndLog(" --must have binary sequence in demodbuffer (run data askrawdemod first)");

@@ -427,7 +429,7 @@ int CmdBiphaseDecodeRaw(const char *Cmd)

int ASKbiphaseDemod(const char *Cmd, bool verbose)

{

//ask raw demod GraphBuffer first

- int offset=0, clk=0, invert=0, maxErr=0;

+ int offset=0, clk=0, invert=0, maxErr=100;

sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr);

uint8_t BitStream[MAX_GRAPH_TRACE_LEN];

@@ -591,8 +593,7 @@ int CmdBitsamples(const char *Cmd)

int cnt = 0;

uint8_t got[12288];

- GetFromBigBuf(got,sizeof(got),0);

- WaitForResponse(CMD_ACK,NULL);

+ GetFromBigBuf(got, sizeof(got), 0 , NULL, -1, false);

for (int j = 0; j < sizeof(got); j++) {

for (int k = 0; k < 8; k++) {

@@ -1131,8 +1132,7 @@ int CmdHexsamples(const char *Cmd)

return 0;

}

- GetFromBigBuf(got,requested,offset);

- WaitForResponse(CMD_ACK,NULL);

+ GetFromBigBuf(got, requested, offset, NULL, -1, false);

i = 0;

for (j = 0; j < requested; j++) {

@@ -1200,10 +1200,9 @@ int getSamples(int n, bool silent)

n = sizeof(got);

if (!silent) PrintAndLog("Reading %d bytes from device memory\n", n);

- GetFromBigBuf(got,n,0);

- if (!silent) PrintAndLog("Data fetched");

UsbCommand response;

- WaitForResponse(CMD_ACK, &response);

+ GetFromBigBuf(got, n, 0, &response, -1, false);

+ if (!silent) PrintAndLog("Data fetched");

uint8_t bits_per_sample = 8;

//Old devices without this feature would send 0 at arg[0]

@@ -1281,26 +1280,36 @@ int CmdTuneSamples(const char *Cmd)

peakf = resp.arg[2] & 0xffff;

peakv = resp.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);

-

- #define LF_UNUSABLE_V 2948 // was 2000. Changed due to bugfix in voltage measurements. LF results are now 47% higher.

- #define LF_MARGINAL_V 14739 // was 10000. Changed due to bugfix bug in voltage measurements. LF results are now 47% higher.

- #define HF_UNUSABLE_V 3167 // was 2000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.

- #define HF_MARGINAL_V 7917 // was 5000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.

-

- if (peakv < LF_UNUSABLE_V)

- PrintAndLog("# Your LF antenna is unusable.");

- else if (peakv < LF_MARGINAL_V)

- PrintAndLog("# Your LF antenna is marginal.");

- if (vHf < HF_UNUSABLE_V)

- PrintAndLog("# Your HF antenna is unusable.");

- else if (vHf < HF_MARGINAL_V)

- PrintAndLog("# Your HF antenna is marginal.");

-

- if (peakv >= LF_UNUSABLE_V) {

+ if (arg & FLAG_TUNE_LF)

+ {

+ PrintAndLog("# LF antenna: %5.2f V @ 125.00 kHz", vLf125/500.0);

+ PrintAndLog("# LF antenna: %5.2f V @ 134.00 kHz", vLf134/500.0);

+ PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/500.0, 12000.0/(peakf+1));

+ }

+ if (arg & FLAG_TUNE_HF)

+ PrintAndLog("# HF antenna: %5.2f V @ 13.56 MHz", vHf/1000.0);

+

+ #define LF_UNUSABLE_V 3000

+ #define LF_MARGINAL_V 15000

+ #define HF_UNUSABLE_V 3200

+ #define HF_MARGINAL_V 8000

+

+ if (arg & FLAG_TUNE_LF)

+ {

+ if (peakv<<1 < LF_UNUSABLE_V)

+ PrintAndLog("# Your LF antenna is unusable.");

+ else if (peakv<<1 < LF_MARGINAL_V)

+ PrintAndLog("# Your LF antenna is marginal.");

+ }

+ if (arg & FLAG_TUNE_HF)

+ {

+ if (vHf < HF_UNUSABLE_V)

+ PrintAndLog("# Your HF antenna is unusable.");

+ else if (vHf < HF_MARGINAL_V)

+ PrintAndLog("# Your HF antenna is marginal.");

+ }

+

+ if (peakv<<1 >= LF_UNUSABLE_V) {

for (int i = 0; i < 256; i++) {

GraphBuffer[i] = resp.d.asBytes[i] - 128;

}