github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 13:23:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ADD: data detectclock - added clock blocks in plot window. Its a draft. Not working for all clocks.

Browse source 
ADD: STT is now marked as a block in plot window,  instead of Marshmellow42 's two lines.
This commit is contained in:
iceman1001 2017-03-02 14:53:50 +01:00
commit a47ded5b54
6 changed files with 135 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

13
client/cmddata.c
View file

@ -1053,29 +1053,30 @@ int CmdDetectClockRate(const char *Cmd)
if (strlen(Cmd) > 6 || strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') if (strlen(Cmd) > 6 || strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H')
return usage_data_detectclock(); return usage_data_detectclock();
int ans = 0; int clock = 0;
switch ( cmdp ) { switch ( cmdp ) {
case 'a' : case 'a' :
case 'A' : case 'A' :
ans = GetAskClock(Cmd+1, true, false); clock = GetAskClock(Cmd+1, true, false);
break; break;
case 'f' : case 'f' :
case 'F' : case 'F' :
ans = GetFskClock("", true, false); clock = GetFskClock("", true, false);
break; break;
case 'n' : case 'n' :
case 'N' : case 'N' :
ans = GetNrzClock("", true, false); clock = GetNrzClock("", true, false);
break; break;
case 'p' : case 'p' :
case 'P' : case 'P' :
ans = GetPskClock("", true, false); clock = GetPskClock("", true, false);
break; break;
default : default :
PrintAndLog ("Please specify a valid modulation to detect the clock of - see option h for help"); PrintAndLog ("Please specify a valid modulation to detect the clock of - see option h for help");
break; break;
} }
return ans; RepaintGraphWindow();
return clock;
} }
char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert) char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)

42
client/graph.c
View file

@ -152,26 +152,26 @@ int GetAskClock(const char str[], bool printAns, bool verbose)
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;
} }
uint8_t GetPskCarrier(const char str[], bool printAns, bool verbose) uint8_t GetPskCarrier(const char str[], bool printAns, bool verbose)
{ {
uint8_t carrier=0; uint8_t carrier = 0;
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);
if ( size == 0 ) { if ( size == 0 ) {
if (verbose) if (verbose)
PrintAndLog("Failed to copy from graphbuffer"); PrintAndLog("Failed to copy from graphbuffer");
return 0; return 0;
} }
//uint8_t countPSK_FC(uint8_t *BitStream, size_t size) carrier = countFC(grph, size, 0);
carrier = countFC(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){ if (printAns)
PrintAndLog("Auto-detected PSK carrier rate: %d", carrier); PrintAndLog("Auto-detected PSK carrier rate: %d", carrier);
}
return carrier; return carrier;
} }
@ -182,18 +182,20 @@ int GetPskClock(const char str[], bool printAns, bool verbose)
if (!strcmp(str, "")) if (!strcmp(str, ""))
clock = 0; clock = 0;
if (clock!=0) return clock; if (clock != 0) 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);
if ( size == 0 ) { if ( size == 0 ) {
if (verbose) PrintAndLog("Failed to copy from graphbuffer"); if (verbose) PrintAndLog("Failed to copy from graphbuffer");
return -1; return -1;
} }
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;
} }
@ -204,10 +206,10 @@ uint8_t GetNrzClock(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);
if ( size == 0 ) { if ( size == 0 ) {
if (verbose) if (verbose)
@ -216,9 +218,11 @@ uint8_t GetNrzClock(const char str[], bool printAns, bool verbose)
} }
clock = DetectNRZClock(grph, size, 0); clock = DetectNRZClock(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){ 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
@ -243,15 +247,17 @@ 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)
{ {
uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
size_t size = getFromGraphBuf(BitStream); size_t size = getFromGraphBuf(BitStream);
if (size==0) return 0; if (size == 0) return 0;
uint16_t ans = countFC(BitStream, size, 1); uint16_t ans = countFC(BitStream, size, 1);
if (ans==0) { if (ans == 0) {
if (verbose || g_debugMode) PrintAndLog("DEBUG: No data found"); if (verbose || g_debugMode) PrintAndLog("DEBUG: No data found");
return 0; return 0;
} }
@ -259,7 +265,7 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
*fc2 = ans & 0xFF; *fc2 = ans & 0xFF;
*rf1 = detectFSKClk(BitStream, size, *fc1, *fc2); *rf1 = detectFSKClk(BitStream, size, *fc1, *fc2);
if (*rf1==0) { if (*rf1 == 0) {
if (verbose || g_debugMode) PrintAndLog("DEBUG: Clock detect error"); if (verbose || g_debugMode) PrintAndLog("DEBUG: Clock detect error");
return 0; return 0;
} }

1
client/proxgui.h
View file

@ -24,6 +24,7 @@ extern int GraphBuffer[MAX_GRAPH_TRACE_LEN];
extern int GraphTraceLen; extern int GraphTraceLen;
extern double CursorScaleFactor; extern double CursorScaleFactor;
extern int PlotGridX, PlotGridY, PlotGridXdefault, PlotGridYdefault, CursorCPos, CursorDPos; extern int PlotGridX, PlotGridY, PlotGridXdefault, PlotGridYdefault, CursorCPos, CursorDPos;
extern int PlotClock, PlockClockStartIndex;
extern int CommandFinished; extern int CommandFinished;
extern int offline; extern int offline;

154
client/proxguiqt.cpp
View file

@ -96,32 +96,40 @@ ProxGuiQT::~ProxGuiQT(void)
} }
} }
// solid colors
#define QT_ORANGE QColor(255, 153, 0)
#define QT_WHITE QColor(255, 255, 255)
#define QT_YELLOW QColor(255, 255, 0)
#define QT_MAGENTA QColor(255, 0, 255)
#define QT_LIGHTBLUE QColor(0, 0, 205)
#define QT_LIGHTGREEN QColor(100, 255, 100)
#define QT_GRAY QColor(100,100,100)
#define QT_BLACK QColor(0,0,0)
// transparent colors
#define QT_ORANGE_TS QColor(255, 153, 0, 96)
#define QT_RED_TS QColor(255, 0, 0, 64)
#define QT_BLACK_TS QColor(0,0,0,0)
void ProxWidget::paintEvent(QPaintEvent *event) void ProxWidget::paintEvent(QPaintEvent *event)
{ {
QPainter painter(this); QPainter painter(this);
QPainterPath penPath, whitePath, greyPath, lightgreyPath, cursorAPath, cursorBPath, cursorCPath, cursorDPath; QPainterPath penPath, whitePath, greyPath, lightgreyPath, cursorAPath, cursorBPath, cursorCPath, cursorDPath;
QRect r; QRect r;
QBrush brush(QColor(100, 255, 100)); QBrush brush(QT_LIGHTGREEN);
QPen pen(QColor(100, 255, 100)); QPen pen(QT_LIGHTGREEN);
painter.setFont(QFont("Arial", 10)); painter.setFont(QFont("Arial", 10));
if(GraphStart < 0) if(GraphStart < 0)
GraphStart = 0; GraphStart = 0;
if (CursorAPos > GraphTraceLen) if (CursorAPos > GraphTraceLen) CursorAPos = 0;
CursorAPos= 0; if (CursorBPos > GraphTraceLen) CursorBPos = 0;
if (CursorCPos > GraphTraceLen) CursorCPos = 0;
if(CursorBPos > GraphTraceLen) if (CursorDPos > GraphTraceLen) CursorDPos = 0;
CursorBPos= 0;
if(CursorCPos > GraphTraceLen)
CursorCPos= 0;
if(CursorDPos > GraphTraceLen)
CursorDPos= 0;
r = rect(); r = rect();
painter.fillRect(r, QT_BLACK);
painter.fillRect(r, QColor(0, 0, 0));
whitePath.moveTo(r.left() + 40, r.top()); whitePath.moveTo(r.left() + 40, r.top());
whitePath.lineTo(r.left() + 40, r.bottom()); whitePath.lineTo(r.left() + 40, r.bottom());
@ -130,33 +138,33 @@ void ProxWidget::paintEvent(QPaintEvent *event)
greyPath.moveTo(r.left(), zeroHeight); greyPath.moveTo(r.left(), zeroHeight);
greyPath.lineTo(r.right(), zeroHeight); greyPath.lineTo(r.right(), zeroHeight);
painter.setPen(QColor(100, 100, 100)); painter.setPen(QT_GRAY);
painter.drawPath(greyPath); painter.drawPath(greyPath);
PageWidth= (int)((r.right() - r.left() - 40) / GraphPixelsPerPoint); PageWidth = (int)((r.right() - r.left() - 40) / GraphPixelsPerPoint);
// plot X and Y grid lines // plot X and Y grid lines
int i; int i;
if ((PlotGridX > 0) && ((PlotGridX * GraphPixelsPerPoint) > 1)) { if ((PlotGridX > 0) && ((PlotGridX * GraphPixelsPerPoint) > 1)) {
for(i = 40 + (GridOffset * GraphPixelsPerPoint); i < r.right(); i += (int)(PlotGridX * GraphPixelsPerPoint)) { for(i = 40 + (GridOffset * GraphPixelsPerPoint); i < r.right(); i += (int)(PlotGridX * GraphPixelsPerPoint)) {
//SelectObject(hdc, GreyPenLite); //SelectObject(hdc, GreyPenLite);
//MoveToEx(hdc, r.left + i, r.top, NULL); //MoveToEx(hdc, r.left + i, r.top, NULL);
//LineTo(hdc, r.left + i, r.bottom); //LineTo(hdc, r.left + i, r.bottom);
lightgreyPath.moveTo(r.left()+i,r.top()); lightgreyPath.moveTo(r.left()+i,r.top());
lightgreyPath.lineTo(r.left()+i,r.bottom()); lightgreyPath.lineTo(r.left()+i,r.bottom());
painter.drawPath(lightgreyPath); painter.drawPath(lightgreyPath);
} }
} }
if ((PlotGridY > 0) && ((PlotGridY * GraphPixelsPerPoint) > 1)){ if ((PlotGridY > 0) && ((PlotGridY * GraphPixelsPerPoint) > 1)){
for(i = 0; i < ((r.top() + r.bottom())>>1); i += (int)(PlotGridY * GraphPixelsPerPoint)) { for(i = 0; i < ((r.top() + r.bottom())>>1); i += (int)(PlotGridY * GraphPixelsPerPoint)) {
lightgreyPath.moveTo(r.left() + 40,zeroHeight + i); lightgreyPath.moveTo(r.left() + 40,zeroHeight + i);
lightgreyPath.lineTo(r.right(),zeroHeight + i); lightgreyPath.lineTo(r.right(),zeroHeight + i);
painter.drawPath(lightgreyPath); painter.drawPath(lightgreyPath);
lightgreyPath.moveTo(r.left() + 40,zeroHeight - i); lightgreyPath.moveTo(r.left() + 40,zeroHeight - i);
lightgreyPath.lineTo(r.right(),zeroHeight - i); lightgreyPath.lineTo(r.right(),zeroHeight - i);
painter.drawPath(lightgreyPath); painter.drawPath(lightgreyPath);
} }
} }
startMax = (GraphTraceLen - (int)((r.right() - r.left() - 40) / GraphPixelsPerPoint)); startMax = (GraphTraceLen - (int)((r.right() - r.left() - 40) / GraphPixelsPerPoint));
@ -168,11 +176,11 @@ void ProxWidget::paintEvent(QPaintEvent *event)
int absYMax = 1; int absYMax = 1;
for(i = GraphStart; ; i++) { for(i = GraphStart; ;i++) {
if(i >= GraphTraceLen) break; if(i >= GraphTraceLen) break;
if(fabs((double)GraphBuffer[i]) > absYMax) if (fabs((double)GraphBuffer[i]) > absYMax)
absYMax = (int)fabs((double)GraphBuffer[i]); absYMax = (int)fabs((double)GraphBuffer[i]);
int x = 40 + (int)((i - GraphStart)*GraphPixelsPerPoint); int x = 40 + (int)((i - GraphStart)*GraphPixelsPerPoint);
@ -196,11 +204,15 @@ void ProxWidget::paintEvent(QPaintEvent *event)
int yMax = INT_MIN; int yMax = INT_MIN;
int yMean = 0; int yMean = 0;
int n = 0; int n = 0;
//int stt_x1 = 0, stt_x2 = 0;
for(i = GraphStart; ; i++) { for(i = GraphStart; ; i++) {
if(i >= GraphTraceLen) break; if(i >= GraphTraceLen) break;
int x = 40 + (int)((i - GraphStart)*GraphPixelsPerPoint); // x == pixel pos.
int x = 40 + (int)((i - GraphStart) * GraphPixelsPerPoint);
// if x reaches end of box, stop loop
if(x > r.right() + GraphPixelsPerPoint) break; if(x > r.right() + GraphPixelsPerPoint) break;
int y = GraphBuffer[i]; int y = GraphBuffer[i];
@ -221,6 +233,7 @@ void ProxWidget::paintEvent(QPaintEvent *event)
penPath.lineTo(x, y); penPath.lineTo(x, y);
// small white boxes (the dots on the signal)
if(GraphPixelsPerPoint > 10) { if(GraphPixelsPerPoint > 10) {
QRect f(QPoint(x - 3, y - 3),QPoint(x + 3, y + 3)); QRect f(QPoint(x - 3, y - 3),QPoint(x + 3, y + 3));
painter.fillRect(f, brush); painter.fillRect(f, brush);
@ -233,7 +246,7 @@ void ProxWidget::paintEvent(QPaintEvent *event)
char str[100]; char str[100];
sprintf(str, "+%d", (i - GraphStart)); sprintf(str, "+%d", (i - GraphStart));
painter.setPen(QColor(255, 255, 255)); painter.setPen( QT_WHITE );
QRect size; QRect size;
QFontMetrics metrics(painter.font()); QFontMetrics metrics(painter.font());
size = metrics.boundingRect(str); size = metrics.boundingRect(str);
@ -245,11 +258,11 @@ void ProxWidget::paintEvent(QPaintEvent *event)
if(i == CursorAPos || i == CursorBPos || i == CursorCPos || i == CursorDPos) { if(i == CursorAPos || i == CursorBPos || i == CursorCPos || i == CursorDPos) {
QPainterPath *cursorPath; QPainterPath *cursorPath;
if (i == CursorAPos) if ( i == CursorAPos )
cursorPath = &cursorAPath; cursorPath = &cursorAPath;
else if (i == CursorBPos) else if ( i == CursorBPos )
cursorPath = &cursorBPath; cursorPath = &cursorBPath;
else if (i == CursorCPos) else if ( i == CursorCPos )
cursorPath = &cursorCPath; cursorPath = &cursorCPath;
else else
cursorPath = &cursorDPath; cursorPath = &cursorDPath;
@ -260,21 +273,40 @@ void ProxWidget::paintEvent(QPaintEvent *event)
} }
} }
// Mark STT block in signal
if ( CursorCPos > 0 ){
int foo = 40 + (int)((CursorCPos - GraphStart) * GraphPixelsPerPoint);
int bar = 40 + ((CursorDPos - GraphStart) * GraphPixelsPerPoint);
QRect r_stt(foo, r.top(), bar-foo, r.bottom() );
painter.fillRect(r_stt, QBrush( QT_ORANGE_TS ));
painter.drawRect(r_stt);
}
// Mark Clock pulse
//extern int PlotClock, PlockClockStartIndex;
if ( PlotClock > 0){
for(int i = PlockClockStartIndex; ; i += PlotClock * 2) {
if(i >= GraphTraceLen ) break;
if ((CursorCPos > 0) && (i >= CursorCPos)) break;
int foo = 40 + (int)((i - GraphStart) * GraphPixelsPerPoint);
int bar = 40 + ((i + PlotClock - GraphStart) * GraphPixelsPerPoint);
QRect r_clock(foo, r.top(), bar-foo, r.bottom() );
painter.fillRect(r_clock, QBrush( QT_RED_TS ));
painter.drawRect(r_clock);
}
}
if(n != 0) if(n != 0)
yMean /= n; yMean /= n;
painter.setPen(QColor(255, 255, 255)); painter.setPen( QT_WHITE ); painter.drawPath(whitePath);
painter.drawPath(whitePath); painter.setPen(pen); painter.drawPath(penPath);
painter.setPen(pen); painter.setPen( QT_YELLOW ); painter.drawPath(cursorAPath);
painter.drawPath(penPath); painter.setPen( QT_MAGENTA ); painter.drawPath(cursorBPath);
painter.setPen(QColor(255, 255, 0)); //painter.setPen( QT_ORANGE ); painter.drawPath(cursorCPath);
painter.drawPath(cursorAPath); //painter.setPen( QT_LIGHTBLUE ); painter.drawPath(cursorDPath);
painter.setPen(QColor(255, 0, 255));
painter.drawPath(cursorBPath);
painter.setPen(QColor(255, 153, 0)); //orange
painter.drawPath(cursorCPath);
painter.setPen(QColor(0, 0, 205)); //light blue
painter.drawPath(cursorDPath);
char str[200]; char str[200];
sprintf(str, "@%d max=%d min=%d mean=%d n=%d/%d dt=%d [%.3f] zoom=%.3f CursorA=%d [%d] CursorB=%d [%d] GridX=%d GridY=%d (%s)", sprintf(str, "@%d max=%d min=%d mean=%d n=%d/%d dt=%d [%.3f] zoom=%.3f CursorA=%d [%d] CursorB=%d [%d] GridX=%d GridY=%d (%s)",
@ -291,7 +323,7 @@ void ProxWidget::paintEvent(QPaintEvent *event)
GridLocked ? "Locked" : "Unlocked" GridLocked ? "Locked" : "Unlocked"
); );
painter.setPen(QColor(255, 255, 255)); painter.setPen( QT_WHITE );
painter.drawText(50, r.bottom() - 20, str); painter.drawText(50, r.bottom() - 20, str);
} }
@ -299,10 +331,10 @@ ProxWidget::ProxWidget(QWidget *parent) : QWidget(parent), GraphStart(0), GraphP
{ {
resize(600, 300); resize(600, 300);
QPalette palette(QColor(0,0,0,0)); QPalette palette( QT_BLACK_TS );
palette.setColor(QPalette::WindowText, QColor(255,255,255)); palette.setColor(QPalette::WindowText, QT_WHITE );
palette.setColor(QPalette::Text, QColor(255,255,255)); palette.setColor(QPalette::Text, QT_WHITE );
palette.setColor(QPalette::Button, QColor(100, 100, 100)); palette.setColor(QPalette::Button, QT_GRAY );
setPalette(palette); setPalette(palette);
setAutoFillBackground(true); setAutoFillBackground(true);
CursorAPos = 0; CursorAPos = 0;

6
client/ui.c
View file

@ -10,8 +10,12 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include "ui.h" #include "ui.h"
// set QT vars
double CursorScaleFactor; double CursorScaleFactor;
int PlotGridX, PlotGridY, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0; int PlotGridX, PlotGridY, PlotGridXdefault = 64, PlotGridYdefault = 64, CursorCPos = 0, CursorDPos = 0;
int PlotClock = 0, PlockClockStartIndex = 0;
int offline; int offline;
int flushAfterWrite = 0; int flushAfterWrite = 0;
extern pthread_mutex_t print_lock; extern pthread_mutex_t print_lock;

1
client/ui.h
View file

@ -46,6 +46,7 @@ void SetLogFilename(char *fn);
extern double CursorScaleFactor; extern double CursorScaleFactor;
extern int PlotGridX, PlotGridY, PlotGridXdefault, PlotGridYdefault, CursorCPos, CursorDPos; extern int PlotGridX, PlotGridY, PlotGridXdefault, PlotGridYdefault, CursorCPos, CursorDPos;
extern int PlotClock, PlockClockStartIndex;
extern int offline; extern int offline;
extern int flushAfterWrite; //buzzy extern int flushAfterWrite; //buzzy