github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3

Browse source
This commit is contained in:
iceman1001 2019-04-14 11:07:44 +02:00
commit c78c6e65f5
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/cmdlf.c
View file

@ -189,9 +189,6 @@ int CmdLFCommandRead(const char *Cmd) {
int CmdFlexdemod(const char *Cmd) { int CmdFlexdemod(const char *Cmd) {
(void)Cmd; // Cmd is not used so far (void)Cmd; // Cmd is not used so far
if (GraphTraceLen < 0)
return 0;
#ifndef LONG_WAIT #ifndef LONG_WAIT
#define LONG_WAIT 100 #define LONG_WAIT 100
#endif #endif

9
client/proxguiqt.cpp
View file

@ -276,9 +276,11 @@ QColor Plot::getColor(int graphNum) {
void Plot::setMaxAndStart(int *buffer, size_t len, QRect plotRect) { void Plot::setMaxAndStart(int *buffer, size_t len, QRect plotRect) {
if (len == 0) return; if (len == 0) return;
startMax = (len - (int)((plotRect.right() - plotRect.left() - 40) / GraphPixelsPerPoint));
if (startMax < 0) {
startMax = 0; startMax = 0;
if (plotRect.right() >= plotRect.left() + 40) {
uint32_t t = (plotRect.right() - plotRect.left() - 40) / GraphPixelsPerPoint;
if (len >= t)
startMax = len - t;
} }
if (GraphStart > startMax) { if (GraphStart > startMax) {
GraphStart = startMax; GraphStart = startMax;
@ -470,9 +472,6 @@ void Plot::paintEvent(QPaintEvent *event) {
painter.setFont(QFont("Courier New", 10)); painter.setFont(QFont("Courier New", 10));
if (GraphStart < 0)
GraphStart = 0;
if (CursorAPos > GraphTraceLen) if (CursorAPos > GraphTraceLen)
CursorAPos = 0; CursorAPos = 0;
if (CursorBPos > GraphTraceLen) if (CursorBPos > GraphTraceLen)