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

CHG: plotting of clock

Browse source
This commit is contained in:
iceman1001 2017-03-04 14:36:09 +01:00
commit e0a241f76e
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/graph.c
View file

@ -263,8 +263,8 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
if (verbose || g_debugMode) PrintAndLog("DEBUG: Clock detect error"); if (verbose || g_debugMode) PrintAndLog("DEBUG: Clock detect error");
return 0; return 0;
} }
if (verbose || g_debugMode)
PrintAndLog("Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d | Best Starting Position: %d", *fc1, *fc2, *rf1, start); PrintAndLog("Detected Field Clocks: FC/%d, FC/%d - Bit Clock: RF/%d | Best Starting Position: %d", *fc1, *fc2, *rf1, start);
SetGraphClock(*rf1, start); SetGraphClock(*rf1, start);
return 1; return 1;
} }

8
client/proxguiqt.cpp
View file

@ -315,7 +315,7 @@ void ProxWidget::paintEvent(QPaintEvent *event)
//painter.setPen( QT_LIGHTBLUE ); painter.drawPath(cursorDPath); //painter.setPen( QT_LIGHTBLUE ); 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) [Clock RF/%d]",
GraphStart, yMax, yMin, yMean, n, GraphTraceLen, GraphStart, yMax, yMin, yMean, n, GraphTraceLen,
CursorBPos - CursorAPos, CursorBPos - CursorAPos,
(CursorBPos - CursorAPos)/CursorScaleFactor, (CursorBPos - CursorAPos)/CursorScaleFactor,
@ -326,11 +326,12 @@ void ProxWidget::paintEvent(QPaintEvent *event)
GraphBuffer[CursorBPos], GraphBuffer[CursorBPos],
PlotGridXdefault, PlotGridXdefault,
PlotGridYdefault, PlotGridYdefault,
GridLocked ? "Locked" : "Unlocked" GridLocked ? "Locked" : "Unlocked",
PlotClock
); );
painter.setPen( QT_WHITE ); painter.setPen( QT_WHITE );
painter.drawText(50, r.bottom() - 20, str); painter.drawText(50, r.bottom() - 10, str);
} }
ProxWidget::ProxWidget(QWidget *parent) : QWidget(parent), GraphStart(0), GraphPixelsPerPoint(1) ProxWidget::ProxWidget(QWidget *parent) : QWidget(parent), GraphStart(0), GraphPixelsPerPoint(1)
@ -345,6 +346,7 @@ ProxWidget::ProxWidget(QWidget *parent) : QWidget(parent), GraphStart(0), GraphP
setAutoFillBackground(true); setAutoFillBackground(true);
CursorAPos = 0; CursorAPos = 0;
CursorBPos = 0; CursorBPos = 0;
PlotClock = 0;
} }
void ProxWidget::closeEvent(QCloseEvent *event) void ProxWidget::closeEvent(QCloseEvent *event)