github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-12 08:16:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #282 from Proxmark/graphwork2

Browse source 
Implement graph improvements
This commit is contained in:
pwpiwi 2017-04-19 18:11:07 +02:00 • committed by GitHub
commit 24aa0a5733
35 changed files with 1096 additions and 384 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -15,6 +15,7 @@
*.moc.cpp *.moc.cpp
*.z *.z
version.c version.c
client/ui/ui_overlays.h
*.exe *.exe
proxmark3 proxmark3

10
armsrc/lfops.c
View file

@ -769,6 +769,7 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
size_t size; size_t size;
uint32_t hi2=0, hi=0, lo=0; uint32_t hi2=0, hi=0, lo=0;
int idx=0; int idx=0;
int dummyIdx = 0;
// Configure to go in 125Khz listen mode // Configure to go in 125Khz listen mode
LFSetupFPGAForADC(95, true); LFSetupFPGAForADC(95, true);
@ -784,7 +785,7 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
// FSK demodulator // FSK demodulator
//size = sizeOfBigBuff; //variable size will change after demod so re initialize it before use //size = sizeOfBigBuff; //variable size will change after demod so re initialize it before use
size = 50*128*2; //big enough to catch 2 sequences of largest format size = 50*128*2; //big enough to catch 2 sequences of largest format
idx = HIDdemodFSK(dest, &size, &hi2, &hi, &lo); idx = HIDdemodFSK(dest, &size, &hi2, &hi, &lo, &dummyIdx);
if (idx>0 && lo>0 && (size==96 || size==192)){ if (idx>0 && lo>0 && (size==96 || size==192)){
// go over previously decoded manchester data and decode into usable tag ID // go over previously decoded manchester data and decode into usable tag ID
@ -861,7 +862,7 @@ void CmdAWIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
{ {
uint8_t *dest = BigBuf_get_addr(); uint8_t *dest = BigBuf_get_addr();
size_t size; size_t size;
int idx=0; int idx=0, dummyIdx=0;
//clear read buffer //clear read buffer
BigBuf_Clear_keep_EM(); BigBuf_Clear_keep_EM();
// Configure to go in 125Khz listen mode // Configure to go in 125Khz listen mode
@ -875,7 +876,7 @@ void CmdAWIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
DoAcquisition_default(-1,true); DoAcquisition_default(-1,true);
// FSK demodulator // FSK demodulator
size = 50*128*2; //big enough to catch 2 sequences of largest format size = 50*128*2; //big enough to catch 2 sequences of largest format
idx = AWIDdemodFSK(dest, &size); idx = AWIDdemodFSK(dest, &size, &dummyIdx);
if (idx<=0 || size!=96) continue; if (idx<=0 || size!=96) continue;
// Index map // Index map
@ -1017,6 +1018,7 @@ void CmdIOdemodFSK(int findone, int *high, int *low, int ledcontrol)
uint8_t version=0; uint8_t version=0;
uint8_t facilitycode=0; uint8_t facilitycode=0;
uint16_t number=0; uint16_t number=0;
int dummyIdx=0;
//clear read buffer //clear read buffer
BigBuf_Clear_keep_EM(); BigBuf_Clear_keep_EM();
// Configure to go in 125Khz listen mode // Configure to go in 125Khz listen mode
@ -1028,7 +1030,7 @@ void CmdIOdemodFSK(int findone, int *high, int *low, int ledcontrol)
DoAcquisition_default(-1,true); DoAcquisition_default(-1,true);
//fskdemod and get start index //fskdemod and get start index
WDT_HIT(); WDT_HIT();
idx = IOdemodFSK(dest, BigBuf_max_traceLen()); idx = IOdemodFSK(dest, BigBuf_max_traceLen(), &dummyIdx);
if (idx<0) continue; if (idx<0) continue;
//valid tag found //valid tag found

11
client/Makefile
View file

@ -40,11 +40,13 @@ endif
QTINCLUDES = $(shell pkg-config --cflags Qt5Core Qt5Widgets 2>/dev/null) QTINCLUDES = $(shell pkg-config --cflags Qt5Core Qt5Widgets 2>/dev/null)
QTLDLIBS = $(shell pkg-config --libs Qt5Core Qt5Widgets 2>/dev/null) QTLDLIBS = $(shell pkg-config --libs Qt5Core Qt5Widgets 2>/dev/null)
MOC = $(shell pkg-config --variable=host_bins Qt5Core)/moc MOC = $(shell pkg-config --variable=host_bins Qt5Core)/moc
UIC = $(shell pkg-config --variable=host_bins Qt5Core)/uic
ifeq ($(QTINCLUDES), ) ifeq ($(QTINCLUDES), )
# if Qt5 not found Check for correctly configured Qt4 # if Qt5 not found Check for correctly configured Qt4
QTINCLUDES = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) QTINCLUDES = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null)
QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null) QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
MOC = $(shell pkg-config --variable=moc_location QtCore) MOC = $(shell pkg-config --variable=moc_location QtCore)
UIC = $(shell pkg-config --variable=uic_location QtCore)
endif endif
ifeq ($(QTINCLUDES), ) ifeq ($(QTINCLUDES), )
# if both pkg-config commands failed, search in common places # if both pkg-config commands failed, search in common places
@ -56,6 +58,7 @@ ifeq ($(QTINCLUDES), )
QTLDLIBS = -L$(QTDIR)/lib -lQt5Widgets -lQt5Gui -lQt5Core QTLDLIBS = -L$(QTDIR)/lib -lQt5Widgets -lQt5Gui -lQt5Core
endif endif
MOC = $(QTDIR)/bin/moc MOC = $(QTDIR)/bin/moc
UIC = $(QTDIR)/bin/uic
endif endif
endif endif
@ -159,9 +162,10 @@ ZLIBOBJS = $(ZLIBSRCS:%.c=$(OBJDIR)/%.o)
BINS = proxmark3 flasher fpga_compress BINS = proxmark3 flasher fpga_compress
WINBINS = $(patsubst %, %.exe, $(BINS)) WINBINS = $(patsubst %, %.exe, $(BINS))
CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(OBJDIR)/*.o *.moc.cpp CLEAN = $(BINS) $(WINBINS) $(COREOBJS) $(CMDOBJS) $(ZLIBOBJS) $(QTGUIOBJS) $(OBJDIR)/*.o *.moc.cpp ui/ui_overlays.h
all: lua_build $(BINS) # need to assign dependancies to build these first...
all: ui/ui_overlays.h lua_build $(BINS)
all-static: LDLIBS:=-static $(LDLIBS) all-static: LDLIBS:=-static $(LDLIBS)
all-static: proxmark3 flasher fpga_compress all-static: proxmark3 flasher fpga_compress
@ -179,6 +183,9 @@ fpga_compress: $(OBJDIR)/fpga_compress.o $(ZLIBOBJS)
proxguiqt.moc.cpp: proxguiqt.h proxguiqt.moc.cpp: proxguiqt.h
$(MOC) -o$@ $^ $(MOC) -o$@ $^
ui/ui_overlays.h: ui/overlays.ui
$(UIC) $^ > $@
lualibs/usb_cmd.lua: ../include/usb_cmd.h lualibs/usb_cmd.lua: ../include/usb_cmd.h
awk -f usb_cmd_h2lua.awk $^ > $@ awk -f usb_cmd_h2lua.awk $^ > $@

127
client/cmddata.c
View file

@ -28,6 +28,8 @@
uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN]; uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
uint8_t g_debugMode=0; uint8_t g_debugMode=0;
size_t DemodBufferLen=0; size_t DemodBufferLen=0;
int g_DemodStartIdx=0;
int g_DemodClock=0;
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
@ -66,15 +68,21 @@ void save_restoreDB(uint8_t saveOpt)
static uint8_t SavedDB[MAX_DEMOD_BUF_LEN]; static uint8_t SavedDB[MAX_DEMOD_BUF_LEN];
static size_t SavedDBlen; static size_t SavedDBlen;
static bool DB_Saved = false; static bool DB_Saved = false;
static int savedDemodStartIdx = 0;
static int savedDemodClock = 0;
if (saveOpt==1) { //save if (saveOpt == GRAPH_SAVE) { //save
memcpy(SavedDB, DemodBuffer, sizeof(DemodBuffer)); memcpy(SavedDB, DemodBuffer, sizeof(DemodBuffer));
SavedDBlen = DemodBufferLen; SavedDBlen = DemodBufferLen;
DB_Saved=true; DB_Saved=true;
savedDemodStartIdx = g_DemodStartIdx;
savedDemodClock = g_DemodClock;
} else if (DB_Saved) { //restore } else if (DB_Saved) { //restore
memcpy(DemodBuffer, SavedDB, sizeof(DemodBuffer)); memcpy(DemodBuffer, SavedDB, sizeof(DemodBuffer));
DemodBufferLen = SavedDBlen; DemodBufferLen = SavedDBlen;
g_DemodClock = savedDemodClock;
g_DemodStartIdx = savedDemodStartIdx;
} }
return; return;
} }
@ -245,7 +253,6 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
return 0; return 0;
} }
if (verbose || g_debugMode) PrintAndLog("\nUsing Clock:%d, Invert:%d, Bits Found:%d",clk,invert,BitLen); if (verbose || g_debugMode) PrintAndLog("\nUsing Clock:%d, Invert:%d, Bits Found:%d",clk,invert,BitLen);
//output //output
setDemodBuf(BitStream,BitLen,0); setDemodBuf(BitStream,BitLen,0);
setClockGrid(clk, startIdx); setClockGrid(clk, startIdx);
@ -295,11 +302,11 @@ int Cmdaskmandemod(const char *Cmd)
} }
bool st = true; bool st = true;
if (Cmd[0]=='s') if (Cmd[0]=='s')
return ASKDemod_ext(Cmd++, true, true, 1, &st); return ASKDemod_ext(Cmd++, true, false, 1, &st);
else if (Cmd[1] == 's') else if (Cmd[1] == 's')
return ASKDemod_ext(Cmd+=2, true, true, 1, &st); return ASKDemod_ext(Cmd+=2, true, false, 1, &st);
else else
return ASKDemod(Cmd, true, true, 1); return ASKDemod(Cmd, true, false, 1);
} }
//by marshmellow //by marshmellow
@ -393,7 +400,7 @@ int CmdBiphaseDecodeRaw(const char *Cmd)
uint8_t BitStream[MAX_DEMOD_BUF_LEN]={0}; uint8_t BitStream[MAX_DEMOD_BUF_LEN]={0};
size = sizeof(BitStream); size = sizeof(BitStream);
if ( !getDemodBuf(BitStream, &size) ) return 0; if ( !getDemodBuf(BitStream, &size) ) return 0;
errCnt=BiphaseRawDecode(BitStream, &size, offset, invert); errCnt=BiphaseRawDecode(BitStream, &size, &offset, invert);
if (errCnt<0){ if (errCnt<0){
PrintAndLog("Error during decode:%d", errCnt); PrintAndLog("Error during decode:%d", errCnt);
return 0; return 0;
@ -406,10 +413,12 @@ int CmdBiphaseDecodeRaw(const char *Cmd)
if (errCnt>0){ if (errCnt>0){
PrintAndLog("# Errors found during Demod (shown as 7 in bit stream): %d",errCnt); PrintAndLog("# Errors found during Demod (shown as 7 in bit stream): %d",errCnt);
} }
PrintAndLog("Biphase Decoded using offset: %d - # invert:%d - data:",offset,invert); PrintAndLog("Biphase Decoded using offset: %d - # invert:%d - data:",offset,invert);
PrintAndLog("%s", sprint_bin_break(BitStream, size, 16)); PrintAndLog("%s", sprint_bin_break(BitStream, size, 16));
if (offset) setDemodBuf(DemodBuffer,DemodBufferLen-offset, offset); //remove first bit from raw demod if (offset) setDemodBuf(DemodBuffer,DemodBufferLen-offset, offset); //remove first bit from raw demod
setClockGrid(g_DemodClock, g_DemodStartIdx + g_DemodClock*offset/2);
return 1; return 1;
} }
@ -423,15 +432,16 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose)
uint8_t BitStream[MAX_GRAPH_TRACE_LEN]; uint8_t BitStream[MAX_GRAPH_TRACE_LEN];
size_t size = getFromGraphBuf(BitStream); size_t size = getFromGraphBuf(BitStream);
int startIdx = 0;
//invert here inverts the ask raw demoded bits which has no effect on the demod, but we need the pointer //invert here inverts the ask raw demoded bits which has no effect on the demod, but we need the pointer
int errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0); int errCnt = askdemod_ext(BitStream, &size, &clk, &invert, maxErr, 0, 0, &startIdx);
if ( errCnt < 0 || errCnt > maxErr ) { if ( errCnt < 0 || errCnt > maxErr ) {
if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk); if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk);
return 0; return 0;
} }
//attempt to Biphase decode BitStream //attempt to Biphase decode BitStream
errCnt = BiphaseRawDecode(BitStream, &size, offset, invert); errCnt = BiphaseRawDecode(BitStream, &size, &offset, invert);
if (errCnt < 0){ if (errCnt < 0){
if (g_debugMode || verbose) PrintAndLog("Error BiphaseRawDecode: %d", errCnt); if (g_debugMode || verbose) PrintAndLog("Error BiphaseRawDecode: %d", errCnt);
return 0; return 0;
@ -442,6 +452,7 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose)
} }
//success set DemodBuffer and return //success set DemodBuffer and return
setDemodBuf(BitStream, size, 0); setDemodBuf(BitStream, size, 0);
setClockGrid(clk, startIdx + clk*offset/2);
if (g_debugMode || verbose){ if (g_debugMode || verbose){
PrintAndLog("Biphase Decoded using offset: %d - clock: %d - # errors:%d - data:",offset,clk,errCnt); PrintAndLog("Biphase Decoded using offset: %d - clock: %d - # errors:%d - data:",offset,clk,errCnt);
printDemodBuff(); printDemodBuff();
@ -502,17 +513,17 @@ int Cmdaskrawdemod(const char *Cmd)
return ASKDemod(Cmd, true, false, 0); return ASKDemod(Cmd, true, false, 0);
} }
int AutoCorrelate(int window, bool SaveGrph, bool verbose) int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose)
{ {
static int CorrelBuffer[MAX_GRAPH_TRACE_LEN]; static int CorrelBuffer[MAX_GRAPH_TRACE_LEN];
size_t Correlation = 0; size_t Correlation = 0;
int maxSum = 0; int maxSum = 0;
int lastMax = 0; int lastMax = 0;
if (verbose) PrintAndLog("performing %d correlations", GraphTraceLen - window); if (verbose) PrintAndLog("performing %d correlations", GraphTraceLen - window);
for (int i = 0; i < GraphTraceLen - window; ++i) { for (int i = 0; i < len - window; ++i) {
int sum = 0; int sum = 0;
for (int j = 0; j < window; ++j) { for (int j = 0; j < window; ++j) {
sum += (GraphBuffer[j]*GraphBuffer[i + j]) / 256; sum += (in[j]*in[i + j]) / 256;
} }
CorrelBuffer[i] = sum; CorrelBuffer[i] = sum;
if (sum >= maxSum-100 && sum <= maxSum+100) { if (sum >= maxSum-100 && sum <= maxSum+100) {
@ -527,20 +538,19 @@ int AutoCorrelate(int window, bool SaveGrph, bool verbose)
} }
if (Correlation==0) { if (Correlation==0) {
//try again with wider margin //try again with wider margin
for (int i = 0; i < GraphTraceLen - window; i++){ for (int i = 0; i < len - window; i++) {
if (CorrelBuffer[i] >= maxSum-(maxSum*0.05) && CorrelBuffer[i] <= maxSum+(maxSum*0.05)) { if (CorrelBuffer[i] >= maxSum-(maxSum*0.05) && CorrelBuffer[i] <= maxSum+(maxSum*0.05)) {
//another max //another max
Correlation = i-lastMax; Correlation = i-lastMax;
lastMax = i; lastMax = i;
//if (CorrelBuffer[i] > maxSum) maxSum = sum;
} }
} }
} }
if (verbose && Correlation > 0) PrintAndLog("Possible Correlation: %d samples",Correlation); if (verbose && Correlation > 0) PrintAndLog("Possible Correlation: %d samples",Correlation);
if (SaveGrph) { if (SaveGrph) {
GraphTraceLen = GraphTraceLen - window; //GraphTraceLen = GraphTraceLen - window;
memcpy(GraphBuffer, CorrelBuffer, GraphTraceLen * sizeof (int)); memcpy(out, CorrelBuffer, len * sizeof(int));
RepaintGraphWindow(); RepaintGraphWindow();
} }
return Correlation; return Correlation;
@ -573,7 +583,7 @@ int CmdAutoCorr(const char *Cmd)
return 0; return 0;
} }
if (grph == 'g') updateGrph=true; if (grph == 'g') updateGrph=true;
return AutoCorrelate(window, updateGrph, true); return AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, window, updateGrph, true);
} }
int CmdBitsamples(const char *Cmd) int CmdBitsamples(const char *Cmd)
@ -676,6 +686,18 @@ int CmdGraphShiftZero(const char *Cmd)
return 0; return 0;
} }
int AskEdgeDetect(const int *in, int *out, int len, int threshold) {
int Last = 0;
for(int i = 1; i<len; i++) {
if (in[i]-in[i-1] >= threshold) //large jump up
Last = 127;
else if(in[i]-in[i-1] <= -1 * threshold) //large jump down
Last = -127;
out[i-1] = Last;
}
return 0;
}
//by marshmellow //by marshmellow
//use large jumps in read samples to identify edges of waves and then amplify that wave to max //use large jumps in read samples to identify edges of waves and then amplify that wave to max
//similar to dirtheshold, threshold commands //similar to dirtheshold, threshold commands
@ -683,18 +705,12 @@ int CmdGraphShiftZero(const char *Cmd)
int CmdAskEdgeDetect(const char *Cmd) int CmdAskEdgeDetect(const char *Cmd)
{ {
int thresLen = 25; int thresLen = 25;
int Last = 0; int ans = 0;
sscanf(Cmd, "%i", &thresLen); sscanf(Cmd, "%i", &thresLen);
for(int i = 1; i<GraphTraceLen; i++){ ans = AskEdgeDetect(GraphBuffer, GraphBuffer, GraphTraceLen, thresLen);
if (GraphBuffer[i]-GraphBuffer[i-1]>=thresLen) //large jump up
Last = 127;
else if(GraphBuffer[i]-GraphBuffer[i-1]<=-1*thresLen) //large jump down
Last = -127;
GraphBuffer[i-1] = Last;
}
RepaintGraphWindow(); RepaintGraphWindow();
return 0; return ans;
} }
/* Print our clock rate */ /* Print our clock rate */
@ -793,7 +809,7 @@ int FSKrawDemod(const char *Cmd, bool verbose)
if (!rfLen) rfLen = 50; if (!rfLen) rfLen = 50;
} }
int startIdx = 0; int startIdx = 0;
int size = fskdemod_ext(BitStream, BitLen, rfLen, invert, fchigh, fclow, &startIdx); int size = fskdemod(BitStream, BitLen, rfLen, invert, fchigh, fclow, &startIdx);
if (size > 0) { if (size > 0) {
setDemodBuf(BitStream,size,0); setDemodBuf(BitStream,size,0);
setClockGrid(rfLen, startIdx); setClockGrid(rfLen, startIdx);
@ -1057,6 +1073,10 @@ int CmdRawDemod(const char *Cmd)
} }
void setClockGrid(int clk, int offset) { void setClockGrid(int clk, int offset) {
g_DemodStartIdx = offset;
g_DemodClock = clk;
if (g_debugMode) PrintAndLog("demodoffset %d, clk %d",offset,clk);
if (offset > clk) offset %= clk; if (offset > clk) offset %= clk;
if (offset < 0) offset += clk; if (offset < 0) offset += clk;
@ -1213,6 +1233,7 @@ int getSamples(int n, bool silent)
GraphTraceLen = n; GraphTraceLen = n;
} }
setClockGrid(0,0);
RepaintGraphWindow(); RepaintGraphWindow();
return 0; return 0;
} }
@ -1316,6 +1337,7 @@ int CmdLoad(const char *Cmd)
} }
fclose(f); fclose(f);
PrintAndLog("loaded %d samples", GraphTraceLen); PrintAndLog("loaded %d samples", GraphTraceLen);
setClockGrid(0,0);
RepaintGraphWindow(); RepaintGraphWindow();
return 0; return 0;
} }
@ -1423,6 +1445,34 @@ int CmdScale(const char *Cmd)
return 0; return 0;
} }
int directionalThreshold(const int* in, int *out, size_t len, int8_t up, int8_t down)
{
int lastValue = in[0];
out[0] = 0; // Will be changed at the end, but init 0 as we adjust to last samples value if no threshold kicks in.
for (int i = 1; i < len; ++i) {
// Apply first threshold to samples heading up
if (in[i] >= up && in[i] > lastValue)
{
lastValue = out[i]; // Buffer last value as we overwrite it.
out[i] = 1;
}
// Apply second threshold to samples heading down
else if (in[i] <= down && in[i] < lastValue)
{
lastValue = out[i]; // Buffer last value as we overwrite it.
out[i] = -1;
}
else
{
lastValue = out[i]; // Buffer last value as we overwrite it.
out[i] = out[i-1];
}
}
out[0] = out[1]; // Align with first edited sample.
return 0;
}
int CmdDirectionalThreshold(const char *Cmd) int CmdDirectionalThreshold(const char *Cmd)
{ {
int8_t upThres = param_get8(Cmd, 0); int8_t upThres = param_get8(Cmd, 0);
@ -1430,30 +1480,7 @@ int CmdDirectionalThreshold(const char *Cmd)
printf("Applying Up Threshold: %d, Down Threshold: %d\n", upThres, downThres); printf("Applying Up Threshold: %d, Down Threshold: %d\n", upThres, downThres);
int lastValue = GraphBuffer[0]; directionalThreshold(GraphBuffer, GraphBuffer,GraphTraceLen, upThres, downThres);
GraphBuffer[0] = 0; // Will be changed at the end, but init 0 as we adjust to last samples value if no threshold kicks in.
for (int i = 1; i < GraphTraceLen; ++i) {
// Apply first threshold to samples heading up
if (GraphBuffer[i] >= upThres && GraphBuffer[i] > lastValue)
{
lastValue = GraphBuffer[i]; // Buffer last value as we overwrite it.
GraphBuffer[i] = 127;
}
// Apply second threshold to samples heading down
else if (GraphBuffer[i] <= downThres && GraphBuffer[i] < lastValue)
{
lastValue = GraphBuffer[i]; // Buffer last value as we overwrite it.
GraphBuffer[i] = -127;
}
else
{
lastValue = GraphBuffer[i]; // Buffer last value as we overwrite it.
GraphBuffer[i] = GraphBuffer[i-1];
}
}
GraphBuffer[0] = GraphBuffer[1]; // Aline with first edited sample.
RepaintGraphWindow(); RepaintGraphWindow();
return 0; return 0;
} }

7
client/cmddata.h
View file

@ -27,7 +27,7 @@ void save_restoreDB(uint8_t saveOpt);// option '1' to save DemodBuffer any other
int CmdPrintDemodBuff(const char *Cmd); int CmdPrintDemodBuff(const char *Cmd);
int Cmdaskrawdemod(const char *Cmd); int Cmdaskrawdemod(const char *Cmd);
int Cmdaskmandemod(const char *Cmd); int Cmdaskmandemod(const char *Cmd);
int AutoCorrelate(int window, bool SaveGrph, bool verbose); int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose);
int CmdAutoCorr(const char *Cmd); int CmdAutoCorr(const char *Cmd);
int CmdBiphaseDecodeRaw(const char *Cmd); int CmdBiphaseDecodeRaw(const char *Cmd);
int CmdBitsamples(const char *Cmd); int CmdBitsamples(const char *Cmd);
@ -65,10 +65,15 @@ int PSKDemod(const char *Cmd, bool verbose);
int NRZrawDemod(const char *Cmd, bool verbose); int NRZrawDemod(const char *Cmd, bool verbose);
int getSamples(int n, bool silent); int getSamples(int n, bool silent);
void setClockGrid(int clk, int offset); void setClockGrid(int clk, int offset);
int directionalThreshold(const int* in, int *out, size_t len, int8_t up, int8_t down);
extern int AskEdgeDetect(const int *in, int *out, int len, int threshold);
//int autoCorr(const int* in, int *out, size_t len, int window);
#define MAX_DEMOD_BUF_LEN (1024*128) #define MAX_DEMOD_BUF_LEN (1024*128)
extern uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN]; extern uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
extern size_t DemodBufferLen; extern size_t DemodBufferLen;
extern int g_DemodStartIdx;
extern int g_DemodClock;
extern uint8_t g_debugMode; extern uint8_t g_debugMode;
#define BIGBUF_SIZE 40000 #define BIGBUF_SIZE 40000

35
client/cmdlf.c
View file

@ -877,26 +877,27 @@ int CmdVchDemod(const char *Cmd)
int CheckChipType(char cmdp) { int CheckChipType(char cmdp) {
uint32_t wordData = 0; uint32_t wordData = 0;
if (offline || cmdp == '1') return 0;
save_restoreGB(GRAPH_SAVE);
save_restoreDB(GRAPH_SAVE);
//check for em4x05/em4x69 chips first //check for em4x05/em4x69 chips first
save_restoreGB(1); if (EM4x05Block0Test(&wordData)) {
save_restoreDB(1);
if ((!offline && (cmdp != '1')) && EM4x05Block0Test(&wordData)) {
PrintAndLog("\nValid EM4x05/EM4x69 Chip Found\nTry lf em 4x05... commands\n"); PrintAndLog("\nValid EM4x05/EM4x69 Chip Found\nTry lf em 4x05... commands\n");
save_restoreGB(0); save_restoreGB(GRAPH_RESTORE);
save_restoreDB(0); save_restoreDB(GRAPH_RESTORE);
return 1; return 1;
} }
//TODO check for t55xx chip... //check for t55xx chip...
if (tryDetectP1(true)) {
if ((!offline && (cmdp != '1')) && tryDetectP1(true)) {
PrintAndLog("\nValid T55xx Chip Found\nTry lf t55xx ... commands\n"); PrintAndLog("\nValid T55xx Chip Found\nTry lf t55xx ... commands\n");
save_restoreGB(0); save_restoreGB(GRAPH_RESTORE);
save_restoreDB(0); save_restoreDB(GRAPH_RESTORE);
return 1; return 1;
} }
save_restoreGB(0); save_restoreGB(GRAPH_RESTORE);
save_restoreDB(0); save_restoreDB(GRAPH_RESTORE);
return 0; return 0;
} }
@ -1056,17 +1057,17 @@ int CmdLFfind(const char *Cmd)
PrintAndLog("\nNo Known Tags Found!\n"); PrintAndLog("\nNo Known Tags Found!\n");
if (testRaw=='u' || testRaw=='U') { if (testRaw=='u' || testRaw=='U') {
ans=CheckChipType(cmdp); //ans=CheckChipType(cmdp);
//test unknown tag formats (raw mode)0 //test unknown tag formats (raw mode)0
PrintAndLog("\nChecking for Unknown tags:\n"); PrintAndLog("\nChecking for Unknown tags:\n");
ans=AutoCorrelate(4000, false, false); ans=AutoCorrelate(GraphBuffer, GraphBuffer, GraphTraceLen, 4000, false, false);
if (ans > 0) PrintAndLog("Possible Auto Correlation of %d repeating samples",ans); if (ans > 0) PrintAndLog("Possible Auto Correlation of %d repeating samples",ans);
ans=GetFskClock("",false,false); ans=GetFskClock("",false,false);
if (ans != 0) { //fsk if (ans != 0) { //fsk
ans=FSKrawDemod("",true); ans=FSKrawDemod("",true);
if (ans>0) { if (ans>0) {
PrintAndLog("\nUnknown FSK Modulated Tag Found!"); PrintAndLog("\nUnknown FSK Modulated Tag Found!");
return CheckChipType(cmdp);; return CheckChipType(cmdp);
} }
} }
bool st = true; bool st = true;
@ -1074,14 +1075,14 @@ int CmdLFfind(const char *Cmd)
if (ans>0) { if (ans>0) {
PrintAndLog("\nUnknown ASK Modulated and Manchester encoded Tag Found!"); PrintAndLog("\nUnknown ASK Modulated and Manchester encoded Tag Found!");
PrintAndLog("\nif it does not look right it could instead be ASK/Biphase - try 'data rawdemod ab'"); PrintAndLog("\nif it does not look right it could instead be ASK/Biphase - try 'data rawdemod ab'");
return CheckChipType(cmdp);; return CheckChipType(cmdp);
} }
ans=CmdPSK1rawDemod(""); ans=CmdPSK1rawDemod("");
if (ans>0) { if (ans>0) {
PrintAndLog("Possible unknown PSK1 Modulated Tag Found above!\n\nCould also be PSK2 - try 'data rawdemod p2'"); PrintAndLog("Possible unknown PSK1 Modulated Tag Found above!\n\nCould also be PSK2 - try 'data rawdemod p2'");
PrintAndLog("\nCould also be PSK3 - [currently not supported]"); PrintAndLog("\nCould also be PSK3 - [currently not supported]");
PrintAndLog("\nCould also be NRZ - try 'data nrzrawdemod'"); PrintAndLog("\nCould also be NRZ - try 'data nrzrawdemod'");
return CheckChipType(cmdp);; return CheckChipType(cmdp);
} }
ans = CheckChipType(cmdp); ans = CheckChipType(cmdp);
PrintAndLog("\nNo Data Found!\n"); PrintAndLog("\nNo Data Found!\n");

4
client/cmdlfawid.c
View file

@ -88,8 +88,9 @@ int CmdFSKdemodAWID(const char *Cmd)
size_t size = getFromGraphBuf(BitStream); size_t size = getFromGraphBuf(BitStream);
if (size==0) return 0; if (size==0) return 0;
int waveIdx = 0;
//get binary from fsk wave //get binary from fsk wave
int idx = AWIDdemodFSK(BitStream, &size); int idx = AWIDdemodFSK(BitStream, &size, &waveIdx);
if (idx<=0){ if (idx<=0){
if (g_debugMode){ if (g_debugMode){
if (idx == -1) if (idx == -1)
@ -126,6 +127,7 @@ int CmdFSKdemodAWID(const char *Cmd)
uint32_t rawHi = bytebits_to_byte(BitStream+idx+32,32); uint32_t rawHi = bytebits_to_byte(BitStream+idx+32,32);
uint32_t rawHi2 = bytebits_to_byte(BitStream+idx,32); uint32_t rawHi2 = bytebits_to_byte(BitStream+idx,32);
setDemodBuf(BitStream,96,idx); setDemodBuf(BitStream,96,idx);
setClockGrid(50, waveIdx + (idx*50));
size = removeParity(BitStream, idx+8, 4, 1, 88); size = removeParity(BitStream, idx+8, 4, 1, 88);
if (size != 66){ if (size != 66){

15
client/cmdlfem4x.c
View file

@ -152,7 +152,9 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo )
if (Em410xDecode(BitStream, &BitLen, &idx, hi, lo)) { if (Em410xDecode(BitStream, &BitLen, &idx, hi, lo)) {
//set GraphBuffer for clone or sim command //set GraphBuffer for clone or sim command
setDemodBuf(BitStream, BitLen, idx); setDemodBuf(DemodBuffer, (BitLen==40) ? 64 : 128, idx+1);
setClockGrid(g_DemodClock, g_DemodStartIdx + ((idx+1)*g_DemodClock));
if (g_debugMode) { if (g_debugMode) {
PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen); PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen);
printDemodBuff(); printDemodBuff();
@ -472,9 +474,6 @@ int EM4x50Read(const char *Cmd, bool verbose)
// get user entry if any // get user entry if any
sscanf(Cmd, "%i %i", &clk, &invert); sscanf(Cmd, "%i %i", &clk, &invert);
// save GraphBuffer - to restore it later
save_restoreGB(1);
// first get high and low values // first get high and low values
for (i = 0; i < GraphTraceLen; i++) { for (i = 0; i < GraphTraceLen; i++) {
if (GraphBuffer[i] > high) if (GraphBuffer[i] > high)
@ -571,6 +570,8 @@ int EM4x50Read(const char *Cmd, bool verbose)
} else if (start < 0) return 0; } else if (start < 0) return 0;
start = skip; start = skip;
snprintf(tmp2, sizeof(tmp2),"%d %d 1000 %d", clk, invert, clk*47); snprintf(tmp2, sizeof(tmp2),"%d %d 1000 %d", clk, invert, clk*47);
// save GraphBuffer - to restore it later
save_restoreGB(GRAPH_SAVE);
// get rid of leading crap // get rid of leading crap
snprintf(tmp, sizeof(tmp), "%i", skip); snprintf(tmp, sizeof(tmp), "%i", skip);
CmdLtrim(tmp); CmdLtrim(tmp);
@ -598,7 +599,7 @@ int EM4x50Read(const char *Cmd, bool verbose)
phaseoff = 0; phaseoff = 0;
i += 2; i += 2;
if (ASKDemod(tmp2, false, false, 1) < 1) { if (ASKDemod(tmp2, false, false, 1) < 1) {
save_restoreGB(0); save_restoreGB(GRAPH_RESTORE);
return 0; return 0;
} }
//set DemodBufferLen to just one block //set DemodBufferLen to just one block
@ -637,7 +638,7 @@ int EM4x50Read(const char *Cmd, bool verbose)
} }
//restore GraphBuffer //restore GraphBuffer
save_restoreGB(0); save_restoreGB(GRAPH_RESTORE);
return (int)AllPTest; return (int)AllPTest;
} }
@ -703,6 +704,8 @@ bool EM4x05testDemodReadData(uint32_t *word, bool readCmd) {
} }
setDemodBuf(DemodBuffer, 32, 0); setDemodBuf(DemodBuffer, 32, 0);
//setClockGrid(0,0);
*word = bytebits_to_byteLSBF(DemodBuffer, 32); *word = bytebits_to_byteLSBF(DemodBuffer, 32);
} }
return true; return true;

2
client/cmdlffdx.c
View file

@ -159,6 +159,8 @@ int CmdFdxDemod(const char *Cmd){
// set and leave DemodBuffer intact // set and leave DemodBuffer intact
setDemodBuf(DemodBuffer, 128, preambleIndex); setDemodBuf(DemodBuffer, 128, preambleIndex);
setClockGrid(g_DemodClock, g_DemodStartIdx + (preambleIndex*g_DemodClock));
uint8_t bits_no_spacer[117]; uint8_t bits_no_spacer[117];
memcpy(bits_no_spacer, DemodBuffer + 11, 117); memcpy(bits_no_spacer, DemodBuffer + 11, 117);

4
client/cmdlfgproxii.c
View file

@ -83,7 +83,9 @@ int CmdG_Prox_II_Demod(const char *Cmd)
PrintAndLog("Decoded Raw: %s", sprint_hex(ByteStream, 8)); PrintAndLog("Decoded Raw: %s", sprint_hex(ByteStream, 8));
} }
PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3); PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3);
setDemodBuf(DemodBuffer+ans, 96, 0); setDemodBuf(DemodBuffer, 96, ans);
setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
return 1; return 1;
} }
//by marshmellow //by marshmellow

4
client/cmdlfhid.c
View file

@ -32,7 +32,8 @@ int CmdFSKdemodHID(const char *Cmd)
size_t BitLen = getFromGraphBuf(BitStream); size_t BitLen = getFromGraphBuf(BitStream);
if (BitLen==0) return 0; if (BitLen==0) return 0;
//get binary from fsk wave //get binary from fsk wave
int idx = HIDdemodFSK(BitStream,&BitLen,&hi2,&hi,&lo); int waveIdx = 0;
int idx = HIDdemodFSK(BitStream,&BitLen,&hi2,&hi,&lo, &waveIdx);
if (idx<0){ if (idx<0){
if (g_debugMode){ if (g_debugMode){
if (idx==-1){ if (idx==-1){
@ -99,6 +100,7 @@ int CmdFSKdemodHID(const char *Cmd)
(unsigned int) fmtLen, (unsigned int) fc, (unsigned int) cardnum); (unsigned int) fmtLen, (unsigned int) fc, (unsigned int) cardnum);
} }
setDemodBuf(BitStream,BitLen,idx); setDemodBuf(BitStream,BitLen,idx);
setClockGrid(50, waveIdx + (idx*50));
if (g_debugMode){ if (g_debugMode){
PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen); PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen);
printDemodBuff(); printDemodBuff();

1
client/cmdlfindala.c
View file

@ -46,6 +46,7 @@ int CmdIndalaDecode(const char *Cmd) {
return -1; return -1;
} }
setDemodBuf(DemodBuffer, size, (size_t)startIdx); setDemodBuf(DemodBuffer, size, (size_t)startIdx);
setClockGrid(g_DemodClock, g_DemodStartIdx + (startIdx*g_DemodClock));
if (invert) if (invert)
if (g_debugMode) if (g_debugMode)
PrintAndLog("Had to invert bits"); PrintAndLog("Had to invert bits");

5
client/cmdlfio.c
View file

@ -53,8 +53,9 @@ int CmdFSKdemodIO(const char *Cmd)
size_t BitLen = getFromGraphBuf(BitStream); size_t BitLen = getFromGraphBuf(BitStream);
if (BitLen==0) return 0; if (BitLen==0) return 0;
int waveIdx = 0;
//get binary from fsk wave //get binary from fsk wave
idx = IOdemodFSK(BitStream,BitLen); idx = IOdemodFSK(BitStream,BitLen, &waveIdx);
if (idx<0){ if (idx<0){
if (g_debugMode){ if (g_debugMode){
if (idx==-1){ if (idx==-1){
@ -119,6 +120,8 @@ int CmdFSKdemodIO(const char *Cmd)
PrintAndLog("IO Prox XSF(%02d)%02x:%05d (%08x%08x) [%02x %s]",version,facilitycode,number,code,code2, crc, crcStr); PrintAndLog("IO Prox XSF(%02d)%02x:%05d (%08x%08x) [%02x %s]",version,facilitycode,number,code,code2, crc, crcStr);
setDemodBuf(BitStream,64,idx); setDemodBuf(BitStream,64,idx);
setClockGrid(64, waveIdx + (idx*64));
if (g_debugMode){ if (g_debugMode){
PrintAndLog("DEBUG: idx: %d, Len: %d, Printing demod buffer:",idx,64); PrintAndLog("DEBUG: idx: %d, Len: %d, Printing demod buffer:",idx,64);
printDemodBuff(); printDemodBuff();

4
client/cmdlfjablotron.c
View file

@ -117,8 +117,8 @@ int CmdJablotronDemod(const char *Cmd) {
return 0; return 0;
} }
setDemodBuf(DemodBuffer+ans, 64, 0); setDemodBuf(DemodBuffer, 64, ans);
//setGrid_Clock(64); setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
//got a good demod //got a good demod
uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32); uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);

3
client/cmdlfnexwatch.c
View file

@ -38,7 +38,8 @@ int CmdPSKNexWatch(const char *Cmd)
} }
if (size != 128) return 0; if (size != 128) return 0;
setDemodBuf(DemodBuffer, size, startIdx+4); setDemodBuf(DemodBuffer, size, startIdx+4);
startIdx = 8+32; //4 = extra i added, 8 = preamble, 32 = reserved bits (always 0) setClockGrid(g_DemodClock, g_DemodStartIdx + ((startIdx+4)*g_DemodClock));
startIdx = 8+32; // 8 = preamble, 32 = reserved bits (always 0)
//get ID //get ID
uint32_t ID = 0; uint32_t ID = 0;
for (uint8_t wordIdx=0; wordIdx<4; wordIdx++){ for (uint8_t wordIdx=0; wordIdx<4; wordIdx++){

1
client/cmdlfnoralsy.c
View file

@ -135,6 +135,7 @@ int CmdNoralsyDemod(const char *Cmd) {
return 0; return 0;
} }
setDemodBuf(DemodBuffer, 96, ans); setDemodBuf(DemodBuffer, 96, ans);
setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
//setGrid_Clock(32); //setGrid_Clock(32);
//got a good demod //got a good demod

4
client/cmdlfparadox.c
View file

@ -32,8 +32,9 @@ int CmdFSKdemodParadox(const char *Cmd)
uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
size_t BitLen = getFromGraphBuf(BitStream); size_t BitLen = getFromGraphBuf(BitStream);
if (BitLen==0) return 0; if (BitLen==0) return 0;
int waveIdx=0;
//get binary from fsk wave //get binary from fsk wave
int idx = ParadoxdemodFSK(BitStream,&BitLen,&hi2,&hi,&lo); int idx = ParadoxdemodFSK(BitStream,&BitLen,&hi2,&hi,&lo,&waveIdx);
if (idx<0){ if (idx<0){
if (g_debugMode){ if (g_debugMode){
if (idx==-1){ if (idx==-1){
@ -63,6 +64,7 @@ int CmdFSKdemodParadox(const char *Cmd)
PrintAndLog("Paradox TAG ID: %x%08x - FC: %d - Card: %d - Checksum: %02x - RAW: %08x%08x%08x", PrintAndLog("Paradox TAG ID: %x%08x - FC: %d - Card: %d - Checksum: %02x - RAW: %08x%08x%08x",
hi>>10, (hi & 0x3)<<26 | (lo>>10), fc, cardnum, (lo>>2) & 0xFF, rawHi2, rawHi, rawLo); hi>>10, (hi & 0x3)<<26 | (lo>>10), fc, cardnum, (lo>>2) & 0xFF, rawHi2, rawHi, rawLo);
setDemodBuf(BitStream,BitLen,idx); setDemodBuf(BitStream,BitLen,idx);
setClockGrid(50, waveIdx + (idx*50));
if (g_debugMode){ if (g_debugMode){
PrintAndLog("DEBUG: idx: %d, len: %d, Printing Demod Buffer:", idx, BitLen); PrintAndLog("DEBUG: idx: %d, len: %d, Printing Demod Buffer:", idx, BitLen);
printDemodBuff(); printDemodBuff();

3
client/cmdlfpresco.c
View file

@ -144,7 +144,8 @@ int CmdPrescoDemod(const char *Cmd) {
uint32_t cardid = raw4; uint32_t cardid = raw4;
PrintAndLog("Presco Tag Found: Card ID %08X", cardid); PrintAndLog("Presco Tag Found: Card ID %08X", cardid);
PrintAndLog("Raw: %08X%08X%08X%08X", raw1,raw2,raw3,raw4); PrintAndLog("Raw: %08X%08X%08X%08X", raw1,raw2,raw3,raw4);
setDemodBuf(DemodBuffer+ans, 128, 0); setDemodBuf(DemodBuffer, 128, ans);
setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
uint32_t sitecode = 0, usercode = 0, fullcode = 0; uint32_t sitecode = 0, usercode = 0, fullcode = 0;
bool Q5=false; bool Q5=false;

4
client/cmdlfpyramid.c
View file

@ -96,8 +96,9 @@ int CmdFSKdemodPyramid(const char *Cmd)
size_t size = getFromGraphBuf(BitStream); size_t size = getFromGraphBuf(BitStream);
if (size==0) return 0; if (size==0) return 0;
int waveIdx=0;
//get binary from fsk wave //get binary from fsk wave
int idx = PyramiddemodFSK(BitStream, &size); int idx = PyramiddemodFSK(BitStream, &size, &waveIdx);
if (idx < 0){ if (idx < 0){
if (g_debugMode){ if (g_debugMode){
if (idx == -5) if (idx == -5)
@ -152,6 +153,7 @@ int CmdFSKdemodPyramid(const char *Cmd)
uint32_t rawHi2 = bytebits_to_byte(BitStream+idx+32,32); uint32_t rawHi2 = bytebits_to_byte(BitStream+idx+32,32);
uint32_t rawHi3 = bytebits_to_byte(BitStream+idx,32); uint32_t rawHi3 = bytebits_to_byte(BitStream+idx,32);
setDemodBuf(BitStream,128,idx); setDemodBuf(BitStream,128,idx);
setClockGrid(50, waveIdx + (idx*50));
size = removeParity(BitStream, idx+8, 8, 1, 120); size = removeParity(BitStream, idx+8, 8, 1, 120);
if (size != 105){ if (size != 105){

2
client/cmdlfsecurakey.c
View file

@ -64,7 +64,7 @@ int CmdSecurakeyDemod(const char *Cmd) {
return 0; return 0;
} }
setDemodBuf(DemodBuffer, 96, ans); setDemodBuf(DemodBuffer, 96, ans);
//setGrid_Clock(40); setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
//got a good demod //got a good demod
uint32_t raw1 = bytebits_to_byte(DemodBuffer , 32); uint32_t raw1 = bytebits_to_byte(DemodBuffer , 32);

12
client/cmdlft55xx.c
View file

@ -419,23 +419,23 @@ bool DecodeT55xxBlock(){
break; break;
case DEMOD_PSK1: case DEMOD_PSK1:
// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise) // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
save_restoreGB(1); save_restoreGB(GRAPH_SAVE);
CmdLtrim("160"); CmdLtrim("160");
snprintf(cmdStr, sizeof(buf),"%d %d 6", bitRate[config.bitrate], config.inverted ); snprintf(cmdStr, sizeof(buf),"%d %d 6", bitRate[config.bitrate], config.inverted );
ans = PSKDemod(cmdStr, false); ans = PSKDemod(cmdStr, false);
//undo trim samples //undo trim samples
save_restoreGB(0); save_restoreGB(GRAPH_RESTORE);
break; break;
case DEMOD_PSK2: //inverted won't affect this case DEMOD_PSK2: //inverted won't affect this
case DEMOD_PSK3: //not fully implemented case DEMOD_PSK3: //not fully implemented
// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise) // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
save_restoreGB(1); save_restoreGB(GRAPH_SAVE);
CmdLtrim("160"); CmdLtrim("160");
snprintf(cmdStr, sizeof(buf),"%d 0 6", bitRate[config.bitrate] ); snprintf(cmdStr, sizeof(buf),"%d 0 6", bitRate[config.bitrate] );
ans = PSKDemod(cmdStr, false); ans = PSKDemod(cmdStr, false);
psk1TOpsk2(DemodBuffer, DemodBufferLen); psk1TOpsk2(DemodBuffer, DemodBufferLen);
//undo trim samples //undo trim samples
save_restoreGB(0); save_restoreGB(GRAPH_RESTORE);
break; break;
case DEMOD_NRZ: case DEMOD_NRZ:
snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted ); snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );
@ -594,7 +594,7 @@ bool tryDetectModulation(){
clk = GetPskClock("", false, false); clk = GetPskClock("", false, false);
if (clk>0) { if (clk>0) {
// allow undo // allow undo
save_restoreGB(1); save_restoreGB(GRAPH_SAVE);
// skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise) // skip first 160 samples to allow antenna to settle in (psk gets inverted occasionally otherwise)
CmdLtrim("160"); CmdLtrim("160");
if ( PSKDemod("0 0 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) { if ( PSKDemod("0 0 6", false) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate, clk, &tests[hits].Q5)) {
@ -638,7 +638,7 @@ bool tryDetectModulation(){
} }
} // inverse waves does not affect this demod } // inverse waves does not affect this demod
//undo trim samples //undo trim samples
save_restoreGB(0); save_restoreGB(GRAPH_RESTORE);
} }
} }
if ( hits == 1) { if ( hits == 1) {

3
client/cmdlfviking.c
View file

@ -73,7 +73,8 @@ int CmdVikingDemod(const char *Cmd) {
uint8_t checksum = bytebits_to_byte(DemodBuffer+ans+32+24, 8); uint8_t checksum = bytebits_to_byte(DemodBuffer+ans+32+24, 8);
PrintAndLog("Viking Tag Found: Card ID %08X, Checksum: %02X", cardid, (unsigned int) checksum); PrintAndLog("Viking Tag Found: Card ID %08X, Checksum: %02X", cardid, (unsigned int) checksum);
PrintAndLog("Raw: %08X%08X", raw1,raw2); PrintAndLog("Raw: %08X%08X", raw1,raw2);
setDemodBuf(DemodBuffer+ans, 64, 0); setDemodBuf(DemodBuffer, 64, ans);
setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
return 1; return 1;
} }

2
client/cmdlfvisa2000.c
View file

@ -119,7 +119,7 @@ int CmdVisa2kDemod(const char *Cmd) {
return 0; return 0;
} }
setDemodBuf(DemodBuffer, 96, ans); setDemodBuf(DemodBuffer, 96, ans);
//setGrid_Clock(64); setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));
//got a good demod //got a good demod
uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32); uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);

10
client/graph.c
View file

@ -18,6 +18,9 @@
int GraphBuffer[MAX_GRAPH_TRACE_LEN]; int GraphBuffer[MAX_GRAPH_TRACE_LEN];
int GraphTraceLen; int GraphTraceLen;
int s_Buff[MAX_GRAPH_TRACE_LEN];
/* write a manchester bit to the graph */ /* write a manchester bit to the graph */
void AppendGraph(int redraw, int clock, int bit) void AppendGraph(int redraw, int clock, int bit)
{ {
@ -50,16 +53,19 @@ int ClearGraph(int redraw)
void save_restoreGB(uint8_t saveOpt) void save_restoreGB(uint8_t saveOpt)
{ {
static int SavedGB[MAX_GRAPH_TRACE_LEN]; static int SavedGB[MAX_GRAPH_TRACE_LEN];
static int SavedGBlen; static int SavedGBlen=0;
static bool GB_Saved = false; static bool GB_Saved = false;
static int SavedGridOffsetAdj=0;
if (saveOpt==1) { //save if (saveOpt == GRAPH_SAVE) { //save
memcpy(SavedGB, GraphBuffer, sizeof(GraphBuffer)); memcpy(SavedGB, GraphBuffer, sizeof(GraphBuffer));
SavedGBlen = GraphTraceLen; SavedGBlen = GraphTraceLen;
GB_Saved=true; GB_Saved=true;
SavedGridOffsetAdj = GridOffset;
} else if (GB_Saved) { //restore } else if (GB_Saved) { //restore
memcpy(GraphBuffer, SavedGB, sizeof(GraphBuffer)); memcpy(GraphBuffer, SavedGB, sizeof(GraphBuffer));
GraphTraceLen = SavedGBlen; GraphTraceLen = SavedGBlen;
GridOffset = SavedGridOffsetAdj;
RepaintGraphWindow(); RepaintGraphWindow();
} }
return; return;

4
client/graph.h
View file

@ -32,7 +32,11 @@ void DetectHighLowInGraph(int *high, int *low, bool addFuzz);
// Max graph trace len: 40000 (bigbuf) * 8 (at 1 bit per sample) // Max graph trace len: 40000 (bigbuf) * 8 (at 1 bit per sample)
#define MAX_GRAPH_TRACE_LEN (40000 * 8 ) #define MAX_GRAPH_TRACE_LEN (40000 * 8 )
#define GRAPH_SAVE 1
#define GRAPH_RESTORE 0
extern int GraphBuffer[MAX_GRAPH_TRACE_LEN]; extern int GraphBuffer[MAX_GRAPH_TRACE_LEN];
extern int GraphTraceLen; extern int GraphTraceLen;
extern int s_Buff[MAX_GRAPH_TRACE_LEN];
#endif #endif

3
client/proxgui.cpp
View file

@ -63,6 +63,7 @@ extern "C" void ExitGraphics(void)
if (!gui) if (!gui)
return; return;
delete gui; gui->Exit();
//delete gui;
gui = NULL; gui = NULL;
} }

21
client/proxgui.h
View file

@ -12,6 +12,9 @@
extern "C" { extern "C" {
#endif #endif
#include <stdint.h>
#include <string.h>
void ShowGraphWindow(void); void ShowGraphWindow(void);
void HideGraphWindow(void); void HideGraphWindow(void);
void RepaintGraphWindow(void); void RepaintGraphWindow(void);
@ -22,12 +25,30 @@ void ExitGraphics(void);
#define MAX_GRAPH_TRACE_LEN (40000*8) #define MAX_GRAPH_TRACE_LEN (40000*8)
extern int GraphBuffer[MAX_GRAPH_TRACE_LEN]; extern int GraphBuffer[MAX_GRAPH_TRACE_LEN];
extern int GraphTraceLen; extern int GraphTraceLen;
extern int s_Buff[MAX_GRAPH_TRACE_LEN];
extern double CursorScaleFactor; extern double CursorScaleFactor;
extern int PlotGridX, PlotGridY, PlotGridXdefault, PlotGridYdefault, CursorCPos, CursorDPos, GridOffset; extern int PlotGridX, PlotGridY, PlotGridXdefault, PlotGridYdefault, CursorCPos, CursorDPos, GridOffset;
extern int CommandFinished; extern int CommandFinished;
extern int offline; extern int offline;
extern bool GridLocked; extern bool GridLocked;
//Operations defined in data_operations
//extern int autoCorr(const int* in, int *out, size_t len, int window);
extern int AskEdgeDetect(const int *in, int *out, int len, int threshold);
extern int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose);
extern int directionalThreshold(const int* in, int *out, size_t len, int8_t up, int8_t down);
extern void save_restoreGB(uint8_t saveOpt);
#define GRAPH_SAVE 1
#define GRAPH_RESTORE 0
#define MAX_DEMOD_BUF_LEN (1024*128)
extern uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
extern size_t DemodBufferLen;
extern size_t g_DemodStartIdx;
extern bool showDemod;
extern uint8_t g_debugMode;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

653
client/proxguiqt.cpp
View file

@ -9,6 +9,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include "proxguiqt.h" #include "proxguiqt.h"
#include <stdbool.h>
#include <iostream> #include <iostream>
#include <QPainterPath> #include <QPainterPath>
#include <QBrush> #include <QBrush>
@ -20,10 +21,18 @@
#include <math.h> #include <math.h>
#include <limits.h> #include <limits.h>
#include <stdio.h> #include <stdio.h>
#include <QSlider>
#include <QHBoxLayout>
#include <string.h>
#include "proxgui.h" #include "proxgui.h"
#include <QtGui>
//#include <ctime>
bool g_useOverlays = false;
int g_absVMax = 0;
int startMax; int startMax;
int PageWidth; int PageWidth;
int unlockStart = 0;
void ProxGuiQT::ShowGraphWindow(void) void ProxGuiQT::ShowGraphWindow(void)
{ {
@ -40,6 +49,11 @@ void ProxGuiQT::HideGraphWindow(void)
emit HideGraphWindowSignal(); emit HideGraphWindowSignal();
} }
void ProxGuiQT::Exit(void)
{
emit ExitSignal();
}
void ProxGuiQT::_ShowGraphWindow(void) void ProxGuiQT::_ShowGraphWindow(void)
{ {
if(!plotapp) if(!plotapp)
@ -67,6 +81,9 @@ void ProxGuiQT::_HideGraphWindow(void)
plotwidget->hide(); plotwidget->hide();
} }
void ProxGuiQT::_Exit(void) {
delete this;
}
void ProxGuiQT::MainLoop() void ProxGuiQT::MainLoop()
{ {
plotapp = new QApplication(argc, argv); plotapp = new QApplication(argc, argv);
@ -74,6 +91,7 @@ void ProxGuiQT::MainLoop()
connect(this, SIGNAL(ShowGraphWindowSignal()), this, SLOT(_ShowGraphWindow())); connect(this, SIGNAL(ShowGraphWindowSignal()), this, SLOT(_ShowGraphWindow()));
connect(this, SIGNAL(RepaintGraphWindowSignal()), this, SLOT(_RepaintGraphWindow())); connect(this, SIGNAL(RepaintGraphWindowSignal()), this, SLOT(_RepaintGraphWindow()));
connect(this, SIGNAL(HideGraphWindowSignal()), this, SLOT(_HideGraphWindow())); connect(this, SIGNAL(HideGraphWindowSignal()), this, SLOT(_HideGraphWindow()));
connect(this, SIGNAL(ExitSignal()), this, SLOT(_Exit()));
plotapp->exec(); plotapp->exec();
} }
@ -85,11 +103,11 @@ ProxGuiQT::ProxGuiQT(int argc, char **argv) : plotapp(NULL), plotwidget(NULL),
ProxGuiQT::~ProxGuiQT(void) ProxGuiQT::~ProxGuiQT(void)
{ {
if (plotwidget) { //if (plotwidget) {
delete plotwidget; //plotwidget->destroy(true,true);
plotwidget = NULL; // delete plotwidget;
} // plotwidget = NULL;
//}
if (plotapp) { if (plotapp) {
plotapp->quit(); plotapp->quit();
delete plotapp; delete plotapp;
@ -97,15 +115,363 @@ ProxGuiQT::~ProxGuiQT(void)
} }
} }
void ProxWidget::paintEvent(QPaintEvent *event) //--------------------
void ProxWidget::applyOperation()
{ {
//printf("ApplyOperation()");
save_restoreGB(GRAPH_SAVE);
memcpy(GraphBuffer, s_Buff, sizeof(int) * GraphTraceLen);
RepaintGraphWindow();
}
void ProxWidget::stickOperation()
{
save_restoreGB(GRAPH_RESTORE);
//printf("stickOperation()");
}
void ProxWidget::vchange_autocorr(int v)
{
int ans;
ans = AutoCorrelate(GraphBuffer, s_Buff, GraphTraceLen, v, true, false);
if (g_debugMode) printf("vchange_autocorr(w:%d): %d\n", v, ans);
g_useOverlays = true;
RepaintGraphWindow();
}
void ProxWidget::vchange_askedge(int v)
{
int ans;
//extern int AskEdgeDetect(const int *in, int *out, int len, int threshold);
ans = AskEdgeDetect(GraphBuffer, s_Buff, GraphTraceLen, v);
if (g_debugMode) printf("vchange_askedge(w:%d)%d\n", v, ans);
g_useOverlays = true;
RepaintGraphWindow();
}
void ProxWidget::vchange_dthr_up(int v)
{
int down = opsController->horizontalSlider_dirthr_down->value();
directionalThreshold(GraphBuffer, s_Buff, GraphTraceLen, v, down);
//printf("vchange_dthr_up(%d)", v);
g_useOverlays = true;
RepaintGraphWindow();
}
void ProxWidget::vchange_dthr_down(int v)
{
//printf("vchange_dthr_down(%d)", v);
int up = opsController->horizontalSlider_dirthr_up->value();
directionalThreshold(GraphBuffer,s_Buff, GraphTraceLen, v, up);
g_useOverlays = true;
RepaintGraphWindow();
}
ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent)
{
this->master = master;
resize(800,500);
/** Setup the controller widget **/
controlWidget = new QWidget();
opsController = new Ui::Form();
opsController->setupUi(controlWidget);
//Due to quirks in QT Designer, we need to fiddle a bit
opsController->horizontalSlider_dirthr_down->setMinimum(-128);
opsController->horizontalSlider_dirthr_down->setMaximum(0);
opsController->horizontalSlider_dirthr_down->setValue(-20);
opsController->horizontalSlider_dirthr_up->setMinimum(-40);
opsController->horizontalSlider_dirthr_up->setMaximum(128);
opsController->horizontalSlider_dirthr_up->setValue(20);
opsController->horizontalSlider_askedge->setValue(25);
opsController->horizontalSlider_window->setValue(4000);
QObject::connect(opsController->pushButton_apply, SIGNAL(clicked()), this, SLOT(applyOperation()));
QObject::connect(opsController->pushButton_sticky, SIGNAL(clicked()), this, SLOT(stickOperation()));
QObject::connect(opsController->horizontalSlider_window, SIGNAL(valueChanged(int)), this, SLOT(vchange_autocorr(int)));
QObject::connect(opsController->horizontalSlider_dirthr_up, SIGNAL(valueChanged(int)), this, SLOT(vchange_dthr_up(int)));
QObject::connect(opsController->horizontalSlider_dirthr_down, SIGNAL(valueChanged(int)), this, SLOT(vchange_dthr_down(int)));
QObject::connect(opsController->horizontalSlider_askedge, SIGNAL(valueChanged(int)), this, SLOT(vchange_askedge(int)));
controlWidget->show();
// Set up the plot widget, which does the actual plotting
plot = new Plot(this);
/*
QSlider* slider = new QSlider(Qt::Horizontal);
slider->setFocusPolicy(Qt::StrongFocus);
slider->setTickPosition(QSlider::TicksBothSides);
slider->setTickInterval(10);
slider->setSingleStep(1);
*/
QVBoxLayout *layout = new QVBoxLayout;
//layout->addWidget(slider);
layout->addWidget(plot);
setLayout(layout);
//printf("Proxwidget Constructor just set layout\r\n");
}
// not 100% sure what i need in this block
// feel free to fix - marshmellow...
ProxWidget::~ProxWidget(void)
{
if (controlWidget) {
controlWidget->close();
delete controlWidget;
controlWidget = NULL;
}
if (opsController) {
delete opsController;
opsController = NULL;
}
if (plot) {
plot->close();
delete plot;
plot = NULL;
}
}
void ProxWidget::closeEvent(QCloseEvent *event)
{
event->ignore();
this->hide();
g_useOverlays = false;
}
void ProxWidget::hideEvent(QHideEvent *event) {
controlWidget->hide();
plot->hide();
}
void ProxWidget::showEvent(QShowEvent *event) {
controlWidget->show();
plot->show();
}
//----------- Plotting
int Plot::xCoordOf(int i, QRect r )
{
return r.left() + (int)((i - GraphStart)*GraphPixelsPerPoint);
}
int Plot::yCoordOf(int v, QRect r, int maxVal)
{
int z = (r.bottom() - r.top())/2;
return -(z * v) / maxVal + z;
}
int Plot::valueOf_yCoord(int y, QRect r, int maxVal)
{
int z = (r.bottom() - r.top())/2;
return (y-z) * maxVal / z;
}
static const QColor GREEN = QColor(100,255,100);
static const QColor RED = QColor(255,100,100);
static const QColor BLUE = QColor(100,100,255);
static const QColor GRAY = QColor(240,240,240);
QColor Plot::getColor(int graphNum)
{
switch (graphNum) {
case 0: return GREEN; //Green
case 1: return RED; //Red
case 2: return BLUE; //Blue
default: return GRAY; //Gray
}
}
void Plot::setMaxAndStart(int *buffer, int len, QRect plotRect)
{
if (len == 0) return;
startMax = (len - (int)((plotRect.right() - plotRect.left() - 40) / GraphPixelsPerPoint));
if(startMax < 0) {
startMax = 0;
}
if(GraphStart > startMax) {
GraphStart = startMax;
}
if (GraphStart > len) return;
int vMin = INT_MAX, vMax = INT_MIN, v = 0;
int sample_index = GraphStart ;
for( ; sample_index < len && xCoordOf(sample_index,plotRect) < plotRect.right() ; sample_index++) {
v = buffer[sample_index];
if(v < vMin) vMin = v;
if(v > vMax) vMax = v;
}
g_absVMax = 0;
if(fabs( (double) vMin) > g_absVMax) g_absVMax = (int)fabs( (double) vMin);
if(fabs( (double) vMax) > g_absVMax) g_absVMax = (int)fabs( (double) vMax);
g_absVMax = (int)(g_absVMax*1.25 + 1);
}
void Plot::PlotDemod(uint8_t *buffer, size_t len, QRect plotRect, QRect annotationRect, QPainter *painter, int graphNum, int plotOffset)
{
if (len == 0 || PlotGridX <= 0) return;
//clock_t begin = clock();
QPainterPath penPath;
int grid_delta_x = PlotGridX;
int first_delta_x = grid_delta_x; //(plotOffset > 0) ? PlotGridX : (PlotGridX +);
if (GraphStart > plotOffset) first_delta_x -= (GraphStart-plotOffset);
int DemodStart = GraphStart;
if (plotOffset > GraphStart) DemodStart = plotOffset;
int BitStart = 0;
// round down
if (DemodStart-plotOffset > 0) BitStart = (int)(((DemodStart-plotOffset)+(PlotGridX-1))/PlotGridX)-1;
first_delta_x += BitStart * PlotGridX;
if (BitStart > (int)len) return;
int delta_x = 0;
int v = 0;
//printf("first_delta_x %i, grid_delta_x %i, DemodStart %i, BitStart %i\n",first_delta_x,grid_delta_x,DemodStart, BitStart);
painter->setPen(getColor(graphNum));
char str[5];
int absVMax = (int)(100*1.05+1);
int x = xCoordOf(DemodStart, plotRect);
int y = yCoordOf((buffer[BitStart]*200-100)*-1,plotRect,absVMax);
penPath.moveTo(x, y);
delta_x = 0;
int clk = first_delta_x;
for(int i = BitStart; i < (int)len && xCoordOf(delta_x+DemodStart, plotRect) < plotRect.right(); i++) {
for (int ii = 0; ii < (clk) && i < (int)len && xCoordOf(DemodStart+delta_x+ii, plotRect) < plotRect.right() ; ii++ ) {
x = xCoordOf(DemodStart+delta_x+ii, plotRect);
v = buffer[i]*200-100;
y = yCoordOf( v, plotRect, absVMax);
penPath.lineTo(x, y);
if(GraphPixelsPerPoint > 10) {
QRect f(QPoint(x - 3, y - 3),QPoint(x + 3, y + 3));
painter->fillRect(f, QColor(100, 255, 100));
}
if (ii == (int)clk/2) {
//print label
sprintf(str, "%u",buffer[i]);
painter->drawText(x-8, y + ((buffer[i] > 0) ? 18 : -6), str);
}
}
delta_x += clk;
clk = grid_delta_x;
}
//Graph annotations
painter->drawPath(penPath);
}
void Plot::PlotGraph(int *buffer, int len, QRect plotRect, QRect annotationRect, QPainter *painter, int graphNum)
{
if (len == 0) return;
//clock_t begin = clock();
QPainterPath penPath;
int vMin = INT_MAX, vMax = INT_MIN, vMean = 0, v = 0, i = 0;
int x = xCoordOf(GraphStart, plotRect);
int y = yCoordOf(buffer[GraphStart],plotRect,g_absVMax);
penPath.moveTo(x, y);
for(i = GraphStart; i < len && xCoordOf(i, plotRect) < plotRect.right(); i++) {
x = xCoordOf(i, plotRect);
v = buffer[i];
y = yCoordOf( v, plotRect, g_absVMax);
penPath.lineTo(x, y);
if(GraphPixelsPerPoint > 10) {
QRect f(QPoint(x - 3, y - 3),QPoint(x + 3, y + 3));
painter->fillRect(f, QColor(100, 255, 100));
}
//catch stats
if(v < vMin) vMin = v;
if(v > vMax) vMax = v;
vMean += v;
}
vMean /= (i - GraphStart);
painter->setPen(getColor(graphNum));
//Draw y-axis
int xo = 5+(graphNum*40);
painter->drawLine(xo, plotRect.top(),xo, plotRect.bottom());
int vMarkers = (g_absVMax - (g_absVMax % 10)) / 5;
int minYDist = 40; //Minimum pixel-distance between markers
char yLbl[20];
int n = 0;
int lasty0 = 65535;
for(v = vMarkers; yCoordOf(v,plotRect,g_absVMax) > plotRect.top() && n < 20; v+= vMarkers ,n++)
{
int y0 = yCoordOf(v,plotRect,g_absVMax);
int y1 = yCoordOf(-v,plotRect,g_absVMax);
if(lasty0 - y0 < minYDist) continue;
painter->drawLine(xo-5,y0, xo+5, y0);
sprintf(yLbl, "%d", v);
painter->drawText(xo+8,y0+7,yLbl);
painter->drawLine(xo-5, y1, xo+5, y1);
sprintf(yLbl, "%d",-v);
painter->drawText(xo+8, y1+5 , yLbl);
lasty0 = y0;
}
//Graph annotations
painter->drawPath(penPath);
char str[200];
sprintf(str, "max=%d min=%d mean=%d n=%d/%d CursorAVal=[%d] CursorBVal=[%d]",
vMax, vMin, vMean, i, len, buffer[CursorAPos], buffer[CursorBPos]);
painter->drawText(20, annotationRect.bottom() - 23 - 20 * graphNum, str);
//clock_t end = clock();
//double elapsed_secs = double(end - begin) / CLOCKS_PER_SEC;
//printf("Plot time %f\n", elapsed_secs);
}
void Plot::plotGridLines(QPainter* painter,QRect r)
{
// set GridOffset
if (PlotGridX <= 0) return;
int offset = GridOffset;
if (GridLocked && PlotGridX) {
offset = GridOffset + PlotGridX - (GraphStart % PlotGridX);
} else if (!GridLocked && GraphStart > 0 && PlotGridX) {
offset = PlotGridX-((GraphStart - offset) % PlotGridX) + GraphStart - unlockStart;
}
offset %= PlotGridX;
if (offset < 0) offset += PlotGridX;
int i;
int grid_delta_x = (int) (PlotGridX * GraphPixelsPerPoint);
int grid_delta_y = PlotGridY;
if ((PlotGridX > 0) && ((PlotGridX * GraphPixelsPerPoint) > 1)) {
for(i = (offset * GraphPixelsPerPoint); i < r.right(); i += grid_delta_x) {
painter->drawLine(r.left()+i, r.top(), r.left()+i, r.bottom());
}
}
if (PlotGridY > 0) {
for(i = 0; yCoordOf(i,r,g_absVMax) > r.top(); i += grid_delta_y) {
painter->drawLine( r.left(), yCoordOf(i,r,g_absVMax), r.right(), yCoordOf(i,r,g_absVMax) );
painter->drawLine( r.left(), yCoordOf(i*-1,r,g_absVMax), r.right(), yCoordOf(i*-1,r,g_absVMax) );
}
}
}
#define HEIGHT_INFO 60
#define WIDTH_AXES 80
void Plot::paintEvent(QPaintEvent *event)
{
QPainter painter(this); QPainter painter(this);
QPainterPath penPath, whitePath, greyPath, lightgreyPath, cursorAPath, cursorBPath, cursorCPath, cursorDPath;
QRect r;
QBrush brush(QColor(100, 255, 100)); QBrush brush(QColor(100, 255, 100));
QPen pen(QColor(100, 255, 100)); QPen pen(QColor(100, 255, 100));
painter.setFont(QFont("Arial", 10)); painter.setFont(QFont("Courier New", 10));
if(GraphStart < 0) { if(GraphStart < 0) {
GraphStart = 0; GraphStart = 0;
@ -120,176 +486,72 @@ void ProxWidget::paintEvent(QPaintEvent *event)
if(CursorDPos > GraphTraceLen) if(CursorDPos > GraphTraceLen)
CursorDPos= 0; CursorDPos= 0;
r = rect(); QRect plotRect(WIDTH_AXES, 0, width()-WIDTH_AXES, height()-HEIGHT_INFO);
QRect infoRect(0, height()-HEIGHT_INFO, width(), HEIGHT_INFO);
painter.fillRect(r, QColor(0, 0, 0)); //Grey background
painter.fillRect(rect(), QColor(60, 60, 60));
//Black foreground
painter.fillRect(plotRect, QColor(0, 0, 0));
whitePath.moveTo(r.left() + 40, r.top()); //init graph variables
whitePath.lineTo(r.left() + 40, r.bottom()); setMaxAndStart(GraphBuffer,GraphTraceLen,plotRect);
int zeroHeight = r.top() + (r.bottom() - r.top()) / 2; // center line
int zeroHeight = plotRect.top() + (plotRect.bottom() - plotRect.top()) / 2;
greyPath.moveTo(r.left(), zeroHeight);
greyPath.lineTo(r.right(), zeroHeight);
painter.setPen(QColor(100, 100, 100)); painter.setPen(QColor(100, 100, 100));
painter.drawPath(greyPath); painter.drawLine(plotRect.left(), zeroHeight, plotRect.right(), zeroHeight);
PageWidth= (int)((r.right() - r.left() - 40) / GraphPixelsPerPoint);
// plot X and Y grid lines // plot X and Y grid lines
int i; plotGridLines(&painter, plotRect);
if ((PlotGridX > 0) && ((PlotGridX * GraphPixelsPerPoint) > 1)) {
for(i = 40 + (GridOffset * GraphPixelsPerPoint); i < r.right(); i += (int)(PlotGridX * GraphPixelsPerPoint)) {
//SelectObject(hdc, GreyPenLite);
//MoveToEx(hdc, r.left + i, r.top, NULL);
//LineTo(hdc, r.left + i, r.bottom);
lightgreyPath.moveTo(r.left()+i,r.top());
lightgreyPath.lineTo(r.left()+i,r.bottom());
painter.drawPath(lightgreyPath);
}
}
if ((PlotGridY > 0) && ((PlotGridY * GraphPixelsPerPoint) > 1)){
for(i = 0; i < ((r.top() + r.bottom())>>1); i += (int)(PlotGridY * GraphPixelsPerPoint)) {
lightgreyPath.moveTo(r.left() + 40,zeroHeight + i);
lightgreyPath.lineTo(r.right(),zeroHeight + i);
painter.drawPath(lightgreyPath);
lightgreyPath.moveTo(r.left() + 40,zeroHeight - i);
lightgreyPath.lineTo(r.right(),zeroHeight - i);
painter.drawPath(lightgreyPath);
}
}
startMax = (GraphTraceLen - (int)((r.right() - r.left() - 40) / GraphPixelsPerPoint)); //Start painting graph
if(startMax < 0) { PlotGraph(GraphBuffer, GraphTraceLen,plotRect,infoRect,&painter,0);
startMax = 0; if (showDemod && DemodBufferLen > 8) {
PlotDemod(DemodBuffer, DemodBufferLen,plotRect,infoRect,&painter,2,g_DemodStartIdx);
} }
if(GraphStart > startMax) { if (g_useOverlays) {
GraphStart = startMax; //init graph variables
setMaxAndStart(s_Buff,GraphTraceLen,plotRect);
PlotGraph(s_Buff, GraphTraceLen,plotRect,infoRect,&painter,1);
} }
// End graph drawing
int absYMax = 1; //Draw the cursors
if(CursorAPos > GraphStart && xCoordOf(CursorAPos, plotRect) < plotRect.right())
for(i = GraphStart; ; i++) {
if(i >= GraphTraceLen) {
break;
}
if(fabs((double)GraphBuffer[i]) > absYMax) {
absYMax = (int)fabs((double)GraphBuffer[i]);
}
int x = 40 + (int)((i - GraphStart)*GraphPixelsPerPoint);
if(x > r.right()) {
break;
}
}
absYMax = (int)(absYMax*1.2 + 1);
// number of points that will be plotted
int span = (int)((r.right() - r.left()) / GraphPixelsPerPoint);
// one label every 100 pixels, let us say
int labels = (r.right() - r.left() - 40) / 100;
if(labels <= 0) labels = 1;
int pointsPerLabel = span / labels;
if(pointsPerLabel <= 0) pointsPerLabel = 1;
int yMin = INT_MAX;
int yMax = INT_MIN;
int yMean = 0;
int n = 0;
for(i = GraphStart; ; i++) {
if(i >= GraphTraceLen) {
break;
}
int x = 40 + (int)((i - GraphStart)*GraphPixelsPerPoint);
if(x > r.right() + GraphPixelsPerPoint) {
break;
}
int y = GraphBuffer[i];
if(y < yMin) {
yMin = y;
}
if(y > yMax) {
yMax = y;
}
yMean += y;
n++;
y = (y * (r.top() - r.bottom()) / (2*absYMax)) + zeroHeight;
if(i == GraphStart) {
penPath.moveTo(x, y);
} else {
penPath.lineTo(x, y);
}
if(GraphPixelsPerPoint > 10) {
QRect f(QPoint(x - 3, y - 3),QPoint(x + 3, y + 3));
painter.fillRect(f, brush);
}
if(((i - GraphStart) % pointsPerLabel == 0) && i != GraphStart) {
whitePath.moveTo(x, zeroHeight - 3);
whitePath.lineTo(x, zeroHeight + 3);
char str[100];
sprintf(str, "+%d", (i - GraphStart));
painter.setPen(QColor(255, 255, 255));
QRect size;
QFontMetrics metrics(painter.font());
size = metrics.boundingRect(str);
painter.drawText(x - (size.right() - size.left()), zeroHeight + 9, str);
penPath.moveTo(x,y);
}
if(i == CursorAPos || i == CursorBPos || i == CursorCPos || i == CursorDPos) {
QPainterPath *cursorPath;
if(i == CursorAPos) {
cursorPath = &cursorAPath;
} else if (i == CursorBPos) {
cursorPath = &cursorBPath;
} else if (i == CursorCPos) {
cursorPath = &cursorCPath;
} else {
cursorPath = &cursorDPath;
}
cursorPath->moveTo(x, r.top());
cursorPath->lineTo(x, r.bottom());
penPath.moveTo(x, y);
}
}
if(n != 0) {
yMean /= n;
}
painter.setPen(QColor(255, 255, 255));
painter.drawPath(whitePath);
painter.setPen(pen);
painter.drawPath(penPath);
painter.setPen(QColor(255, 255, 0));
painter.drawPath(cursorAPath);
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];
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)",
GraphStart, yMax, yMin, yMean, n, GraphTraceLen,
CursorBPos - CursorAPos, (CursorBPos - CursorAPos)/CursorScaleFactor,GraphPixelsPerPoint,CursorAPos,GraphBuffer[CursorAPos],CursorBPos,GraphBuffer[CursorBPos],PlotGridXdefault,PlotGridYdefault,GridLocked?"Locked":"Unlocked");
painter.setPen(QColor(255, 255, 255));
painter.drawText(50, r.bottom() - 20, str);
}
ProxWidget::ProxWidget(QWidget *parent) : QWidget(parent), GraphStart(0), GraphPixelsPerPoint(1)
{ {
painter.setPen(QColor(255, 255, 0));
painter.drawLine(xCoordOf(CursorAPos, plotRect),plotRect.top(),xCoordOf(CursorAPos, plotRect),plotRect.bottom());
}
if(CursorBPos > GraphStart && xCoordOf(CursorBPos, plotRect) < plotRect.right())
{
painter.setPen(QColor(255, 0, 255));
painter.drawLine(xCoordOf(CursorBPos, plotRect),plotRect.top(),xCoordOf(CursorBPos, plotRect),plotRect.bottom());
}
if(CursorCPos > GraphStart && xCoordOf(CursorCPos, plotRect) < plotRect.right())
{
painter.setPen(QColor(255, 153, 0)); //orange
painter.drawLine(xCoordOf(CursorCPos, plotRect),plotRect.top(),xCoordOf(CursorCPos, plotRect),plotRect.bottom());
}
if(CursorDPos > GraphStart && xCoordOf(CursorDPos, plotRect) < plotRect.right())
{
painter.setPen(QColor(0, 0, 205)); //light blue
painter.drawLine(xCoordOf(CursorDPos, plotRect),plotRect.top(),xCoordOf(CursorDPos, plotRect),plotRect.bottom());
}
//Draw annotations
char str[200];
sprintf(str, "@%d dt=%d [%2.2f] zoom=%2.2f CursorAPos=%d CursorBPos=%d GridX=%d GridY=%d (%s) GridXoffset=%d",
GraphStart, CursorBPos - CursorAPos, (CursorBPos - CursorAPos)/CursorScaleFactor,
GraphPixelsPerPoint,CursorAPos,CursorBPos,PlotGridXdefault,PlotGridYdefault,GridLocked?"Locked":"Unlocked",GridOffset);
painter.setPen(QColor(255, 255, 255));
painter.drawText(20, infoRect.bottom() - 3, str);
}
Plot::Plot(QWidget *parent) : QWidget(parent), GraphStart(0), GraphPixelsPerPoint(1)
{
//Need to set this, otherwise we don't receive keypress events
setFocusPolicy( Qt::StrongFocus);
resize(600, 300); resize(600, 300);
QPalette palette(QColor(0,0,0,0)); QPalette palette(QColor(0,0,0,0));
@ -300,18 +562,21 @@ ProxWidget::ProxWidget(QWidget *parent) : QWidget(parent), GraphStart(0), GraphP
setAutoFillBackground(true); setAutoFillBackground(true);
CursorAPos = 0; CursorAPos = 0;
CursorBPos = 0; CursorBPos = 0;
setWindowTitle(tr("Sliders"));
} }
void ProxWidget::closeEvent(QCloseEvent *event) void Plot::closeEvent(QCloseEvent *event)
{ {
event->ignore(); event->ignore();
this->hide(); this->hide();
g_useOverlays = false;
} }
void ProxWidget::mouseMoveEvent(QMouseEvent *event) void Plot::mouseMoveEvent(QMouseEvent *event)
{ {
int x = event->x(); int x = event->x();
x -= 40; x -= WIDTH_AXES;
x = (int)(x / GraphPixelsPerPoint); x = (int)(x / GraphPixelsPerPoint);
x += GraphStart; x += GraphStart;
if((event->buttons() & Qt::LeftButton)) { if((event->buttons() & Qt::LeftButton)) {
@ -324,12 +589,9 @@ void ProxWidget::mouseMoveEvent(QMouseEvent *event)
this->update(); this->update();
} }
void ProxWidget::keyPressEvent(QKeyEvent *event) void Plot::keyPressEvent(QKeyEvent *event)
{ {
int offset; int offset;
int gridchanged;
gridchanged= 0;
if(event->modifiers() & Qt::ShiftModifier) { if(event->modifiers() & Qt::ShiftModifier) {
if (PlotGridX) if (PlotGridX)
@ -357,53 +619,18 @@ void ProxWidget::keyPressEvent(QKeyEvent *event)
case Qt::Key_Right: case Qt::Key_Right:
if(GraphPixelsPerPoint < 20) { if(GraphPixelsPerPoint < 20) {
if (PlotGridX && GridLocked && GraphStart < startMax){
GridOffset -= offset;
GridOffset %= PlotGridX;
gridchanged= 1;
}
GraphStart += offset; GraphStart += offset;
} else { } else {
if (PlotGridX && GridLocked && GraphStart < startMax){
GridOffset--;
GridOffset %= PlotGridX;
gridchanged= 1;
}
GraphStart++; GraphStart++;
} }
if(GridOffset < 0) {
GridOffset += PlotGridX;
}
if (gridchanged)
if (GraphStart > startMax) {
GridOffset += (GraphStart - startMax);
GridOffset %= PlotGridX;
}
break; break;
case Qt::Key_Left: case Qt::Key_Left:
if(GraphPixelsPerPoint < 20) { if(GraphPixelsPerPoint < 20) {
if (PlotGridX && GridLocked && GraphStart > 0){
GridOffset += offset;
GridOffset %= PlotGridX;
gridchanged= 1;
}
GraphStart -= offset; GraphStart -= offset;
} else { } else {
if (PlotGridX && GridLocked && GraphStart > 0){
GridOffset++;
GridOffset %= PlotGridX;
gridchanged= 1;
}
GraphStart--; GraphStart--;
} }
if (gridchanged){
if (GraphStart < 0)
GridOffset += GraphStart;
if(GridOffset < 0)
GridOffset += PlotGridX;
GridOffset %= PlotGridX;
}
break; break;
case Qt::Key_G: case Qt::Key_G:
@ -439,6 +666,10 @@ void ProxWidget::keyPressEvent(QKeyEvent *event)
case Qt::Key_L: case Qt::Key_L:
GridLocked = !GridLocked; GridLocked = !GridLocked;
if (GridLocked)
GridOffset += (GraphStart - unlockStart);
else
unlockStart = GraphStart;
break; break;
case Qt::Key_Q: case Qt::Key_Q:

66
client/proxguiqt.h
View file

@ -8,24 +8,37 @@
// GUI (QT) // GUI (QT)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef PROXGUI_QT
#define PROXGUI_QT
#include <QApplication> #include <QApplication>
#include <QPushButton> #include <QPushButton>
#include <QObject> #include <QObject>
#include <QWidget> #include <QWidget>
#include <QPainter> #include <QPainter>
#include <QtGui>
class ProxWidget : public QWidget #include "ui/ui_overlays.h"
/**
* @brief The actual plot, black area were we paint the graph
*/
class Plot: public QWidget
{ {
Q_OBJECT;
private: private:
int GraphStart; int GraphStart;
double GraphPixelsPerPoint; double GraphPixelsPerPoint;
int CursorAPos; int CursorAPos;
int CursorBPos; int CursorBPos;
void PlotGraph(int *buffer, int len, QRect r,QRect r2, QPainter* painter, int graphNum);
void PlotDemod(uint8_t *buffer, size_t len, QRect r,QRect r2, QPainter* painter, int graphNum, int plotOffset);
void plotGridLines(QPainter* painter,QRect r);
int xCoordOf(int i, QRect r );
int yCoordOf(int v, QRect r, int maxVal);
int valueOf_yCoord(int y, QRect r, int maxVal);
void setMaxAndStart(int *buffer, int len, QRect plotRect);
QColor getColor(int graphNum);
public: public:
ProxWidget(QWidget *parent = 0); Plot(QWidget *parent = 0);
protected: protected:
void paintEvent(QPaintEvent *event); void paintEvent(QPaintEvent *event);
@ -33,6 +46,43 @@ class ProxWidget : public QWidget
void mouseMoveEvent(QMouseEvent *event); void mouseMoveEvent(QMouseEvent *event);
void mousePressEvent(QMouseEvent *event) { mouseMoveEvent(event); } void mousePressEvent(QMouseEvent *event) { mouseMoveEvent(event); }
void keyPressEvent(QKeyEvent *event); void keyPressEvent(QKeyEvent *event);
};
class ProxGuiQT;
/**
* The window with plot and controls
*/
class ProxWidget : public QWidget
{
Q_OBJECT; //needed for slot/signal classes
private:
ProxGuiQT *master;
Plot *plot;
Ui::Form *opsController;
QWidget* controlWidget;
public:
ProxWidget(QWidget *parent = 0, ProxGuiQT *master = NULL);
~ProxWidget(void);
//OpsShow(void);
protected:
// void paintEvent(QPaintEvent *event);
void closeEvent(QCloseEvent *event);
void showEvent(QShowEvent *event);
void hideEvent(QHideEvent *event);
// void mouseMoveEvent(QMouseEvent *event);
// void mousePressEvent(QMouseEvent *event) { mouseMoveEvent(event); }
// void keyPressEvent(QKeyEvent *event);
public slots:
void applyOperation();
void stickOperation();
void vchange_autocorr(int v);
void vchange_askedge(int v);
void vchange_dthr_up(int v);
void vchange_dthr_down(int v);
}; };
class ProxGuiQT : public QObject class ProxGuiQT : public QObject
@ -53,14 +103,16 @@ class ProxGuiQT : public QObject
void RepaintGraphWindow(void); void RepaintGraphWindow(void);
void HideGraphWindow(void); void HideGraphWindow(void);
void MainLoop(void); void MainLoop(void);
void Exit(void);
private slots: private slots:
void _ShowGraphWindow(void); void _ShowGraphWindow(void);
void _RepaintGraphWindow(void); void _RepaintGraphWindow(void);
void _HideGraphWindow(void); void _HideGraphWindow(void);
void _Exit(void);
signals: signals:
void ShowGraphWindowSignal(void); void ShowGraphWindowSignal(void);
void RepaintGraphWindowSignal(void); void RepaintGraphWindowSignal(void);
void HideGraphWindowSignal(void); void HideGraphWindowSignal(void);
void ExitSignal(void);
}; };
#endif // PROXGUI_QT

15
client/proxmark3.c
View file

@ -176,12 +176,12 @@ static void *main_loop(void *targ) {
pthread_join(reader_thread, NULL); pthread_join(reader_thread, NULL);
} }
ExitGraphics();
if (script_file) { if (script_file) {
fclose(script_file); fclose(script_file);
script_file = NULL; script_file = NULL;
} }
ExitGraphics();
pthread_exit(NULL); pthread_exit(NULL);
return NULL; return NULL;
} }
@ -254,7 +254,7 @@ int main(int argc, char* argv[]) {
.usb_present = 0, .usb_present = 0,
.script_cmds_file = NULL .script_cmds_file = NULL
}; };
pthread_t main_loop_threat; pthread_t main_loop_thread;
sp = uart_open(argv[1]); sp = uart_open(argv[1]);
@ -288,13 +288,16 @@ int main(int argc, char* argv[]) {
// create a mutex to avoid interlacing print commands from our different threads // create a mutex to avoid interlacing print commands from our different threads
pthread_mutex_init(&print_lock, NULL); pthread_mutex_init(&print_lock, NULL);
pthread_create(&main_loop_thread, NULL, &main_loop, &marg);
pthread_create(&main_loop_threat, NULL, &main_loop, &marg); // build ui/graph forms on separate thread (killed on main_loop_thread);
InitGraphics(argc, argv); InitGraphics(argc, argv);
MainGraphics(); MainGraphics();
//this won't return until ExitGraphics() is called
//wait for thread to finish
pthread_join(main_loop_thread, NULL);
pthread_join(main_loop_threat, NULL);
// Clean up the port // Clean up the port
if (offline == 0) { if (offline == 0) {

3
client/ui.c
View file

@ -19,11 +19,12 @@
#include "ui.h" #include "ui.h"
double CursorScaleFactor = 1; double CursorScaleFactor = 1;
int PlotGridX, PlotGridY, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0; int PlotGridX=0, PlotGridY=0, PlotGridXdefault= 64, PlotGridYdefault= 64, CursorCPos= 0, CursorDPos= 0;
int offline; int offline;
int flushAfterWrite = 0; //buzzy int flushAfterWrite = 0; //buzzy
int GridOffset = 0; int GridOffset = 0;
bool GridLocked = false; bool GridLocked = false;
bool showDemod = true;
extern pthread_mutex_t print_lock; extern pthread_mutex_t print_lock;

2
client/ui.h
View file

@ -12,6 +12,7 @@
#define UI_H__ #define UI_H__
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h>
void ShowGui(void); void ShowGui(void);
void HideGraphWindow(void); void HideGraphWindow(void);
@ -25,5 +26,6 @@ extern int PlotGridX, PlotGridY, PlotGridXdefault, PlotGridYdefault, CursorCPos,
extern int offline; extern int offline;
extern int flushAfterWrite; //buzzy extern int flushAfterWrite; //buzzy
extern bool GridLocked; extern bool GridLocked;
extern bool showDemod;
#endif #endif

340
client/ui/overlays.ui Normal file
View file

@ -0,0 +1,340 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Form</class>
<widget class="QWidget" name="Form">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>614</width>
<height>286</height>
</rect>
</property>
<property name="windowTitle">
<string>Overlays</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QTabWidget" name="tabWidget_overlays">
<property name="currentIndex">
<number>1</number>
</property>
<widget class="QWidget" name="tab">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<attribute name="title">
<string>Autocorrelate</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="1">
<widget class="QLabel" name="label_5">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Window size</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QSlider" name="horizontalSlider_window">
<property name="minimum">
<number>10</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
<property name="value">
<number>2000</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_3">
<attribute name="title">
<string>AskEdge</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QFormLayout" name="formLayout_4">
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Edge Jump Threshold</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_9">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QSlider" name="horizontalSlider_askedge">
<property name="minimum">
<number>5</number>
</property>
<property name="maximum">
<number>80</number>
</property>
<property name="value">
<number>20</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>Dirthreshold</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Up</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_6">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QSlider" name="horizontalSlider_dirthr_up">
<property name="maximum">
<number>128</number>
</property>
<property name="value">
<number>20</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QFormLayout" name="formLayout_3">
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Down</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_7">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QSlider" name="horizontalSlider_dirthr_down">
<property name="maximum">
<number>127</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="pushButton_apply">
<property name="text">
<string>Apply</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushButton_sticky">
<property name="text">
<string>Restore</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>horizontalSlider_window</sender>
<signal>valueChanged(int)</signal>
<receiver>label_4</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>46</x>
<y>118</y>
</hint>
<hint type="destinationlabel">
<x>597</x>
<y>257</y>
</hint>
</hints>
</connection>
<connection>
<sender>horizontalSlider_window</sender>
<signal>valueChanged(int)</signal>
<receiver>label_5</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>170</x>
<y>118</y>
</hint>
<hint type="destinationlabel">
<x>161</x>
<y>69</y>
</hint>
</hints>
</connection>
<connection>
<sender>horizontalSlider_dirthr_up</sender>
<signal>valueChanged(int)</signal>
<receiver>label_6</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>70</x>
<y>118</y>
</hint>
<hint type="destinationlabel">
<x>68</x>
<y>67</y>
</hint>
</hints>
</connection>
<connection>
<sender>horizontalSlider_dirthr_down</sender>
<signal>valueChanged(int)</signal>
<receiver>label_7</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>201</x>
<y>185</y>
</hint>
<hint type="destinationlabel">
<x>149</x>
<y>135</y>
</hint>
</hints>
</connection>
<connection>
<sender>horizontalSlider_askedge</sender>
<signal>valueChanged(int)</signal>
<receiver>label_9</receiver>
<slot>setNum(int)</slot>
<hints>
<hint type="sourcelabel">
<x>149</x>
<y>102</y>
</hint>
<hint type="destinationlabel">
<x>250</x>
<y>70</y>
</hint>
</hints>
</connection>
</connections>
</ui>

50
common/lfdemod.c
View file

@ -1130,10 +1130,10 @@ int millerRawDecode(uint8_t *BitStream, size_t *size, int invert) {
//take 01 or 10 = 1 and 11 or 00 = 0 //take 01 or 10 = 1 and 11 or 00 = 0
//check for phase errors - should never have 111 or 000 should be 01001011 or 10110100 for 1010 //check for phase errors - should never have 111 or 000 should be 01001011 or 10110100 for 1010
//decodes biphase or if inverted it is AKA conditional dephase encoding AKA differential manchester encoding //decodes biphase or if inverted it is AKA conditional dephase encoding AKA differential manchester encoding
int BiphaseRawDecode(uint8_t *BitStream, size_t *size, int offset, int invert) { int BiphaseRawDecode(uint8_t *BitStream, size_t *size, int *offset, int invert) {
uint16_t bitnum = 0; uint16_t bitnum = 0;
uint16_t errCnt = 0; uint16_t errCnt = 0;
size_t i = offset; size_t i = *offset;
uint16_t MaxBits=512; uint16_t MaxBits=512;
//if not enough samples - error //if not enough samples - error
if (*size < 51) return -1; if (*size < 51) return -1;
@ -1143,8 +1143,8 @@ int BiphaseRawDecode(uint8_t *BitStream, size_t *size, int offset, int invert) {
if (BitStream[i+1]==BitStream[i+2]) offsetA=0; if (BitStream[i+1]==BitStream[i+2]) offsetA=0;
if (BitStream[i+2]==BitStream[i+3]) offsetB=0; if (BitStream[i+2]==BitStream[i+3]) offsetB=0;
} }
if (!offsetA && offsetB) offset++; if (!offsetA && offsetB) *offset+=1;
for (i=offset; i<*size-3; i+=2){ for (i=*offset; i<*size-3; i+=2){
//check for phase error //check for phase error
if (BitStream[i+1]==BitStream[i+2]) { if (BitStream[i+1]==BitStream[i+2]) {
BitStream[bitnum++]=7; BitStream[bitnum++]=7;
@ -1489,18 +1489,14 @@ size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert,
//by marshmellow (from holiman's base) //by marshmellow (from holiman's base)
// full fsk demod from GraphBuffer wave to decoded 1s and 0s (no mandemod) // full fsk demod from GraphBuffer wave to decoded 1s and 0s (no mandemod)
int fskdemod_ext(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *startIdx) { int fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *startIdx) {
if (justNoise(dest, size)) return 0;
// FSK demodulator // FSK demodulator
size = fsk_wave_demod(dest, size, fchigh, fclow, startIdx); size = fsk_wave_demod(dest, size, fchigh, fclow, startIdx);
size = aggregate_bits(dest, size, rfLen, invert, fchigh, fclow, startIdx); size = aggregate_bits(dest, size, rfLen, invert, fchigh, fclow, startIdx);
return size; return size;
} }
int fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow) {
int startIdx=0;
return fskdemod_ext(dest, size, rfLen, invert, fchigh, fclow, &startIdx);
}
// by marshmellow // by marshmellow
// convert psk1 demod to psk2 demod // convert psk1 demod to psk2 demod
// only transition waves are 1s // only transition waves are 1s
@ -1627,14 +1623,12 @@ int pskRawDemod(uint8_t dest[], size_t *size, int *clock, int *invert) {
// by marshmellow // by marshmellow
// FSK Demod then try to locate an AWID ID // FSK Demod then try to locate an AWID ID
int AWIDdemodFSK(uint8_t *dest, size_t *size) { int AWIDdemodFSK(uint8_t *dest, size_t *size, int *waveStartIdx) {
//make sure buffer has enough data //make sure buffer has enough data
if (*size < 96*50) return -1; if (*size < 96*50) return -1;
if (justNoise(dest, *size)) return -2;
// FSK demodulator // FSK demodulator
*size = fskdemod(dest, *size, 50, 1, 10, 8); // fsk2a RF/50 *size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); // fsk2a RF/50
if (*size < 96) return -3; //did we get a good demod? if (*size < 96) return -3; //did we get a good demod?
uint8_t preamble[] = {0,0,0,0,0,0,0,1}; uint8_t preamble[] = {0,0,0,0,0,0,0,1};
@ -1716,12 +1710,10 @@ int gProxII_Demod(uint8_t BitStream[], size_t *size) {
} }
// loop to get raw HID waveform then FSK demodulate the TAG ID from it // loop to get raw HID waveform then FSK demodulate the TAG ID from it
int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo) { int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx) {
if (justNoise(dest, *size)) return -1;
size_t numStart=0, size2=*size, startIdx=0; size_t numStart=0, size2=*size, startIdx=0;
// FSK demodulator // FSK demodulator fsk2a so invert and fc/10/8
*size = fskdemod(dest, size2,50,1,10,8); //fsk2a *size = fskdemod(dest, size2, 50, 1, 10, 8, waveStartIdx);
if (*size < 96*2) return -2; if (*size < 96*2) return -2;
// 00011101 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1 // 00011101 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1
uint8_t preamble[] = {0,0,0,1,1,1,0,1}; uint8_t preamble[] = {0,0,0,1,1,1,0,1};
@ -1746,12 +1738,11 @@ int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32
return (int)startIdx; return (int)startIdx;
} }
int IOdemodFSK(uint8_t *dest, size_t size) { int IOdemodFSK(uint8_t *dest, size_t size, int *waveStartIdx) {
if (justNoise(dest, size)) return -1;
//make sure buffer has data //make sure buffer has data
if (size < 66*64) return -2; if (size < 66*64) return -2;
// FSK demodulator // FSK demodulator RF/64, fsk2a so invert, and fc/10/8
size = fskdemod(dest, size, 64, 1, 10, 8); // FSK2a RF/64 size = fskdemod(dest, size, 64, 1, 10, 8, waveStartIdx);
if (size < 65) return -3; //did we get a good demod? if (size < 65) return -3; //did we get a good demod?
//Index map //Index map
//0 10 20 30 40 50 60 //0 10 20 30 40 50 60
@ -1796,12 +1787,10 @@ int indala26decode(uint8_t *bitStream, size_t *size, uint8_t *invert) {
} }
// loop to get raw paradox waveform then FSK demodulate the TAG ID from it // loop to get raw paradox waveform then FSK demodulate the TAG ID from it
int ParadoxdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo) { int ParadoxdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx) {
if (justNoise(dest, *size)) return -1;
size_t numStart=0, size2=*size, startIdx=0; size_t numStart=0, size2=*size, startIdx=0;
// FSK demodulator // FSK demodulator
*size = fskdemod(dest, size2,50,1,10,8); //fsk2a *size = fskdemod(dest, size2,50,1,10,8,waveStartIdx); //fsk2a
if (*size < 96) return -2; if (*size < 96) return -2;
// 00001111 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1 // 00001111 bit pattern represent start of frame, 01 pattern represents a 0 and 10 represents a 1
@ -1841,15 +1830,12 @@ int PrescoDemod(uint8_t *dest, size_t *size) {
// by marshmellow // by marshmellow
// FSK Demod then try to locate a Farpointe Data (pyramid) ID // FSK Demod then try to locate a Farpointe Data (pyramid) ID
int PyramiddemodFSK(uint8_t *dest, size_t *size) { int PyramiddemodFSK(uint8_t *dest, size_t *size, int *waveStartIdx) {
//make sure buffer has data //make sure buffer has data
if (*size < 128*50) return -5; if (*size < 128*50) return -5;
//test samples are not just noise
if (justNoise(dest, *size)) return -1;
// FSK demodulator // FSK demodulator
*size = fskdemod(dest, *size, 50, 1, 10, 8); // fsk2a RF/50 *size = fskdemod(dest, *size, 50, 1, 10, 8, waveStartIdx); // fsk2a RF/50
if (*size < 128) return -2; //did we get a good demod? if (*size < 128) return -2; //did we get a good demod?
uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1}; uint8_t preamble[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1};

15
common/lfdemod.h
View file

@ -21,7 +21,7 @@ extern size_t addParity(uint8_t *BitSource, uint8_t *dest, uint8_t sourceLen,
extern int askdemod(uint8_t *BinStream, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType); extern int askdemod(uint8_t *BinStream, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType);
extern int askdemod_ext(uint8_t *BinStream, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType, int *startIdx); extern int askdemod_ext(uint8_t *BinStream, size_t *size, int *clk, int *invert, int maxErr, uint8_t amp, uint8_t askType, int *startIdx);
extern void askAmp(uint8_t *BitStream, size_t size); extern void askAmp(uint8_t *BitStream, size_t size);
extern int BiphaseRawDecode(uint8_t * BitStream, size_t *size, int offset, int invert); extern int BiphaseRawDecode(uint8_t * BitStream, size_t *size, int *offset, int invert);
extern uint32_t bytebits_to_byte(uint8_t* src, size_t numbits); extern uint32_t bytebits_to_byte(uint8_t* src, size_t numbits);
extern uint32_t bytebits_to_byteLSBF(uint8_t* src, size_t numbits); extern uint32_t bytebits_to_byteLSBF(uint8_t* src, size_t numbits);
extern uint16_t countFC(uint8_t *BitStream, size_t size, uint8_t fskAdj); extern uint16_t countFC(uint8_t *BitStream, size_t size, uint8_t fskAdj);
@ -32,8 +32,7 @@ extern int DetectNRZClock(uint8_t dest[], size_t size, int clock, size_t *c
extern int DetectPSKClock(uint8_t dest[], size_t size, int clock, size_t *firstPhaseShift, uint8_t *curPhase, uint8_t *fc); extern int DetectPSKClock(uint8_t dest[], size_t size, int clock, size_t *firstPhaseShift, uint8_t *curPhase, uint8_t *fc);
extern int DetectStrongAskClock(uint8_t dest[], size_t size, int high, int low, int *clock); extern int DetectStrongAskClock(uint8_t dest[], size_t size, int high, int low, int *clock);
extern bool DetectST(uint8_t buffer[], size_t *size, int *foundclock, size_t *ststart, size_t *stend); extern bool DetectST(uint8_t buffer[], size_t *size, int *foundclock, size_t *ststart, size_t *stend);
extern int fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow); extern int fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *startIdx);
extern int fskdemod_ext(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow, int *startIdx);
extern int getHiLo(uint8_t *BitStream, size_t size, int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo); extern int getHiLo(uint8_t *BitStream, size_t size, int *high, int *low, uint8_t fuzzHi, uint8_t fuzzLo);
extern uint32_t manchesterEncode2Bytes(uint16_t datain); extern uint32_t manchesterEncode2Bytes(uint16_t datain);
extern int ManchesterEncode(uint8_t *BitStream, size_t size); extern int ManchesterEncode(uint8_t *BitStream, size_t size);
@ -49,16 +48,16 @@ extern void psk1TOpsk2(uint8_t *BitStream, size_t size);
extern size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen); extern size_t removeParity(uint8_t *BitStream, size_t startIdx, uint8_t pLen, uint8_t pType, size_t bLen);
//tag specific //tag specific
extern int AWIDdemodFSK(uint8_t *dest, size_t *size); extern int AWIDdemodFSK(uint8_t *dest, size_t *size, int *waveStartIdx);
extern uint8_t Em410xDecode(uint8_t *BitStream, size_t *size, size_t *startIdx, uint32_t *hi, uint64_t *lo); extern uint8_t Em410xDecode(uint8_t *BitStream, size_t *size, size_t *startIdx, uint32_t *hi, uint64_t *lo);
extern int FDXBdemodBI(uint8_t *dest, size_t *size); extern int FDXBdemodBI(uint8_t *dest, size_t *size);
extern int gProxII_Demod(uint8_t BitStream[], size_t *size); extern int gProxII_Demod(uint8_t BitStream[], size_t *size);
extern int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo); extern int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx);
extern int IOdemodFSK(uint8_t *dest, size_t size); extern int IOdemodFSK(uint8_t *dest, size_t size, int *waveStartIdx);
extern int indala26decode(uint8_t *bitStream, size_t *size, uint8_t *invert); extern int indala26decode(uint8_t *bitStream, size_t *size, uint8_t *invert);
extern int ParadoxdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo); extern int ParadoxdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32_t *lo, int *waveStartIdx);
extern int PrescoDemod(uint8_t *dest, size_t *size); extern int PrescoDemod(uint8_t *dest, size_t *size);
extern int PyramiddemodFSK(uint8_t *dest, size_t *size); extern int PyramiddemodFSK(uint8_t *dest, size_t *size, int *waveStartIdx);
extern int VikingDemod_AM(uint8_t *dest, size_t *size); extern int VikingDemod_AM(uint8_t *dest, size_t *size);
extern int Visa2kDemod_AM(uint8_t *dest, size_t *size); extern int Visa2kDemod_AM(uint8_t *dest, size_t *size);