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

clean up some comments

Browse source
This commit is contained in:
marshmellow42 2015-01-26 17:49:30 -05:00
commit 8c65b650e8
2 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/cmddata.c
View file

@ -1190,12 +1190,17 @@ int CmdFSKfcDetect(const char *Cmd)
return 1; return 1;
} }
//by marshmellow
//attempt to detect the bit clock for PSK or NRZ modulations
int CmdDetectNRZpskClockRate(const char *Cmd) int CmdDetectNRZpskClockRate(const char *Cmd)
{ {
GetNRZpskClock("",0,0); GetNRZpskClock("",0,0);
return 0; return 0;
} }
//by marshmellow
//attempt to psk1 or nrz demod graph buffer
//NOTE CURRENTLY RELIES ON PEAKS :(
int PSKnrzDemod(const char *Cmd, uint8_t verbose) int PSKnrzDemod(const char *Cmd, uint8_t verbose)
{ {
int invert=0; int invert=0;
@ -1296,6 +1301,9 @@ int CmdIndalaDecode(const char *Cmd)
return 1; return 1;
} }
//by marshmellow
//attempt to clean psk wave noise after a peak
//NOTE RELIES ON PEAKS :(
int CmdPskClean(const char *Cmd) int CmdPskClean(const char *Cmd)
{ {
uint8_t bitStream[MAX_GRAPH_TRACE_LEN]={0}; uint8_t bitStream[MAX_GRAPH_TRACE_LEN]={0};

15
common/lfdemod.c
View file

@ -336,30 +336,20 @@ int askrawdemod(uint8_t *BinStream, size_t *size, int *clk, int *invert)
for (i = iii; i < *size; ++i) { for (i = iii; i < *size; ++i) {
if ((BinStream[i] >= high) && ((i-lastBit)>(*clk-tol))){ if ((BinStream[i] >= high) && ((i-lastBit)>(*clk-tol))){
lastBit+=*clk; lastBit+=*clk;
//BitStream[bitnum] = *invert;
//bitnum++;
midBit=0; midBit=0;
} else if ((BinStream[i] <= low) && ((i-lastBit)>(*clk-tol))){ } else if ((BinStream[i] <= low) && ((i-lastBit)>(*clk-tol))){
//low found and we are expecting a bar //low found and we are expecting a bar
lastBit+=*clk; lastBit+=*clk;
//BitStream[bitnum] = 1- *invert;
//bitnum++;
midBit=0; midBit=0;
} else if ((BinStream[i]<=low) && (midBit==0) && ((i-lastBit)>((*clk/2)-tol))){ } else if ((BinStream[i]<=low) && (midBit==0) && ((i-lastBit)>((*clk/2)-tol))){
//mid bar? //mid bar?
midBit=1; midBit=1;
//BitStream[bitnum]= 1- *invert;
//bitnum++;
} else if ((BinStream[i]>=high) && (midBit==0) && ((i-lastBit)>((*clk/2)-tol))){ } else if ((BinStream[i]>=high) && (midBit==0) && ((i-lastBit)>((*clk/2)-tol))){
//mid bar? //mid bar?
midBit=1; midBit=1;
//BitStream[bitnum]= *invert;
//bitnum++;
} else if ((i-lastBit)>((*clk/2)+tol) && (midBit==0)){ } else if ((i-lastBit)>((*clk/2)+tol) && (midBit==0)){
//no mid bar found //no mid bar found
midBit=1; midBit=1;
//BitStream[bitnum]= BitStream[bitnum-1];
//bitnum++;
} else { } else {
//mid value found or no bar supposed to be here //mid value found or no bar supposed to be here
@ -367,16 +357,11 @@ int askrawdemod(uint8_t *BinStream, size_t *size, int *clk, int *invert)
//should have hit a high or low based on clock!! //should have hit a high or low based on clock!!
//debug //debug
//PrintAndLog("DEBUG - no wave in expected area - location: %d, expected: %d-%d, lastBit: %d - resetting search",i,(lastBit+(clk-((int)(tol)))),(lastBit+(clk+((int)(tol)))),lastBit); //PrintAndLog("DEBUG - no wave in expected area - location: %d, expected: %d-%d, lastBit: %d - resetting search",i,(lastBit+(clk-((int)(tol)))),(lastBit+(clk+((int)(tol)))),lastBit);
//if (bitnum > 0){
// BitStream[bitnum]=77;
// bitnum++;
//}
errCnt++; errCnt++;
lastBit+=*clk;//skip over until hit too many errors lastBit+=*clk;//skip over until hit too many errors
if (errCnt > ((*size/1000))){ //allow 1 error for every 1000 samples else start over if (errCnt > ((*size/1000))){ //allow 1 error for every 1000 samples else start over
errCnt=0; errCnt=0;
// bitnum=0;//start over
break; break;
} }
} }