#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
uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
uint8_t g_debugMode=0;
size_t DemodBufferLen=0;
-//size_t g_demodStartIdx=0;
-//uint8_t g_demodClock=0;
static int CmdHelp(const char *Cmd);
if (buff == NULL)
return;
- if ( size >= MAX_DEMOD_BUF_LEN)
- size = MAX_DEMOD_BUF_LEN;
+ if ( size > MAX_DEMOD_BUF_LEN - startIdx)
+ size = MAX_DEMOD_BUF_LEN - startIdx;
size_t i = 0;
for (; i < size; i++){
return;
}
+bool getDemodBuf(uint8_t *buff, size_t *size) {
+ if (buff == NULL) return false;
+ if (size == NULL) return false;
+ if (*size == 0) return false;
+
+ *size = (*size > DemodBufferLen) ? DemodBufferLen : *size;
+
+ memcpy(buff, DemodBuffer, *size);
+ return true;
+}
+
+// option '1' to save DemodBuffer any other to restore
+void save_restoreDB(uint8_t saveOpt)
+{
+ static uint8_t SavedDB[MAX_DEMOD_BUF_LEN];
+ static size_t SavedDBlen;
+ static bool DB_Saved = false;
+
+ if (saveOpt==1) { //save
+
+ memcpy(SavedDB, DemodBuffer, sizeof(DemodBuffer));
+ SavedDBlen = DemodBufferLen;
+ DB_Saved=true;
+ } else if (DB_Saved) { //restore
+ memcpy(DemodBuffer, SavedDB, sizeof(DemodBuffer));
+ DemodBufferLen = SavedDBlen;
+ }
+ return;
+}
+
int CmdSetDebugMode(const char *Cmd)
{
int demod=0;
}
bool st = false;
size_t ststart = 0, stend = 0;
- if (*stCheck) st = DetectST_ext(BitStream, &BitLen, &foundclk, &ststart, &stend);
+ if (*stCheck) st = DetectST(BitStream, &BitLen, &foundclk, &ststart, &stend);
+ *stCheck = st;
if (st) {
- *stCheck = st;
clk = (clk == 0) ? foundclk : clk;
CursorCPos = ststart;
CursorDPos = stend;
if (verbose || g_debugMode) PrintAndLog("\nFound Sequence Terminator - First one is shown by orange and blue graph markers");
- }
- int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, askamp, askType);
+ //Graph ST trim (for testing)
+ //for (int i = 0; i < BitLen; i++) {
+ // GraphBuffer[i] = BitStream[i]-128;
+ //}
+ //RepaintGraphWindow();
+ }
+ int startIdx = 0;
+ int errCnt = askdemod_ext(BitStream, &BitLen, &clk, &invert, maxErr, askamp, askType, &startIdx);
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;
//output
setDemodBuf(BitStream,BitLen,0);
+ setClockGrid(clk, startIdx);
+
if (verbose || g_debugMode){
if (errCnt>0) PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
if (askType) PrintAndLog("ASK/Manchester - Clock: %d - Decoded bitstream:",clk);
return 0;
}
if (DemodBufferLen==0) return 0;
- uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+ uint8_t BitStream[MAX_DEMOD_BUF_LEN]={0};
int high=0,low=0;
for (;i<DemodBufferLen;++i){
if (DemodBuffer[i]>high) high=DemodBuffer[i];
return 0;
}
sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr);
- if (DemodBufferLen==0){
+ if (DemodBufferLen==0) {
PrintAndLog("DemodBuffer Empty - run 'data rawdemod ar' first");
return 0;
}
- uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
- memcpy(BitStream, DemodBuffer, DemodBufferLen);
- size = DemodBufferLen;
+ uint8_t BitStream[MAX_DEMOD_BUF_LEN]={0};
+ size = sizeof(BitStream);
+ if ( !getDemodBuf(BitStream, &size) ) return 0;
errCnt=BiphaseRawDecode(BitStream, &size, offset, invert);
if (errCnt<0){
PrintAndLog("Error during decode:%d", errCnt);
int offset=0, clk=0, invert=0, maxErr=0;
sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr);
- uint8_t BitStream[MAX_DEMOD_BUF_LEN];
+ uint8_t BitStream[MAX_GRAPH_TRACE_LEN];
size_t size = getFromGraphBuf(BitStream);
//invert here inverts the ask raw demoded bits which has no effect on the demod, but we need the pointer
int errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0);
}
//get bit clock length
if (!rfLen) {
- rfLen = detectFSKClk(BitStream, BitLen, fchigh, fclow);
+ int firstClockEdge = 0; //todo - align grid on graph with this...
+ rfLen = detectFSKClk(BitStream, BitLen, fchigh, fclow, &firstClockEdge);
if (!rfLen) rfLen = 50;
}
- int size = fskdemod(BitStream, BitLen, rfLen, invert, fchigh, fclow);
+ int startIdx = 0;
+ int size = fskdemod_ext(BitStream, BitLen, rfLen, invert, fchigh, fclow, &startIdx);
if (size > 0) {
setDemodBuf(BitStream,size,0);
+ setClockGrid(rfLen, startIdx);
// Now output the bitstream to the scrollback by line of 16 bits
if (verbose || g_debugMode) {
uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
size_t BitLen = getFromGraphBuf(BitStream);
if (BitLen==0) return 0;
- uint8_t carrier=countFC(BitStream, BitLen, 0);
- if (carrier!=2 && carrier!=4 && carrier!=8){
- //invalid carrier
- return 0;
- }
- if (g_debugMode){
- PrintAndLog("Carrier: rf/%d",carrier);
- }
int errCnt=0;
- errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert);
+ int startIdx = 0;
+ errCnt = pskRawDemod_ext(BitStream, &BitLen, &clk, &invert, &startIdx);
if (errCnt > maxErr){
if (g_debugMode || verbose) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
return 0;
}
//prime demod buffer for output
setDemodBuf(BitStream,BitLen,0);
+ setClockGrid(clk, startIdx);
+
return 1;
}
if (verbose || g_debugMode) PrintAndLog("Tried NRZ Demod using Clock: %d - invert: %d - Bits Found: %d",clk,invert,BitLen);
//prime demod buffer for output
setDemodBuf(BitStream,BitLen,0);
+ setClockGrid(clk, clkStartIdx);
+
if (errCnt>0 && (verbose || g_debugMode)) PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
if (verbose || g_debugMode) {
return ans;
}
+void setClockGrid(int clk, int offset) {
+ if (offset > clk) offset %= clk;
+ if (offset < 0) offset += clk;
+
+ if (offset > GraphTraceLen || offset < 0) return;
+ if (clk < 8 || clk > GraphTraceLen) {
+ GridLocked = false;
+ GridOffset = 0;
+ PlotGridX = 0;
+ PlotGridXdefault = 0;
+ RepaintGraphWindow();
+ } else {
+ GridLocked = true;
+ GridOffset = offset;
+ PlotGridX = clk;
+ PlotGridXdefault = clk;
+ RepaintGraphWindow();
+ }
+}
+
int CmdGrid(const char *Cmd)
{
sscanf(Cmd, "%i %i", &PlotGridX, &PlotGridY);
return val;
}
-int getSamples(const char *Cmd, bool silent)
+int getSamples(int n, bool silent)
{
//If we get all but the last byte in bigbuf,
// we don't have to worry about remaining trash
uint8_t got[BIGBUF_SIZE-1] = { 0 };
- int n = strtol(Cmd, NULL, 0);
-
if (n == 0 || n > sizeof(got))
n = sizeof(got);
- PrintAndLog("Reading %d bytes from device memory\n", n);
+ if (!silent) PrintAndLog("Reading %d bytes from device memory\n", n);
GetFromBigBuf(got,n,0);
- PrintAndLog("Data fetched");
+ if (!silent) PrintAndLog("Data fetched");
UsbCommand response;
WaitForResponse(CMD_ACK, &response);
uint8_t bits_per_sample = 8;
if(response.arg[0] > 0)
{
sample_config *sc = (sample_config *) response.d.asBytes;
- PrintAndLog("Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample
+ if (!silent) PrintAndLog("Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample
, sc->decimation);
bits_per_sample = sc->bits_per_sample;
}
if(bits_per_sample < 8)
{
- PrintAndLog("Unpacking...");
+ if (!silent) PrintAndLog("Unpacking...");
BitstreamIn bout = { got, bits_per_sample * n, 0};
int j =0;
for (j = 0; j * bits_per_sample < n * 8 && j < n; j++) {
int CmdSamples(const char *Cmd)
{
- return getSamples(Cmd, false);
+ int n = strtol(Cmd, NULL, 0);
+ return getSamples(n, false);
}
int CmdTuneSamples(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;
}
{"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)"},
- //{"fskfcdetect", CmdFSKfcDetect, 1, "Try to detect the Field Clock of an FSK wave"},
{"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