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

plot trim: adjust demod graph and cursors when possible

Browse source
This commit is contained in:
Philippe Teuwen 2020-10-06 14:11:09 +02:00
commit fd3b440eea
3 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/src/cmddata.c
View file

@ -30,7 +30,7 @@
uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN]; uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
size_t DemodBufferLen = 0; size_t DemodBufferLen = 0;
size_t g_DemodStartIdx = 0; int32_t g_DemodStartIdx = 0;
int g_DemodClock = 0; int g_DemodClock = 0;
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
@ -1789,6 +1789,7 @@ int CmdLtrim(const char *Cmd) {
GraphBuffer[i - ds] = GraphBuffer[i]; GraphBuffer[i - ds] = GraphBuffer[i];
GraphTraceLen -= ds; GraphTraceLen -= ds;
g_DemodStartIdx -= ds;
RepaintGraphWindow(); RepaintGraphWindow();
return PM3_SUCCESS; return PM3_SUCCESS;
} }

2
client/src/cmddata.h
View file

@ -86,7 +86,7 @@ extern uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
extern size_t DemodBufferLen; extern size_t DemodBufferLen;
extern int g_DemodClock; extern int g_DemodClock;
extern size_t g_DemodStartIdx; extern int32_t g_DemodStartIdx;
#ifdef __cplusplus #ifdef __cplusplus
} }

11
client/src/proxguiqt.cpp
View file

@ -703,6 +703,16 @@ void Plot::Trim(void) {
if ((CursorAPos == 0) || (CursorBPos == 0)) { // if we don't have both cursors set if ((CursorAPos == 0) || (CursorBPos == 0)) { // if we don't have both cursors set
lref = GraphStart; lref = GraphStart;
rref = GraphStop; rref = GraphStop;
if (CursorAPos >= lref) {
CursorAPos -= lref;
} else {
CursorAPos = 0;
}
if (CursorBPos >= lref) {
CursorBPos -= lref;
} else {
CursorBPos = 0;
}
} else { } else {
lref = CursorAPos < CursorBPos ? CursorAPos : CursorBPos; lref = CursorAPos < CursorBPos ? CursorAPos : CursorBPos;
rref = CursorAPos < CursorBPos ? CursorBPos : CursorAPos; rref = CursorAPos < CursorBPos ? CursorBPos : CursorAPos;
@ -715,6 +725,7 @@ void Plot::Trim(void) {
CursorAPos -= lref; CursorAPos -= lref;
CursorBPos -= lref; CursorBPos -= lref;
} }
g_DemodStartIdx -= lref;
for (uint32_t i = lref; i < rref; ++i) for (uint32_t i = lref; i < rref; ++i)
GraphBuffer[i - lref] = GraphBuffer[i]; GraphBuffer[i - lref] = GraphBuffer[i];
GraphTraceLen = rref - lref; GraphTraceLen = rref - lref;