RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-04-24 09:33:06 +08:00
Code Issues Projects Releases Packages Wiki Activity

CHG: data plot- the marking of clock, looks better without borders. It only connected to ASK. STT mark also looks better.

Browse source 
Still problem with finding the startindex...
This commit is contained in:
iceman1001 2017-03-02 21:00:51 +01:00
parent a47ded5b54
commit c6e5c7ea46
4 changed files with 103 additions and 93 deletions

32
client/graph.c
View file

@ -37,12 +37,9 @@ int ClearGraph(int redraw)
{ {
int gtl = GraphTraceLen; int gtl = GraphTraceLen;
memset(GraphBuffer, 0x00, GraphTraceLen); memset(GraphBuffer, 0x00, GraphTraceLen);
GraphTraceLen = 0; GraphTraceLen = 0;
if (redraw) if (redraw)
RepaintGraphWindow(); RepaintGraphWindow();
return gtl; return gtl;
} }
// option '1' to save GraphBuffer any other to restore // option '1' to save GraphBuffer any other to restore
@ -70,13 +67,14 @@ void setGraphBuf(uint8_t *buff, size_t size)
{ {
if ( buff == NULL ) return; if ( buff == NULL ) return;
uint16_t i = 0; ClearGraph(0);
if ( size > MAX_GRAPH_TRACE_LEN ) if ( size > MAX_GRAPH_TRACE_LEN )
size = MAX_GRAPH_TRACE_LEN; size = MAX_GRAPH_TRACE_LEN;
ClearGraph(0);
for (; i < size; ++i){ for (uint16_t i = 0; i < size; ++i)
GraphBuffer[i] = buff[i] - 128; GraphBuffer[i] = buff[i] - 128;
}
GraphTraceLen = size; GraphTraceLen = size;
RepaintGraphWindow(); RepaintGraphWindow();
return; return;
@ -133,8 +131,8 @@ int GetAskClock(const char str[], bool printAns, bool verbose)
if (!strcmp(str, "")) if (!strcmp(str, ""))
clock = 0; clock = 0;
if (clock != 0) if (clock != 0) return clock;
return clock;
// Auto-detect clock // Auto-detect clock
uint8_t grph[MAX_GRAPH_TRACE_LEN]={0}; uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
size_t size = getFromGraphBuf(grph); size_t size = getFromGraphBuf(grph);
@ -145,15 +143,12 @@ int GetAskClock(const char str[], bool printAns, bool verbose)
} }
bool st = DetectST(grph, &size, &clock); bool st = DetectST(grph, &size, &clock);
int start = 0; int start = 0;
if (st == false) { if (st == false)
start = DetectASKClock(grph, size, &clock, 20); start = DetectASKClock(grph, size, &clock, 20);
}
// Only print this message if we're not looping something // Only print this message if we're not looping something
if (printAns){ if (printAns)
PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start); PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start);
}
PlotClock = clock;
PlockClockStartIndex = start;
return clock; return clock;
} }
@ -193,9 +188,6 @@ int GetPskClock(const char str[], bool printAns, bool verbose)
clock = DetectPSKClock(grph, size, 0); clock = DetectPSKClock(grph, size, 0);
// Only print this message if we're not looping something // Only print this message if we're not looping something
if (printAns) PrintAndLog("Auto-detected clock rate: %d", clock); if (printAns) PrintAndLog("Auto-detected clock rate: %d", clock);
PlotClock = clock;
// PlockClockStartIndex = start;
return clock; return clock;
} }
@ -221,8 +213,6 @@ uint8_t GetNrzClock(const char str[], bool printAns, bool verbose)
if (printAns) if (printAns)
PrintAndLog("Auto-detected clock rate: %d", clock); PrintAndLog("Auto-detected clock rate: %d", clock);
PlotClock = clock;
//PlockClockStartIndex = start;
return clock; return clock;
} }
//by marshmellow //by marshmellow
@ -247,8 +237,6 @@ uint8_t GetFskClock(const char str[], bool printAns, bool verbose)
PrintAndLog("DEBUG: unknown fsk field clock detected"); PrintAndLog("DEBUG: unknown fsk field clock detected");
PrintAndLog("Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1); PrintAndLog("Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d", fc1, fc2, rf1);
} }
//PlotClock = clock;
//PlockClockStartIndex = start;
return 0; return 0;
} }
uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose) uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)

14
client/proxguiqt.cpp
View file

@ -9,6 +9,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <iostream> #include <iostream>
#include <QT>
#include <QPainterPath> #include <QPainterPath>
#include <QBrush> #include <QBrush>
#include <QPen> #include <QPen>
@ -278,8 +279,10 @@ void ProxWidget::paintEvent(QPaintEvent *event)
int foo = 40 + (int)((CursorCPos - GraphStart) * GraphPixelsPerPoint); int foo = 40 + (int)((CursorCPos - GraphStart) * GraphPixelsPerPoint);
int bar = 40 + ((CursorDPos - GraphStart) * GraphPixelsPerPoint); int bar = 40 + ((CursorDPos - GraphStart) * GraphPixelsPerPoint);
QRect r_stt(foo, r.top(), bar-foo, r.bottom() ); QRect r_stt(foo, r.top(), bar-foo, r.bottom() );
painter.fillRect(r_stt, QBrush( QT_ORANGE_TS )); QBrush b_stt( QBrush( QT_ORANGE_TS ));
painter.drawRect(r_stt); b_stt.setStyle(Qt::Dense1Pattern);
painter.setPen(Qt::NoPen);
painter.fillRect(r_stt, b_stt);
} }
// Mark Clock pulse // Mark Clock pulse
@ -293,8 +296,11 @@ void ProxWidget::paintEvent(QPaintEvent *event)
int foo = 40 + (int)((i - GraphStart) * GraphPixelsPerPoint); int foo = 40 + (int)((i - GraphStart) * GraphPixelsPerPoint);
int bar = 40 + ((i + PlotClock - GraphStart) * GraphPixelsPerPoint); int bar = 40 + ((i + PlotClock - GraphStart) * GraphPixelsPerPoint);
QRect r_clock(foo, r.top(), bar-foo, r.bottom() ); QRect r_clock(foo, r.top(), bar-foo, r.bottom() );
painter.fillRect(r_clock, QBrush( QT_RED_TS ));
painter.drawRect(r_clock); QBrush b_clk( QBrush( QT_RED_TS ));
b_clk.setStyle(Qt::Dense1Pattern);
painter.setPen(Qt::NoPen);
painter.fillRect(r_clock, b_clk);
} }
} }

2
client/proxguiqt.h
View file

@ -23,6 +23,8 @@ class ProxWidget : public QWidget
double GraphPixelsPerPoint; double GraphPixelsPerPoint;
int CursorAPos; int CursorAPos;
int CursorBPos; int CursorBPos;
//int CursorCPos;
//int CursorDPos;
public: public:
ProxWidget(QWidget *parent = 0); ProxWidget(QWidget *parent = 0);

50
common/lfdemod.c
View file

@ -940,6 +940,10 @@ int DetectStrongAskClock(uint8_t dest[], size_t size, uint8_t high, uint8_t low)
} }
return 0; return 0;
} }
void SetGraphClock( int clock, int startidx){
PlotClock = clock;
PlockClockStartIndex = startidx;
}
// by marshmellow // by marshmellow
// not perfect especially with lower clocks or VERY good antennas (heavy wave clipping) // not perfect especially with lower clocks or VERY good antennas (heavy wave clipping)
@ -1026,6 +1030,8 @@ int DetectASKClock(uint8_t dest[], size_t size, int *clock, int maxErr)
if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, err %d, startpos %d, endpos %d", clk[clkCnt], errCnt, ii, i); if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, err %d, startpos %d, endpos %d", clk[clkCnt], errCnt, ii, i);
if (errCnt==0 && clkCnt<7) { if (errCnt==0 && clkCnt<7) {
if (!clockFnd) *clock = clk[clkCnt]; if (!clockFnd) *clock = clk[clkCnt];
SetGraphClock(*clock, ii);
return ii; return ii;
} }
//if we found errors see if it is lowest so far and save it as best run //if we found errors see if it is lowest so far and save it as best run
@ -1048,6 +1054,8 @@ int DetectASKClock(uint8_t dest[], size_t size, int *clock, int maxErr)
if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, # Errors %d, Current Best Clk %d, bestStart %d", clk[k], bestErr[k], clk[best], bestStart[best]); if (g_debugMode == 2) prnt("DEBUG ASK: clk %d, # Errors %d, Current Best Clk %d, bestStart %d", clk[k], bestErr[k], clk[best], bestStart[best]);
} }
if (!clockFnd) *clock = clk[best]; if (!clockFnd) *clock = clk[best];
SetGraphClock(*clock, bestStart[best]);
return bestStart[best]; return bestStart[best];
} }
@ -1058,14 +1066,17 @@ int DetectPSKClock(uint8_t dest[], size_t size, int clock)
{ {
uint8_t clk[] = {255,16,32,40,50,64,100,128,255}; //255 is not a valid clock uint8_t clk[] = {255,16,32,40,50,64,100,128,255}; //255 is not a valid clock
uint16_t loopCnt = 4096; //don't need to loop through entire array... uint16_t loopCnt = 4096; //don't need to loop through entire array...
if (size == 0) return 0;
if (size<loopCnt) loopCnt = size-20;
//if we already have a valid clock quit //if we already have a valid clock quit
size_t i=1; size_t i=1;
for (; i < 8; ++i) for (; i < 8; ++i)
if (clk[i] == clock) return clock; if (clk[i] == clock) return clock;
if (size < 160+20) return 0;
// size must be larger than 20 here, and 160 later on.
if (size < loopCnt) loopCnt = size-20;
size_t waveStart=0, waveEnd=0, firstFullWave=0, lastClkBit=0; size_t waveStart=0, waveEnd=0, firstFullWave=0, lastClkBit=0;
uint8_t clkCnt, fc=0, fullWaveLen=0, tol=1; uint8_t clkCnt, fc=0, fullWaveLen=0, tol=1;
uint16_t peakcnt=0, errCnt=0, waveLenCnt=0; uint16_t peakcnt=0, errCnt=0, waveLenCnt=0;
@ -1131,9 +1142,7 @@ int DetectPSKClock(uint8_t dest[], size_t size, int clock)
} }
} }
} }
if (errCnt == 0){ if (errCnt == 0) return clk[clkCnt];
return clk[clkCnt];
}
if (errCnt <= bestErr[clkCnt]) bestErr[clkCnt] = errCnt; if (errCnt <= bestErr[clkCnt]) bestErr[clkCnt] = errCnt;
if (peakcnt > peaksdet[clkCnt]) peaksdet[clkCnt] = peakcnt; if (peakcnt > peaksdet[clkCnt]) peaksdet[clkCnt] = peakcnt;
} }
@ -1141,9 +1150,9 @@ int DetectPSKClock(uint8_t dest[], size_t size, int clock)
//return the highest clk with the most peaks found //return the highest clk with the most peaks found
uint8_t best = 7; uint8_t best = 7;
for (i=7; i >= 1; i--){ for (i=7; i >= 1; i--){
if (peaksdet[i] > peaksdet[best]) { if (peaksdet[i] > peaksdet[best])
best = i; best = i;
}
if (g_debugMode == 2) prnt("DEBUG PSK: Clk: %d, peaks: %d, errs: %d, bestClk: %d",clk[i],peaksdet[i],bestErr[i],clk[best]); if (g_debugMode == 2) prnt("DEBUG PSK: Clk: %d, peaks: %d, errs: %d, bestClk: %d",clk[i],peaksdet[i],bestErr[i],clk[best]);
} }
return clk[best]; return clk[best];
@ -1180,17 +1189,21 @@ int DetectStrongNRZClk(uint8_t *dest, size_t size, int peak, int low){
//by marshmellow //by marshmellow
//detect nrz clock by reading #peaks vs no peaks(or errors) //detect nrz clock by reading #peaks vs no peaks(or errors)
//iceman: shouldn't param clock be reference? like DetectASKClock
int DetectNRZClock(uint8_t dest[], size_t size, int clock) int DetectNRZClock(uint8_t dest[], size_t size, int clock)
{ {
size_t i = 0; size_t i = 0;
uint8_t clk[] = {8,16,32,40,50,64,100,128,255}; uint8_t clk[] = {8,16,32,40,50,64,100,128,255};
size_t loopCnt = 4096; //don't need to loop through entire array... size_t loopCnt = 4096; //don't need to loop through entire array...
if (size == 0) return 0;
if (size<loopCnt) loopCnt = size-20;
//if we already have a valid clock quit //if we already have a valid clock quit
for (; i < 8; ++i) for (; i < 8; ++i)
if (clk[i] == clock) return clock; if (clk[i] == clock) return clock;
if (size < 20) return 0;
// size must be larger than 20 here
if (size < loopCnt) loopCnt = size-20;
//get high and low peak //get high and low peak
int peak, low; int peak, low;
if (getHiLo(dest, loopCnt, &peak, &low, 75, 75) < 1) return 0; if (getHiLo(dest, loopCnt, &peak, &low, 75, 75) < 1) return 0;
@ -1262,7 +1275,8 @@ int DetectNRZClock(uint8_t dest[], size_t size, int clock)
} else if (dest[i] < peak && dest[i] > low){ } else if (dest[i] < peak && dest[i] > low){
if (ignoreCnt == 0){ if (ignoreCnt == 0){
bitHigh=false; bitHigh=false;
if (errBitHigh==true) peakcnt--; if (errBitHigh==true)
peakcnt--;
errBitHigh=false; errBitHigh=false;
} else { } else {
ignoreCnt--; ignoreCnt--;
@ -1279,17 +1293,17 @@ int DetectNRZClock(uint8_t dest[], size_t size, int clock)
} }
} }
} }
int iii=7;
uint8_t best = 0; uint8_t best = 0;
for (iii=7; iii > 0; iii--){ for (int m = 7; m > 0; m--){
if ((peaksdet[iii] >= (peaksdet[best]-1)) && (peaksdet[iii] <= peaksdet[best]+1) && lowestTransition) { if ((peaksdet[m] >= (peaksdet[best]-1)) && (peaksdet[m] <= peaksdet[best]+1) && lowestTransition) {
if (clk[iii] > (lowestTransition - (clk[iii]/8)) && clk[iii] < (lowestTransition + (clk[iii]/8))) { if (clk[m] > (lowestTransition - (clk[m]/8)) && clk[m] < (lowestTransition + (clk[m]/8))) {
best = iii; best = m;
} }
} else if (peaksdet[iii] > peaksdet[best]){ } else if (peaksdet[m] > peaksdet[best]){
best = iii; best = m;
} }
if (g_debugMode==2) prnt("DEBUG NRZ: Clk: %d, peaks: %d, maxPeak: %d, bestClk: %d, lowestTrs: %d",clk[iii],peaksdet[iii],maxPeak, clk[best], lowestTransition); if (g_debugMode==2) prnt("DEBUG NRZ: Clk: %d, peaks: %d, maxPeak: %d, bestClk: %d, lowestTrs: %d", clk[m], peaksdet[m], maxPeak, clk[best], lowestTransition);
} }
return clk[best]; return clk[best];