// 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
static uint8_t SavedDB[MAX_DEMOD_BUF_LEN];
static size_t SavedDBlen;
static bool DB_Saved = false;
+ static int savedDemodStartIdx = 0;
+ static int savedDemodClock = 0;
- if (saveOpt==1) { //save
+ if (saveOpt == GRAPH_SAVE) { //save
memcpy(SavedDB, DemodBuffer, sizeof(DemodBuffer));
SavedDBlen = DemodBufferLen;
DB_Saved=true;
+ savedDemodStartIdx = g_DemodStartIdx;
+ savedDemodClock = g_DemodClock;
} else if (DB_Saved) { //restore
memcpy(DemodBuffer, SavedDB, sizeof(DemodBuffer));
DemodBufferLen = SavedDBlen;
+ g_DemodClock = savedDemodClock;
+ g_DemodStartIdx = savedDemodStartIdx;
}
return;
}
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++) {
if (!rfLen) rfLen = 50;
}
int startIdx = 0;
- int size = fskdemod_ext(BitStream, BitLen, rfLen, invert, fchigh, fclow, &startIdx);
+ int size = fskdemod(BitStream, BitLen, rfLen, invert, fchigh, fclow, &startIdx);
if (size > 0) {
setDemodBuf(BitStream,size,0);
setClockGrid(rfLen, startIdx);
g_DemodClock = clk;
if (g_debugMode) PrintAndLog("demodoffset %d, clk %d",offset,clk);
- if (offset > clk) offset %= clk;
+ if (offset > clk) offset %= clk;
if (offset < 0) offset += clk;
if (offset > GraphTraceLen || offset < 0) return;
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++) {
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]
}
setClockGrid(0,0);
+ DemodBufferLen = 0;
RepaintGraphWindow();
return 0;
}
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;
}
fclose(f);
PrintAndLog("loaded %d samples", GraphTraceLen);
setClockGrid(0,0);
+ DemodBufferLen = 0;
RepaintGraphWindow();
return 0;
}
if (max != min) {
for (i = 0; i < GraphTraceLen; ++i) {
- GraphBuffer[i] = (GraphBuffer[i] - ((max + min) / 2)) * 256 /
- (max - min);
+ GraphBuffer[i] = ((long)(GraphBuffer[i] - ((max + min) / 2)) * 256) / (max - min);
//marshmelow: adjusted *1000 to *256 to make +/- 128 so demod commands still work
}
}
return 0;
}
+ /* // example of FSK2 RF/50 Tones
+ static const int LowTone[] = {
+ 1, 1, 1, 1, 1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, -1, -1, -1, -1, -1
+ };
+ static const int HighTone[] = {
+ 1, 1, 1, 1, 1, -1, -1, -1, -1, // note one extra 1 to padd due to 50/8 remainder (1/2 the remainder)
+ 1, 1, 1, 1, -1, -1, -1, -1,
+ 1, 1, 1, 1, -1, -1, -1, -1,
+ 1, 1, 1, 1, -1, -1, -1, -1,
+ 1, 1, 1, 1, -1, -1, -1, -1,
+ 1, 1, 1, 1, -1, -1, -1, -1, -1, // note one extra -1 to padd due to 50/8 remainder
+ };
+ */
+void GetHiLoTone(int *LowTone, int *HighTone, int clk, int LowToneFC, int HighToneFC) {
+ int i,j=0;
+ int Left_Modifier = ((clk % LowToneFC) % 2) + ((clk % LowToneFC)/2);
+ int Right_Modifier = (clk % LowToneFC) / 2;
+ //int HighToneMod = clk mod HighToneFC;
+ int LeftHalfFCCnt = (LowToneFC % 2) + (LowToneFC/2); //truncate
+ int FCs_per_clk = clk/LowToneFC;
+
+ // need to correctly split up the clock to field clocks.
+ // First attempt uses modifiers on each end to make up for when FCs don't evenly divide into Clk
+
+ // start with LowTone
+ // set extra 1 modifiers to make up for when FC doesn't divide evenly into Clk
+ for (i = 0; i < Left_Modifier; i++) {
+ LowTone[i] = 1;
+ }
+
+ // loop # of field clocks inside the main clock
+ for (i = 0; i < (FCs_per_clk); i++) {
+ // loop # of samples per field clock
+ for (j = 0; j < LowToneFC; j++) {
+ LowTone[(i*LowToneFC)+Left_Modifier+j] = ( j < LeftHalfFCCnt ) ? 1 : -1;
+ }
+ }
+
+ int k;
+ // add last -1 modifiers
+ for (k = 0; k < Right_Modifier; k++) {
+ LowTone[((i-1)*LowToneFC)+Left_Modifier+j+k] = -1;
+ }
+
+ // now do hightone
+ Left_Modifier = ((clk % HighToneFC) % 2) + ((clk % HighToneFC)/2);
+ Right_Modifier = (clk % HighToneFC) / 2;
+ LeftHalfFCCnt = (HighToneFC % 2) + (HighToneFC/2); //truncate
+ FCs_per_clk = clk/HighToneFC;
+
+ for (i = 0; i < Left_Modifier; i++) {
+ HighTone[i] = 1;
+ }
+
+ // loop # of field clocks inside the main clock
+ for (i = 0; i < (FCs_per_clk); i++) {
+ // loop # of samples per field clock
+ for (j = 0; j < HighToneFC; j++) {
+ HighTone[(i*HighToneFC)+Left_Modifier+j] = ( j < LeftHalfFCCnt ) ? 1 : -1;
+ }
+ }
+
+ // add last -1 modifiers
+ for (k = 0; k < Right_Modifier; k++) {
+ PrintAndLog("(i-1)*HighToneFC+lm+j+k %i",((i-1)*HighToneFC)+Left_Modifier+j+k);
+ HighTone[((i-1)*HighToneFC)+Left_Modifier+j+k] = -1;
+ }
+ if (g_debugMode == 2) {
+ for ( i = 0; i < clk; i++) {
+ PrintAndLog("Low: %i, High: %i",LowTone[i],HighTone[i]);
+ }
+ }
+}
+
+//old CmdFSKdemod adapted by marshmellow
+//converts FSK to clear NRZ style wave. (or demodulates)
+int FSKToNRZ(int *data, int *dataLen, int clk, int LowToneFC, int HighToneFC) {
+ uint8_t ans=0;
+ if (clk == 0 || LowToneFC == 0 || HighToneFC == 0) {
+ int firstClockEdge=0;
+ ans = fskClocks((uint8_t *) &LowToneFC, (uint8_t *) &HighToneFC, (uint8_t *) &clk, false, &firstClockEdge);
+ if (g_debugMode > 1) {
+ PrintAndLog ("DEBUG FSKtoNRZ: detected clocks: fc_low %i, fc_high %i, clk %i, firstClockEdge %i, ans %u", LowToneFC, HighToneFC, clk, firstClockEdge, ans);
+ }
+ }
+ // currently only know fsk modulations with field clocks < 10 samples and > 4 samples. filter out to remove false positives (and possibly destroying ask/psk modulated waves...)
+ if (ans == 0 || clk == 0 || LowToneFC == 0 || HighToneFC == 0 || LowToneFC > 10 || HighToneFC < 4) {
+ if (g_debugMode > 1) {
+ PrintAndLog ("DEBUG FSKtoNRZ: no fsk clocks found");
+ }
+ return 0;
+ }
+ int LowTone[clk];
+ int HighTone[clk];
+ GetHiLoTone(LowTone, HighTone, clk, LowToneFC, HighToneFC);
+
+ int i, j;
+
+ // loop through ([all samples] - clk)
+ for (i = 0; i < *dataLen - clk; ++i) {
+ int lowSum = 0, highSum = 0;
+
+ // sum all samples together starting from this sample for [clk] samples for each tone (multiply tone value with sample data)
+ for (j = 0; j < clk; ++j) {
+ lowSum += LowTone[j] * data[i+j];
+ highSum += HighTone[j] * data[i + j];
+ }
+ // get abs( [average sample value per clk] * 100 ) (or a rolling average of sorts)
+ lowSum = abs(100 * lowSum / clk);
+ highSum = abs(100 * highSum / clk);
+ // save these back to buffer for later use
+ data[i] = (highSum << 16) | lowSum;
+ }
+
+ // now we have the abs( [average sample value per clk] * 100 ) for each tone
+ // loop through again [all samples] - clk - 16
+ // note why 16??? is 16 the largest FC? changed to LowToneFC as that should be the > fc
+ for(i = 0; i < *dataLen - clk - LowToneFC; ++i) {
+ int lowTot = 0, highTot = 0;
+
+ // sum a field clock width of abs( [average sample values per clk] * 100) for each tone
+ for (j = 0; j < LowToneFC; ++j) { //10 for fsk2
+ lowTot += (data[i + j] & 0xffff);
+ }
+ for (j = 0; j < HighToneFC; j++) { //8 for fsk2
+ highTot += (data[i + j] >> 16);
+ }
+
+ // subtract the sum of lowTone averages by the sum of highTone averages as it
+ // and write back the new graph value
+ data[i] = lowTot - highTot;
+ }
+ // update dataLen to what we put back to the data sample buffer
+ *dataLen -= (clk + LowToneFC);
+ return 0;
+}
+
+int usage_data_fsktonrz() {
+ PrintAndLog("Usage: data fsktonrz c <clock> l <fc_low> f <fc_high>");
+ PrintAndLog("Options: ");
+ PrintAndLog(" h This help");
+ PrintAndLog(" c <clock> enter the a clock (omit to autodetect)");
+ PrintAndLog(" l <fc_low> enter a field clock (omit to autodetect)");
+ PrintAndLog(" f <fc_high> enter a field clock (omit to autodetect)");
+ return 0;
+}
+
+int CmdFSKToNRZ(const char *Cmd) {
+ // take clk, fc_low, fc_high
+ // blank = auto;
+ bool errors = false;
+ int clk = 0;
+ char cmdp = 0;
+ int fc_low = 10, fc_high = 8;
+ while(param_getchar(Cmd, cmdp) != 0x00)
+ {
+ switch(param_getchar(Cmd, cmdp))
+ {
+ case 'h':
+ case 'H':
+ return usage_data_fsktonrz();
+ case 'C':
+ case 'c':
+ clk = param_get32ex(Cmd, cmdp+1, 0, 10);
+ cmdp += 2;
+ break;
+ case 'F':
+ case 'f':
+ fc_high = param_get32ex(Cmd, cmdp+1, 0, 10);
+ cmdp += 2;
+ break;
+ case 'L':
+ case 'l':
+ fc_low = param_get32ex(Cmd, cmdp+1, 0, 10);
+ cmdp += 2;
+ break;
+ default:
+ PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+ errors = true;
+ break;
+ }
+ if(errors) break;
+ }
+ //Validations
+ if(errors) return usage_data_fsktonrz();
+
+ setClockGrid(0,0);
+ DemodBufferLen = 0;
+ int ans = FSKToNRZ(GraphBuffer, &GraphTraceLen, clk, fc_low, fc_high);
+ CmdNorm("");
+ RepaintGraphWindow();
+ return ans;
+}
+
+
static command_t CommandTable[] =
{
{"help", CmdHelp, 1, "This help"},
{"buffclear", CmdBuffClear, 1, "Clear sample buffer and graph window"},
{"dec", CmdDec, 1, "Decimate samples"},
{"detectclock", CmdDetectClockRate, 1, "[modulation] Detect clock rate of wave in GraphBuffer (options: 'a','f','n','p' for ask, fsk, nrz, psk respectively)"},
+ {"fsktonrz", CmdFSKToNRZ, 1, "Convert fsk2 to nrz wave for alternate fsk demodulating (for weak fsk)"},
{"getbitstream", CmdGetBitStream, 1, "Convert GraphBuffer's >=1 values to 1 and <1 to 0"},
{"grid", CmdGrid, 1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
{"hexsamples", CmdHexsamples, 0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"},
projects / proxmark3-svn / blobdiff